diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle.sql
index 7ffcebed6b..3445dea47a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/characters.sql
index ea2aace011..60e1a786a2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/characters.sql
@@ -60,4 +60,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort.sql
index 00eb12a37e..33143b0805 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort_siege_guards.sql
index 4872d0110c..40ed7619dc 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_siege_guards` VALUES
 -- Shanty Guards
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort_spawnlist.sql
index 0285fa6edd..d3caf9312e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,7 +11,7 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_spawnlist` VALUES
 (101,null,35658,-53273,156650,-1896,62000,0,0),
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/grandboss_data.sql
index a6eea53a0e..d1008dd77e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/heroes.sql
index 2fc8753f90..49a371cbd5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/heroes.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/items.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/olympiad_fights.sql
index 618ee73db0..662f1c4a7e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(1) unsigned NOT NULL DEFAULT '0',
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/olympiad_nobles.sql
index 0c8b3d0f9b..8e46191a26 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_done_week_non_classed` tinyint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week_team` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_01.0_Ertheia/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/config/Custom/AutoPlay.ini b/L2J_Mobius_01.0_Ertheia/dist/game/config/Custom/AutoPlay.ini
index 9a4fd4bf2e..6e9d9628be 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/config/Custom/AutoPlay.ini
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/config/Custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # Enable .play command only for premium players.
 # Premium System must be enabled.
 # Default: False
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_01.0_Ertheia/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/config/General.ini b/L2J_Mobius_01.0_Ertheia/dist/game/config/General.ini
index e2e7d162ab..3448711898 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/config/General.ini
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/config/General.ini
@@ -426,8 +426,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/ActionData.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/ActionData.xml
index 965751da7b..9b400ad513 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/ActionData.xml
@@ -1,219 +1,252 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
-	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
-	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="38" handler="Ride" /> <!-- Mount/Dismount -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
-	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
-	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
-	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
-	<action id="70" handler="AirshipAction" option="4" /> <!-- Exit Airship -->
-	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
-	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
-	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
-	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
-	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Nightshade - Shade Sacrifice -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
-	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="0" handler="SitStand" /> <!-- Toggle Sit/Stand. (/sit, /stand) -->
+	<action id="1" handler="RunWalk" /> <!-- Toggle Walk/Run. (/walk, /run) -->
+	<action id="2" handler="None" /> <!-- Attacks selected target(s), or takes a general action if the target cannot be attacked. Hold down the Ctrl key and click to attack by force. (/attack, /attackforce) -->
+	<action id="3" handler="None" /> <!-- Request a trade from the selected target. (/trade) -->
+	<action id="4" handler="None" /> <!-- Select the nearest attackable target. (/targetnext) -->
+	<action id="5" handler="None" /> <!-- Pick up items that are scattered nearby. (/pickup) -->
+	<action id="6" handler="None" /> <!-- Change to the target of the currently selected player. (/assist) -->
+	<action id="7" handler="None" /> <!-- Invite the selected person to your party. (/invite) -->
+	<action id="8" handler="None" /> <!-- Leave the party. (/leave) -->
+	<action id="9" handler="None" /> <!-- If you are the leader of the party, dismiss selected members from your party. (/dismiss) -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Sets up a private store to sell your items. (/vendor) -->
+	<action id="11" handler="None" /> <!-- Display the party matching window to search for parties or to add members to your party. (/partymatching) -->
+	<action id="12" handler="SocialAction" option="2" /> <!-- Emote: Greet others with a kind "hello." (/socialhello) -->
+	<action id="13" handler="SocialAction" option="3" /> <!-- Emote: Let everyone know that you or someone else is victorious! (/socialvictory) -->
+	<action id="14" handler="SocialAction" option="4" /> <!-- Emote: Rouse your allies and charge! (/socialcharge) -->
+	<action id="15" handler="PetHold" /> <!-- Have your pet follow you or stay and hold its ground. -->
+	<action id="16" handler="PetAttack" /> <!-- Attack target. -->
+	<action id="17" handler="PetStop" /> <!-- Stop current action. -->
+	<action id="18" handler="None" /> <!-- Pick up nearby items. -->
+	<action id="19" handler="UnsummonPet" /> <!-- Returns your pet back to its home. -->
+	<action id="20" handler="None" /> <!-- Use special skill. -->
+	<action id="21" handler="ServitorHold" /> <!-- Have your summons follow you or stay and hold its ground. -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attack target. -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="24" handler="SocialAction" option="6" /> <!-- Emote: Respond positively. (/socialyes) -->
+	<action id="25" handler="SocialAction" option="5" /> <!-- Emote: Respond negatively. (/socialno) -->
+	<action id="26" handler="SocialAction" option="7" /> <!-- Emote: Show your respect and bow. (/socialbow) -->
+	<action id="27" handler="None" /> <!-- Use special skill. -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Sets up a private store to purchase items. (/buy) -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Emote: You have no idea what's going on. (/socialunaware) -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Emote: I'm waiting... (/socialwaiting) -->
+	<action id="31" handler="SocialAction" option="10" /> <!-- Emote: Have a good laugh. (/sociallaugh) -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Toggle between Attack/Move modes. -->
+	<action id="33" handler="SocialAction" option="11" /> <!-- Emote: Applaud. (/socialapplause) -->
+	<action id="34" handler="SocialAction" option="12" /> <!-- Emote: Serve them up your best dance moves. (/socialdance) -->
+	<action id="35" handler="SocialAction" option="13" /> <!-- Emote: Show grief. (/socialsad) -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Poison gas attack. -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Set up a private workshop that creates items by using Dwarven recipes in exchange for a fee. (/dwarvenmanufacture) -->
+	<action id="38" handler="Ride" /> <!-- Toggle mount/dismount when near or on an NPC that can be ridden. (/mount, /dismount, /mountdismount) -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Exploding corpse attack. -->
+	<action id="40" handler="None" /> <!-- Enhances a target's evaluation score. (/evaluate) -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Attacks castle gates, walls, or headquarters by shooting a cannon. -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Reflects damage back to an enemy. -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Attacks an enemy by creating a whirling surge of water. -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Attacks an enemy with a powerful explosion. -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Restores the summoner's MP. -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Attacks an enemy by summoning up a devastating storm. -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Damages an enemy and heals the servitor at the same time. -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Attacks the enemy by shooting a cannon. -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Attack with a fit of rage. -->
+	<action id="50" handler="None" /> <!-- The selected party member will become the new party leader. (/changepartyleader) -->
+	<action id="51" handler="None" /> <!-- Creates an item using a common recipe in exchange for a fee. (/generalmanufacture) -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Removes the bonds from the summons and releases it. -->
+	<action id="53" handler="ServitorMove" /> <!-- Move to the target. -->
+	<action id="54" handler="PetMove" /> <!-- Move to the target. -->
+	<action id="55" handler="None" /> <!-- Toggle recording and stop recording of replay files. (/start_replayrecording, /stop_replayrecording, /startstop_replayrecording) -->
+	<action id="56" handler="None" /> <!-- Invite the selected target to a command channel. (/channelinvite) -->
+	<action id="57" handler="None" /> <!-- Highlights private store and private workshop messages that contain the search word. (/findprivatestore) -->
+	<action id="58" handler="None" /> <!-- Challenge another player to a duel. (/duel) -->
+	<action id="59" handler="None" /> <!-- Withdraw from a duel. A withdrawal is treated as a defeat. (/withdraw) -->
+	<action id="60" handler="None" /> <!-- Challenge another party to a duel. (/partyduel) -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Open a personal store for package sale. (/packagesale) -->
+	<action id="62" handler="SocialAction" option="14" /> <!-- Charm Pose (Command: /charm) -->
+	<action id="63" handler="None" /> <!-- Begins a fun and easy mini-game. (command: /minigame) -->
+	<action id="64" handler="TeleportBookmark" /> <!-- Displays My Teleports window you can use to save and manage my teleport locations (command: /myteleport). -->
+	<action id="65" handler="BotReport" /> <!-- Reports the targeted player as a suspected bot. -->
+	<action id="66" handler="SocialAction" option="15" /> <!-- Allows character to strike shy pose. (command: /shyness) -->
+	<action id="67" handler="AirshipAction" option="1" /> <!-- Allows you to control the Airship. -->
+	<action id="68" handler="AirshipAction" option="2" /> <!-- Relinquishes control of the Airship. -->
+	<action id="69" handler="AirshipAction" option="3" /> <!-- Choose from pre-designated locations. -->
+	<action id="70" handler="AirshipAction" option="4" /> <!-- Disembarks from the Airship. -->
+	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange bows with another person. (command: /two-personbow) -->
+	<action id="72" handler="SocialAction" option="17" /> <!-- High Five another person. (command: /hi-five) -->
+	<action id="73" handler="SocialAction" option="18" /> <!-- Dance with another player. (command: /coupledance) -->
+	<action id="74" handler="None" /> <!-- It turns on or off the entire status information gauge above the player's head. (Commands: /statusbaroff, /statusbaron, /statusbaronoff) -->
+	<action id="76" handler="None" /> <!-- Invite the selected target as friends. (Commands: /friendinvite, /addfriend, /registerfriend) -->
+	<action id="77" handler="None" /> <!-- Start or end recording videos. (Commands: /startrecording, /stoprecording, /startstoprecording) -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Use Token 1 on the target. It is only available with party status. (Command: /usetoken1) -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Use Token 2 on the target. It is only available with party status. (Command: /usetoken2) -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Use Token 3 on the target. It is only available with party status. (Command: /usetoken3) -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Use Token 4 on the target. It is only available with party status. (Command: /usetoken4) -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Make a target of an object that was applied with the token 1. It is only available with party status. (Command: /targettoken1) -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Make a target of an object that was applied with the token 2. It is only available with party status. (Command: /targettoken2) -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Make a target of an object that was applied with the token 3. It is only available with party status. (Command: /targettoken3) -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Make a target of an object that was applied with the token 4. It is only available with party status. (Command: /targettoken4) -->
+	<action id="87" handler="SocialAction" option="28" /> <!-- Gesture of Proposal (Command: /Propose) -->
+	<action id="88" handler="SocialAction" option="29" /> <!-- Gesture of Provocation (Command: /Provoke) -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off (Command: /showoff) -->
+	<action id="90" handler="InstanceZoneInfo" /> <!-- Display list of usage times for instanced zones. (Command: /instancedzone) -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Attacks castle gates, walls, or headquarters with a powerful strike. -->
+	<action id="1001" handler="None" /> <!-- A reckless yet powerful attack that must be used with extreme caution. -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Incites those around the summon to attack you. -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Instantly increases P. Def. and M. Def. significantly. Character is immovable while this skill is in effect. -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- A magical attack. -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Recovers the pet's HP. -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Temporarily increases your party's chance to land a critical attack and also increases the power of the attack if successful. -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Temporarily increases your party's P. Atk and accuracy. -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Has a chance to remove curses from party members. -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Temporarily increases your party's MP regeneration. -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Temporarily shortens your party's spell re-use timer. -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Remove a curse from your party. -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Provokes an opponent to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Provokes multiple enemies around the caster to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Sacrifice HP in order to regenerate the HP of a selected target. -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Attempt a powerful, critical attack on an opponent. -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- A stunning blow that inflicts damage and instantly throws an enemy into a state of stun. -->
+	
+	<!-- TODO: Find skill ids. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Inflict a deadly curse on an enemy that absorbs their HP. -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kat the Cat -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mew the Cat -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kai the Cat -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Boxer the Unicorn -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mirage the Unicorn -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Merrow the Unicorn -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Shadow -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by Shadow -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Silhouette -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by reanimated man -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by reanimated man -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by corrupted man -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King: A powerful slashing attack. Over-hit is possible. -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King: Slashes at surrounding enemies while spinning in the air. Over-hit is possible. -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King: Immobilizes all nearby enemies. -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn: Powerful rear kicks that stun and damage an enemy. Over-hit is possible. -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn: Pounds multiple enemies with a tremendous onrush of water. -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord: Detonates a corpse, inflicting damage to nearby enemies. -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord: Blades attached to each arm slash out in a devastating attack. Over-hit is possible. -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord: Curses nearby enemies, poisoning them and reducing their Atk. Spd. -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon: Fires a projectile a short distance. Consumes 4 Flash Gunpowder. -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon: Fires a projectile a long distance. Consumes 5 Flash Gunpowder. -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Viciously bite an enemy. -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Scratch an enemy with both paws. Causes bleeding. -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awaken hidden powers. -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Decrease a nearby enemy's P. Atk./M. Atk. with a wolf cry. -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Decrease a nearby enemy's attack speed/magic speed with a strider roar. -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Viciously bite an enemy. -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Cause both damage and shock at the same time. Instantly stuns an enemy. -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Breath fire in front of you. -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Increases maximum HP temporarily. -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Increases maximum MP temporarily. -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Increases Atk. Spd. temporarily. -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Increases Casting Spd. temporarily. -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Temporarily decreases the target's MP consumption of skills. Consumes Spirit Ore. -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Increases M. Atk. power temporarily. -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Temporarily increases the critical rate of damage attack magic. -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Temporarily increases the critical attack power. -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Temporarily increases the probability of critical attack. -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Temporarily increases Accuracy. -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Rapidly attacks the enemy twice. -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Inflicts shock and damage to the enemy at the same time with a powerful spin attack. -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Attacks nearby enemies with a doll heap attack. -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakens a hidden ability. -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of thunder. -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack on nearby enemies when hit. -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Control put in place to prevent the use of a buff upon the master. 5-minute duration. -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Powerfully attacks the target. -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- A powerful attack that pierces through a target. -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies by spinning your own body like a whirlwind. -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Attacks a front-line enemy with a powerful lance thrust. -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Shouts a victory cry that increases your abilities. -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Gathers energy into your body, then releases it in a destructive blast. -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Hits enemies with a powerful wave of force. -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Emits a loud roar that amplifies your abilities. -->
+	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Charges toward the enemy and inflicts damage. -->
+	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Cancels the target's de-buff. -->
+	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Emits a spread of ring-shaped flames. -->
+	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Attacks the enemy with a powerful flaming beak. -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Toggles you between Attack and Support modes. -->
+	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Cancels more than one of the enemy's buffs. -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Decreases the enemy's Dark attribute by 25. -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Strike multiple enemies at the front with the tail. -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Bites the enemies at the front. -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Causes nearby enemies to flee in fear. -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Increases your speed. -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Greatly increases its master's speed. -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Increases the speed of its master and their party. -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Teleports its master to the Seed of Annihilation. -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Teleports its master and their party to the Seed of Annihilation. -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attack the target. -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move to a designated location. -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Make the servitor disappear by cancelling the summoning. -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Do not counter-attack. -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Counter-attack when the master or itself is attacked. -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Damages and provokes the target. -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Roll over and deliver a shock to the ground stunning nearby targets. -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Bites the target to inflict damage. -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Damages the target and absorbs some of its HP. -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Attack nearby enemies and block their physical skills. -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Flourishes claws and frontally attacks enemies. -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Dashes toward enemies to inflict damage and Stun them. -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Inflicts damage onto the enemies with a flame. -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Flies straight into the enemy. -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Purifies the master. -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Attack the enemy by darting a feather. -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Hurt the enemy by attacking them with sharp claws. -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Recover the targets near the tree and clear any debuff. -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Attacks nearby targets with a powerful punch. -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Provokes nearby enemies. -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Bites the enemy. -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Provokes nearby enemies. -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Bites the enemy. -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Provokes nearby enemies. -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Bites the enemy. -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1142" handler="None" /> <!-- Attacks nearby enemies and blocks their P. Skills. -->
+	<action id="1143" handler="None" /> <!-- Rushes to the enemy to inflict damage and Stun. -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Can express affection to Rudolph. Affection Level rises by 25%. Warning: Can be used only when a Rudolph requests expression of affection, and cannot be used while transformed! -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Increases Max HP by 20%, Max MP by 20%, and the Speed by 20% for 5 minutes. Increases the Debuff Resistance by 10%. Reuse delay 10 minutes. Consumes 3 Rose Essence(s) during skill use. Doesn't overlap with other buffs except Critical Seduction. -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- For 30 minutes, increases party members' Max HP by 30%, Max MP by 30%, Max CP by 30%, P. Def. by 30%, magic M. Def. by 30%, Speed by 20, P. Atk. by 10%, and magic M. Atk. by 20%. Decreases MP consumption for skill use by 15%. Reuse delay 5 minutes. Consumes 10 Rose Essence(s) during skill use. -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of lightning. -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack upon contacted enemies nearby. -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Restricts to prevent the use of a buff upon the master. 5 minute duration. -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Inflicts a powerful attack that seems to pierce through the target. -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies. -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impales an enemy with a sword. -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Raises one's own abilities. -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Gathered energy within ones self can be focused and used to attack an enemy. -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Fires a shock wave to attack enemies at the front. -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Amplifies one's own abilities. -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switches between attack mode and support mode. -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Instantly restores the master's HP by 10%. Increases the master's Debuff Resistance by 80%, Buff-canceling Attack Resistance by 40%, Speed by 10, P. Def. by 20%, and M. Def. by 20%, and decreases MP consumption for all skills by 50% for 1 minute. -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/DoorData.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/DoorData.xml
index 0790af5b77..75078aea42 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/DoorData.xml
@@ -11298,6 +11298,176 @@
 		<openStatus default="open" />
 	</door>
 	
+	<!-- 21_16 FIXME: Rune clanhall doors cannot be found in client. -->
+	<door id="21160001" name="rune_castle_agit_002_001">
+		<nodes nodeZ="872">
+			<node x="37679" y="-50432" />
+			<node x="37726" y="-50433" />
+			<node x="37726" y="-50423" />
+			<node x="37678" y="-50424" />
+		</nodes>
+		<location x="37680" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160002" name="rune_castle_agit_002_002">
+		<nodes nodeZ="872">
+			<node x="37724" y="-50432" />
+			<node x="37771" y="-50432" />
+			<node x="37771" y="-50423" />
+			<node x="37723" y="-50424" />
+		</nodes>
+		<location x="37770" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160003" name="rune_castle_agit_003_001">
+		<nodes nodeZ="872">
+			<node x="38527" y="-50151" />
+			<node x="38570" y="-50131" />
+			<node x="38566" y="-50122" />
+			<node x="38524" y="-50144" />
+		</nodes>
+		<location x="38527" y="-50147" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160004" name="rune_castle_agit_003_002">
+		<nodes nodeZ="872">
+			<node x="38569" y="-50132" />
+			<node x="38610" y="-50111" />
+			<node x="38606" y="-50103" />
+			<node x="38564" y="-50124" />
+		</nodes>
+		<location x="38607" y="-50108" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160005" name="rune_castle_agit_004_001">
+		<nodes nodeZ="872">
+			<node x="39122" y="-49542" />
+			<node x="39145" y="-49501" />
+			<node x="39137" y="-49498" />
+			<node x="39115" y="-49539" />
+		</nodes>
+		<location x="39119" y="-49539" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160006" name="rune_castle_agit_004_002">
+		<nodes nodeZ="872">
+			<node x="39145" y="-49503" />
+			<node x="39167" y="-49462" />
+			<node x="39160" y="-49459" />
+			<node x="39136" y="-49498" />
+		</nodes>
+		<location x="39163" y="-49461" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160007" name="rune_castle_agit_001_001">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48291" />
+			<node x="39341" y="-48245" />
+			<node x="39335" y="-48245" />
+			<node x="39334" y="-48290" />
+		</nodes>
+		<location x="39338" y="-48290" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160008" name="rune_castle_agit_001_002">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48246" />
+			<node x="39342" y="-48199" />
+			<node x="39334" y="-48199" />
+			<node x="39334" y="-48246" />
+		</nodes>
+		<location x="39338" y="-48200" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160009" name="rune_castle_agit_005_001">
+		<nodes nodeZ="872">
+			<node x="39176" y="-47024" />
+			<node x="39155" y="-46982" />
+			<node x="39147" y="-46986" />
+			<node x="39169" y="-47026" />
+		</nodes>
+		<location x="39172" y="-47024" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160010" name="rune_castle_agit_005_002">
+		<nodes nodeZ="872">
+			<node x="39154" y="-46982" />
+			<node x="39133" y="-46942" />
+			<node x="39127" y="-46945" />
+			<node x="39148" y="-46986" />
+		</nodes>
+		<location x="39130" y="-46944" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160011" name="rune_castle_agit_006_001">
+		<nodes nodeZ="872">
+			<node x="38626" y="-46372" />
+			<node x="38586" y="-46350" />
+			<node x="38581" y="-46358" />
+			<node x="38623" y="-46379" />
+		</nodes>
+		<location x="38624" y="-46375" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160012" name="rune_castle_agit_006_002">
+		<nodes nodeZ="872">
+			<node x="38587" y="-46350" />
+			<node x="38545" y="-46330" />
+			<node x="38542" y="-46336" />
+			<node x="38583" y="-46358" />
+		</nodes>
+		<location x="38544" y="-46333" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160013" name="rune_castle_agit_007_001">
+		<nodes nodeZ="873">
+			<node x="37787" y="-46044" />
+			<node x="37741" y="-46044" />
+			<node x="37741" y="-46051" />
+			<node x="37787" y="-46050" />
+		</nodes>
+		<location x="37787" y="-46047" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160014" name="rune_castle_agit_007_002">
+		<nodes nodeZ="873">
+			<node x="37743" y="-46043" />
+			<node x="37697" y="-46045" />
+			<node x="37697" y="-46051" />
+			<node x="37742" y="-46051" />
+		</nodes>
+		<location x="37697" y="-46048" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	
 	<!-- 21_17 -->
 	<door id="21170001" name="Rune_bodeful_fortress_s.Rune_bf_azit_gate_door">
 		<nodes nodeZ="544">
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 4c9d1bc4cc..056fe69093 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -252,6 +253,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 6a1e99290e..2ec17e9b00 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -41,6 +41,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AirBind", AirBind::new);
@@ -225,7 +227,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
similarity index 80%
rename from L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
rename to L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
index c99b060259..4f72de76fa 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -1,31 +1,31 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
similarity index 80%
rename from L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
rename to L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
index c99b060259..84f20e491a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -1,31 +1,31 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index cd446ab812..2775ff29a4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -182,6 +182,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()))
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index b7434abd2e..1ba322bbe3 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,55 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
 }
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..798a363468 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,46 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 68c2f77658..7e9df354f4 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.quest.QuestState;
@@ -46,10 +47,11 @@ public class ChamberOfProphecies extends AbstractInstance
 {
 	// NPCs
 	private static final int KAIN_VAN_HALTER = 31639;
-	private static final int VAN_HALTER = 33999;
-	private static final int FERIN = 34001;
 	private static final int GRAIL = 33996;
 	private static final int MYSTERIOUS_WIZARD = 33980;
+	// Helper NPCs
+	private static final int HELPER_VAN_HALTER = 33999;
+	private static final int HELPER_FERIN = 34001;
 	// Misc
 	private static final int DOOR_2 = 17230102;
 	private static final int DOOR_3 = 17230103;
@@ -66,7 +68,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		addStartNpc(KAIN_VAN_HALTER);
 		addFirstTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
 		addTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
-		addCreatureSeeId(FERIN, VAN_HALTER);
+		addCreatureSeeId(HELPER_FERIN, HELPER_VAN_HALTER);
 	}
 	
 	@Override
@@ -145,12 +147,12 @@ public class ChamberOfProphecies extends AbstractInstance
 				{
 					return null;
 				}
-				final Npc valHalter = world.getNpc(VAN_HALTER);
-				if (valHalter != null)
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
+				if (vanHalter != null)
 				{
-					valHalter.deleteMe(); // probably needs another npc id for initial room
+					vanHalter.deleteMe(); // probably needs another npc id for initial room
 				}
-				final Npc ferin = world.getNpc(FERIN);
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
 				if (ferin != null)
 				{
 					ferin.deleteMe(); // probably needs another npc id for initial room
@@ -190,6 +192,8 @@ public class ChamberOfProphecies extends AbstractInstance
 			case "CHECK_STATUS":
 			{
 				final Instance world = player.getInstanceWorld();
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
 				if (!isInInstance(world))
 				{
 					return null;
@@ -200,8 +204,8 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
-							startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY2", 14000, ferin, player);
+							startQuestTimer("SEY_KAIN", 24000, vanHalter, player);
 							startQuestTimer("OPEN_DOOR1", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -221,7 +225,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY3", 8000, ferin, player);
 							startQuestTimer("OPEN_DOOR2", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -234,7 +238,7 @@ public class ChamberOfProphecies extends AbstractInstance
 							world.setStatus(4);
 							world.spawnGroup("wof_room3_2");
 							world.openCloseDoor(DOOR_3, false);
-							startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY_KAIN_1", 5000, vanHalter, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
 						break;
@@ -245,8 +249,8 @@ public class ChamberOfProphecies extends AbstractInstance
 						{
 							world.setStatus(5);
 							world.spawnGroup("wof_room4");
-							startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
-							startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY_KAIN_2", 3000, vanHalter, player);
+							startQuestTimer("SEY4", 7000, ferin, player);
 						}
 						else
 						{
@@ -304,7 +308,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					return null;
 				}
 				cancelQuestTimer("ATTACK1", npc, player);
-				startQuestTimer("ATTACK2", 200, world.getNpc(VAN_HALTER), player, true);
+				startQuestTimer("ATTACK2", 200, world.getNpc(HELPER_VAN_HALTER), player, true);
 				world.setStatus(3);
 				world.spawnGroup("wof_room3");
 				world.openCloseDoor(DOOR_3, true);
@@ -321,7 +325,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY2":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.YOU_CAN_T_DIE_HERE_I_DIDN_T_LEARN_RESURRECT_YET));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_4", 0, 0, 0, 0, 0));
@@ -330,7 +334,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GISELLE_WAS_SUCH_A_SWEET_CHILD));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_1", 0, 0, 0, 0, 0));
@@ -340,7 +344,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY3":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.DO_YOU_THINK_I_LL_GROW_TALLER_IF_I_EAT_LOTS_AND_LOTS));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_6", 0, 0, 0, 0, 0));
@@ -349,7 +353,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_1":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.SUCH_MONSTERS_IN_A_PLACE_LIKE_THIS_UNBELIEVABLE));
 				}
@@ -357,7 +361,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_2":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THAT_S_THE_MONSTER_THAT_ATTACKED_FAERON_YOU_RE_OUTMATCHED_HERE_GO_AHEAD_I_LL_CATCH_UP));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_6", 0, 0, 0, 0, 0));
@@ -367,7 +371,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY4":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GO_NOW_KAIN_CAN_HANDLE_THIS));
 					npc.setScriptValue(1);
@@ -377,7 +381,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_3":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.LEAVE_THIS_TO_ME_GO));
 					npc.setScriptValue(1);
@@ -387,7 +391,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "REST":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, player);
 				}
@@ -508,7 +512,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		{
 			switch (npc.getId())
 			{
-				case FERIN:
+				case HELPER_FERIN:
 				{
 					if (creature.isPlayer() && !creature.isDead() && npc.isScriptValue(0))
 					{
@@ -516,7 +520,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					}
 					break;
 				}
-				case VAN_HALTER:
+				case HELPER_VAN_HALTER:
 				{
 					if (creature.isPlayer() && !creature.isDead() && world.isStatus(0))
 					{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
index 5cc212ec6f..95f6b485ff 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
@@ -16,9 +16,10 @@
  */
 package quests.Q00625_TheFinestIngredientsPart2;
 
-import org.l2jmobius.gameserver.data.SpawnTable;
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -120,7 +121,7 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 						{
 							rewardItems(player, GREATER_DYE_OF_DEX_2);
 						}
-						qs.exitQuest(false, true);
+						qs.exitQuest(true, true);
 						htmltext = event;
 					}
 					else
@@ -136,12 +137,11 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 				{
 					if (hasItem(player, FOOD_FOR_BUMBALUMP))
 					{
+						qs.setCond(2, true);
 						if (!isBumbalumpSpawned())
 						{
-							qs.setCond(2, true);
 							takeItem(player, FOOD_FOR_BUMBALUMP);
-							final Npc umpaloopa = addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
-							umpaloopa.setSummoner(player);
+							addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
 							htmltext = event;
 						}
 						else
@@ -154,6 +154,18 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 						htmltext = "31542-04.html";
 					}
 				}
+				else if (qs.isCond(2))
+				{
+					if (!isBumbalumpSpawned())
+					{
+						addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
+						htmltext = event;
+					}
+					else
+					{
+						htmltext = "31542-03.html";
+					}
+				}
 				break;
 			}
 			case "NPC_TALK":
@@ -181,7 +193,7 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 				{
 					if (talker.getLevel() >= MIN_LEVEL)
 					{
-						htmltext = (hasItem(talker, SOY_SOURCE_JAR)) ? "31521-01.htm" : "31521-02.htm";
+						htmltext = hasItem(talker, SOY_SOURCE_JAR) ? "31521-01.htm" : "31521-02.htm";
 					}
 					else
 					{
@@ -221,18 +233,14 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 				{
 					case 1:
 					{
-						if (hasItem(talker, FOOD_FOR_BUMBALUMP))
-						{
-							htmltext = "31542-01.html";
-						}
+						htmltext = "31542-01.html";
 						break;
 					}
 					case 2:
 					{
 						if (!isBumbalumpSpawned())
 						{
-							final Npc umpaloopa = addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
-							umpaloopa.setSummoner(talker);
+							addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
 							htmltext = "31542-02.html";
 						}
 						else
@@ -264,20 +272,23 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 	@Override
 	public String onKill(Npc npc, Player killer, boolean isSummon)
 	{
-		final QuestState qs = getRandomPartyMemberState(killer, 1, 2, npc);
-		if ((qs != null) && Util.checkIfInRange(1500, npc, killer, true))
-		{
-			if (npc.getSummoner() == killer)
-			{
-				qs.setCond(3, true);
-				giveItems(qs.getPlayer(), SPECIAL_YETI_MEAT);
-			}
-		}
+		executeForEachPlayer(killer, npc, isSummon, true, false);
 		return super.onKill(npc, killer, isSummon);
 	}
 	
+	@Override
+	public void actionForEachPlayer(Player player, Npc npc, boolean isSummon)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if ((qs != null) && qs.isCond(2) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, true))
+		{
+			qs.setCond(3, true);
+			giveItems(player, SPECIAL_YETI_MEAT);
+		}
+	}
+	
 	private static boolean isBumbalumpSpawned()
 	{
-		return SpawnTable.getInstance().getAnySpawn(ICICLE_EMPEROR_BUMBALUMP) != null;
+		return World.getInstance().getVisibleObjects().stream().anyMatch(object -> object.getId() == ICICLE_EMPEROR_BUMBALUMP);
 	}
 }
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/npcs/33900-33999.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/npcs/33900-33999.xml
index e7d9149662..be3105929f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/npcs/33900-33999.xml
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/npcs/33900-33999.xml
@@ -2254,26 +2254,37 @@
 			<param name="SpiritShotRate" value="10" />
 			<skill name="Skill01_ID" id="16387" level="1" />
 		</parameters>
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="17427" />
+		<race>FRIEND</race>
+		<sex>MALE</sex>
+		<equipment rhand="36218" />
+		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234" hpRegen="9.5" mp="1846" mpRegen="3.3" />
+			<vitals hp="42340.06312688557" hpRegen="8.5" mp="18046.8" mpRegen="3" />
+			<attack physical="25000" magical="2811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="430" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="10085.36442" magical="2064.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
 			</speed>
-			<attack physical="12289.0459514498" magical="811.85773400546" critical="4" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="5362.06896551724" magical="264.78509919958" />
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" talkable="false" canBeSown="true" />
+		<status attackable="false" talkable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4414" level="1" /> <!-- Heavy Armor Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="14" /> <!-- Humans -->
+			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
 			<skill id="16387" level="1" /> <!-- Chain Smash -->
 			<skill id="16388" level="1" /> <!-- Kain's Wrath -->
 		</skillList>
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/npcs/34000-34099.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/npcs/34000-34099.xml
index e01080c485..8781c15070 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/npcs/34000-34099.xml
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/npcs/34000-34099.xml
@@ -17,22 +17,43 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="34001" level="85" type="Folk" name="Ferin">
+	<npc id="34001" level="85" type="FriendlyNpc" name="Ferin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+		<race>FRIEND</race>
 		<sex>FEMALE</sex>
+		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234" hpRegen="7.5" mp="1846" mpRegen="2.7" />
+			<vitals hp="4234.06312688557" hpRegen="8.5" mp="1846.8" mpRegen="3" />
+			<attack physical="1188.87259499001" magical="811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
 			</speed>
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" talkable="false" />
+		<status attackable="false" talkable="false" undying="true" />
 		<collision>
 			<radius normal="8" />
 			<height normal="16" />
 		</collision>
+		<skillList>
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="1" /> <!-- Heavy Armor Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
+		</skillList>
 	</npc>
 	<npc id="34002" level="99" type="Folk" name="Dolkin" title="Maestro">
 		<race>DWARF</race>
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/16300-16399.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/16300-16399.xml
index 32b05dca8a..ea9c427db0 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/16300-16399.xml
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/16300-16399.xml
@@ -794,6 +794,22 @@
 		<reuseDelay>5000</reuseDelay>
 		<effectPoint>-150</effectPoint>
 		<isDebuff>true</isDebuff>
+		<activateRate>80</activateRate>
+		<affectRange>900</affectRange>
+		<basicProperty>PHYSICAL</basicProperty>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<trait>PULL</trait>
+		<effects>
+			<effect name="AirBind" />
+			<effect name="Bluff">
+				<chance>100</chance>
+			</effect>
+			<effect name="PullBack">
+				<speed>600</speed>
+				<delay>600</delay>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="16388" toLevel="1" name="Kain's Wrath">
 		<!-- Consumed by vengeful fury toward all who harm Giselle. -->
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/30000-30099.xml
index 30c64231be..c056683b3a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/30000-30099.xml
@@ -1584,8 +1584,8 @@
 		<operateType>P</operateType>
 		<magicLevel>85</magicLevel>
 		<effects>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>350</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/documentation.txt
index 117b6c3638..4422565298 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/documentation.txt
@@ -10,6 +10,8 @@ AddHate: Instant effect that increases target's hate towards you.
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -196,7 +198,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/Config.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/Config.java
index cf8ebad6d2..23a188f297 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/Config.java
@@ -1242,6 +1242,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static boolean AUTO_PLAY_PREMIUM;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
@@ -1317,6 +1318,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2596,6 +2598,7 @@ public class Config
 			ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 			AUTO_PLAY_PREMIUM = autoPlayConfig.getBoolean("AutoPlayPremium", false);
 			DISABLED_AUTO_SKILLS.clear();
 			final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
@@ -3353,6 +3356,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 01a9aec62d..93e23a1ba8 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -416,7 +416,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -427,14 +426,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index c5839831ba..deb0eec41a 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -546,9 +546,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 2260001e17..380989e049 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 36f3461010..efc07efb38 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -230,7 +230,7 @@ public class ShortCuts implements IRestorable
 			if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL))
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
index e229501dae..663ea6b31c 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1288,7 +1288,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2816,7 +2816,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2829,178 +2829,140 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						player.refreshExpertisePenalty();
-						sendPacket(info);
+					}
+					player.refreshExpertisePenalty();
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java
index 15b20f8f7c..e3cb3d181b 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4571,7 +4571,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8335,9 +8335,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Summon.java
index d3f774596c..66a299ce8e 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -846,7 +847,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -867,7 +868,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -892,7 +900,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -900,7 +908,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -946,7 +961,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index eb31dfcf3e..3a1e8faafa 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -873,15 +872,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -892,8 +889,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -902,7 +903,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -975,45 +976,26 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
 		
-		// Notify recalculation to child classes.
+		// Notify recalculation to child classes
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index a5b88e0118..6e93ee87d7 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index b125be1866..f4ae05dca6 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -43,9 +43,9 @@ import org.l2jmobius.gameserver.enums.AttributeType;
 import org.l2jmobius.gameserver.enums.Movie;
 import org.l2jmobius.gameserver.enums.QuestSound;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
-import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.instancemanager.InstanceManager;
+import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager;
 import org.l2jmobius.gameserver.instancemanager.MailManager;
 import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
@@ -2241,6 +2241,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index e94a83beb6..07fde85bba 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -38,6 +38,7 @@ import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
 import org.l2jmobius.gameserver.enums.AttributeType;
@@ -50,6 +51,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -67,12 +69,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDr
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPickup;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -80,11 +84,13 @@ import org.l2jmobius.gameserver.model.options.EnchantOptions;
 import org.l2jmobius.gameserver.model.options.Options;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.SkillConditionScope;
 import org.l2jmobius.gameserver.model.variables.ItemVariables;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1580,7 +1586,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2208,6 +2216,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2232,6 +2245,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2257,6 +2272,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 61caf4ca41..958b8e0bc5 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -736,7 +736,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -888,7 +889,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 5dbb5b80d0..5f008153ea 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -652,7 +652,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -675,7 +675,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -710,7 +710,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 6894ac0fba..e2e6bb404c 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -129,7 +129,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index 8f916369b4..b7b0c4ef53 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index 265cef95f4..4211092a85 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -97,6 +97,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index ba0cae8d91..3d8867918f 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -701,7 +701,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList(false);
 		player.updateShortCuts(_id, _level, 0);
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 272b2a4e6e..d8e61aaa3e 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -61,6 +61,6 @@ public class RequestShortCutReg implements ClientPacket
 		
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, 0, _characterType);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 	}
 }
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index d78d842163..07ed7641a9 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,127 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 38, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 49, 50, 51,
-		52, 53, 54, 55,
-		56, 57, 58, 59,
-		60, 61, 62, 63,
-		64, 65, 66, 67,
-		68, 69, 70, 71,
-		72, 73, 74, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index dcc44cb9f3..2e152e2e29 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -207,7 +207,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		ServerPackets.EX_PET_INFO.writeId(this);
 		writeInt(_summon.getObjectId());
-		writeByte(_value); // // 0=teleported 1=default 2=summoned
+		writeByte(_value); // 0=teleported 1=default 2=summoned
 		writeShort(37); // mask_bits_37
 		writeBytes(_masks);
 		// Block 1
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index f93c9e5e69..03909a2746 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
similarity index 96%
rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
index 52a4032d14..62bb425a5a 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -1,182 +1,182 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeByte(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 7cabe767a2..dcf0dfd50b 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,19 +19,19 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
 	}
 	
@@ -53,9 +53,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeShort(0);
-					writeShort(0);
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeShort(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeShort(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeShort(0);
+						writeShort(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 8872c0cf63..5cbe0a07b6 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -42,13 +48,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeShort(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeShort(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -59,8 +68,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 68ca369edf..37f3211b0a 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1f54b5040f..0d5d066d25 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,6 +25,7 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -95,6 +98,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							if (player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -120,23 +134,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -144,6 +167,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -178,32 +204,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -302,6 +351,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 7cd7dd9696..c56221841f 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
@@ -51,7 +52,6 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +381,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_01.0_Ertheia/readme.txt b/L2J_Mobius_01.0_Ertheia/readme.txt
index e1d3241e7a..4ed6098455 100644
--- a/L2J_Mobius_01.0_Ertheia/readme.txt
+++ b/L2J_Mobius_01.0_Ertheia/readme.txt
@@ -6,7 +6,7 @@ Eclipse: https://www.mediafire.com/file/dd2fj30rtvj33lz/eclipse-java-2023-03-R-w
 Geodata: http://www.mediafire.com/file/pzykzq2vpy4po2u/L2J_Mobius_01.0_Ertheia_Geodata.zip
 
 Client (password L2jMobius): https://drive.google.com/u/0/uc?id=1MhjWZwmgfNVQeuTLWPJsFIDfeZi2300T&export=download
-System: https://mega.nz/#!s8lghARA!f7Hi1Yx5JWrNjT3kMRaGK_StI1Tnrxnhia8kaG8edSs
+System: https://mega.nz/file/opMwVYTb#GxZnLjDOV0lJvz4oUTwyojVJa9AE_mm1ypcTGSxV1KQ
 
 All provided download links are for personal use. Redistribution of these links is bannable.
 
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle.sql
index 7ffcebed6b..3445dea47a 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/characters.sql
index ea2aace011..60e1a786a2 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/characters.sql
@@ -60,4 +60,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort.sql
index c1f09a3f79..c8e7f5458c 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort_siege_guards.sql
index 4872d0110c..40ed7619dc 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_siege_guards` VALUES
 -- Shanty Guards
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort_spawnlist.sql
index 0285fa6edd..d3caf9312e 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,7 +11,7 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_spawnlist` VALUES
 (101,null,35658,-53273,156650,-1896,62000,0,0),
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/grandboss_data.sql
index d2dd95c8fd..ac0712c7fa 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/heroes.sql
index 2fc8753f90..49a371cbd5 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/heroes.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/items.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/olympiad_fights.sql
index 618ee73db0..662f1c4a7e 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(1) unsigned NOT NULL DEFAULT '0',
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/olympiad_nobles.sql
index 0c8b3d0f9b..8e46191a26 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_done_week_non_classed` tinyint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week_team` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_02.5_Underground/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_02.5_Underground/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_02.5_Underground/dist/game/config/Custom/AutoPlay.ini b/L2J_Mobius_02.5_Underground/dist/game/config/Custom/AutoPlay.ini
index 9a4fd4bf2e..6e9d9628be 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/config/Custom/AutoPlay.ini
+++ b/L2J_Mobius_02.5_Underground/dist/game/config/Custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # Enable .play command only for premium players.
 # Premium System must be enabled.
 # Default: False
diff --git a/L2J_Mobius_02.5_Underground/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_02.5_Underground/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_02.5_Underground/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_02.5_Underground/dist/game/config/General.ini b/L2J_Mobius_02.5_Underground/dist/game/config/General.ini
index ff90e7e58e..d765d7ce87 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/config/General.ini
+++ b/L2J_Mobius_02.5_Underground/dist/game/config/General.ini
@@ -434,8 +434,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/ActionData.xml b/L2J_Mobius_02.5_Underground/dist/game/data/ActionData.xml
index 965751da7b..0a6251e2e3 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/ActionData.xml
@@ -1,219 +1,264 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
-	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
-	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="38" handler="Ride" /> <!-- Mount/Dismount -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
-	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
-	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
-	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
-	<action id="70" handler="AirshipAction" option="4" /> <!-- Exit Airship -->
-	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
-	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
-	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
-	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
-	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Nightshade - Shade Sacrifice -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
-	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="0" handler="SitStand" /> <!-- Toggle Sit/Stand. (/sit, /stand) -->
+	<action id="1" handler="RunWalk" /> <!-- Toggle Walk/Run. (/walk, /run) -->
+	<action id="2" handler="None" /> <!-- Attacks selected target(s), or takes a general action if the target cannot be attacked. Hold down the Ctrl key and click to attack by force. (/attack, /attackforce) -->
+	<action id="3" handler="None" /> <!-- Request a trade from the selected target. (/trade) -->
+	<action id="4" handler="None" /> <!-- Select the nearest attackable target. (/targetnext) -->
+	<action id="5" handler="None" /> <!-- Pick up items that are scattered nearby. (/pickup) -->
+	<action id="6" handler="None" /> <!-- Change to the target of the currently selected player. (/assist) -->
+	<action id="7" handler="None" /> <!-- Invite the selected person to your party. (/invite) -->
+	<action id="8" handler="None" /> <!-- Leave the party. (/leave) -->
+	<action id="9" handler="None" /> <!-- If you are the leader of the party, dismiss selected members from your party. (/dismiss) -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Sets up a private store to sell your items. (/vendor) -->
+	<action id="11" handler="None" /> <!-- Display the party matching window to search for parties or to add members to your party. (/partymatching) -->
+	<action id="12" handler="SocialAction" option="2" /> <!-- Emote: Greet others with a kind "hello." (/socialhello) -->
+	<action id="13" handler="SocialAction" option="3" /> <!-- Emote: Let everyone know that you or someone else is victorious! (/socialvictory) -->
+	<action id="14" handler="SocialAction" option="4" /> <!-- Emote: Rouse your allies and charge! (/socialcharge) -->
+	<action id="15" handler="PetHold" /> <!-- Have your pet follow you or stay and hold its ground. -->
+	<action id="16" handler="PetAttack" /> <!-- Attack target. -->
+	<action id="17" handler="PetStop" /> <!-- Stop current action. -->
+	<action id="18" handler="None" /> <!-- Pick up nearby items. -->
+	<action id="19" handler="UnsummonPet" /> <!-- Returns your pet back to its home. -->
+	<action id="20" handler="None" /> <!-- Use special skill. -->
+	<action id="21" handler="ServitorHold" /> <!-- Have your summons follow you or stay and hold its ground. -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attack target. -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="24" handler="SocialAction" option="6" /> <!-- Emote: Respond positively. (/socialyes) -->
+	<action id="25" handler="SocialAction" option="5" /> <!-- Emote: Respond negatively. (/socialno) -->
+	<action id="26" handler="SocialAction" option="7" /> <!-- Emote: Show your respect and bow. (/socialbow) -->
+	<action id="27" handler="None" /> <!-- Use special skill. -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Sets up a private store to purchase items. (/buy) -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Emote: You have no idea what's going on. (/socialunaware) -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Emote: I'm waiting... (/socialwaiting) -->
+	<action id="31" handler="SocialAction" option="10" /> <!-- Emote: Have a good laugh. (/sociallaugh) -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Toggle between Attack/Move modes. -->
+	<action id="33" handler="SocialAction" option="11" /> <!-- Emote: Applaud. (/socialapplause) -->
+	<action id="34" handler="SocialAction" option="12" /> <!-- Emote: Serve them up your best dance moves. (/socialdance) -->
+	<action id="35" handler="SocialAction" option="13" /> <!-- Emote: Show grief. (/socialsad) -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Poison gas attack. -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Set up a private workshop that creates items by using Dwarven recipes in exchange for a fee. (/dwarvenmanufacture) -->
+	<action id="38" handler="Ride" /> <!-- Toggle mount/dismount when near or on an NPC that can be ridden. (/mount, /dismount, /mountdismount) -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Exploding corpse attack. -->
+	<action id="40" handler="None" /> <!-- Enhances a target's evaluation score. (/evaluate) -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Attacks castle gates, walls, or headquarters by shooting a cannon. -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Reflects damage back to an enemy. -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Attacks an enemy by creating a whirling surge of water. -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Attacks an enemy with a powerful explosion. -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Restores the summoner's MP. -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Attacks an enemy by summoning up a devastating storm. -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Damages an enemy and heals the servitor at the same time. -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Attacks the enemy by shooting a cannon. -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Attack with a fit of rage. -->
+	<action id="50" handler="None" /> <!-- The selected party member will become the new party leader. (/changepartyleader) -->
+	<action id="51" handler="None" /> <!-- Creates an item using a common recipe in exchange for a fee. (/generalmanufacture) -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Removes the bonds from the summons and releases it. -->
+	<action id="53" handler="ServitorMove" /> <!-- Move to the target. -->
+	<action id="54" handler="PetMove" /> <!-- Move to the target. -->
+	<action id="55" handler="None" /> <!-- Toggle recording and stop recording of replay files. (/start_replayrecording, /stop_replayrecording, /startstop_replayrecording) -->
+	<action id="56" handler="None" /> <!-- Invite the selected target to a command channel. (/channelinvite) -->
+	<action id="57" handler="None" /> <!-- Highlights private store and private workshop messages that contain the search word. (/findprivatestore) -->
+	<action id="58" handler="None" /> <!-- Challenge another player to a duel. (/duel) -->
+	<action id="59" handler="None" /> <!-- Withdraw from a duel. A withdrawal is treated as a defeat. (/withdraw) -->
+	<action id="60" handler="None" /> <!-- Challenge another party to a duel. Note : Cannot teleport to the Coliseum when in an instanced zone. (/partyduel) -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Open a personal store for package sale. (/packagesale) -->
+	<action id="62" handler="SocialAction" option="14" /> <!-- Charm Pose (Command: /charm) -->
+	<action id="63" handler="None" /> <!-- Begins a fun and easy mini-game. (command: /minigame) -->
+	<action id="64" handler="TeleportBookmark" /> <!-- Displays My Teleports window you can use to save and manage my teleport locations (command: /myteleport). -->
+	<action id="65" handler="BotReport" /> <!-- Reports the targeted player as a suspected bot. -->
+	<action id="66" handler="SocialAction" option="15" /> <!-- Allows character to strike shy pose. (command: /shyness) -->
+	<action id="67" handler="AirshipAction" option="1" /> <!-- Allows you to control the Airship. -->
+	<action id="68" handler="AirshipAction" option="2" /> <!-- Relinquishes control of the Airship. -->
+	<action id="69" handler="AirshipAction" option="3" /> <!-- Choose from pre-designated locations. -->
+	<action id="70" handler="AirshipAction" option="4" /> <!-- Disembarks from the Airship. -->
+	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange bows with another person. (command: /two-personbow) -->
+	<action id="72" handler="SocialAction" option="17" /> <!-- High Five another person. (command: /hi-five) -->
+	<action id="73" handler="SocialAction" option="18" /> <!-- Dance with another player. (command: /coupledance) -->
+	<action id="74" handler="None" /> <!-- It turns on or off the entire status information gauge above the player's head. (Commands: /statusbaroff, /statusbaron, /statusbaronoff) -->
+	<action id="76" handler="None" /> <!-- Invite the selected target as friends. (Commands: /friendinvite, /addfriend, /registerfriend) -->
+	<action id="77" handler="None" /> <!-- Start or end recording videos. (Commands: /startrecording, /stoprecording, /startstoprecording) -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Use Token 1 on the target. It is only available with party status. (Command: /usetoken1) -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Use Token 2 on the target. It is only available with party status. (Command: /usetoken2) -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Use Token 3 on the target. It is only available with party status. (Command: /usetoken3) -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Use Token 4 on the target. It is only available with party status. (Command: /usetoken4) -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Make a target of an object that was applied with the token 1. It is only available with party status. (Command: /targettoken1) -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Make a target of an object that was applied with the token 2. It is only available with party status. (Command: /targettoken2) -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Make a target of an object that was applied with the token 3. It is only available with party status. (Command: /targettoken3) -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Make a target of an object that was applied with the token 4. It is only available with party status. (Command: /targettoken4) -->
+	<action id="87" handler="SocialAction" option="28" /> <!-- Gesture of Proposal (Command: /Propose) -->
+	<action id="88" handler="SocialAction" option="29" /> <!-- Gesture of Provocation (Command: /Provoke) -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off (Command: /showoff) -->
+	<action id="90" handler="InstanceZoneInfo" /> <!-- Display list of usage times for instanced zones. (Command: /instancedzone) -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Attacks castle gates, walls, or headquarters with a powerful strike. -->
+	<action id="1001" handler="None" /> <!-- A reckless yet powerful attack that must be used with extreme caution. -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Incites those around the summon to attack you. -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Instantly increases P. Def. and M. Def. significantly. Character is immovable while this skill is in effect. -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- A magical attack. -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Recovers the pet's HP. -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Temporarily increases your party's chance to land a critical attack and also increases the power of the attack if successful. -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Temporarily increases your party's P. Atk and accuracy. -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Has a chance to remove curses from party members. -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Temporarily increases your party's MP regeneration. -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Temporarily shortens your party's spell re-use timer. -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Remove a curse from your party. -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Provokes an opponent to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Provokes multiple enemies around the caster to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Sacrifice HP in order to regenerate the HP of a selected target. -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Attempt a powerful, critical attack on an opponent. -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- A stunning blow that inflicts damage and instantly throws an enemy into a state of stun. -->
+	
+	<!-- TODO: Find skill ids. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Inflict a deadly curse on an enemy that absorbs their HP. -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kat the Cat -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mew the Cat -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kai the Cat -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Boxer the Unicorn -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mirage the Unicorn -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Merrow the Unicorn -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Shadow -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by Shadow -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Silhouette -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by reanimated man -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by reanimated man -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by corrupted man -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King: A powerful slashing attack. Over-hit is possible. -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King: Slashes at surrounding enemies while spinning in the air. Over-hit is possible. -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King: Immobilizes all nearby enemies. -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn: Powerful rear kicks that stun and damage an enemy. Over-hit is possible. -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn: Pounds multiple enemies with a tremendous onrush of water. -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord: Detonates a corpse, inflicting damage to nearby enemies. -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord: Blades attached to each arm slash out in a devastating attack. Over-hit is possible. -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord: Curses nearby enemies, poisoning them and reducing their Atk. Spd. -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon: Fires a projectile a short distance. Consumes 4 Flash Gunpowder. -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon: Fires a projectile a long distance. Consumes 5 Flash Gunpowder. -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Viciously bite an enemy. -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Scratch an enemy with both paws. Causes bleeding. -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awaken hidden powers. -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Decrease a nearby enemy's P. Atk./M. Atk. with a wolf cry. -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Decrease a nearby enemy's attack speed/magic speed with a strider roar. -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Viciously bite an enemy. -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Cause both damage and shock at the same time. Instantly stuns an enemy. -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Breath fire in front of you. -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Increases maximum HP temporarily. -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Increases maximum MP temporarily. -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Increases Atk. Spd. temporarily. -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Increases Casting Spd. temporarily. -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Temporarily decreases the target's MP consumption of skills. Consumes Spirit Ore. -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Increases M. Atk. power temporarily. -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Temporarily increases the critical rate of damage attack magic. -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Temporarily increases the critical attack power. -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Temporarily increases the probability of critical attack. -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Temporarily increases Accuracy. -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Rapidly attacks the enemy twice. -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Inflicts shock and damage to the enemy at the same time with a powerful spin attack. -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Attacks nearby enemies with a doll heap attack. -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakens a hidden ability. -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of thunder. -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack on nearby enemies when hit. -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Control put in place to prevent the use of a buff upon the master. 5-minute duration. -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Powerfully attacks the target. -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- A powerful attack that pierces through a target. -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies by spinning your own body like a whirlwind. -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Attacks a front-line enemy with a powerful lance thrust. -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Shouts a victory cry that increases your abilities. -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Gathers energy into your body, then releases it in a destructive blast. -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Hits enemies with a powerful wave of force. -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Emits a loud roar that amplifies your abilities. -->
+	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Charges toward the enemy and inflicts damage. -->
+	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Cancels the target's de-buff. -->
+	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Emits a spread of ring-shaped flames. -->
+	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Attacks the enemy with a powerful flaming beak. -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Toggles you between Attack and Support modes. -->
+	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Cancels more than one of the enemy's buffs. -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Decreases the enemy's Dark attribute by 25. -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Strike multiple enemies at the front with the tail. -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Bites the enemies at the front. -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Causes nearby enemies to flee in fear. -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Increases your speed. -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Greatly increases its master's speed. -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Increases the speed of its master and their party. -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Teleports its master to the Seed of Annihilation. -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Teleports its master and their party to the Seed of Annihilation. -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attack the target. -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move to a designated location. -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Make the servitor disappear by cancelling the summoning. -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Do not counter-attack. -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Counter-attack when the master or itself is attacked. -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Damages and provokes the target. -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Roll over and deliver a shock to the ground stunning nearby targets. -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Bites the target to inflict damage. -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Damages the target and absorbs some of its HP. -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Attack nearby enemies and block their physical skills. -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Flourishes claws and frontally attacks enemies. -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Dashes toward enemies to inflict damage and Stun them. -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Inflicts damage onto the enemies with a flame. -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Flies straight into the enemy. -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Purifies the master. -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Attack the enemy by darting a feather. -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Hurt the enemy by attacking them with sharp claws. -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Recover the targets near the tree and clear any debuff. -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Attacks nearby targets with a powerful punch. -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Provokes nearby enemies. -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Bites the enemy. -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Provokes nearby enemies. -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Bites the enemy. -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Provokes nearby enemies. -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Bites the enemy. -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1142" handler="None" /> <!-- Attacks nearby enemies and blocks their P. Skills. -->
+	<action id="1143" handler="None" /> <!-- Rushes to the enemy to inflict damage and Stun. -->
+	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Pounces on the enemy to inflict damage and decreases their Speed by 100. -->
+	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Deals damage to the target and knocks down for 3 seconds. -->
+	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Pushes the target and those around while inflicting damage. -->
+	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Rushes to the enemy to inflict damage and Stun for 5 seconds. -->
+	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Deals damage to enemies around and pushes them back. -->
+	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Deals damage to the target and those around, and decreases their Speed for 5 seconds. -->
+	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Deals damage to the target and those around. -->
+	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Launches a powerful slashing attack. -->
+	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Aims at the enemy's vital spot from long range. -->
+	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Deals damage to the target. -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Can express affection to Rudolph. Affection Level rises by 25%. Warning: Can be used only when a Rudolph requests expression of affection, and cannot be used while transformed! -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Increases Max HP by 20%, Max MP by 20%, and the Speed by 20% for 5 minutes. Increases the Debuff Resistance by 10%. Reuse delay 10 minutes. Consumes 3 Rose Essence(s) during skill use. Doesn't overlap with other buffs except Critical Seduction. -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- For 30 minutes, increases party members' Max HP by 30%, Max MP by 30%, Max CP by 30%, P. Def. by 30%, magic M. Def. by 30%, Speed by 20, P. Atk. by 10%, and magic M. Atk. by 20%. Decreases MP consumption for skill use by 15%. Reuse delay 5 minutes. Consumes 10 Rose Essence(s) during skill use. -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of lightning. -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack upon contacted enemies nearby. -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Restricts to prevent the use of a buff upon the master. 5 minute duration. -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Inflicts a powerful attack that seems to pierce through the target. -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies. -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impales an enemy with a sword. -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Raises one's own abilities. -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Gathered energy within ones self can be focused and used to attack an enemy. -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Fires a shock wave to attack enemies at the front. -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Amplifies one's own abilities. -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switches between attack mode and support mode. -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Instantly restores the master's HP by 10%. Increases the master's Debuff Resistance by 80%, Buff-canceling Attack Resistance by 40%, Speed by 10, P. Def. by 20%, and M. Def. by 20%, and decreases MP consumption for all skills by 50% for 1 minute. -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/DoorData.xml b/L2J_Mobius_02.5_Underground/dist/game/data/DoorData.xml
index 97c5aa1a38..9b22fbf524 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/DoorData.xml
@@ -11258,6 +11258,176 @@
 		<openStatus default="open" />
 	</door>
 	
+	<!-- 21_16 FIXME: Rune clanhall doors cannot be found in client. -->
+	<door id="21160001" name="rune_castle_agit_002_001">
+		<nodes nodeZ="872">
+			<node x="37679" y="-50432" />
+			<node x="37726" y="-50433" />
+			<node x="37726" y="-50423" />
+			<node x="37678" y="-50424" />
+		</nodes>
+		<location x="37680" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160002" name="rune_castle_agit_002_002">
+		<nodes nodeZ="872">
+			<node x="37724" y="-50432" />
+			<node x="37771" y="-50432" />
+			<node x="37771" y="-50423" />
+			<node x="37723" y="-50424" />
+		</nodes>
+		<location x="37770" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160003" name="rune_castle_agit_003_001">
+		<nodes nodeZ="872">
+			<node x="38527" y="-50151" />
+			<node x="38570" y="-50131" />
+			<node x="38566" y="-50122" />
+			<node x="38524" y="-50144" />
+		</nodes>
+		<location x="38527" y="-50147" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160004" name="rune_castle_agit_003_002">
+		<nodes nodeZ="872">
+			<node x="38569" y="-50132" />
+			<node x="38610" y="-50111" />
+			<node x="38606" y="-50103" />
+			<node x="38564" y="-50124" />
+		</nodes>
+		<location x="38607" y="-50108" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160005" name="rune_castle_agit_004_001">
+		<nodes nodeZ="872">
+			<node x="39122" y="-49542" />
+			<node x="39145" y="-49501" />
+			<node x="39137" y="-49498" />
+			<node x="39115" y="-49539" />
+		</nodes>
+		<location x="39119" y="-49539" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160006" name="rune_castle_agit_004_002">
+		<nodes nodeZ="872">
+			<node x="39145" y="-49503" />
+			<node x="39167" y="-49462" />
+			<node x="39160" y="-49459" />
+			<node x="39136" y="-49498" />
+		</nodes>
+		<location x="39163" y="-49461" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160007" name="rune_castle_agit_001_001">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48291" />
+			<node x="39341" y="-48245" />
+			<node x="39335" y="-48245" />
+			<node x="39334" y="-48290" />
+		</nodes>
+		<location x="39338" y="-48290" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160008" name="rune_castle_agit_001_002">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48246" />
+			<node x="39342" y="-48199" />
+			<node x="39334" y="-48199" />
+			<node x="39334" y="-48246" />
+		</nodes>
+		<location x="39338" y="-48200" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160009" name="rune_castle_agit_005_001">
+		<nodes nodeZ="872">
+			<node x="39176" y="-47024" />
+			<node x="39155" y="-46982" />
+			<node x="39147" y="-46986" />
+			<node x="39169" y="-47026" />
+		</nodes>
+		<location x="39172" y="-47024" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160010" name="rune_castle_agit_005_002">
+		<nodes nodeZ="872">
+			<node x="39154" y="-46982" />
+			<node x="39133" y="-46942" />
+			<node x="39127" y="-46945" />
+			<node x="39148" y="-46986" />
+		</nodes>
+		<location x="39130" y="-46944" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160011" name="rune_castle_agit_006_001">
+		<nodes nodeZ="872">
+			<node x="38626" y="-46372" />
+			<node x="38586" y="-46350" />
+			<node x="38581" y="-46358" />
+			<node x="38623" y="-46379" />
+		</nodes>
+		<location x="38624" y="-46375" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160012" name="rune_castle_agit_006_002">
+		<nodes nodeZ="872">
+			<node x="38587" y="-46350" />
+			<node x="38545" y="-46330" />
+			<node x="38542" y="-46336" />
+			<node x="38583" y="-46358" />
+		</nodes>
+		<location x="38544" y="-46333" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160013" name="rune_castle_agit_007_001">
+		<nodes nodeZ="873">
+			<node x="37787" y="-46044" />
+			<node x="37741" y="-46044" />
+			<node x="37741" y="-46051" />
+			<node x="37787" y="-46050" />
+		</nodes>
+		<location x="37787" y="-46047" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160014" name="rune_castle_agit_007_002">
+		<nodes nodeZ="873">
+			<node x="37743" y="-46043" />
+			<node x="37697" y="-46045" />
+			<node x="37697" y="-46051" />
+			<node x="37742" y="-46051" />
+		</nodes>
+		<location x="37697" y="-46048" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	
 	<!-- 21_17 -->
 	<door id="21170001" name="Rune_bodeful_fortress_s.Rune_bf_azit_gate_door">
 		<nodes nodeZ="544">
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 4c9d1bc4cc..056fe69093 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -252,6 +253,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 6a1e99290e..2ec17e9b00 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -41,6 +41,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AirBind", AirBind::new);
@@ -225,7 +227,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index cd446ab812..2775ff29a4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -182,6 +182,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()))
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index b7434abd2e..1ba322bbe3 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,55 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
 }
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..798a363468 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,46 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 7bc5cc6e16..c46acc049a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -66,7 +66,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 68c2f77658..7e9df354f4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.quest.QuestState;
@@ -46,10 +47,11 @@ public class ChamberOfProphecies extends AbstractInstance
 {
 	// NPCs
 	private static final int KAIN_VAN_HALTER = 31639;
-	private static final int VAN_HALTER = 33999;
-	private static final int FERIN = 34001;
 	private static final int GRAIL = 33996;
 	private static final int MYSTERIOUS_WIZARD = 33980;
+	// Helper NPCs
+	private static final int HELPER_VAN_HALTER = 33999;
+	private static final int HELPER_FERIN = 34001;
 	// Misc
 	private static final int DOOR_2 = 17230102;
 	private static final int DOOR_3 = 17230103;
@@ -66,7 +68,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		addStartNpc(KAIN_VAN_HALTER);
 		addFirstTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
 		addTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
-		addCreatureSeeId(FERIN, VAN_HALTER);
+		addCreatureSeeId(HELPER_FERIN, HELPER_VAN_HALTER);
 	}
 	
 	@Override
@@ -145,12 +147,12 @@ public class ChamberOfProphecies extends AbstractInstance
 				{
 					return null;
 				}
-				final Npc valHalter = world.getNpc(VAN_HALTER);
-				if (valHalter != null)
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
+				if (vanHalter != null)
 				{
-					valHalter.deleteMe(); // probably needs another npc id for initial room
+					vanHalter.deleteMe(); // probably needs another npc id for initial room
 				}
-				final Npc ferin = world.getNpc(FERIN);
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
 				if (ferin != null)
 				{
 					ferin.deleteMe(); // probably needs another npc id for initial room
@@ -190,6 +192,8 @@ public class ChamberOfProphecies extends AbstractInstance
 			case "CHECK_STATUS":
 			{
 				final Instance world = player.getInstanceWorld();
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
 				if (!isInInstance(world))
 				{
 					return null;
@@ -200,8 +204,8 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
-							startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY2", 14000, ferin, player);
+							startQuestTimer("SEY_KAIN", 24000, vanHalter, player);
 							startQuestTimer("OPEN_DOOR1", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -221,7 +225,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY3", 8000, ferin, player);
 							startQuestTimer("OPEN_DOOR2", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -234,7 +238,7 @@ public class ChamberOfProphecies extends AbstractInstance
 							world.setStatus(4);
 							world.spawnGroup("wof_room3_2");
 							world.openCloseDoor(DOOR_3, false);
-							startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY_KAIN_1", 5000, vanHalter, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
 						break;
@@ -245,8 +249,8 @@ public class ChamberOfProphecies extends AbstractInstance
 						{
 							world.setStatus(5);
 							world.spawnGroup("wof_room4");
-							startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
-							startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY_KAIN_2", 3000, vanHalter, player);
+							startQuestTimer("SEY4", 7000, ferin, player);
 						}
 						else
 						{
@@ -304,7 +308,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					return null;
 				}
 				cancelQuestTimer("ATTACK1", npc, player);
-				startQuestTimer("ATTACK2", 200, world.getNpc(VAN_HALTER), player, true);
+				startQuestTimer("ATTACK2", 200, world.getNpc(HELPER_VAN_HALTER), player, true);
 				world.setStatus(3);
 				world.spawnGroup("wof_room3");
 				world.openCloseDoor(DOOR_3, true);
@@ -321,7 +325,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY2":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.YOU_CAN_T_DIE_HERE_I_DIDN_T_LEARN_RESURRECT_YET));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_4", 0, 0, 0, 0, 0));
@@ -330,7 +334,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GISELLE_WAS_SUCH_A_SWEET_CHILD));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_1", 0, 0, 0, 0, 0));
@@ -340,7 +344,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY3":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.DO_YOU_THINK_I_LL_GROW_TALLER_IF_I_EAT_LOTS_AND_LOTS));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_6", 0, 0, 0, 0, 0));
@@ -349,7 +353,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_1":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.SUCH_MONSTERS_IN_A_PLACE_LIKE_THIS_UNBELIEVABLE));
 				}
@@ -357,7 +361,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_2":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THAT_S_THE_MONSTER_THAT_ATTACKED_FAERON_YOU_RE_OUTMATCHED_HERE_GO_AHEAD_I_LL_CATCH_UP));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_6", 0, 0, 0, 0, 0));
@@ -367,7 +371,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY4":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GO_NOW_KAIN_CAN_HANDLE_THIS));
 					npc.setScriptValue(1);
@@ -377,7 +381,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_3":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.LEAVE_THIS_TO_ME_GO));
 					npc.setScriptValue(1);
@@ -387,7 +391,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "REST":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, player);
 				}
@@ -508,7 +512,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		{
 			switch (npc.getId())
 			{
-				case FERIN:
+				case HELPER_FERIN:
 				{
 					if (creature.isPlayer() && !creature.isDead() && npc.isScriptValue(0))
 					{
@@ -516,7 +520,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					}
 					break;
 				}
-				case VAN_HALTER:
+				case HELPER_VAN_HALTER:
 				{
 					if (creature.isPlayer() && !creature.isDead() && world.isStatus(0))
 					{
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/items/46200-46299.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/items/46200-46299.xml
index 5453de5be2..b15d68e1fc 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/items/46200-46299.xml
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/items/46200-46299.xml
@@ -795,14 +795,19 @@
 	<item id="46254" name="Dandy's Golden Ball" type="EtcItem">
 		<!-- For 1 hr., XP/SP gain + 100%, and changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or XP Buff 50%. -->
 		<set name="icon" val="icon.ev_dinos_baseball_gold" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_stackable" val="true" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="is_freightable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="18471" level="1" /> <!-- Dandy's Golden Ball -->
+		</skills>
 	</item>
 	<item id="46255" name="Automatic Appearance: Halloween Outfit" type="EtcItem">
 		<!-- Changes the appearance of upper armor into that of a Halloween Outfit. Works on one-pieces too. -->
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/npcs/33900-33999.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/npcs/33900-33999.xml
index e7d9149662..be3105929f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/npcs/33900-33999.xml
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/npcs/33900-33999.xml
@@ -2254,26 +2254,37 @@
 			<param name="SpiritShotRate" value="10" />
 			<skill name="Skill01_ID" id="16387" level="1" />
 		</parameters>
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="17427" />
+		<race>FRIEND</race>
+		<sex>MALE</sex>
+		<equipment rhand="36218" />
+		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234" hpRegen="9.5" mp="1846" mpRegen="3.3" />
+			<vitals hp="42340.06312688557" hpRegen="8.5" mp="18046.8" mpRegen="3" />
+			<attack physical="25000" magical="2811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="430" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="10085.36442" magical="2064.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
 			</speed>
-			<attack physical="12289.0459514498" magical="811.85773400546" critical="4" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="5362.06896551724" magical="264.78509919958" />
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" talkable="false" canBeSown="true" />
+		<status attackable="false" talkable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4414" level="1" /> <!-- Heavy Armor Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="14" /> <!-- Humans -->
+			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
 			<skill id="16387" level="1" /> <!-- Chain Smash -->
 			<skill id="16388" level="1" /> <!-- Kain's Wrath -->
 		</skillList>
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/npcs/34000-34099.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/npcs/34000-34099.xml
index c4901037b2..b0801690fc 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/npcs/34000-34099.xml
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/npcs/34000-34099.xml
@@ -17,22 +17,43 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="34001" level="85" type="Folk" name="Ferin">
+	<npc id="34001" level="85" type="FriendlyNpc" name="Ferin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+		<race>FRIEND</race>
 		<sex>FEMALE</sex>
+		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234" hpRegen="7.5" mp="1846" mpRegen="2.7" />
+			<vitals hp="4234.06312688557" hpRegen="8.5" mp="1846.8" mpRegen="3" />
+			<attack physical="1188.87259499001" magical="811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
 			</speed>
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" talkable="false" />
+		<status attackable="false" talkable="false" undying="true" />
 		<collision>
 			<radius normal="8" />
 			<height normal="16" />
 		</collision>
+		<skillList>
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="1" /> <!-- Heavy Armor Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
+		</skillList>
 	</npc>
 	<npc id="34002" level="99" type="Folk" name="Dolkin" title="Maestro">
 		<race>DWARF</race>
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/16300-16399.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/16300-16399.xml
index 74ed4f803d..81368cb1a4 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/16300-16399.xml
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/16300-16399.xml
@@ -794,6 +794,22 @@
 		<reuseDelay>5000</reuseDelay>
 		<effectPoint>-150</effectPoint>
 		<isDebuff>true</isDebuff>
+		<activateRate>80</activateRate>
+		<affectRange>900</affectRange>
+		<basicProperty>PHYSICAL</basicProperty>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<trait>PULL</trait>
+		<effects>
+			<effect name="AirBind" />
+			<effect name="Bluff">
+				<chance>100</chance>
+			</effect>
+			<effect name="PullBack">
+				<speed>600</speed>
+				<delay>600</delay>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="16388" toLevel="1" name="Kain's Wrath">
 		<!-- Consumed by vengeful fury toward all who harm Giselle. -->
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/18400-18499.xml
index ee4f8ee396..c871a8e610 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/18400-18499.xml
@@ -877,8 +877,30 @@
 		<!-- For 1 hr., XP/SP gain + 100%, and changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or XP Buff 50%. -->
 		<icon>icon.ev_dinos_baseball_gold</icon>
 		<operateType>A2</operateType>
+		<effectPoint>1</effectPoint>
+		<abnormalType>CHANGEBODY</abnormalType>
+		<abnormalVisualEffect>CHANGE_DINOS</abnormalVisualEffect>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>46254</itemConsumeId> <!-- Dandy's Home Run Ball -->
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>-3</magicLevel>
+		<abnormalLevel>2</abnormalLevel>
+		<abnormalTime>3600</abnormalTime>
 		<reuseDelay>15000</reuseDelay>
+		<irreplacableBuff>true</irreplacableBuff>
+		<stayAfterDeath>true</stayAfterDeath>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="ExpModify">
+				<amount>100</amount>
+			</effect>
+			<effect name="SpModify">
+				<amount>100</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18472" toLevel="6" name="Giveaway Number 1">
 		<icon>icon.skill0000</icon>
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/30000-30099.xml
index ff76ae6f6e..fd4dbef53d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/30000-30099.xml
@@ -1923,8 +1923,8 @@
 		<operateType>P</operateType>
 		<magicLevel>85</magicLevel>
 		<effects>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>350</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/documentation.txt
index 117b6c3638..4422565298 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/documentation.txt
@@ -10,6 +10,8 @@ AddHate: Instant effect that increases target's hate towards you.
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -196,7 +198,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/Config.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/Config.java
index cd8efaff2d..a9f25cabde 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/Config.java
@@ -1254,6 +1254,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static boolean AUTO_PLAY_PREMIUM;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
@@ -1329,6 +1330,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2621,6 +2623,7 @@ public class Config
 			ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 			AUTO_PLAY_PREMIUM = autoPlayConfig.getBoolean("AutoPlayPremium", false);
 			DISABLED_AUTO_SKILLS.clear();
 			final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
@@ -3378,6 +3381,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 01a9aec62d..93e23a1ba8 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -416,7 +416,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -427,14 +426,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index c5839831ba..deb0eec41a 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -546,9 +546,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 2260001e17..380989e049 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 36f3461010..efc07efb38 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -230,7 +230,7 @@ public class ShortCuts implements IRestorable
 			if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL))
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
index e229501dae..663ea6b31c 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1288,7 +1288,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2816,7 +2816,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2829,178 +2829,140 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						player.refreshExpertisePenalty();
-						sendPacket(info);
+					}
+					player.refreshExpertisePenalty();
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java
index cc1647c702..1f7275c9c9 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4573,7 +4573,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8338,9 +8338,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Summon.java
index d3f774596c..66a299ce8e 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -846,7 +847,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -867,7 +868,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -892,7 +900,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -900,7 +908,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -946,7 +961,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index eb31dfcf3e..3a1e8faafa 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -873,15 +872,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -892,8 +889,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -902,7 +903,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -975,45 +976,26 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
 		
-		// Notify recalculation to child classes.
+		// Notify recalculation to child classes
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index a5b88e0118..6e93ee87d7 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index b125be1866..aebcf37378 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2241,6 +2241,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index 953f769a75..a5dcc7540c 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -38,6 +38,7 @@ import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -51,6 +52,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -69,12 +71,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDr
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPickup;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -82,11 +86,13 @@ import org.l2jmobius.gameserver.model.options.EnchantOptions;
 import org.l2jmobius.gameserver.model.options.Options;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.SkillConditionScope;
 import org.l2jmobius.gameserver.model.variables.ItemVariables;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1585,7 +1591,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2471,6 +2479,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2495,6 +2508,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2520,6 +2535,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 57c751293a..a27e3aea14 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -742,7 +742,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -894,7 +895,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index e7c37a9ae6..cc8e010ff3 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -652,7 +652,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -675,7 +675,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -710,7 +710,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 6894ac0fba..e2e6bb404c 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -129,7 +129,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index 8f916369b4..b7b0c4ef53 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index 265cef95f4..4211092a85 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -97,6 +97,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 54704f9bda..6d4c3d9e2e 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -701,7 +701,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList(false);
 		player.updateShortCuts(_id, _level, 0);
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 50c8e2816f..aaf2725444 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -63,6 +63,6 @@ public class RequestShortCutReg implements ClientPacket
 		
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 	}
 }
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index d78d842163..07ed7641a9 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,127 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 38, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 49, 50, 51,
-		52, 53, 54, 55,
-		56, 57, 58, 59,
-		60, 61, 62, 63,
-		64, 65, 66, 67,
-		68, 69, 70, 71,
-		72, 73, 74, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index dcc44cb9f3..2e152e2e29 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -207,7 +207,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		ServerPackets.EX_PET_INFO.writeId(this);
 		writeInt(_summon.getObjectId());
-		writeByte(_value); // // 0=teleported 1=default 2=summoned
+		writeByte(_value); // 0=teleported 1=default 2=summoned
 		writeShort(37); // mask_bits_37
 		writeBytes(_masks);
 		// Block 1
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index f93c9e5e69..03909a2746 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
similarity index 96%
rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
index 52a4032d14..62bb425a5a 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -1,182 +1,182 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeByte(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 83e29f7bed..3ee2b1ef96 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,19 +19,19 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
 	}
 	
@@ -53,8 +53,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 8872c0cf63..c2b8c8f51a 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -42,13 +48,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -59,8 +68,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 68ca369edf..37f3211b0a 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1f54b5040f..0d5d066d25 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,6 +25,7 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -95,6 +98,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							if (player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -120,23 +134,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -144,6 +167,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -178,32 +204,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -302,6 +351,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 7cd7dd9696..c56221841f 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
@@ -51,7 +52,6 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +381,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle.sql
index 7ffcebed6b..3445dea47a 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/characters.sql
index ea2aace011..60e1a786a2 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/characters.sql
@@ -60,4 +60,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort.sql
index c1f09a3f79..c8e7f5458c 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort_siege_guards.sql
index 4872d0110c..40ed7619dc 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_siege_guards` VALUES
 -- Shanty Guards
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort_spawnlist.sql
index 0285fa6edd..d3caf9312e 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,7 +11,7 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_spawnlist` VALUES
 (101,null,35658,-53273,156650,-1896,62000,0,0),
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/grandboss_data.sql
index cdf2d6c810..d1d27566f9 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/heroes.sql
index 2fc8753f90..49a371cbd5 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/heroes.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/items.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/olympiad_fights.sql
index 618ee73db0..662f1c4a7e 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(1) unsigned NOT NULL DEFAULT '0',
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/olympiad_nobles.sql
index 0c8b3d0f9b..8e46191a26 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_done_week_non_classed` tinyint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week_team` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_03.0_Helios/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_03.0_Helios/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_03.0_Helios/dist/game/config/Custom/AutoPlay.ini b/L2J_Mobius_03.0_Helios/dist/game/config/Custom/AutoPlay.ini
index 9a4fd4bf2e..6e9d9628be 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/config/Custom/AutoPlay.ini
+++ b/L2J_Mobius_03.0_Helios/dist/game/config/Custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # Enable .play command only for premium players.
 # Premium System must be enabled.
 # Default: False
diff --git a/L2J_Mobius_03.0_Helios/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_03.0_Helios/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_03.0_Helios/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_03.0_Helios/dist/game/config/General.ini b/L2J_Mobius_03.0_Helios/dist/game/config/General.ini
index ff90e7e58e..d765d7ce87 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/config/General.ini
+++ b/L2J_Mobius_03.0_Helios/dist/game/config/General.ini
@@ -434,8 +434,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/ActionData.xml b/L2J_Mobius_03.0_Helios/dist/game/data/ActionData.xml
index 965751da7b..faab75a2f1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/ActionData.xml
@@ -1,219 +1,265 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
-	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
-	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="38" handler="Ride" /> <!-- Mount/Dismount -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
-	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
-	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
-	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
-	<action id="70" handler="AirshipAction" option="4" /> <!-- Exit Airship -->
-	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
-	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
-	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
-	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
-	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Nightshade - Shade Sacrifice -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
-	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="0" handler="SitStand" /> <!-- Toggle Sit/Stand. (/sit, /stand) -->
+	<action id="1" handler="RunWalk" /> <!-- Toggle Walk/Run. (/walk, /run) -->
+	<action id="2" handler="None" /> <!-- Attacks selected target(s), or takes a general action if the target cannot be attacked. Hold down the Ctrl key and click to attack by force. (/attack, /attackforce) -->
+	<action id="3" handler="None" /> <!-- Request a trade from the selected target. (/trade) -->
+	<action id="4" handler="None" /> <!-- Select the nearest attackable target. (/targetnext) -->
+	<action id="5" handler="None" /> <!-- Pick up items that are scattered nearby. (/pickup) -->
+	<action id="6" handler="None" /> <!-- Change to the target of the currently selected player. (/assist) -->
+	<action id="7" handler="None" /> <!-- Invite the selected person to your party. (/invite) -->
+	<action id="8" handler="None" /> <!-- Leave the party. (/leave) -->
+	<action id="9" handler="None" /> <!-- If you are the leader of the party, dismiss selected members from your party. (/dismiss) -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Sets up a private store to sell your items. (/vendor) -->
+	<action id="11" handler="None" /> <!-- Display the party matching window to search for parties or to add members to your party. (/partymatching) -->
+	<action id="12" handler="SocialAction" option="2" /> <!-- Emote: Greet others with a kind "hello." (/socialhello) -->
+	<action id="13" handler="SocialAction" option="3" /> <!-- Emote: Let everyone know that you or someone else is victorious! (/socialvictory) -->
+	<action id="14" handler="SocialAction" option="4" /> <!-- Emote: Rouse your allies and charge! (/socialcharge) -->
+	<action id="15" handler="PetHold" /> <!-- Have your pet follow you or stay and hold its ground. -->
+	<action id="16" handler="PetAttack" /> <!-- Attack target. -->
+	<action id="17" handler="PetStop" /> <!-- Stop current action. -->
+	<action id="18" handler="None" /> <!-- Pick up nearby items. -->
+	<action id="19" handler="UnsummonPet" /> <!-- Returns your pet back to its home. -->
+	<action id="20" handler="None" /> <!-- Use special skill. -->
+	<action id="21" handler="ServitorHold" /> <!-- Have your summons follow you or stay and hold its ground. -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attack target. -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="24" handler="SocialAction" option="6" /> <!-- Emote: Respond positively. (/socialyes) -->
+	<action id="25" handler="SocialAction" option="5" /> <!-- Emote: Respond negatively. (/socialno) -->
+	<action id="26" handler="SocialAction" option="7" /> <!-- Emote: Show your respect and bow. (/socialbow) -->
+	<action id="27" handler="None" /> <!-- Use special skill. -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Sets up a private store to purchase items. (/buy) -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Emote: You have no idea what's going on. (/socialunaware) -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Emote: I'm waiting... (/socialwaiting) -->
+	<action id="31" handler="SocialAction" option="10" /> <!-- Emote: Have a good laugh. (/sociallaugh) -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Toggle between Attack/Move modes. -->
+	<action id="33" handler="SocialAction" option="11" /> <!-- Emote: Applaud. (/socialapplause) -->
+	<action id="34" handler="SocialAction" option="12" /> <!-- Emote: Serve them up your best dance moves. (/socialdance) -->
+	<action id="35" handler="SocialAction" option="13" /> <!-- Emote: Show grief. (/socialsad) -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Poison gas attack. -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Set up a private workshop that creates items by using Dwarven recipes in exchange for a fee. (/dwarvenmanufacture) -->
+	<action id="38" handler="Ride" /> <!-- Toggle mount/dismount when near or on an NPC that can be ridden. (/mount, /dismount, /mountdismount) -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Exploding corpse attack. -->
+	<action id="40" handler="None" /> <!-- Enhances a target's evaluation score. (/evaluate) -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Attacks castle gates, walls, or headquarters by shooting a cannon. -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Reflects damage back to an enemy. -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Attacks an enemy by creating a whirling surge of water. -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Attacks an enemy with a powerful explosion. -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Restores the summoner's MP. -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Attacks an enemy by summoning up a devastating storm. -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Damages an enemy and heals the servitor at the same time. -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Attacks the enemy by shooting a cannon. -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Attack with a fit of rage. -->
+	<action id="50" handler="None" /> <!-- The selected party member will become the new party leader. (/changepartyleader) -->
+	<action id="51" handler="None" /> <!-- Creates an item using a common recipe in exchange for a fee. (/generalmanufacture) -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Removes the bonds from the summons and releases it. -->
+	<action id="53" handler="ServitorMove" /> <!-- Move to the target. -->
+	<action id="54" handler="PetMove" /> <!-- Move to the target. -->
+	<action id="55" handler="None" /> <!-- Toggle recording and stop recording of replay files. (/start_replayrecording, /stop_replayrecording, /startstop_replayrecording) -->
+	<action id="56" handler="None" /> <!-- Invite the selected target to a command channel. (/channelinvite) -->
+	<action id="57" handler="None" /> <!-- Highlights private store and private workshop messages that contain the search word. (/findprivatestore) -->
+	<action id="58" handler="None" /> <!-- Challenge another player to a duel. (/duel) -->
+	<action id="59" handler="None" /> <!-- Withdraw from a duel. A withdrawal is treated as a defeat. (/withdraw) -->
+	<action id="60" handler="None" /> <!-- Challenge another party to a duel. Note : Cannot teleport to the Coliseum when in an instanced zone. (/partyduel) -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Open a personal store for package sale. (/packagesale) -->
+	<action id="62" handler="SocialAction" option="14" /> <!-- Charm Pose (Command: /charm) -->
+	<action id="63" handler="None" /> <!-- Begins a fun and easy mini-game. (command: /minigame) -->
+	<action id="64" handler="TeleportBookmark" /> <!-- Displays My Teleports window you can use to save and manage my teleport locations (command: /myteleport). -->
+	<action id="65" handler="BotReport" /> <!-- Reports the targeted player as a suspected bot. (Command: /AutoHuntingReport) -->
+	<action id="66" handler="SocialAction" option="15" /> <!-- Allows character to strike shy pose. (command: /shyness) -->
+	<action id="67" handler="AirshipAction" option="1" /> <!-- Allows you to control the Airship. -->
+	<action id="68" handler="AirshipAction" option="2" /> <!-- Relinquishes control of the Airship. -->
+	<action id="69" handler="AirshipAction" option="3" /> <!-- Choose from pre-designated locations. -->
+	<action id="70" handler="AirshipAction" option="4" /> <!-- Disembarks from the Airship. -->
+	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange bows with another person. (command: /two-personbow) -->
+	<action id="72" handler="SocialAction" option="17" /> <!-- High Five another person. (command: /hi-five) -->
+	<action id="73" handler="SocialAction" option="18" /> <!-- Dance with another player. (command: /coupledance) -->
+	<action id="74" handler="None" /> <!-- It turns on or off the entire status information gauge above the player's head. (Commands: /statusbaroff, /statusbaron, /statusbaronoff) -->
+	<action id="76" handler="None" /> <!-- Invite the selected target as friends. (Commands: /friendinvite, /addfriend, /registerfriend) -->
+	<action id="77" handler="None" /> <!-- Start or end recording videos. (Commands: /startrecording, /stoprecording, /startstoprecording) -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Use Token 1 on the target. It is only available with party status. (Command: /usetoken1) -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Use Token 2 on the target. It is only available with party status. (Command: /usetoken2) -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Use Token 3 on the target. It is only available with party status. (Command: /usetoken3) -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Use Token 4 on the target. It is only available with party status. (Command: /usetoken4) -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Make a target of an object that was applied with the token 1. It is only available with party status. (Command: /targettoken1) -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Make a target of an object that was applied with the token 2. It is only available with party status. (Command: /targettoken2) -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Make a target of an object that was applied with the token 3. It is only available with party status. (Command: /targettoken3) -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Make a target of an object that was applied with the token 4. It is only available with party status. (Command: /targettoken4) -->
+	<action id="87" handler="SocialAction" option="28" /> <!-- Gesture of Proposal (Command: /Propose) -->
+	<action id="88" handler="SocialAction" option="29" /> <!-- Gesture of Provocation (Command: /Provoke) -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off (Command: /showoff) -->
+	<action id="90" handler="InstanceZoneInfo" /> <!-- Display list of usage times for instanced zones. (Command: /instancedzone) -->
+	<action id="92" handler="None" /> <!-- Select target that was selected previously. (Command: /previoustarget) -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Attacks castle gates, walls, or headquarters with a powerful strike. -->
+	<action id="1001" handler="None" /> <!-- A reckless yet powerful attack that must be used with extreme caution. -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Incites those around the summon to attack you. -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Instantly increases P. Def. and M. Def. significantly. Character is immovable while this skill is in effect. -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- A magical attack. -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Recovers the pet's HP. -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Temporarily increases your party's chance to land a critical attack and also increases the power of the attack if successful. -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Temporarily increases your party's P. Atk and accuracy. -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Has a chance to remove curses from party members. -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Temporarily increases your party's MP regeneration. -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Temporarily shortens your party's spell re-use timer. -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Remove a curse from your party. -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Provokes an opponent to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Provokes multiple enemies around the caster to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Sacrifice HP in order to regenerate the HP of a selected target. -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Attempt a powerful, critical attack on an opponent. -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- A stunning blow that inflicts damage and instantly throws an enemy into a state of stun. -->
+	
+	<!-- TODO: Find skill ids. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Inflict a deadly curse on an enemy that absorbs their HP. -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kat the Cat -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mew the Cat -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kai the Cat -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Boxer the Unicorn -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mirage the Unicorn -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Merrow the Unicorn -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Shadow -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by Shadow -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Silhouette -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by reanimated man -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by reanimated man -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by corrupted man -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King: A powerful slashing attack. Over-hit is possible. -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King: Slashes at surrounding enemies while spinning in the air. Over-hit is possible. -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King: Immobilizes all nearby enemies. -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn: Powerful rear kicks that stun and damage an enemy. Over-hit is possible. -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn: Pounds multiple enemies with a tremendous onrush of water. -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord: Detonates a corpse, inflicting damage to nearby enemies. -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord: Blades attached to each arm slash out in a devastating attack. Over-hit is possible. -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord: Curses nearby enemies, poisoning them and reducing their Atk. Spd. -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon: Fires a projectile a short distance. Consumes 4 Flash Gunpowder. -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon: Fires a projectile a long distance. Consumes 5 Flash Gunpowder. -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Viciously bite an enemy. -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Scratch an enemy with both paws. Causes bleeding. -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awaken hidden powers. -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Decrease a nearby enemy's P. Atk./M. Atk. with a wolf cry. -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Decrease a nearby enemy's attack speed/magic speed with a strider roar. -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Viciously bite an enemy. -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Cause both damage and shock at the same time. Instantly stuns an enemy. -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Breath fire in front of you. -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Increases maximum HP temporarily. -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Increases maximum MP temporarily. -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Increases Atk. Spd. temporarily. -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Increases Casting Spd. temporarily. -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Temporarily decreases the target's MP consumption of skills. Consumes Spirit Ore. -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Increases M. Atk. power temporarily. -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Temporarily increases the critical rate of damage attack magic. -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Temporarily increases the critical attack power. -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Temporarily increases the probability of critical attack. -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Temporarily increases Accuracy. -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Rapidly attacks the enemy twice. -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Inflicts shock and damage to the enemy at the same time with a powerful spin attack. -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Attacks nearby enemies with a doll heap attack. -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakens a hidden ability. -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of thunder. -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack on nearby enemies when hit. -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Control put in place to prevent the use of a buff upon the master. 5-minute duration. -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Powerfully attacks the target. -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- A powerful attack that pierces through a target. -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies by spinning your own body like a whirlwind. -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Attacks a front-line enemy with a powerful lance thrust. -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Shouts a victory cry that increases your abilities. -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Gathers energy into your body, then releases it in a destructive blast. -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Hits enemies with a powerful wave of force. -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Emits a loud roar that amplifies your abilities. -->
+	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Charges toward the enemy and inflicts damage. -->
+	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Cancels the target's de-buff. -->
+	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Emits a spread of ring-shaped flames. -->
+	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Attacks the enemy with a powerful flaming beak. -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Toggles you between Attack and Support modes. -->
+	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Cancels more than one of the enemy's buffs. -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Decreases the enemy's Dark attribute by 25. -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Strike multiple enemies at the front with the tail. -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Bites the enemies at the front. -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Causes nearby enemies to flee in fear. -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Increases your speed. -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Greatly increases its master's speed. -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Increases the speed of its master and their party. -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Teleports its master to the Seed of Annihilation. -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Teleports its master and their party to the Seed of Annihilation. -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attack the target. -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move to a designated location. -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Make the servitor disappear by cancelling the summoning. -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Do not counter-attack. -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Counter-attack when the master or itself is attacked. -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Damages and provokes the target. -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Roll over and deliver a shock to the ground stunning nearby targets. -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Bites the target to inflict damage. -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Damages the target and absorbs some of its HP. -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Attack nearby enemies and block their physical skills. -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Flourishes claws and frontally attacks enemies. -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Dashes toward enemies to inflict damage and Stun them. -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Inflicts damage onto the enemies with a flame. -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Flies straight into the enemy. -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Purifies the master. -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Attack the enemy by darting a feather. -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Hurt the enemy by attacking them with sharp claws. -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Recover the targets near the tree and clear any debuff. -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Attacks nearby targets with a powerful punch. -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Provokes nearby enemies. -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Bites the enemy. -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Provokes nearby enemies. -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Bites the enemy. -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Provokes nearby enemies. -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Bites the enemy. -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1142" handler="None" /> <!-- Attacks nearby enemies and blocks their P. Skills. -->
+	<action id="1143" handler="None" /> <!-- Rushes to the enemy to inflict damage and Stun. -->
+	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Pounces on the enemy to inflict damage and decreases their Speed by 100. -->
+	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Deals damage to the target and knocks down for 3 seconds. -->
+	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Pushes the target and those around while inflicting damage. -->
+	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Rushes to the enemy to inflict damage and Stun for 5 seconds. -->
+	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Deals damage to enemies around and pushes them back. -->
+	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Deals damage to the target and those around, and decreases their Speed for 5 seconds. -->
+	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Deals damage to the target and those around. -->
+	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Launches a powerful slashing attack. -->
+	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Aims at the enemy's vital spot from long range. -->
+	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Deals damage to the target. -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Can express affection to Rudolph. Affection Level rises by 25%. Warning: Can be used only when a Rudolph requests expression of affection, and cannot be used while transformed! -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Increases Max HP by 20%, Max MP by 20%, and the Speed by 20% for 5 minutes. Increases the Debuff Resistance by 10%. Reuse delay 10 minutes. Consumes 3 Rose Essence(s) during skill use. Doesn't overlap with other buffs except Critical Seduction. -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- For 30 minutes, increases party members' Max HP by 30%, Max MP by 30%, Max CP by 30%, P. Def. by 30%, magic M. Def. by 30%, Speed by 20, P. Atk. by 10%, and magic M. Atk. by 20%. Decreases MP consumption for skill use by 15%. Reuse delay 5 minutes. Consumes 10 Rose Essence(s) during skill use. -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of lightning. -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack upon contacted enemies nearby. -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Restricts to prevent the use of a buff upon the master. 5 minute duration. -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Inflicts a powerful attack that seems to pierce through the target. -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies. -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impales an enemy with a sword. -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Raises one's own abilities. -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Gathered energy within ones self can be focused and used to attack an enemy. -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Fires a shock wave to attack enemies at the front. -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Amplifies one's own abilities. -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switches between attack mode and support mode. -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Instantly restores the master's HP by 10%. Increases the master's Debuff Resistance by 80%, Buff-canceling Attack Resistance by 40%, Speed by 10, P. Def. by 20%, and M. Def. by 20%, and decreases MP consumption for all skills by 50% for 1 minute. -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/DoorData.xml b/L2J_Mobius_03.0_Helios/dist/game/data/DoorData.xml
index bd9fae8fbe..478bdac9bc 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/DoorData.xml
@@ -11258,6 +11258,176 @@
 		<openStatus default="open" />
 	</door>
 	
+	<!-- 21_16 FIXME: Rune clanhall doors cannot be found in client. -->
+	<door id="21160001" name="rune_castle_agit_002_001">
+		<nodes nodeZ="872">
+			<node x="37679" y="-50432" />
+			<node x="37726" y="-50433" />
+			<node x="37726" y="-50423" />
+			<node x="37678" y="-50424" />
+		</nodes>
+		<location x="37680" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160002" name="rune_castle_agit_002_002">
+		<nodes nodeZ="872">
+			<node x="37724" y="-50432" />
+			<node x="37771" y="-50432" />
+			<node x="37771" y="-50423" />
+			<node x="37723" y="-50424" />
+		</nodes>
+		<location x="37770" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160003" name="rune_castle_agit_003_001">
+		<nodes nodeZ="872">
+			<node x="38527" y="-50151" />
+			<node x="38570" y="-50131" />
+			<node x="38566" y="-50122" />
+			<node x="38524" y="-50144" />
+		</nodes>
+		<location x="38527" y="-50147" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160004" name="rune_castle_agit_003_002">
+		<nodes nodeZ="872">
+			<node x="38569" y="-50132" />
+			<node x="38610" y="-50111" />
+			<node x="38606" y="-50103" />
+			<node x="38564" y="-50124" />
+		</nodes>
+		<location x="38607" y="-50108" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160005" name="rune_castle_agit_004_001">
+		<nodes nodeZ="872">
+			<node x="39122" y="-49542" />
+			<node x="39145" y="-49501" />
+			<node x="39137" y="-49498" />
+			<node x="39115" y="-49539" />
+		</nodes>
+		<location x="39119" y="-49539" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160006" name="rune_castle_agit_004_002">
+		<nodes nodeZ="872">
+			<node x="39145" y="-49503" />
+			<node x="39167" y="-49462" />
+			<node x="39160" y="-49459" />
+			<node x="39136" y="-49498" />
+		</nodes>
+		<location x="39163" y="-49461" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160007" name="rune_castle_agit_001_001">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48291" />
+			<node x="39341" y="-48245" />
+			<node x="39335" y="-48245" />
+			<node x="39334" y="-48290" />
+		</nodes>
+		<location x="39338" y="-48290" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160008" name="rune_castle_agit_001_002">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48246" />
+			<node x="39342" y="-48199" />
+			<node x="39334" y="-48199" />
+			<node x="39334" y="-48246" />
+		</nodes>
+		<location x="39338" y="-48200" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160009" name="rune_castle_agit_005_001">
+		<nodes nodeZ="872">
+			<node x="39176" y="-47024" />
+			<node x="39155" y="-46982" />
+			<node x="39147" y="-46986" />
+			<node x="39169" y="-47026" />
+		</nodes>
+		<location x="39172" y="-47024" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160010" name="rune_castle_agit_005_002">
+		<nodes nodeZ="872">
+			<node x="39154" y="-46982" />
+			<node x="39133" y="-46942" />
+			<node x="39127" y="-46945" />
+			<node x="39148" y="-46986" />
+		</nodes>
+		<location x="39130" y="-46944" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160011" name="rune_castle_agit_006_001">
+		<nodes nodeZ="872">
+			<node x="38626" y="-46372" />
+			<node x="38586" y="-46350" />
+			<node x="38581" y="-46358" />
+			<node x="38623" y="-46379" />
+		</nodes>
+		<location x="38624" y="-46375" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160012" name="rune_castle_agit_006_002">
+		<nodes nodeZ="872">
+			<node x="38587" y="-46350" />
+			<node x="38545" y="-46330" />
+			<node x="38542" y="-46336" />
+			<node x="38583" y="-46358" />
+		</nodes>
+		<location x="38544" y="-46333" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160013" name="rune_castle_agit_007_001">
+		<nodes nodeZ="873">
+			<node x="37787" y="-46044" />
+			<node x="37741" y="-46044" />
+			<node x="37741" y="-46051" />
+			<node x="37787" y="-46050" />
+		</nodes>
+		<location x="37787" y="-46047" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160014" name="rune_castle_agit_007_002">
+		<nodes nodeZ="873">
+			<node x="37743" y="-46043" />
+			<node x="37697" y="-46045" />
+			<node x="37697" y="-46051" />
+			<node x="37742" y="-46051" />
+		</nodes>
+		<location x="37697" y="-46048" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	
 	<!-- 21_17 -->
 	<door id="21170001" name="Rune_bodeful_fortress_s.Rune_bf_azit_gate_door">
 		<nodes nodeZ="544">
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/multisell/3160302.xml b/L2J_Mobius_03.0_Helios/dist/game/data/multisell/3160302.xml
index 649c3f4856..c9ee0fe75e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/multisell/3160302.xml
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/multisell/3160302.xml
@@ -42,7 +42,7 @@
 		<production count="1" id="38568" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
@@ -50,7 +50,7 @@
 		<production count="1" id="38569" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 4c9d1bc4cc..056fe69093 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -252,6 +253,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 6a1e99290e..2ec17e9b00 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -41,6 +41,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AirBind", AirBind::new);
@@ -225,7 +227,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index cd446ab812..2775ff29a4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -182,6 +182,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()))
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index b7434abd2e..1ba322bbe3 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,55 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
 }
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..798a363468 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,46 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 7bc5cc6e16..c46acc049a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -66,7 +66,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 68c2f77658..7e9df354f4 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.quest.QuestState;
@@ -46,10 +47,11 @@ public class ChamberOfProphecies extends AbstractInstance
 {
 	// NPCs
 	private static final int KAIN_VAN_HALTER = 31639;
-	private static final int VAN_HALTER = 33999;
-	private static final int FERIN = 34001;
 	private static final int GRAIL = 33996;
 	private static final int MYSTERIOUS_WIZARD = 33980;
+	// Helper NPCs
+	private static final int HELPER_VAN_HALTER = 33999;
+	private static final int HELPER_FERIN = 34001;
 	// Misc
 	private static final int DOOR_2 = 17230102;
 	private static final int DOOR_3 = 17230103;
@@ -66,7 +68,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		addStartNpc(KAIN_VAN_HALTER);
 		addFirstTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
 		addTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
-		addCreatureSeeId(FERIN, VAN_HALTER);
+		addCreatureSeeId(HELPER_FERIN, HELPER_VAN_HALTER);
 	}
 	
 	@Override
@@ -145,12 +147,12 @@ public class ChamberOfProphecies extends AbstractInstance
 				{
 					return null;
 				}
-				final Npc valHalter = world.getNpc(VAN_HALTER);
-				if (valHalter != null)
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
+				if (vanHalter != null)
 				{
-					valHalter.deleteMe(); // probably needs another npc id for initial room
+					vanHalter.deleteMe(); // probably needs another npc id for initial room
 				}
-				final Npc ferin = world.getNpc(FERIN);
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
 				if (ferin != null)
 				{
 					ferin.deleteMe(); // probably needs another npc id for initial room
@@ -190,6 +192,8 @@ public class ChamberOfProphecies extends AbstractInstance
 			case "CHECK_STATUS":
 			{
 				final Instance world = player.getInstanceWorld();
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
 				if (!isInInstance(world))
 				{
 					return null;
@@ -200,8 +204,8 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
-							startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY2", 14000, ferin, player);
+							startQuestTimer("SEY_KAIN", 24000, vanHalter, player);
 							startQuestTimer("OPEN_DOOR1", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -221,7 +225,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY3", 8000, ferin, player);
 							startQuestTimer("OPEN_DOOR2", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -234,7 +238,7 @@ public class ChamberOfProphecies extends AbstractInstance
 							world.setStatus(4);
 							world.spawnGroup("wof_room3_2");
 							world.openCloseDoor(DOOR_3, false);
-							startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY_KAIN_1", 5000, vanHalter, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
 						break;
@@ -245,8 +249,8 @@ public class ChamberOfProphecies extends AbstractInstance
 						{
 							world.setStatus(5);
 							world.spawnGroup("wof_room4");
-							startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
-							startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY_KAIN_2", 3000, vanHalter, player);
+							startQuestTimer("SEY4", 7000, ferin, player);
 						}
 						else
 						{
@@ -304,7 +308,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					return null;
 				}
 				cancelQuestTimer("ATTACK1", npc, player);
-				startQuestTimer("ATTACK2", 200, world.getNpc(VAN_HALTER), player, true);
+				startQuestTimer("ATTACK2", 200, world.getNpc(HELPER_VAN_HALTER), player, true);
 				world.setStatus(3);
 				world.spawnGroup("wof_room3");
 				world.openCloseDoor(DOOR_3, true);
@@ -321,7 +325,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY2":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.YOU_CAN_T_DIE_HERE_I_DIDN_T_LEARN_RESURRECT_YET));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_4", 0, 0, 0, 0, 0));
@@ -330,7 +334,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GISELLE_WAS_SUCH_A_SWEET_CHILD));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_1", 0, 0, 0, 0, 0));
@@ -340,7 +344,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY3":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.DO_YOU_THINK_I_LL_GROW_TALLER_IF_I_EAT_LOTS_AND_LOTS));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_6", 0, 0, 0, 0, 0));
@@ -349,7 +353,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_1":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.SUCH_MONSTERS_IN_A_PLACE_LIKE_THIS_UNBELIEVABLE));
 				}
@@ -357,7 +361,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_2":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THAT_S_THE_MONSTER_THAT_ATTACKED_FAERON_YOU_RE_OUTMATCHED_HERE_GO_AHEAD_I_LL_CATCH_UP));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_6", 0, 0, 0, 0, 0));
@@ -367,7 +371,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY4":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GO_NOW_KAIN_CAN_HANDLE_THIS));
 					npc.setScriptValue(1);
@@ -377,7 +381,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_3":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.LEAVE_THIS_TO_ME_GO));
 					npc.setScriptValue(1);
@@ -387,7 +391,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "REST":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, player);
 				}
@@ -508,7 +512,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		{
 			switch (npc.getId())
 			{
-				case FERIN:
+				case HELPER_FERIN:
 				{
 					if (creature.isPlayer() && !creature.isDead() && npc.isScriptValue(0))
 					{
@@ -516,7 +520,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					}
 					break;
 				}
-				case VAN_HALTER:
+				case HELPER_VAN_HALTER:
 				{
 					if (creature.isPlayer() && !creature.isDead() && world.isStatus(0))
 					{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/items/46200-46299.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/items/46200-46299.xml
index a01fbd148f..98acfe9ec5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/items/46200-46299.xml
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/items/46200-46299.xml
@@ -795,14 +795,19 @@
 	<item id="46254" name="Dandy's Golden Ball" type="EtcItem">
 		<!-- For 1 hr., XP/SP gain + 100%, and changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or XP Buff 50%. -->
 		<set name="icon" val="icon.ev_dinos_baseball_gold" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_stackable" val="true" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="is_freightable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="18471" level="1" /> <!-- Dandy's Golden Ball -->
+		</skills>
 	</item>
 	<item id="46255" name="Automatic Appearance: Halloween Outfit" type="EtcItem">
 		<!-- Changes the appearance of upper armor into that of a Halloween Outfit. Works on one-pieces too. -->
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/npcs/33900-33999.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/npcs/33900-33999.xml
index 5164bff2c0..5440046ef3 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/npcs/33900-33999.xml
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/npcs/33900-33999.xml
@@ -2254,26 +2254,37 @@
 			<param name="SpiritShotRate" value="10" />
 			<skill name="Skill01_ID" id="16387" level="1" />
 		</parameters>
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="17427" />
+		<race>FRIEND</race>
+		<sex>MALE</sex>
+		<equipment rhand="36218" />
+		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234" hpRegen="9.5" mp="1846" mpRegen="3.3" />
+			<vitals hp="42340.06312688557" hpRegen="8.5" mp="18046.8" mpRegen="3" />
+			<attack physical="25000" magical="2811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="430" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="10085.36442" magical="2064.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
 			</speed>
-			<attack physical="12289.0459514498" magical="811.85773400546" critical="4" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="5362.06896551724" magical="264.78509919958" />
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" talkable="false" canBeSown="true" />
+		<status attackable="false" talkable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4414" level="1" /> <!-- Heavy Armor Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="14" /> <!-- Humans -->
+			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
 			<skill id="16387" level="1" /> <!-- Chain Smash -->
 			<skill id="16388" level="1" /> <!-- Kain's Wrath -->
 		</skillList>
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/npcs/34000-34099.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/npcs/34000-34099.xml
index 1fe5999dc4..62a1e6ac2f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/npcs/34000-34099.xml
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/npcs/34000-34099.xml
@@ -17,22 +17,43 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="34001" level="85" type="Folk" name="Ferin">
+	<npc id="34001" level="85" type="FriendlyNpc" name="Ferin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+		<race>FRIEND</race>
 		<sex>FEMALE</sex>
+		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234" hpRegen="7.5" mp="1846" mpRegen="2.7" />
+			<vitals hp="4234.06312688557" hpRegen="8.5" mp="1846.8" mpRegen="3" />
+			<attack physical="1188.87259499001" magical="811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
 			</speed>
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" talkable="false" />
+		<status attackable="false" talkable="false" undying="true" />
 		<collision>
 			<radius normal="8" />
 			<height normal="16" />
 		</collision>
+		<skillList>
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="1" /> <!-- Heavy Armor Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
+		</skillList>
 	</npc>
 	<npc id="34002" level="99" type="Folk" name="Dolkin" title="Maestro">
 		<race>DWARF</race>
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/16300-16399.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/16300-16399.xml
index dbc97136a3..be4550a865 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/16300-16399.xml
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/16300-16399.xml
@@ -794,6 +794,22 @@
 		<reuseDelay>5000</reuseDelay>
 		<effectPoint>-150</effectPoint>
 		<isDebuff>true</isDebuff>
+		<activateRate>80</activateRate>
+		<affectRange>900</affectRange>
+		<basicProperty>PHYSICAL</basicProperty>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<trait>PULL</trait>
+		<effects>
+			<effect name="AirBind" />
+			<effect name="Bluff">
+				<chance>100</chance>
+			</effect>
+			<effect name="PullBack">
+				<speed>600</speed>
+				<delay>600</delay>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="16388" toLevel="1" name="Kain's Wrath">
 		<!-- Consumed by vengeful fury toward all who harm Giselle. -->
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/18400-18499.xml
index 5dec60a7e1..5100d9425f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/18400-18499.xml
@@ -877,8 +877,30 @@
 		<!-- For 1 hr., XP/SP gain + 100%, and changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or XP Buff 50%. -->
 		<icon>icon.ev_dinos_baseball_gold</icon>
 		<operateType>A2</operateType>
+		<effectPoint>1</effectPoint>
+		<abnormalType>CHANGEBODY</abnormalType>
+		<abnormalVisualEffect>CHANGE_DINOS</abnormalVisualEffect>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>46254</itemConsumeId> <!-- Dandy's Home Run Ball -->
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>-3</magicLevel>
+		<abnormalLevel>2</abnormalLevel>
+		<abnormalTime>3600</abnormalTime>
 		<reuseDelay>15000</reuseDelay>
+		<irreplacableBuff>true</irreplacableBuff>
+		<stayAfterDeath>true</stayAfterDeath>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="ExpModify">
+				<amount>100</amount>
+			</effect>
+			<effect name="SpModify">
+				<amount>100</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18472" toLevel="6" name="Giveaway Number 1">
 		<icon>icon.skill0000</icon>
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/30000-30099.xml
index 15c8a7d57b..522699adc6 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/30000-30099.xml
@@ -1923,8 +1923,8 @@
 		<operateType>P</operateType>
 		<magicLevel>85</magicLevel>
 		<effects>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>350</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/documentation.txt
index 117b6c3638..4422565298 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/documentation.txt
@@ -10,6 +10,8 @@ AddHate: Instant effect that increases target's hate towards you.
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -196,7 +198,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/Config.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/Config.java
index ad4c5cff52..f16b39c04c 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/Config.java
@@ -1267,6 +1267,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static boolean AUTO_PLAY_PREMIUM;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
@@ -1342,6 +1343,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2643,6 +2645,7 @@ public class Config
 			ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 			AUTO_PLAY_PREMIUM = autoPlayConfig.getBoolean("AutoPlayPremium", false);
 			DISABLED_AUTO_SKILLS.clear();
 			final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
@@ -3400,6 +3403,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index a50cbb8033..8378c362cb 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index c5839831ba..deb0eec41a 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -546,9 +546,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 2260001e17..380989e049 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 36f3461010..efc07efb38 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -230,7 +230,7 @@ public class ShortCuts implements IRestorable
 			if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL))
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
index e229501dae..663ea6b31c 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1288,7 +1288,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2816,7 +2816,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2829,178 +2829,140 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						player.refreshExpertisePenalty();
-						sendPacket(info);
+					}
+					player.refreshExpertisePenalty();
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java
index da6ebb9cb2..c66305dcf6 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4575,7 +4575,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8340,9 +8340,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Summon.java
index d3f774596c..66a299ce8e 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -846,7 +847,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -867,7 +868,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -892,7 +900,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -900,7 +908,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -946,7 +961,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index eb31dfcf3e..3a1e8faafa 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -873,15 +872,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -892,8 +889,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -902,7 +903,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -975,45 +976,26 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
 		
-		// Notify recalculation to child classes.
+		// Notify recalculation to child classes
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index a5b88e0118..6e93ee87d7 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index e17d405a46..fba22cdb8c 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2242,6 +2242,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index 953f769a75..a5dcc7540c 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -38,6 +38,7 @@ import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -51,6 +52,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -69,12 +71,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDr
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPickup;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -82,11 +86,13 @@ import org.l2jmobius.gameserver.model.options.EnchantOptions;
 import org.l2jmobius.gameserver.model.options.Options;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.SkillConditionScope;
 import org.l2jmobius.gameserver.model.variables.ItemVariables;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1585,7 +1591,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2471,6 +2479,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2495,6 +2508,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2520,6 +2535,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 57c751293a..a27e3aea14 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -742,7 +742,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -894,7 +895,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index e7c37a9ae6..cc8e010ff3 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -652,7 +652,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -675,7 +675,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -710,7 +710,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 6894ac0fba..e2e6bb404c 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -129,7 +129,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index 8f916369b4..b7b0c4ef53 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index 265cef95f4..4211092a85 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -97,6 +97,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 54704f9bda..6d4c3d9e2e 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -701,7 +701,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList(false);
 		player.updateShortCuts(_id, _level, 0);
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index c16d3301f0..7c284015a5 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -63,6 +63,6 @@ public class RequestShortCutReg implements ClientPacket
 		
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 	}
 }
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index d78d842163..07ed7641a9 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,127 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 38, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 49, 50, 51,
-		52, 53, 54, 55,
-		56, 57, 58, 59,
-		60, 61, 62, 63,
-		64, 65, 66, 67,
-		68, 69, 70, 71,
-		72, 73, 74, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index dcc44cb9f3..2e152e2e29 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -207,7 +207,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		ServerPackets.EX_PET_INFO.writeId(this);
 		writeInt(_summon.getObjectId());
-		writeByte(_value); // // 0=teleported 1=default 2=summoned
+		writeByte(_value); // 0=teleported 1=default 2=summoned
 		writeShort(37); // mask_bits_37
 		writeBytes(_masks);
 		// Block 1
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index f93c9e5e69..03909a2746 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
similarity index 96%
rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
index 52a4032d14..62bb425a5a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -1,182 +1,182 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeByte(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 83e29f7bed..3ee2b1ef96 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,19 +19,19 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
 	}
 	
@@ -53,8 +53,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 8872c0cf63..c2b8c8f51a 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -42,13 +48,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -59,8 +68,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 68ca369edf..37f3211b0a 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1f54b5040f..0d5d066d25 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,6 +25,7 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -95,6 +98,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							if (player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -120,23 +134,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -144,6 +167,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -178,32 +204,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -302,6 +351,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 7cd7dd9696..c56221841f 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
@@ -51,7 +52,6 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +381,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle.sql
index 7ffcebed6b..3445dea47a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/characters.sql
index ea2aace011..60e1a786a2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/characters.sql
@@ -60,4 +60,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort.sql
index c1f09a3f79..c8e7f5458c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort_siege_guards.sql
index 4872d0110c..40ed7619dc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_siege_guards` VALUES
 -- Shanty Guards
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort_spawnlist.sql
index 0285fa6edd..d3caf9312e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,7 +11,7 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_spawnlist` VALUES
 (101,null,35658,-53273,156650,-1896,62000,0,0),
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/grandboss_data.sql
index cdf2d6c810..d1d27566f9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/heroes.sql
index 2fc8753f90..49a371cbd5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/heroes.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/items.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/olympiad_fights.sql
index 618ee73db0..662f1c4a7e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(1) unsigned NOT NULL DEFAULT '0',
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/config/Custom/AutoPlay.ini b/L2J_Mobius_04.0_GrandCrusade/dist/game/config/Custom/AutoPlay.ini
index 9a4fd4bf2e..6e9d9628be 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/config/Custom/AutoPlay.ini
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/config/Custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # Enable .play command only for premium players.
 # Premium System must be enabled.
 # Default: False
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_04.0_GrandCrusade/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/config/General.ini b/L2J_Mobius_04.0_GrandCrusade/dist/game/config/General.ini
index ff90e7e58e..d765d7ce87 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/config/General.ini
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/config/General.ini
@@ -434,8 +434,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/ActionData.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/ActionData.xml
index 965751da7b..7c9012c234 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/ActionData.xml
@@ -1,219 +1,266 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
-	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
-	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="38" handler="Ride" /> <!-- Mount/Dismount -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
-	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
-	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
-	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
-	<action id="70" handler="AirshipAction" option="4" /> <!-- Exit Airship -->
-	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
-	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
-	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
-	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
-	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Nightshade - Shade Sacrifice -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
-	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="0" handler="SitStand" /> <!-- Toggle Sit/Stand. (/sit, /stand) -->
+	<action id="1" handler="RunWalk" /> <!-- Toggle Walk/Run. (/walk, /run) -->
+	<action id="2" handler="None" /> <!-- Attacks selected target(s), or takes a general action if the target cannot be attacked. Hold down the Ctrl key and click to attack by force. (/attack, /attackforce) -->
+	<action id="3" handler="None" /> <!-- Request a trade from the selected target. (/trade) -->
+	<action id="4" handler="None" /> <!-- Select the nearest attackable target. (/targetnext) -->
+	<action id="5" handler="None" /> <!-- Pick up items that are scattered nearby. (/pickup) -->
+	<action id="6" handler="None" /> <!-- Change to the target of the currently selected player. (/assist) -->
+	<action id="7" handler="None" /> <!-- Invite the selected person to your party. (/invite) -->
+	<action id="8" handler="None" /> <!-- Leave the party. (/leave) -->
+	<action id="9" handler="None" /> <!-- If you are the leader of the party, dismiss selected members from your party. (/dismiss) -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Sets up a private store to sell your items. (/vendor) -->
+	<action id="11" handler="None" /> <!-- Display the party matching window to search for parties or to add members to your party. (/partymatching) -->
+	<action id="12" handler="SocialAction" option="2" /> <!-- Emote: Greet others with a kind "hello." (/socialhello) -->
+	<action id="13" handler="SocialAction" option="3" /> <!-- Emote: Let everyone know that you or someone else is victorious! (/socialvictory) -->
+	<action id="14" handler="SocialAction" option="4" /> <!-- Emote: Rouse your allies and charge! (/socialcharge) -->
+	<action id="15" handler="PetHold" /> <!-- Have your pet follow you or stay and hold its ground. -->
+	<action id="16" handler="PetAttack" /> <!-- Attack target. -->
+	<action id="17" handler="PetStop" /> <!-- Stop current action. -->
+	<action id="18" handler="None" /> <!-- Pick up nearby items. -->
+	<action id="19" handler="UnsummonPet" /> <!-- Returns your pet back to its home. -->
+	<action id="20" handler="None" /> <!-- Use special skill. -->
+	<action id="21" handler="ServitorHold" /> <!-- Have your summons follow you or stay and hold its ground. -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attack target. -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="24" handler="SocialAction" option="6" /> <!-- Emote: Respond positively. (/socialyes) -->
+	<action id="25" handler="SocialAction" option="5" /> <!-- Emote: Respond negatively. (/socialno) -->
+	<action id="26" handler="SocialAction" option="7" /> <!-- Emote: Show your respect and bow. (/socialbow) -->
+	<action id="27" handler="None" /> <!-- Use special skill. -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Sets up a private store to purchase items. (/buy) -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Emote: You have no idea what's going on. (/socialunaware) -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Emote: I'm waiting... (/socialwaiting) -->
+	<action id="31" handler="SocialAction" option="10" /> <!-- Emote: Have a good laugh. (/sociallaugh) -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Toggle between Attack/Move modes. -->
+	<action id="33" handler="SocialAction" option="11" /> <!-- Emote: Applaud. (/socialapplause) -->
+	<action id="34" handler="SocialAction" option="12" /> <!-- Emote: Serve them up your best dance moves. (/socialdance) -->
+	<action id="35" handler="SocialAction" option="13" /> <!-- Emote: Show grief. (/socialsad) -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Poison gas attack. -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Set up a private workshop that creates items by using Dwarven recipes in exchange for a fee. (/dwarvenmanufacture) -->
+	<action id="38" handler="Ride" /> <!-- Toggle mount/dismount when near or on an NPC that can be ridden. (/mount, /dismount, /mountdismount) -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Exploding corpse attack. -->
+	<action id="40" handler="None" /> <!-- Enhances a target's evaluation score. (/evaluate) -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Attacks castle gates, walls, or headquarters by shooting a cannon. -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Reflects damage back to an enemy. -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Attacks an enemy by creating a whirling surge of water. -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Attacks an enemy with a powerful explosion. -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Restores the summoner's MP. -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Attacks an enemy by summoning up a devastating storm. -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Damages an enemy and heals the servitor at the same time. -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Attacks the enemy by shooting a cannon. -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Attack with a fit of rage. -->
+	<action id="50" handler="None" /> <!-- The selected party member will become the new party leader. (/changepartyleader) -->
+	<action id="51" handler="None" /> <!-- Creates an item using a common recipe in exchange for a fee. (/generalmanufacture) -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Removes the bonds from the summons and releases it. -->
+	<action id="53" handler="ServitorMove" /> <!-- Move to the target. -->
+	<action id="54" handler="PetMove" /> <!-- Move to the target. -->
+	<action id="55" handler="None" /> <!-- Toggle recording and stop recording of replay files. (/start_replayrecording, /stop_replayrecording, /startstop_replayrecording) -->
+	<action id="56" handler="None" /> <!-- Invite the selected target to a command channel. (/channelinvite) -->
+	<action id="57" handler="None" /> <!-- Highlights private store and private workshop messages that contain the search word. (/findprivatestore) -->
+	<action id="58" handler="None" /> <!-- Challenge another player to a duel. (/duel) -->
+	<action id="59" handler="None" /> <!-- Withdraw from a duel. A withdrawal is treated as a defeat. (/withdraw) -->
+	<action id="60" handler="None" /> <!-- Challenge another party to a duel. Note : Cannot teleport to the Coliseum when in an instanced zone. (/partyduel) -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Open a personal store for package sale. (/packagesale) -->
+	<action id="62" handler="SocialAction" option="14" /> <!-- Charm Pose (Command: /charm) -->
+	<action id="63" handler="None" /> <!-- Begins a fun and easy mini-game. (command: /minigame) -->
+	<action id="64" handler="TeleportBookmark" /> <!-- Displays My Teleports window you can use to save and manage my teleport locations (command: /myteleport). -->
+	<action id="65" handler="BotReport" /> <!-- Reports the targeted player as a suspected bot. (Command: /AutoHuntingReport) -->
+	<action id="66" handler="SocialAction" option="15" /> <!-- Allows character to strike shy pose. (command: /shyness) -->
+	<action id="67" handler="AirshipAction" option="1" /> <!-- Allows you to control the Airship. -->
+	<action id="68" handler="AirshipAction" option="2" /> <!-- Relinquishes control of the Airship. -->
+	<action id="69" handler="AirshipAction" option="3" /> <!-- Choose from pre-designated locations. -->
+	<action id="70" handler="AirshipAction" option="4" /> <!-- Disembarks from the Airship. -->
+	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange bows with another person. (command: /two-personbow) -->
+	<action id="72" handler="SocialAction" option="17" /> <!-- High Five another person. (command: /hi-five) -->
+	<action id="73" handler="SocialAction" option="18" /> <!-- Dance with another player. (command: /coupledance) -->
+	<action id="74" handler="None" /> <!-- It turns on or off the entire status information gauge above the player's head. (Commands: /statusbaroff, /statusbaron, /statusbaronoff) -->
+	<action id="76" handler="None" /> <!-- Invite the selected target as friends. (Commands: /friendinvite, /addfriend, /registerfriend) -->
+	<action id="77" handler="None" /> <!-- Start or end recording videos. (Commands: /startrecording, /stoprecording, /startstoprecording) -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Use Token 1 on the target. It is only available with party status. (Command: /usetoken1) -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Use Token 2 on the target. It is only available with party status. (Command: /usetoken2) -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Use Token 3 on the target. It is only available with party status. (Command: /usetoken3) -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Use Token 4 on the target. It is only available with party status. (Command: /usetoken4) -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Make a target of an object that was applied with the token 1. It is only available with party status. (Command: /targettoken1) -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Make a target of an object that was applied with the token 2. It is only available with party status. (Command: /targettoken2) -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Make a target of an object that was applied with the token 3. It is only available with party status. (Command: /targettoken3) -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Make a target of an object that was applied with the token 4. It is only available with party status. (Command: /targettoken4) -->
+	<action id="87" handler="SocialAction" option="28" /> <!-- Gesture of Proposal (Command: /socialpropose) -->
+	<action id="88" handler="SocialAction" option="29" /> <!-- Gesture of Provocation (Command: /socialprovocation) -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off (Command: /socialbeauty) -->
+	<action id="90" handler="InstanceZoneInfo" /> <!-- Display list of usage times for instanced zones. (Command: /instancezone) -->
+	<action id="92" handler="None" /> <!-- Select target that was selected previously. (Command: /previoustarget) -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Attacks castle gates, walls, or headquarters with a powerful strike. -->
+	<action id="1001" handler="None" /> <!-- A reckless yet powerful attack that must be used with extreme caution. -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Incites those around the summon to attack you. -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Instantly increases P. Def. and M. Def. significantly. Character is immovable while this skill is in effect. -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- A magical attack. -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Recovers the pet's HP. -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Temporarily increases your party's chance to land a critical attack and also increases the power of the attack if successful. -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Temporarily increases your party's P. Atk and accuracy. -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Has a chance to remove curses from party members. -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Temporarily increases your party's MP regeneration. -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Temporarily shortens your party's spell re-use timer. -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Remove a curse from your party. -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Provokes an opponent to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Provokes multiple enemies around the caster to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Sacrifice HP in order to regenerate the HP of a selected target. -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Attempt a powerful, critical attack on an opponent. -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- A stunning blow that inflicts damage and instantly throws an enemy into a state of stun. -->
+	
+	<!-- TODO: Find skill ids. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Inflict a deadly curse on an enemy that absorbs their HP. -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kat the Cat -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mew the Cat -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kai the Cat -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Boxer the Unicorn -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mirage the Unicorn -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Merrow the Unicorn -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Shadow -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by Shadow -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Silhouette -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by reanimated man -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by reanimated man -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by corrupted man -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King: A powerful slashing attack. Over-hit is possible. -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King: Slashes at surrounding enemies while spinning in the air. Over-hit is possible. -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King: Immobilizes all nearby enemies. -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn: Powerful rear kicks that stun and damage an enemy. Over-hit is possible. -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn: Pounds multiple enemies with a tremendous onrush of water. -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord: Detonates a corpse, inflicting damage to nearby enemies. -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord: Blades attached to each arm slash out in a devastating attack. Over-hit is possible. -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord: Curses nearby enemies, poisoning them and reducing their Atk. Spd. -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon: Fires a projectile a short distance. Consumes 4 Flash Gunpowder. -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon: Fires a projectile a long distance. Consumes 5 Flash Gunpowder. -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Viciously bite an enemy. -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Scratch an enemy with both paws. Causes bleeding. -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awaken hidden powers. -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Decrease a nearby enemy's P. Atk./M. Atk. with a wolf cry. -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Decrease a nearby enemy's attack speed/magic speed with a strider roar. -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Viciously bite an enemy. -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Cause both damage and shock at the same time. Instantly stuns an enemy. -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Breath fire in front of you. -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Increases maximum HP temporarily. -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Increases maximum MP temporarily. -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Increases Atk. Spd. temporarily. -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Increases Casting Spd. temporarily. -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Temporarily decreases the target's MP consumption of skills. Consumes Spirit Ore. -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Increases M. Atk. power temporarily. -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Temporarily increases the critical rate of damage attack magic. -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Temporarily increases the critical attack power. -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Temporarily increases the probability of critical attack. -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Temporarily increases Accuracy. -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Rapidly attacks the enemy twice. -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Inflicts shock and damage to the enemy at the same time with a powerful spin attack. -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Attacks nearby enemies with a doll heap attack. -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakens a hidden ability. -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of thunder. -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack on nearby enemies when hit. -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Control put in place to prevent the use of a buff upon the master. 5-minute duration. -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Powerfully attacks the target. -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- A powerful attack that pierces through a target. -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies by spinning your own body like a whirlwind. -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Attacks a front-line enemy with a powerful lance thrust. -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Shouts a victory cry that increases your abilities. -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Gathers energy into your body, then releases it in a destructive blast. -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Hits enemies with a powerful wave of force. -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Emits a loud roar that amplifies your abilities. -->
+	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Charges toward the enemy and inflicts damage. -->
+	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Cancels the target's de-buff. -->
+	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Emits a spread of ring-shaped flames. -->
+	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Attacks the enemy with a powerful flaming beak. -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Toggles you between Attack and Support modes. -->
+	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Cancels more than one of the enemy's buffs. -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Decreases the enemy's Dark attribute by 25. -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Strike multiple enemies at the front with the tail. -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Bites the enemies at the front. -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Causes nearby enemies to flee in fear. -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Increases your speed. -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Greatly increases its master's speed. -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Increases the speed of its master and their party. -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Teleports its master to the Seed of Annihilation. -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Teleports its master and their party to the Seed of Annihilation. -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attack the target. -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move to a designated location. -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Make the servitor disappear by cancelling the summoning. -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Do not counter-attack. -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Counter-attack when the master or itself is attacked. -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Damages and provokes the target. -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Roll over and deliver a shock to the ground stunning nearby targets. -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Bites the target to inflict damage. -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Damages the target and absorbs some of its HP. -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Attack nearby enemies and block their physical skills. -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Flourishes claws and frontally attacks enemies. -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Dashes toward enemies to inflict damage and Stun them. -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Inflicts damage onto the enemies with a flame. -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Flies straight into the enemy. -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Purifies the master. -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Attack the enemy by darting a feather. -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Hurt the enemy by attacking them with sharp claws. -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Recover the targets near the tree and clear any debuff. -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Attacks nearby targets with a powerful punch. -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Provokes nearby enemies. -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Bites the enemy. -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Provokes nearby enemies. -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Bites the enemy. -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Provokes nearby enemies. -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Bites the enemy. -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1142" handler="None" /> <!-- Attacks nearby enemies and blocks their P. Skills. -->
+	<action id="1143" handler="None" /> <!-- Rushes to the enemy to inflict damage and Stun. -->
+	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Pounces on the enemy to inflict damage and decreases their Speed by 100. -->
+	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Deals damage to the target and knocks down for 3 seconds. -->
+	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Pushes the target and those around while inflicting damage. -->
+	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Rushes to the enemy to inflict damage and Stun for 5 seconds. -->
+	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Deals damage to enemies around and pushes them back. -->
+	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Deals damage to the target and those around, and decreases their Speed for 5 seconds. -->
+	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Deals damage to the target and those around. -->
+	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Launches a powerful slashing attack. -->
+	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Aims at the enemy's vital spot from long range. -->
+	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Deals damage to the target. -->
+	<action id="1156" handler="ServitorSkillUse" option="19406" /> <!-- Inflicts dark magic damage with 620 power to nearby enemies and reduces Speed by 120 and Healing received by 20% for 5 seconds. -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Can express affection to Rudolph. Affection Level rises by 25%. Warning: Can be used only when a Rudolph requests expression of affection, and cannot be used while transformed! -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Increases Max HP by 20%, Max MP by 20%, and the Speed by 20% for 5 minutes. Increases the Debuff Resistance by 10%. Reuse delay 10 minutes. Consumes 3 Rose Essence(s) during skill use. Doesn't overlap with other buffs except Critical Seduction. -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- For 30 minutes, increases party members' Max HP by 30%, Max MP by 30%, Max CP by 30%, P. Def. by 30%, magic M. Def. by 30%, Speed by 20, P. Atk. by 10%, and magic M. Atk. by 20%. Decreases MP consumption for skill use by 15%. Reuse delay 5 minutes. Consumes 10 Rose Essence(s) during skill use. -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of lightning. -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack upon contacted enemies nearby. -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Restricts to prevent the use of a buff upon the master. 5 minute duration. -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Inflicts a powerful attack that seems to pierce through the target. -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies. -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impales an enemy with a sword. -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Raises one's own abilities. -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Gathered energy within ones self can be focused and used to attack an enemy. -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Fires a shock wave to attack enemies at the front. -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Amplifies one's own abilities. -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switches between attack mode and support mode. -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Instantly restores the master's HP by 10%. Increases the master's Debuff Resistance by 80%, Buff-canceling Attack Resistance by 40%, Speed by 10, P. Def. by 20%, and M. Def. by 20%, and decreases MP consumption for all skills by 50% for 1 minute. -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/DoorData.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/DoorData.xml
index e3cedbdf7d..431cc1a08d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/DoorData.xml
@@ -11308,6 +11308,176 @@
 		<openStatus default="open" />
 	</door>
 	
+	<!-- 21_16 FIXME: Rune clanhall doors cannot be found in client. -->
+	<door id="21160001" name="rune_castle_agit_002_001">
+		<nodes nodeZ="872">
+			<node x="37679" y="-50432" />
+			<node x="37726" y="-50433" />
+			<node x="37726" y="-50423" />
+			<node x="37678" y="-50424" />
+		</nodes>
+		<location x="37680" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160002" name="rune_castle_agit_002_002">
+		<nodes nodeZ="872">
+			<node x="37724" y="-50432" />
+			<node x="37771" y="-50432" />
+			<node x="37771" y="-50423" />
+			<node x="37723" y="-50424" />
+		</nodes>
+		<location x="37770" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160003" name="rune_castle_agit_003_001">
+		<nodes nodeZ="872">
+			<node x="38527" y="-50151" />
+			<node x="38570" y="-50131" />
+			<node x="38566" y="-50122" />
+			<node x="38524" y="-50144" />
+		</nodes>
+		<location x="38527" y="-50147" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160004" name="rune_castle_agit_003_002">
+		<nodes nodeZ="872">
+			<node x="38569" y="-50132" />
+			<node x="38610" y="-50111" />
+			<node x="38606" y="-50103" />
+			<node x="38564" y="-50124" />
+		</nodes>
+		<location x="38607" y="-50108" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160005" name="rune_castle_agit_004_001">
+		<nodes nodeZ="872">
+			<node x="39122" y="-49542" />
+			<node x="39145" y="-49501" />
+			<node x="39137" y="-49498" />
+			<node x="39115" y="-49539" />
+		</nodes>
+		<location x="39119" y="-49539" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160006" name="rune_castle_agit_004_002">
+		<nodes nodeZ="872">
+			<node x="39145" y="-49503" />
+			<node x="39167" y="-49462" />
+			<node x="39160" y="-49459" />
+			<node x="39136" y="-49498" />
+		</nodes>
+		<location x="39163" y="-49461" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160007" name="rune_castle_agit_001_001">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48291" />
+			<node x="39341" y="-48245" />
+			<node x="39335" y="-48245" />
+			<node x="39334" y="-48290" />
+		</nodes>
+		<location x="39338" y="-48290" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160008" name="rune_castle_agit_001_002">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48246" />
+			<node x="39342" y="-48199" />
+			<node x="39334" y="-48199" />
+			<node x="39334" y="-48246" />
+		</nodes>
+		<location x="39338" y="-48200" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160009" name="rune_castle_agit_005_001">
+		<nodes nodeZ="872">
+			<node x="39176" y="-47024" />
+			<node x="39155" y="-46982" />
+			<node x="39147" y="-46986" />
+			<node x="39169" y="-47026" />
+		</nodes>
+		<location x="39172" y="-47024" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160010" name="rune_castle_agit_005_002">
+		<nodes nodeZ="872">
+			<node x="39154" y="-46982" />
+			<node x="39133" y="-46942" />
+			<node x="39127" y="-46945" />
+			<node x="39148" y="-46986" />
+		</nodes>
+		<location x="39130" y="-46944" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160011" name="rune_castle_agit_006_001">
+		<nodes nodeZ="872">
+			<node x="38626" y="-46372" />
+			<node x="38586" y="-46350" />
+			<node x="38581" y="-46358" />
+			<node x="38623" y="-46379" />
+		</nodes>
+		<location x="38624" y="-46375" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160012" name="rune_castle_agit_006_002">
+		<nodes nodeZ="872">
+			<node x="38587" y="-46350" />
+			<node x="38545" y="-46330" />
+			<node x="38542" y="-46336" />
+			<node x="38583" y="-46358" />
+		</nodes>
+		<location x="38544" y="-46333" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160013" name="rune_castle_agit_007_001">
+		<nodes nodeZ="873">
+			<node x="37787" y="-46044" />
+			<node x="37741" y="-46044" />
+			<node x="37741" y="-46051" />
+			<node x="37787" y="-46050" />
+		</nodes>
+		<location x="37787" y="-46047" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160014" name="rune_castle_agit_007_002">
+		<nodes nodeZ="873">
+			<node x="37743" y="-46043" />
+			<node x="37697" y="-46045" />
+			<node x="37697" y="-46051" />
+			<node x="37742" y="-46051" />
+		</nodes>
+		<location x="37697" y="-46048" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	
 	<!-- 21_17 -->
 	<door id="21170001" name="Rune_bodeful_fortress_s.Rune_bf_azit_gate_door">
 		<nodes nodeZ="544">
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/multisell/3160302.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/multisell/3160302.xml
index 649c3f4856..c9ee0fe75e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/multisell/3160302.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/multisell/3160302.xml
@@ -42,7 +42,7 @@
 		<production count="1" id="38568" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
@@ -50,7 +50,7 @@
 		<production count="1" id="38569" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 4c9d1bc4cc..056fe69093 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -252,6 +253,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java
index e048aa180a..1d2bdeff34 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -41,6 +41,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AirBind", AirBind::new);
@@ -229,7 +231,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index cd446ab812..2775ff29a4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -182,6 +182,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()))
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index b7434abd2e..1ba322bbe3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,55 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
 }
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..798a363468 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,46 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 68c2f77658..7e9df354f4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.quest.QuestState;
@@ -46,10 +47,11 @@ public class ChamberOfProphecies extends AbstractInstance
 {
 	// NPCs
 	private static final int KAIN_VAN_HALTER = 31639;
-	private static final int VAN_HALTER = 33999;
-	private static final int FERIN = 34001;
 	private static final int GRAIL = 33996;
 	private static final int MYSTERIOUS_WIZARD = 33980;
+	// Helper NPCs
+	private static final int HELPER_VAN_HALTER = 33999;
+	private static final int HELPER_FERIN = 34001;
 	// Misc
 	private static final int DOOR_2 = 17230102;
 	private static final int DOOR_3 = 17230103;
@@ -66,7 +68,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		addStartNpc(KAIN_VAN_HALTER);
 		addFirstTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
 		addTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
-		addCreatureSeeId(FERIN, VAN_HALTER);
+		addCreatureSeeId(HELPER_FERIN, HELPER_VAN_HALTER);
 	}
 	
 	@Override
@@ -145,12 +147,12 @@ public class ChamberOfProphecies extends AbstractInstance
 				{
 					return null;
 				}
-				final Npc valHalter = world.getNpc(VAN_HALTER);
-				if (valHalter != null)
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
+				if (vanHalter != null)
 				{
-					valHalter.deleteMe(); // probably needs another npc id for initial room
+					vanHalter.deleteMe(); // probably needs another npc id for initial room
 				}
-				final Npc ferin = world.getNpc(FERIN);
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
 				if (ferin != null)
 				{
 					ferin.deleteMe(); // probably needs another npc id for initial room
@@ -190,6 +192,8 @@ public class ChamberOfProphecies extends AbstractInstance
 			case "CHECK_STATUS":
 			{
 				final Instance world = player.getInstanceWorld();
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
 				if (!isInInstance(world))
 				{
 					return null;
@@ -200,8 +204,8 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
-							startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY2", 14000, ferin, player);
+							startQuestTimer("SEY_KAIN", 24000, vanHalter, player);
 							startQuestTimer("OPEN_DOOR1", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -221,7 +225,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY3", 8000, ferin, player);
 							startQuestTimer("OPEN_DOOR2", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -234,7 +238,7 @@ public class ChamberOfProphecies extends AbstractInstance
 							world.setStatus(4);
 							world.spawnGroup("wof_room3_2");
 							world.openCloseDoor(DOOR_3, false);
-							startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY_KAIN_1", 5000, vanHalter, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
 						break;
@@ -245,8 +249,8 @@ public class ChamberOfProphecies extends AbstractInstance
 						{
 							world.setStatus(5);
 							world.spawnGroup("wof_room4");
-							startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
-							startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY_KAIN_2", 3000, vanHalter, player);
+							startQuestTimer("SEY4", 7000, ferin, player);
 						}
 						else
 						{
@@ -304,7 +308,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					return null;
 				}
 				cancelQuestTimer("ATTACK1", npc, player);
-				startQuestTimer("ATTACK2", 200, world.getNpc(VAN_HALTER), player, true);
+				startQuestTimer("ATTACK2", 200, world.getNpc(HELPER_VAN_HALTER), player, true);
 				world.setStatus(3);
 				world.spawnGroup("wof_room3");
 				world.openCloseDoor(DOOR_3, true);
@@ -321,7 +325,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY2":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.YOU_CAN_T_DIE_HERE_I_DIDN_T_LEARN_RESURRECT_YET));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_4", 0, 0, 0, 0, 0));
@@ -330,7 +334,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GISELLE_WAS_SUCH_A_SWEET_CHILD));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_1", 0, 0, 0, 0, 0));
@@ -340,7 +344,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY3":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.DO_YOU_THINK_I_LL_GROW_TALLER_IF_I_EAT_LOTS_AND_LOTS));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_6", 0, 0, 0, 0, 0));
@@ -349,7 +353,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_1":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.SUCH_MONSTERS_IN_A_PLACE_LIKE_THIS_UNBELIEVABLE));
 				}
@@ -357,7 +361,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_2":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THAT_S_THE_MONSTER_THAT_ATTACKED_FAERON_YOU_RE_OUTMATCHED_HERE_GO_AHEAD_I_LL_CATCH_UP));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_6", 0, 0, 0, 0, 0));
@@ -367,7 +371,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY4":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GO_NOW_KAIN_CAN_HANDLE_THIS));
 					npc.setScriptValue(1);
@@ -377,7 +381,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_3":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.LEAVE_THIS_TO_ME_GO));
 					npc.setScriptValue(1);
@@ -387,7 +391,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "REST":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, player);
 				}
@@ -508,7 +512,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		{
 			switch (npc.getId())
 			{
-				case FERIN:
+				case HELPER_FERIN:
 				{
 					if (creature.isPlayer() && !creature.isDead() && npc.isScriptValue(0))
 					{
@@ -516,7 +520,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					}
 					break;
 				}
-				case VAN_HALTER:
+				case HELPER_VAN_HALTER:
 				{
 					if (creature.isPlayer() && !creature.isDead() && world.isStatus(0))
 					{
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/items/46200-46299.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/items/46200-46299.xml
index 911244acf7..8cdd54d498 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/items/46200-46299.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/items/46200-46299.xml
@@ -795,14 +795,19 @@
 	<item id="46254" name="Dandy's Golden Ball" type="EtcItem">
 		<!-- For 1 hr., XP/SP gain +100%, and changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or XP Buff 50%. -->
 		<set name="icon" val="icon.ev_dinos_baseball_gold" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_stackable" val="true" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="is_freightable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="18471" level="1" /> <!-- Dandy's Golden Ball -->
+		</skills>
 	</item>
 	<item id="46255" name="Automatic Appearance: Halloween Outfit" type="EtcItem">
 		<!-- Changes the appearance of upper armor into that of a Halloween Outfit. Works on one-pieces too. -->
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/npcs/33900-33999.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/npcs/33900-33999.xml
index 3c49f48bf7..078b62ab5f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/npcs/33900-33999.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/npcs/33900-33999.xml
@@ -2265,26 +2265,37 @@
 			<param name="SpiritShotRate" value="10" />
 			<skill name="Skill01_ID" id="16387" level="1" />
 		</parameters>
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<race>FRIEND</race>
+		<sex>MALE</sex>
 		<equipment rhand="36218" />
+		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234" hpRegen="9.5" mp="1846" mpRegen="3.3" />
+			<vitals hp="42340.06312688557" hpRegen="8.5" mp="18046.8" mpRegen="3" />
+			<attack physical="25000" magical="2811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="430" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="10085.36442" magical="2064.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
 			</speed>
-			<attack physical="12289.0459514498" magical="811.85773400546" critical="4" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="5362.06896551724" magical="264.78509919958" />
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" talkable="false" canBeSown="true" />
+		<status attackable="false" talkable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4414" level="1" /> <!-- Heavy Armor Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="14" /> <!-- Humans -->
+			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
 			<skill id="16387" level="1" /> <!-- Chain Smash -->
 			<skill id="16388" level="1" /> <!-- Kain's Wrath -->
 		</skillList>
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/npcs/34000-34099.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/npcs/34000-34099.xml
index bf754d796b..94008f3f8f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/npcs/34000-34099.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/npcs/34000-34099.xml
@@ -17,22 +17,43 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="34001" level="85" type="Folk" name="Ferin">
+	<npc id="34001" level="85" type="FriendlyNpc" name="Ferin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+		<race>FRIEND</race>
 		<sex>FEMALE</sex>
+		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234" hpRegen="7.5" mp="1846" mpRegen="2.7" />
+			<vitals hp="4234.06312688557" hpRegen="8.5" mp="1846.8" mpRegen="3" />
+			<attack physical="1188.87259499001" magical="811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
 			</speed>
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" talkable="false" />
+		<status attackable="false" talkable="false" undying="true" />
 		<collision>
 			<radius normal="8" />
 			<height normal="16" />
 		</collision>
+		<skillList>
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="1" /> <!-- Heavy Armor Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
+		</skillList>
 	</npc>
 	<npc id="34002" level="99" type="Folk" name="Dolkin" title="Maestro">
 		<race>DWARF</race>
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/16300-16399.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/16300-16399.xml
index 36b7b1c7a5..f1f3ee17f8 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/16300-16399.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/16300-16399.xml
@@ -794,6 +794,22 @@
 		<reuseDelay>5000</reuseDelay>
 		<effectPoint>-150</effectPoint>
 		<isDebuff>true</isDebuff>
+		<activateRate>80</activateRate>
+		<affectRange>900</affectRange>
+		<basicProperty>PHYSICAL</basicProperty>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<trait>PULL</trait>
+		<effects>
+			<effect name="AirBind" />
+			<effect name="Bluff">
+				<chance>100</chance>
+			</effect>
+			<effect name="PullBack">
+				<speed>600</speed>
+				<delay>600</delay>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="16388" toLevel="1" name="Kain's Wrath">
 		<!-- Consumed by vengeful fury toward all who harm Giselle. -->
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/18400-18499.xml
index 075118bfaa..98aff3a6ab 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/18400-18499.xml
@@ -877,8 +877,30 @@
 		<!-- For 1 hr., XP/SP gain +100%, and changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or XP Buff 50%. -->
 		<icon>icon.ev_dinos_baseball_gold</icon>
 		<operateType>A2</operateType>
+		<effectPoint>1</effectPoint>
+		<abnormalType>CHANGEBODY</abnormalType>
+		<abnormalVisualEffect>CHANGE_DINOS</abnormalVisualEffect>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>46254</itemConsumeId> <!-- Dandy's Home Run Ball -->
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>-3</magicLevel>
+		<abnormalLevel>2</abnormalLevel>
+		<abnormalTime>3600</abnormalTime>
 		<reuseDelay>15000</reuseDelay>
+		<irreplacableBuff>true</irreplacableBuff>
+		<stayAfterDeath>true</stayAfterDeath>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="ExpModify">
+				<amount>100</amount>
+			</effect>
+			<effect name="SpModify">
+				<amount>100</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18472" toLevel="6" name="Giveaway Number 1">
 		<icon>icon.skill0000</icon>
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml
index 4e1e1a1278..8adacbda05 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml
@@ -1841,8 +1841,8 @@
 		<operateType>P</operateType>
 		<magicLevel>85</magicLevel>
 		<effects>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>350</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt
index 30a08c7143..01fbc79dcc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt
@@ -10,6 +10,8 @@ AddHate: Instant effect that increases target's hate towards you.
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -200,7 +202,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/Config.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/Config.java
index 87194d630c..b8dab50682 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/Config.java
@@ -1254,6 +1254,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static boolean AUTO_PLAY_PREMIUM;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
@@ -1329,6 +1330,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2617,6 +2619,7 @@ public class Config
 			ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 			AUTO_PLAY_PREMIUM = autoPlayConfig.getBoolean("AutoPlayPremium", false);
 			DISABLED_AUTO_SKILLS.clear();
 			final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
@@ -3374,6 +3377,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 6485e6c47d..2208f823ee 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index c5839831ba..deb0eec41a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -546,9 +546,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 2260001e17..380989e049 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 36f3461010..efc07efb38 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -230,7 +230,7 @@ public class ShortCuts implements IRestorable
 			if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL))
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
index e229501dae..663ea6b31c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1288,7 +1288,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2816,7 +2816,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2829,178 +2829,140 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						player.refreshExpertisePenalty();
-						sendPacket(info);
+					}
+					player.refreshExpertisePenalty();
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java
index a80469774c..a43cdaf22a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4570,7 +4570,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8357,9 +8357,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Summon.java
index d3f774596c..66a299ce8e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -846,7 +847,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -867,7 +868,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -892,7 +900,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -900,7 +908,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -946,7 +961,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index eb31dfcf3e..3a1e8faafa 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -873,15 +872,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -892,8 +889,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -902,7 +903,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -975,45 +976,26 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
 		
-		// Notify recalculation to child classes.
+		// Notify recalculation to child classes
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index a5b88e0118..6e93ee87d7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index e17d405a46..fba22cdb8c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2242,6 +2242,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index deb95a0431..2a8fb54b97 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -38,6 +38,7 @@ import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -51,6 +52,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -69,12 +71,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDr
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPickup;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -82,11 +86,13 @@ import org.l2jmobius.gameserver.model.options.EnchantOptions;
 import org.l2jmobius.gameserver.model.options.Options;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.SkillConditionScope;
 import org.l2jmobius.gameserver.model.variables.ItemVariables;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1585,7 +1591,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2505,6 +2513,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2529,6 +2542,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2554,6 +2569,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 04d1b9eca7..77ec47e3aa 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -742,7 +742,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -894,7 +895,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index e7c37a9ae6..cc8e010ff3 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -652,7 +652,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -675,7 +675,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -710,7 +710,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 5e7139a310..2140c9a55d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -129,7 +129,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index 8f916369b4..b7b0c4ef53 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index 265cef95f4..4211092a85 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -97,6 +97,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 54704f9bda..6d4c3d9e2e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -701,7 +701,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList(false);
 		player.updateShortCuts(_id, _level, 0);
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index c16d3301f0..7c284015a5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -63,6 +63,6 @@ public class RequestShortCutReg implements ClientPacket
 		
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 	}
 }
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index d78d842163..07ed7641a9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,127 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 38, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 49, 50, 51,
-		52, 53, 54, 55,
-		56, 57, 58, 59,
-		60, 61, 62, 63,
-		64, 65, 66, 67,
-		68, 69, 70, 71,
-		72, 73, 74, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index dcc44cb9f3..2e152e2e29 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -207,7 +207,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		ServerPackets.EX_PET_INFO.writeId(this);
 		writeInt(_summon.getObjectId());
-		writeByte(_value); // // 0=teleported 1=default 2=summoned
+		writeByte(_value); // 0=teleported 1=default 2=summoned
 		writeShort(37); // mask_bits_37
 		writeBytes(_masks);
 		// Block 1
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index f93c9e5e69..03909a2746 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
similarity index 96%
rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
index 52a4032d14..62bb425a5a 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -1,182 +1,182 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeByte(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 83e29f7bed..3ee2b1ef96 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,19 +19,19 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
 	}
 	
@@ -53,8 +53,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 8872c0cf63..c2b8c8f51a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -42,13 +48,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -59,8 +68,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 68ca369edf..37f3211b0a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1f54b5040f..0d5d066d25 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,6 +25,7 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -95,6 +98,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							if (player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -120,23 +134,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -144,6 +167,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -178,32 +204,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -302,6 +351,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 7cd7dd9696..c56221841f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
@@ -51,7 +52,6 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +381,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle.sql
index 7ffcebed6b..3445dea47a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/characters.sql
index ea2aace011..60e1a786a2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/characters.sql
@@ -60,4 +60,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort.sql
index c1f09a3f79..c8e7f5458c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort_siege_guards.sql
index 4872d0110c..40ed7619dc 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_siege_guards` VALUES
 -- Shanty Guards
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort_spawnlist.sql
index 0285fa6edd..d3caf9312e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,7 +11,7 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_spawnlist` VALUES
 (101,null,35658,-53273,156650,-1896,62000,0,0),
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/grandboss_data.sql
index cdf2d6c810..d1d27566f9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/heroes.sql
index 2fc8753f90..49a371cbd5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/heroes.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/items.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/olympiad_fights.sql
index 618ee73db0..662f1c4a7e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(1) unsigned NOT NULL DEFAULT '0',
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_05.0_Salvation/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/config/Custom/AutoPlay.ini b/L2J_Mobius_05.0_Salvation/dist/game/config/Custom/AutoPlay.ini
index 9a4fd4bf2e..6e9d9628be 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/config/Custom/AutoPlay.ini
+++ b/L2J_Mobius_05.0_Salvation/dist/game/config/Custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # Enable .play command only for premium players.
 # Premium System must be enabled.
 # Default: False
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_05.0_Salvation/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_05.0_Salvation/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/config/General.ini b/L2J_Mobius_05.0_Salvation/dist/game/config/General.ini
index ff90e7e58e..d765d7ce87 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/config/General.ini
+++ b/L2J_Mobius_05.0_Salvation/dist/game/config/General.ini
@@ -434,8 +434,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/ActionData.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/ActionData.xml
index 965751da7b..34c4fa24b6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/ActionData.xml
@@ -1,219 +1,264 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
-	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
-	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="38" handler="Ride" /> <!-- Mount/Dismount -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
-	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
-	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
-	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
-	<action id="70" handler="AirshipAction" option="4" /> <!-- Exit Airship -->
-	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
-	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
-	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
-	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
-	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Nightshade - Shade Sacrifice -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
-	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="0" handler="SitStand" /> <!-- Toggle Sit/Stand. (Command: /sit, /stand) -->
+	<action id="1" handler="RunWalk" /> <!-- Toggle Walk/Run. (Command: /walk, /run) -->
+	<action id="2" handler="None" /> <!-- Attacks selected target(s), or takes a general action if the target cannot be attacked. Hold down the Ctrl key and click to attack by force. (Command: /attack, /attackforce) -->
+	<action id="3" handler="None" /> <!-- Request a trade from the selected target. (Command: /trade) -->
+	<action id="4" handler="None" /> <!-- Select the nearest attackable target. (Command: /targetnext) -->
+	<action id="5" handler="None" /> <!-- Pick up items that are scattered nearby. (Command: /pickup) -->
+	<action id="6" handler="None" /> <!-- Change to the target of the currently selected player. (Command: /assist) -->
+	<action id="7" handler="None" /> <!-- Invite the selected person to your party. (Command: /invite) -->
+	<action id="8" handler="None" /> <!-- Leave the party. (Command: /leave) -->
+	<action id="9" handler="None" /> <!-- If you are the leader of the party, dismiss selected members from your party. (Command: /dismiss) -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Sets up a private store to sell your items. (Command: /vendor) -->
+	<action id="11" handler="None" /> <!-- Display the party matching window to search for parties or to add members to your party. (Command: /partymatching) -->
+	<action id="12" handler="SocialAction" option="2" /> <!-- Emote: Greet others with a kind "hello." (Command: /socialhello) -->
+	<action id="13" handler="SocialAction" option="3" /> <!-- Emote: Let everyone know that you or someone else is victorious! (Command: /socialvictory) -->
+	<action id="14" handler="SocialAction" option="4" /> <!-- Emote: Rouse your allies and charge! (Command: /socialcharge) -->
+	<action id="15" handler="PetHold" /> <!-- Have your pet follow you or stay and hold its ground. -->
+	<action id="16" handler="PetAttack" /> <!-- Attack target. -->
+	<action id="17" handler="PetStop" /> <!-- Stop current action. -->
+	<action id="18" handler="None" /> <!-- Pick up nearby items. -->
+	<action id="19" handler="UnsummonPet" /> <!-- Returns your pet back to its home. -->
+	<action id="20" handler="None" /> <!-- Use special skill. -->
+	<action id="21" handler="ServitorHold" /> <!-- Have your summons follow you or stay and hold its ground. -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attack target. -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="24" handler="SocialAction" option="6" /> <!-- Emote: Respond positively. (Command: /socialyes) -->
+	<action id="25" handler="SocialAction" option="5" /> <!-- Emote: Respond negatively. (Command: /socialno) -->
+	<action id="26" handler="SocialAction" option="7" /> <!-- Emote: Show your respect and bow. (Command: /socialbow) -->
+	<action id="27" handler="None" /> <!-- Use special skill. -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Sets up a private store to purchase items. (Command: /buy) -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Emote: You have no idea what's going on. (Command: /socialunaware) -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Emote: I'm waiting... (Command: /socialwaiting) -->
+	<action id="31" handler="SocialAction" option="10" /> <!-- Emote: Have a good laugh. (Command: /sociallaugh) -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Toggle between Attack/Move modes. -->
+	<action id="33" handler="SocialAction" option="11" /> <!-- Emote: Applaud. (Command: /socialapplause) -->
+	<action id="34" handler="SocialAction" option="12" /> <!-- Emote: Serve them up your best dance moves. (Command: /socialdance) -->
+	<action id="35" handler="SocialAction" option="13" /> <!-- Emote: Show grief. (Command: /socialsad) -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Poison gas attack. -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Set up a private workshop that creates items by using Dwarven recipes in exchange for a fee. (Command: /dwarvenmanufacture) -->
+	<action id="38" handler="Ride" /> <!-- Toggle mount/dismount when near or on an NPC that can be ridden. (Commands: /mount, /dismount, /mountdismount) -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Exploding corpse attack. -->
+	<action id="40" handler="None" /> <!-- Enhances a target's evaluation score. (Command: /evaluate) -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Attacks castle gates, walls, or headquarters by shooting a cannon. -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Reflects damage back to an enemy. -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Attacks an enemy by creating a whirling surge of water. -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Attacks an enemy with a powerful explosion. -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Restores the summoner's MP. -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Attacks an enemy by summoning up a devastating storm. -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Damages an enemy and heals the servitor at the same time. -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Attacks the enemy by shooting a cannon. -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Attack with a fit of rage. -->
+	<action id="50" handler="None" /> <!-- The selected party member will become the new party leader. (Command: /changepartyleader) -->
+	<action id="51" handler="None" /> <!-- Creates an item using a common recipe in exchange for a fee. (Command: /generalmanufacture) -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Removes the bonds from the summons and releases it. -->
+	<action id="53" handler="ServitorMove" /> <!-- Move to the target. -->
+	<action id="54" handler="PetMove" /> <!-- Move to the target. -->
+	<action id="55" handler="None" /> <!-- Toggle recording and stop recording of replay files. (Commands: /replayrecstart, /replayrecstop, /replayrecstartstop) -->
+	<action id="56" handler="None" /> <!-- Invite the selected target to a command channel. (Command: /channelinvite) -->
+	<action id="57" handler="None" /> <!-- Highlights private store and private workshop messages that contain the search word. (Command: /findprivatestore) -->
+	<action id="58" handler="None" /> <!-- Challenge another player to a duel. (Command: /duel) -->
+	<action id="59" handler="None" /> <!-- Withdraw from a duel. A withdrawal is treated as a defeat. (Command: /withdraw) -->
+	<action id="60" handler="None" /> <!-- Challenge another party to a duel. Note : Cannot teleport to the Coliseum when in an Instance Zone. (Command: /partyduel) -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Open a personal store for package sale. (Command: /packagesale) -->
+	<action id="62" handler="SocialAction" option="14" /> <!-- Charm Pose (Command: /charm) -->
+	<action id="63" handler="None" /> <!-- Begins a fun and easy mini-game. (Command: /minigame) -->
+	<action id="64" handler="TeleportBookmark" /> <!-- Displays My Teleports window you can use to save and manage my teleport locations (Command: /myteleport). -->
+	<action id="65" handler="BotReport" /> <!-- Reports the targeted player as a suspected bot. (Command: /botreport) -->
+	<action id="66" handler="SocialAction" option="15" /> <!-- Allows character to strike shy pose. (Command: /shyness) -->
+	<action id="67" handler="AirshipAction" option="1" /> <!-- Allows you to control the Airship. -->
+	<action id="68" handler="AirshipAction" option="2" /> <!-- Relinquishes control of the Airship. -->
+	<action id="69" handler="AirshipAction" option="3" /> <!-- Choose from pre-designated locations. -->
+	<action id="70" handler="AirshipAction" option="4" /> <!-- Disembarks from the Airship. -->
+	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange bows with another person. (Command: /couplebow) -->
+	<action id="72" handler="SocialAction" option="17" /> <!-- High Five another person. (Command: /couplehighfive) -->
+	<action id="73" handler="SocialAction" option="18" /> <!-- Dance with another player. (Command: /coupledance) -->
+	<action id="74" handler="None" /> <!-- It turns on or off the entire status information gauge above the player's head. (Commands: /statusbaroff, /statusbaron, /statusbaronoff) -->
+	<action id="76" handler="None" /> <!-- Invite the selected target as friends. (Commands: /friendinvite, /friendadd, /friendreg) -->
+	<action id="77" handler="None" /> <!-- Start or end recording videos. (Commands: /startrecording, /stoprecording, /startstoprecording) -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Use Token 1 on the target. It is only available with party status. (Command: /usetoken1) -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Use Token 2 on the target. It is only available with party status. (Command: /usetoken2) -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Use Token 3 on the target. It is only available with party status. (Command: /usetoken3) -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Use Token 4 on the target. It is only available with party status. (Command: /usetoken4) -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Make a target of an object that was applied with the token 1. It is only available with party status. (Command: /targettoken1) -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Make a target of an object that was applied with the token 2. It is only available with party status. (Command: /targettoken2) -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Make a target of an object that was applied with the token 3. It is only available with party status. (Command: /targettoken3) -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Make a target of an object that was applied with the token 4. It is only available with party status. (Command: /targettoken4) -->
+	<action id="87" handler="SocialAction" option="28" /> <!-- Gesture of Proposal (Command: /propose) -->
+	<action id="88" handler="SocialAction" option="29" /> <!-- Gesture of Provocation (Command: /provoke) -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off (Command: /showoff) -->
+	<action id="90" handler="InstanceZoneInfo" /> <!-- Display list of usage times for Instance Zones. (Command: /instancezone) -->
+	<action id="92" handler="None" /> <!-- Select target that was selected previously. (Command: /previoustarget) -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Attacks castle gates, walls, or headquarters with a powerful strike. -->
+	<action id="1001" handler="None" /> <!-- A reckless yet powerful attack that must be used with extreme caution. -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Incites those around the summon to attack you. -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Instantly increases P. Def. and M. Def. significantly. Character is immovable while this skill is in effect. -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- A magical attack. -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Recovers the pet's HP. -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Temporarily increases your party's chance to land a critical attack and also increases the power of the attack if successful. -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Temporarily increases your party's P. Atk and accuracy. -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Has a chance to remove curses from party members. -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Temporarily increases your party's MP regeneration. -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Temporarily shortens your party's spell re-use timer. -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Remove a curse from your party. -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Provokes an opponent to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Provokes multiple enemies around the caster to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Sacrifice HP in order to regenerate the HP of a selected target. -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Attempt a powerful, critical attack on an opponent. -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- A stunning blow that inflicts damage and instantly throws an enemy into a state of stun. -->
+	
+	<!-- TODO: Find skill ids. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Inflict a deadly curse on an enemy that absorbs their HP. -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kat the Cat -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mew the Cat -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kai the Cat -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Boxer the Unicorn -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mirage the Unicorn -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Merrow the Unicorn -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Shadow -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by Shadow -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Silhouette -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by reanimated man -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by reanimated man -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by corrupted man -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King: A powerful slashing attack. Over-hit is possible. -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King: Slashes at surrounding enemies while spinning in the air. Over-hit is possible. -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King: Immobilizes all nearby enemies. -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn: Powerful rear kicks that stun and damage an enemy. Over-hit is possible. -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn: Pounds multiple enemies with a tremendous onrush of water. -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord: Detonates a corpse, inflicting damage to nearby enemies. -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord: Blades attached to each arm slash out in a devastating attack. Over-hit is possible. -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord: Curses nearby enemies, poisoning them and reducing their Atk. Spd. -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon: Fires a projectile a short distance. Consumes 4 Flash Gunpowder. -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon: Fires a projectile a long distance. Consumes 5 Flash Gunpowder. -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Viciously bite an enemy. -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Scratch an enemy with both paws. Causes bleeding. -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awaken hidden powers. -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Decrease a nearby enemy's P. Atk./M. Atk. with a wolf cry. -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Decrease a nearby enemy's attack speed/magic speed with a strider roar. -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Viciously bite an enemy. -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Cause both damage and shock at the same time. Instantly stuns an enemy. -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Breath fire in front of you. -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Increases maximum HP temporarily. -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Increases maximum MP temporarily. -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Increases Atk. Spd. temporarily. -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Increases Casting Spd. temporarily. -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Temporarily decreases the target's MP consumption of skills. Consumes Spirit Ore. -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Increases M. Atk. power temporarily. -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Temporarily increases the critical rate of damage attack magic. -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Temporarily increases the critical attack power. -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Temporarily increases the probability of critical attack. -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Temporarily increases Accuracy. -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Rapidly attacks the enemy twice. -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Inflicts shock and damage to the enemy at the same time with a powerful spin attack. -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Attacks nearby enemies with a doll heap attack. -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakens a hidden ability. -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of thunder. -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack on nearby enemies when hit. -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Control put in place to prevent the use of a buff upon the master. 5-minute duration. -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Powerfully attacks the target. -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- A powerful attack that pierces through a target. -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies by spinning your own body like a whirlwind. -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Attacks a front-line enemy with a powerful lance thrust. -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Shouts a victory cry that increases your abilities. -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Gathers energy into your body, then releases it in a destructive blast. -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Hits enemies with a powerful wave of force. -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Emits a loud roar that amplifies your abilities. -->
+	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Charges toward the enemy and inflicts damage. -->
+	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Cancels the target's de-buff. -->
+	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Emits a spread of ring-shaped flames. -->
+	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Attacks the enemy with a powerful flaming beak. -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Toggles you between Attack and Support modes. -->
+	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Cancels more than one of the enemy's buffs. -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Decreases the enemy's Dark attribute by 25. -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Strike multiple enemies at the front with the tail. -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Bites the enemies at the front. -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Causes nearby enemies to flee in fear. -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Increases your speed. -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Greatly increases its master's speed. -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Increases the speed of its master and their party. -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Teleports its master to the Seed of Annihilation. -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Teleports its master and their party to the Seed of Annihilation. -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attack the target. -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move to a designated location. -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Make the servitor disappear by cancelling the summoning. -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Do not counter-attack. -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Counter-attack when the master or itself is attacked. -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Damages and provokes the target. -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Roll over and deliver a shock to the ground stunning nearby targets. -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Bites the target to inflict damage. -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Damages the target and absorbs some of its HP. -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Attack nearby enemies and block their physical skills. -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Flourishes claws and frontally attacks enemies. -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Dashes toward enemies to inflict damage and Stun them. -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Inflicts damage onto the enemies with a flame. -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Flies straight into the enemy. -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Purifies the master. -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Attack the enemy by darting a feather. -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Hurt the enemy by attacking them with sharp claws. -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Recover the targets near the tree and clear any debuff. -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Attacks nearby targets with a powerful punch. -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Provokes nearby enemies. -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Bites the enemy. -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Provokes nearby enemies. -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Bites the enemy. -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Provokes nearby enemies. -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Bites the enemy. -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Pounces on the enemy to inflict damage and decreases their Speed by 100. -->
+	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Deals damage to the target and knocks down for 3 seconds. -->
+	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Pushes the target and those around while inflicting damage. -->
+	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Rushes to the enemy to inflict damage and Stun for 5 seconds. -->
+	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Deals damage to enemies around and pushes them back. -->
+	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Deals damage to the target and those around, and decreases their Speed for 5 seconds. -->
+	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Deals damage to the target and those around. -->
+	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Launches a powerful slashing attack. -->
+	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Aims at the enemy's vital spot from long range. -->
+	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Deals damage to the target. -->
+	<action id="1156" handler="ServitorSkillUse" option="19406" /> <!-- Inflicts dark magic damage with 620 power to nearby enemies and reduces Speed by 120 and Healing received by 20% for 5 seconds. -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Can express affection to Rudolph. Affection Level rises by 25%. Warning: Can be used only when a Rudolph requests expression of affection, and cannot be used while transformed! -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Increases Max HP by 20%, Max MP by 20%, and the Speed by 20% for 5 minutes. Increases the Debuff Resistance by 10%. Reuse delay 10 minutes. Consumes 3 Rose Essence(s) during skill use. Doesn't overlap with other buffs except Critical Seduction. -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- For 30 minutes, increases party members' Max HP by 30%, Max MP by 30%, Max CP by 30%, P. Def. by 30%, magic M. Def. by 30%, Speed by 20, P. Atk. by 10%, and magic M. Atk. by 20%. Decreases MP consumption for skill use by 15%. Reuse delay 5 minutes. Consumes 10 Rose Essence(s) during skill use. -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of lightning. -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack upon contacted enemies nearby. -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Restricts to prevent the use of a buff upon the master. 5 minute duration. -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Inflicts a powerful attack that seems to pierce through the target. -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies. -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impales an enemy with a sword. -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Raises one's own abilities. -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Gathered energy within ones self can be focused and used to attack an enemy. -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Fires a shock wave to attack enemies at the front. -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Amplifies one's own abilities. -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switches between attack mode and support mode. -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Instantly restores the master's HP by 10%. Increases the master's Debuff Resistance by 80%, Buff-canceling Attack Resistance by 40%, Speed by 10, P. Def. by 20%, and M. Def. by 20%, and decreases MP consumption for all skills by 50% for 1 minute. -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/DoorData.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/DoorData.xml
index a8329e9ede..2c6a47df32 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/DoorData.xml
@@ -11539,6 +11539,176 @@
 		<openStatus default="open" />
 	</door>
 	
+	<!-- 21_16 FIXME: Rune clanhall doors cannot be found in client. -->
+	<door id="21160001" name="rune_castle_agit_002_001">
+		<nodes nodeZ="872">
+			<node x="37679" y="-50432" />
+			<node x="37726" y="-50433" />
+			<node x="37726" y="-50423" />
+			<node x="37678" y="-50424" />
+		</nodes>
+		<location x="37680" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160002" name="rune_castle_agit_002_002">
+		<nodes nodeZ="872">
+			<node x="37724" y="-50432" />
+			<node x="37771" y="-50432" />
+			<node x="37771" y="-50423" />
+			<node x="37723" y="-50424" />
+		</nodes>
+		<location x="37770" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160003" name="rune_castle_agit_003_001">
+		<nodes nodeZ="872">
+			<node x="38527" y="-50151" />
+			<node x="38570" y="-50131" />
+			<node x="38566" y="-50122" />
+			<node x="38524" y="-50144" />
+		</nodes>
+		<location x="38527" y="-50147" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160004" name="rune_castle_agit_003_002">
+		<nodes nodeZ="872">
+			<node x="38569" y="-50132" />
+			<node x="38610" y="-50111" />
+			<node x="38606" y="-50103" />
+			<node x="38564" y="-50124" />
+		</nodes>
+		<location x="38607" y="-50108" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160005" name="rune_castle_agit_004_001">
+		<nodes nodeZ="872">
+			<node x="39122" y="-49542" />
+			<node x="39145" y="-49501" />
+			<node x="39137" y="-49498" />
+			<node x="39115" y="-49539" />
+		</nodes>
+		<location x="39119" y="-49539" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160006" name="rune_castle_agit_004_002">
+		<nodes nodeZ="872">
+			<node x="39145" y="-49503" />
+			<node x="39167" y="-49462" />
+			<node x="39160" y="-49459" />
+			<node x="39136" y="-49498" />
+		</nodes>
+		<location x="39163" y="-49461" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160007" name="rune_castle_agit_001_001">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48291" />
+			<node x="39341" y="-48245" />
+			<node x="39335" y="-48245" />
+			<node x="39334" y="-48290" />
+		</nodes>
+		<location x="39338" y="-48290" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160008" name="rune_castle_agit_001_002">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48246" />
+			<node x="39342" y="-48199" />
+			<node x="39334" y="-48199" />
+			<node x="39334" y="-48246" />
+		</nodes>
+		<location x="39338" y="-48200" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160009" name="rune_castle_agit_005_001">
+		<nodes nodeZ="872">
+			<node x="39176" y="-47024" />
+			<node x="39155" y="-46982" />
+			<node x="39147" y="-46986" />
+			<node x="39169" y="-47026" />
+		</nodes>
+		<location x="39172" y="-47024" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160010" name="rune_castle_agit_005_002">
+		<nodes nodeZ="872">
+			<node x="39154" y="-46982" />
+			<node x="39133" y="-46942" />
+			<node x="39127" y="-46945" />
+			<node x="39148" y="-46986" />
+		</nodes>
+		<location x="39130" y="-46944" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160011" name="rune_castle_agit_006_001">
+		<nodes nodeZ="872">
+			<node x="38626" y="-46372" />
+			<node x="38586" y="-46350" />
+			<node x="38581" y="-46358" />
+			<node x="38623" y="-46379" />
+		</nodes>
+		<location x="38624" y="-46375" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160012" name="rune_castle_agit_006_002">
+		<nodes nodeZ="872">
+			<node x="38587" y="-46350" />
+			<node x="38545" y="-46330" />
+			<node x="38542" y="-46336" />
+			<node x="38583" y="-46358" />
+		</nodes>
+		<location x="38544" y="-46333" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160013" name="rune_castle_agit_007_001">
+		<nodes nodeZ="873">
+			<node x="37787" y="-46044" />
+			<node x="37741" y="-46044" />
+			<node x="37741" y="-46051" />
+			<node x="37787" y="-46050" />
+		</nodes>
+		<location x="37787" y="-46047" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160014" name="rune_castle_agit_007_002">
+		<nodes nodeZ="873">
+			<node x="37743" y="-46043" />
+			<node x="37697" y="-46045" />
+			<node x="37697" y="-46051" />
+			<node x="37742" y="-46051" />
+		</nodes>
+		<location x="37697" y="-46048" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	
 	<!-- 21_17 -->
 	<door id="21170001" name="Rune_bodeful_fortress_s.Rune_bf_azit_gate_door">
 		<nodes nodeZ="544">
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/multisell/3160302.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/multisell/3160302.xml
index 649c3f4856..c9ee0fe75e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/multisell/3160302.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/multisell/3160302.xml
@@ -42,7 +42,7 @@
 		<production count="1" id="38568" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
@@ -50,7 +50,7 @@
 		<production count="1" id="38569" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 5a5354674c..d83f874085 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -250,6 +251,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java
index ff35ec6ce0..b4f60dddfa 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -41,6 +41,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AgathionSlot", AgathionSlot::new);
@@ -233,7 +235,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
index 163645cc95..17726d3831 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
@@ -26,7 +26,9 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.network.serverpackets.AbnormalStatusUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
 
@@ -73,7 +75,36 @@ public class ReplaceSkillBySkill extends AbstractEffect
 				player.deleteShortCut(slot, page);
 				final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
 				player.registerShortCut(newShortcut);
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
+			}
+		}
+		
+		// Replace continuous effects.
+		if (knownSkill.isContinuous() && player.isAffectedBySkill(knownSkill.getId()))
+		{
+			int abnormalTime = 0;
+			for (BuffInfo info : player.getEffectList().getEffects())
+			{
+				if (info.getSkill().getId() == knownSkill.getId())
+				{
+					abnormalTime = info.getAbnormalTime();
+					break;
+				}
+			}
+			
+			if (abnormalTime > 2000)
+			{
+				addedSkill.applyEffects(player, player);
+				final AbnormalStatusUpdate asu = new AbnormalStatusUpdate();
+				for (BuffInfo info : player.getEffectList().getEffects())
+				{
+					if (info.getSkill().getId() == addedSkill.getId())
+					{
+						info.resetAbnormalTime(abnormalTime);
+						asu.addSkill(info);
+					}
+				}
+				player.sendPacket(asu);
 			}
 		}
 		
@@ -105,7 +136,36 @@ public class ReplaceSkillBySkill extends AbstractEffect
 				player.deleteShortCut(slot, page);
 				final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
 				player.registerShortCut(newShortcut);
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
+			}
+		}
+		
+		// Replace continuous effects.
+		if (knownSkill.isContinuous() && player.isAffectedBySkill(knownSkill.getId()))
+		{
+			int abnormalTime = 0;
+			for (BuffInfo info : player.getEffectList().getEffects())
+			{
+				if (info.getSkill().getId() == knownSkill.getId())
+				{
+					abnormalTime = info.getAbnormalTime();
+					break;
+				}
+			}
+			
+			if (abnormalTime > 2000)
+			{
+				addedSkill.applyEffects(player, player);
+				final AbnormalStatusUpdate asu = new AbnormalStatusUpdate();
+				for (BuffInfo info : player.getEffectList().getEffects())
+				{
+					if (info.getSkill().getId() == addedSkill.getId())
+					{
+						info.resetAbnormalTime(abnormalTime);
+						asu.addSkill(info);
+					}
+				}
+				player.sendPacket(asu);
 			}
 		}
 		
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index cd446ab812..2775ff29a4 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -182,6 +182,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()))
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index b7434abd2e..1ba322bbe3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,55 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
 }
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..798a363468 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,46 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index fb87dc68c5..07bbfa7e21 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.quest.QuestState;
@@ -46,10 +47,11 @@ public class ChamberOfProphecies extends AbstractInstance
 {
 	// NPCs
 	private static final int KAIN_VAN_HALTER = 31639;
-	private static final int VAN_HALTER = 33999;
-	private static final int FERIN = 34001;
 	private static final int GRAIL = 33996;
 	private static final int MYSTERIOUS_WIZARD = 33980;
+	// Helper NPCs
+	private static final int HELPER_VAN_HALTER = 33999;
+	private static final int HELPER_FERIN = 34001;
 	// Misc
 	private static final int DOOR_2 = 17230102;
 	private static final int DOOR_3 = 17230103;
@@ -66,7 +68,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		addStartNpc(KAIN_VAN_HALTER);
 		addFirstTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
 		addTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
-		addCreatureSeeId(FERIN, VAN_HALTER);
+		addCreatureSeeId(HELPER_FERIN, HELPER_VAN_HALTER);
 	}
 	
 	@Override
@@ -145,12 +147,12 @@ public class ChamberOfProphecies extends AbstractInstance
 				{
 					return null;
 				}
-				final Npc valHalter = world.getNpc(VAN_HALTER);
-				if (valHalter != null)
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
+				if (vanHalter != null)
 				{
-					valHalter.deleteMe(); // probably needs another npc id for initial room
+					vanHalter.deleteMe(); // probably needs another npc id for initial room
 				}
-				final Npc ferin = world.getNpc(FERIN);
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
 				if (ferin != null)
 				{
 					ferin.deleteMe(); // probably needs another npc id for initial room
@@ -190,6 +192,8 @@ public class ChamberOfProphecies extends AbstractInstance
 			case "CHECK_STATUS":
 			{
 				final Instance world = player.getInstanceWorld();
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
 				if (!isInInstance(world))
 				{
 					return null;
@@ -200,8 +204,8 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
-							startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY2", 14000, ferin, player);
+							startQuestTimer("SEY_KAIN", 24000, vanHalter, player);
 							startQuestTimer("OPEN_DOOR1", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -221,7 +225,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY3", 8000, ferin, player);
 							startQuestTimer("OPEN_DOOR2", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -234,7 +238,7 @@ public class ChamberOfProphecies extends AbstractInstance
 							world.setStatus(4);
 							world.spawnGroup("wof_room3_2");
 							world.openCloseDoor(DOOR_3, false);
-							startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY_KAIN_1", 5000, vanHalter, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
 						break;
@@ -245,8 +249,8 @@ public class ChamberOfProphecies extends AbstractInstance
 						{
 							world.setStatus(5);
 							world.spawnGroup("wof_room4");
-							startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
-							startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY_KAIN_2", 3000, vanHalter, player);
+							startQuestTimer("SEY4", 7000, ferin, player);
 						}
 						else
 						{
@@ -304,7 +308,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					return null;
 				}
 				cancelQuestTimer("ATTACK1", npc, player);
-				startQuestTimer("ATTACK2", 200, world.getNpc(VAN_HALTER), player, true);
+				startQuestTimer("ATTACK2", 200, world.getNpc(HELPER_VAN_HALTER), player, true);
 				world.setStatus(3);
 				world.spawnGroup("wof_room3");
 				world.openCloseDoor(DOOR_3, true);
@@ -321,7 +325,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY2":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.YOU_CAN_T_DIE_HERE_I_DIDN_T_LEARN_RESURRECT_YET));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_4", 0, 0, 0, 0, 0));
@@ -330,7 +334,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GISELLE_WAS_SUCH_A_SWEET_CHILD));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_1", 0, 0, 0, 0, 0));
@@ -340,7 +344,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY3":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.DO_YOU_THINK_I_LL_GROW_TALLER_IF_I_EAT_LOTS_AND_LOTS));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_6", 0, 0, 0, 0, 0));
@@ -349,7 +353,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_1":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.SUCH_MONSTERS_IN_A_PLACE_LIKE_THIS_UNBELIEVABLE));
 				}
@@ -357,7 +361,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_2":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THAT_S_THE_MONSTER_THAT_ATTACKED_FAERON_YOU_RE_OUTMATCHED_HERE_GO_AHEAD_I_LL_CATCH_UP));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_6", 0, 0, 0, 0, 0));
@@ -367,7 +371,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY4":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GO_NOW_KAIN_CAN_HANDLE_THIS));
 					npc.setScriptValue(1);
@@ -377,7 +381,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_3":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.LEAVE_THIS_TO_ME_GO));
 					npc.setScriptValue(1);
@@ -387,7 +391,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "REST":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, player);
 				}
@@ -508,7 +512,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		{
 			switch (npc.getId())
 			{
-				case FERIN:
+				case HELPER_FERIN:
 				{
 					if (creature.isPlayer() && !creature.isDead() && npc.isScriptValue(0))
 					{
@@ -516,7 +520,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					}
 					break;
 				}
-				case VAN_HALTER:
+				case HELPER_VAN_HALTER:
 				{
 					if (creature.isPlayer() && !creature.isDead() && world.isStatus(0))
 					{
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/items/46200-46299.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/items/46200-46299.xml
index a8511b3604..a9cc5fe23c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/items/46200-46299.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/items/46200-46299.xml
@@ -796,14 +796,19 @@
 	<item id="46254" name="Dandy's Golden Ball" type="EtcItem">
 		<!-- For 1 hr., XP/ SP gain +100%, and changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or XP Buff 50%. -->
 		<set name="icon" val="BranchIcon.icon.g_ev_goldenball" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_stackable" val="true" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="is_freightable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="18471" level="1" /> <!-- Dandy's Golden Ball -->
+		</skills>
 	</item>
 	<item id="46255" name="Automatic Appearance: Halloween Outfit" type="EtcItem">
 		<!-- Changes the appearance of upper armor into that of a Halloween Outfit. Works on one-pieces too. -->
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/npcs/33900-33999.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/npcs/33900-33999.xml
index 303a0bfeb1..e1b6dd79e9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/npcs/33900-33999.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/npcs/33900-33999.xml
@@ -2287,26 +2287,37 @@
 			<param name="SpiritShotRate" value="10" />
 			<skill name="Skill01_ID" id="16387" level="1" />
 		</parameters>
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<race>FRIEND</race>
+		<sex>MALE</sex>
 		<equipment rhand="36218" />
+		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234" hpRegen="9.5" mp="1846" mpRegen="3.3" />
+			<vitals hp="42340.06312688557" hpRegen="8.5" mp="18046.8" mpRegen="3" />
+			<attack physical="25000" magical="2811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="430" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="10085.36442" magical="2064.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
 			</speed>
-			<attack physical="12289.0459514498" magical="811.85773400546" critical="4" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="5362.06896551724" magical="264.78509919958" />
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" talkable="false" canBeSown="true" />
+		<status attackable="false" talkable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4414" level="1" /> <!-- Heavy Armor Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="14" /> <!-- Humans -->
+			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
 			<skill id="16387" level="1" /> <!-- Chain Smash -->
 			<skill id="16388" level="1" /> <!-- Kain's Wrath -->
 		</skillList>
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/npcs/34000-34099.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/npcs/34000-34099.xml
index 63e1bea4d1..6ba051967c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/npcs/34000-34099.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/npcs/34000-34099.xml
@@ -17,22 +17,43 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="34001" level="85" type="Folk" name="Ferin">
+	<npc id="34001" level="85" type="FriendlyNpc" name="Ferin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+		<race>FRIEND</race>
 		<sex>FEMALE</sex>
+		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234" hpRegen="7.5" mp="1846" mpRegen="2.7" />
+			<vitals hp="4234.06312688557" hpRegen="8.5" mp="1846.8" mpRegen="3" />
+			<attack physical="1188.87259499001" magical="811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
 			</speed>
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" talkable="false" />
+		<status attackable="false" talkable="false" undying="true" />
 		<collision>
 			<radius normal="8" />
 			<height normal="16" />
 		</collision>
+		<skillList>
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="1" /> <!-- Heavy Armor Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
+		</skillList>
 	</npc>
 	<npc id="34002" level="99" type="Folk" name="Dolkin" title="Maestro">
 		<race>DWARF</race>
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/16300-16399.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/16300-16399.xml
index 18b0020780..ea5b54bce7 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/16300-16399.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/16300-16399.xml
@@ -794,6 +794,22 @@
 		<reuseDelay>5000</reuseDelay>
 		<effectPoint>-150</effectPoint>
 		<isDebuff>true</isDebuff>
+		<activateRate>80</activateRate>
+		<affectRange>900</affectRange>
+		<basicProperty>PHYSICAL</basicProperty>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<trait>PULL</trait>
+		<effects>
+			<effect name="AirBind" />
+			<effect name="Bluff">
+				<chance>100</chance>
+			</effect>
+			<effect name="PullBack">
+				<speed>600</speed>
+				<delay>600</delay>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="16388" toLevel="1" name="Kain's Wrath">
 		<!-- Consumed by vengeful fury toward all who harm Giselle. -->
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/18400-18499.xml
index 3590d8e6f8..160622b0f9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/18400-18499.xml
@@ -877,8 +877,30 @@
 		<!-- For 1 hr., XP/ SP gain +100%, and changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or XP Buff 50%. -->
 		<icon>BranchIcon.icon.g_ev_goldenball</icon>
 		<operateType>A2</operateType>
+		<effectPoint>1</effectPoint>
+		<abnormalType>CHANGEBODY</abnormalType>
+		<abnormalVisualEffect>CHANGE_DINOS</abnormalVisualEffect>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>46254</itemConsumeId> <!-- Dandy's Home Run Ball -->
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>-3</magicLevel>
+		<abnormalLevel>2</abnormalLevel>
+		<abnormalTime>3600</abnormalTime>
 		<reuseDelay>15000</reuseDelay>
+		<irreplacableBuff>true</irreplacableBuff>
+		<stayAfterDeath>true</stayAfterDeath>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="ExpModify">
+				<amount>100</amount>
+			</effect>
+			<effect name="SpModify">
+				<amount>100</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18472" toLevel="6" name="Giveaway Number 1">
 		<icon>icon.skill0000</icon>
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/30000-30099.xml
index a06b78109c..e8603046f6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/30000-30099.xml
@@ -1841,8 +1841,8 @@
 		<operateType>P</operateType>
 		<magicLevel>85</magicLevel>
 		<effects>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>350</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/documentation.txt
index 8ff0ea62d7..015e227d6d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/documentation.txt
@@ -10,6 +10,8 @@ AddHate: Instant effect that increases target's hate towards you.
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -204,7 +206,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/Config.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/Config.java
index cb6ce29649..0c6cc44f74 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/Config.java
@@ -1249,6 +1249,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static boolean AUTO_PLAY_PREMIUM;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
@@ -1324,6 +1325,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2608,6 +2610,7 @@ public class Config
 			ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 			AUTO_PLAY_PREMIUM = autoPlayConfig.getBoolean("AutoPlayPremium", false);
 			DISABLED_AUTO_SKILLS.clear();
 			final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
@@ -3365,6 +3368,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 6485e6c47d..2208f823ee 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index c5839831ba..deb0eec41a 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -546,9 +546,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 2260001e17..380989e049 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 36f3461010..efc07efb38 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -230,7 +230,7 @@ public class ShortCuts implements IRestorable
 			if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL))
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 8f070057a2..a2c1396ce8 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1288,7 +1288,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2816,7 +2816,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2829,178 +2829,140 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						player.refreshExpertisePenalty();
-						sendPacket(info);
+					}
+					player.refreshExpertisePenalty();
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
index 87c570457d..381fd21993 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4614,7 +4614,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8402,9 +8402,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Summon.java
index d3f774596c..66a299ce8e 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -846,7 +847,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -867,7 +868,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -892,7 +900,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -900,7 +908,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -946,7 +961,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index eb31dfcf3e..3a1e8faafa 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -873,15 +872,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -892,8 +889,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -902,7 +903,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -975,45 +976,26 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
 		
-		// Notify recalculation to child classes.
+		// Notify recalculation to child classes
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 6015c738a8..0a92034304 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0c1b384f4b..f3f6a9b3f8 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2242,6 +2242,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index e9fd1cbbd6..c62cb2e398 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -39,6 +39,7 @@ import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AgathionData;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -52,6 +53,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -74,12 +76,14 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemEnchantAdd;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemSoulCrystalAdd;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
 import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -94,6 +98,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1652,7 +1657,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2578,6 +2585,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2602,6 +2614,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2627,6 +2641,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index d56b0c567d..60de6aa87e 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -755,7 +755,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -907,7 +908,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index b5c422461f..f0419f52eb 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -652,7 +652,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -675,7 +675,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -710,7 +710,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 7da4c71951..f165fbf19a 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -131,7 +131,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index 8f916369b4..b7b0c4ef53 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index 265cef95f4..4211092a85 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -97,6 +97,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index f8b2d25913..c079b52adf 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -651,7 +651,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList();
 		player.updateShortCuts(_id, _level, 0);
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index c16d3301f0..7c284015a5 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -63,6 +63,6 @@ public class RequestShortCutReg implements ClientPacket
 		
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 	}
 }
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index d78d842163..07ed7641a9 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,127 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 38, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 49, 50, 51,
-		52, 53, 54, 55,
-		56, 57, 58, 59,
-		60, 61, 62, 63,
-		64, 65, 66, 67,
-		68, 69, 70, 71,
-		72, 73, 74, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index dcc44cb9f3..2e152e2e29 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -207,7 +207,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		ServerPackets.EX_PET_INFO.writeId(this);
 		writeInt(_summon.getObjectId());
-		writeByte(_value); // // 0=teleported 1=default 2=summoned
+		writeByte(_value); // 0=teleported 1=default 2=summoned
 		writeShort(37); // mask_bits_37
 		writeBytes(_masks);
 		// Block 1
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index f93c9e5e69..03909a2746 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
deleted file mode 100644
index 52a4032d14..0000000000
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
new file mode 100644
index 0000000000..62bb425a5a
--- /dev/null
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -0,0 +1,182 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeByte(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 83e29f7bed..3ee2b1ef96 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,19 +19,19 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
 	}
 	
@@ -53,8 +53,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 8872c0cf63..c2b8c8f51a 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -42,13 +48,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -59,8 +68,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 68ca369edf..37f3211b0a 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1f54b5040f..0d5d066d25 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,6 +25,7 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -95,6 +98,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							if (player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -120,23 +134,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -144,6 +167,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -178,32 +204,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -302,6 +351,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 7cd7dd9696..c56221841f 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
@@ -51,7 +52,6 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +381,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle.sql
index 7ffcebed6b..3445dea47a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/characters.sql
index ea2aace011..60e1a786a2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/characters.sql
@@ -60,4 +60,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort.sql
index c1f09a3f79..c8e7f5458c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort_siege_guards.sql
index 4872d0110c..40ed7619dc 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_siege_guards` VALUES
 -- Shanty Guards
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort_spawnlist.sql
index 0285fa6edd..d3caf9312e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,7 +11,7 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_spawnlist` VALUES
 (101,null,35658,-53273,156650,-1896,62000,0,0),
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/grandboss_data.sql
index e14345aecf..6631489eea 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/heroes.sql
index 2fc8753f90..49a371cbd5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/heroes.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/items.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/olympiad_fights.sql
index 618ee73db0..662f1c4a7e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(1) unsigned NOT NULL DEFAULT '0',
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_05.5_EtinasFate/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/config/Custom/AutoPlay.ini b/L2J_Mobius_05.5_EtinasFate/dist/game/config/Custom/AutoPlay.ini
index 9a4fd4bf2e..6e9d9628be 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/config/Custom/AutoPlay.ini
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/config/Custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # Enable .play command only for premium players.
 # Premium System must be enabled.
 # Default: False
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_05.5_EtinasFate/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/config/General.ini b/L2J_Mobius_05.5_EtinasFate/dist/game/config/General.ini
index ff90e7e58e..d765d7ce87 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/config/General.ini
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/config/General.ini
@@ -434,8 +434,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/ActionData.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/ActionData.xml
index 965751da7b..34c4fa24b6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/ActionData.xml
@@ -1,219 +1,264 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
-	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
-	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="38" handler="Ride" /> <!-- Mount/Dismount -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
-	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
-	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
-	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
-	<action id="70" handler="AirshipAction" option="4" /> <!-- Exit Airship -->
-	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
-	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
-	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
-	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
-	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Nightshade - Shade Sacrifice -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
-	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="0" handler="SitStand" /> <!-- Toggle Sit/Stand. (Command: /sit, /stand) -->
+	<action id="1" handler="RunWalk" /> <!-- Toggle Walk/Run. (Command: /walk, /run) -->
+	<action id="2" handler="None" /> <!-- Attacks selected target(s), or takes a general action if the target cannot be attacked. Hold down the Ctrl key and click to attack by force. (Command: /attack, /attackforce) -->
+	<action id="3" handler="None" /> <!-- Request a trade from the selected target. (Command: /trade) -->
+	<action id="4" handler="None" /> <!-- Select the nearest attackable target. (Command: /targetnext) -->
+	<action id="5" handler="None" /> <!-- Pick up items that are scattered nearby. (Command: /pickup) -->
+	<action id="6" handler="None" /> <!-- Change to the target of the currently selected player. (Command: /assist) -->
+	<action id="7" handler="None" /> <!-- Invite the selected person to your party. (Command: /invite) -->
+	<action id="8" handler="None" /> <!-- Leave the party. (Command: /leave) -->
+	<action id="9" handler="None" /> <!-- If you are the leader of the party, dismiss selected members from your party. (Command: /dismiss) -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Sets up a private store to sell your items. (Command: /vendor) -->
+	<action id="11" handler="None" /> <!-- Display the party matching window to search for parties or to add members to your party. (Command: /partymatching) -->
+	<action id="12" handler="SocialAction" option="2" /> <!-- Emote: Greet others with a kind "hello." (Command: /socialhello) -->
+	<action id="13" handler="SocialAction" option="3" /> <!-- Emote: Let everyone know that you or someone else is victorious! (Command: /socialvictory) -->
+	<action id="14" handler="SocialAction" option="4" /> <!-- Emote: Rouse your allies and charge! (Command: /socialcharge) -->
+	<action id="15" handler="PetHold" /> <!-- Have your pet follow you or stay and hold its ground. -->
+	<action id="16" handler="PetAttack" /> <!-- Attack target. -->
+	<action id="17" handler="PetStop" /> <!-- Stop current action. -->
+	<action id="18" handler="None" /> <!-- Pick up nearby items. -->
+	<action id="19" handler="UnsummonPet" /> <!-- Returns your pet back to its home. -->
+	<action id="20" handler="None" /> <!-- Use special skill. -->
+	<action id="21" handler="ServitorHold" /> <!-- Have your summons follow you or stay and hold its ground. -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attack target. -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="24" handler="SocialAction" option="6" /> <!-- Emote: Respond positively. (Command: /socialyes) -->
+	<action id="25" handler="SocialAction" option="5" /> <!-- Emote: Respond negatively. (Command: /socialno) -->
+	<action id="26" handler="SocialAction" option="7" /> <!-- Emote: Show your respect and bow. (Command: /socialbow) -->
+	<action id="27" handler="None" /> <!-- Use special skill. -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Sets up a private store to purchase items. (Command: /buy) -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Emote: You have no idea what's going on. (Command: /socialunaware) -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Emote: I'm waiting... (Command: /socialwaiting) -->
+	<action id="31" handler="SocialAction" option="10" /> <!-- Emote: Have a good laugh. (Command: /sociallaugh) -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Toggle between Attack/Move modes. -->
+	<action id="33" handler="SocialAction" option="11" /> <!-- Emote: Applaud. (Command: /socialapplause) -->
+	<action id="34" handler="SocialAction" option="12" /> <!-- Emote: Serve them up your best dance moves. (Command: /socialdance) -->
+	<action id="35" handler="SocialAction" option="13" /> <!-- Emote: Show grief. (Command: /socialsad) -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Poison gas attack. -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Set up a private workshop that creates items by using Dwarven recipes in exchange for a fee. (Command: /dwarvenmanufacture) -->
+	<action id="38" handler="Ride" /> <!-- Toggle mount/dismount when near or on an NPC that can be ridden. (Commands: /mount, /dismount, /mountdismount) -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Exploding corpse attack. -->
+	<action id="40" handler="None" /> <!-- Enhances a target's evaluation score. (Command: /evaluate) -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Attacks castle gates, walls, or headquarters by shooting a cannon. -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Reflects damage back to an enemy. -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Attacks an enemy by creating a whirling surge of water. -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Attacks an enemy with a powerful explosion. -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Restores the summoner's MP. -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Attacks an enemy by summoning up a devastating storm. -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Damages an enemy and heals the servitor at the same time. -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Attacks the enemy by shooting a cannon. -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Attack with a fit of rage. -->
+	<action id="50" handler="None" /> <!-- The selected party member will become the new party leader. (Command: /changepartyleader) -->
+	<action id="51" handler="None" /> <!-- Creates an item using a common recipe in exchange for a fee. (Command: /generalmanufacture) -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Removes the bonds from the summons and releases it. -->
+	<action id="53" handler="ServitorMove" /> <!-- Move to the target. -->
+	<action id="54" handler="PetMove" /> <!-- Move to the target. -->
+	<action id="55" handler="None" /> <!-- Toggle recording and stop recording of replay files. (Commands: /replayrecstart, /replayrecstop, /replayrecstartstop) -->
+	<action id="56" handler="None" /> <!-- Invite the selected target to a command channel. (Command: /channelinvite) -->
+	<action id="57" handler="None" /> <!-- Highlights private store and private workshop messages that contain the search word. (Command: /findprivatestore) -->
+	<action id="58" handler="None" /> <!-- Challenge another player to a duel. (Command: /duel) -->
+	<action id="59" handler="None" /> <!-- Withdraw from a duel. A withdrawal is treated as a defeat. (Command: /withdraw) -->
+	<action id="60" handler="None" /> <!-- Challenge another party to a duel. Note : Cannot teleport to the Coliseum when in an Instance Zone. (Command: /partyduel) -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Open a personal store for package sale. (Command: /packagesale) -->
+	<action id="62" handler="SocialAction" option="14" /> <!-- Charm Pose (Command: /charm) -->
+	<action id="63" handler="None" /> <!-- Begins a fun and easy mini-game. (Command: /minigame) -->
+	<action id="64" handler="TeleportBookmark" /> <!-- Displays My Teleports window you can use to save and manage my teleport locations (Command: /myteleport). -->
+	<action id="65" handler="BotReport" /> <!-- Reports the targeted player as a suspected bot. (Command: /botreport) -->
+	<action id="66" handler="SocialAction" option="15" /> <!-- Allows character to strike shy pose. (Command: /shyness) -->
+	<action id="67" handler="AirshipAction" option="1" /> <!-- Allows you to control the Airship. -->
+	<action id="68" handler="AirshipAction" option="2" /> <!-- Relinquishes control of the Airship. -->
+	<action id="69" handler="AirshipAction" option="3" /> <!-- Choose from pre-designated locations. -->
+	<action id="70" handler="AirshipAction" option="4" /> <!-- Disembarks from the Airship. -->
+	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange bows with another person. (Command: /couplebow) -->
+	<action id="72" handler="SocialAction" option="17" /> <!-- High Five another person. (Command: /couplehighfive) -->
+	<action id="73" handler="SocialAction" option="18" /> <!-- Dance with another player. (Command: /coupledance) -->
+	<action id="74" handler="None" /> <!-- It turns on or off the entire status information gauge above the player's head. (Commands: /statusbaroff, /statusbaron, /statusbaronoff) -->
+	<action id="76" handler="None" /> <!-- Invite the selected target as friends. (Commands: /friendinvite, /friendadd, /friendreg) -->
+	<action id="77" handler="None" /> <!-- Start or end recording videos. (Commands: /startrecording, /stoprecording, /startstoprecording) -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Use Token 1 on the target. It is only available with party status. (Command: /usetoken1) -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Use Token 2 on the target. It is only available with party status. (Command: /usetoken2) -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Use Token 3 on the target. It is only available with party status. (Command: /usetoken3) -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Use Token 4 on the target. It is only available with party status. (Command: /usetoken4) -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Make a target of an object that was applied with the token 1. It is only available with party status. (Command: /targettoken1) -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Make a target of an object that was applied with the token 2. It is only available with party status. (Command: /targettoken2) -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Make a target of an object that was applied with the token 3. It is only available with party status. (Command: /targettoken3) -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Make a target of an object that was applied with the token 4. It is only available with party status. (Command: /targettoken4) -->
+	<action id="87" handler="SocialAction" option="28" /> <!-- Gesture of Proposal (Command: /propose) -->
+	<action id="88" handler="SocialAction" option="29" /> <!-- Gesture of Provocation (Command: /provoke) -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off (Command: /showoff) -->
+	<action id="90" handler="InstanceZoneInfo" /> <!-- Display list of usage times for Instance Zones. (Command: /instancezone) -->
+	<action id="92" handler="None" /> <!-- Select target that was selected previously. (Command: /previoustarget) -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Attacks castle gates, walls, or headquarters with a powerful strike. -->
+	<action id="1001" handler="None" /> <!-- A reckless yet powerful attack that must be used with extreme caution. -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Incites those around the summon to attack you. -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Instantly increases P. Def. and M. Def. significantly. Character is immovable while this skill is in effect. -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- A magical attack. -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Recovers the pet's HP. -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Temporarily increases your party's chance to land a critical attack and also increases the power of the attack if successful. -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Temporarily increases your party's P. Atk and accuracy. -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Has a chance to remove curses from party members. -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Temporarily increases your party's MP regeneration. -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Temporarily shortens your party's spell re-use timer. -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Remove a curse from your party. -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Provokes an opponent to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Provokes multiple enemies around the caster to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Sacrifice HP in order to regenerate the HP of a selected target. -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Attempt a powerful, critical attack on an opponent. -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- A stunning blow that inflicts damage and instantly throws an enemy into a state of stun. -->
+	
+	<!-- TODO: Find skill ids. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Inflict a deadly curse on an enemy that absorbs their HP. -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kat the Cat -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mew the Cat -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kai the Cat -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Boxer the Unicorn -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mirage the Unicorn -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Merrow the Unicorn -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Shadow -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by Shadow -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Silhouette -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by reanimated man -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by reanimated man -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by corrupted man -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King: A powerful slashing attack. Over-hit is possible. -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King: Slashes at surrounding enemies while spinning in the air. Over-hit is possible. -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King: Immobilizes all nearby enemies. -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn: Powerful rear kicks that stun and damage an enemy. Over-hit is possible. -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn: Pounds multiple enemies with a tremendous onrush of water. -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord: Detonates a corpse, inflicting damage to nearby enemies. -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord: Blades attached to each arm slash out in a devastating attack. Over-hit is possible. -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord: Curses nearby enemies, poisoning them and reducing their Atk. Spd. -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon: Fires a projectile a short distance. Consumes 4 Flash Gunpowder. -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon: Fires a projectile a long distance. Consumes 5 Flash Gunpowder. -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Viciously bite an enemy. -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Scratch an enemy with both paws. Causes bleeding. -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awaken hidden powers. -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Decrease a nearby enemy's P. Atk./M. Atk. with a wolf cry. -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Decrease a nearby enemy's attack speed/magic speed with a strider roar. -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Viciously bite an enemy. -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Cause both damage and shock at the same time. Instantly stuns an enemy. -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Breath fire in front of you. -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Increases maximum HP temporarily. -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Increases maximum MP temporarily. -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Increases Atk. Spd. temporarily. -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Increases Casting Spd. temporarily. -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Temporarily decreases the target's MP consumption of skills. Consumes Spirit Ore. -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Increases M. Atk. power temporarily. -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Temporarily increases the critical rate of damage attack magic. -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Temporarily increases the critical attack power. -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Temporarily increases the probability of critical attack. -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Temporarily increases Accuracy. -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Rapidly attacks the enemy twice. -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Inflicts shock and damage to the enemy at the same time with a powerful spin attack. -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Attacks nearby enemies with a doll heap attack. -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakens a hidden ability. -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of thunder. -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack on nearby enemies when hit. -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Control put in place to prevent the use of a buff upon the master. 5-minute duration. -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Powerfully attacks the target. -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- A powerful attack that pierces through a target. -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies by spinning your own body like a whirlwind. -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Attacks a front-line enemy with a powerful lance thrust. -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Shouts a victory cry that increases your abilities. -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Gathers energy into your body, then releases it in a destructive blast. -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Hits enemies with a powerful wave of force. -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Emits a loud roar that amplifies your abilities. -->
+	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Charges toward the enemy and inflicts damage. -->
+	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Cancels the target's de-buff. -->
+	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Emits a spread of ring-shaped flames. -->
+	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Attacks the enemy with a powerful flaming beak. -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Toggles you between Attack and Support modes. -->
+	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Cancels more than one of the enemy's buffs. -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Decreases the enemy's Dark attribute by 25. -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Strike multiple enemies at the front with the tail. -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Bites the enemies at the front. -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Causes nearby enemies to flee in fear. -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Increases your speed. -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Greatly increases its master's speed. -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Increases the speed of its master and their party. -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Teleports its master to the Seed of Annihilation. -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Teleports its master and their party to the Seed of Annihilation. -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attack the target. -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move to a designated location. -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Make the servitor disappear by cancelling the summoning. -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Do not counter-attack. -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Counter-attack when the master or itself is attacked. -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Damages and provokes the target. -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Roll over and deliver a shock to the ground stunning nearby targets. -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Bites the target to inflict damage. -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Damages the target and absorbs some of its HP. -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Attack nearby enemies and block their physical skills. -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Flourishes claws and frontally attacks enemies. -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Dashes toward enemies to inflict damage and Stun them. -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Inflicts damage onto the enemies with a flame. -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Flies straight into the enemy. -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Purifies the master. -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Attack the enemy by darting a feather. -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Hurt the enemy by attacking them with sharp claws. -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Recover the targets near the tree and clear any debuff. -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Attacks nearby targets with a powerful punch. -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Provokes nearby enemies. -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Bites the enemy. -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Provokes nearby enemies. -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Bites the enemy. -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Provokes nearby enemies. -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Bites the enemy. -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Pounces on the enemy to inflict damage and decreases their Speed by 100. -->
+	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Deals damage to the target and knocks down for 3 seconds. -->
+	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Pushes the target and those around while inflicting damage. -->
+	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Rushes to the enemy to inflict damage and Stun for 5 seconds. -->
+	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Deals damage to enemies around and pushes them back. -->
+	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Deals damage to the target and those around, and decreases their Speed for 5 seconds. -->
+	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Deals damage to the target and those around. -->
+	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Launches a powerful slashing attack. -->
+	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Aims at the enemy's vital spot from long range. -->
+	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Deals damage to the target. -->
+	<action id="1156" handler="ServitorSkillUse" option="19406" /> <!-- Inflicts dark magic damage with 620 power to nearby enemies and reduces Speed by 120 and Healing received by 20% for 5 seconds. -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Can express affection to Rudolph. Affection Level rises by 25%. Warning: Can be used only when a Rudolph requests expression of affection, and cannot be used while transformed! -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Increases Max HP by 20%, Max MP by 20%, and the Speed by 20% for 5 minutes. Increases the Debuff Resistance by 10%. Reuse delay 10 minutes. Consumes 3 Rose Essence(s) during skill use. Doesn't overlap with other buffs except Critical Seduction. -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- For 30 minutes, increases party members' Max HP by 30%, Max MP by 30%, Max CP by 30%, P. Def. by 30%, magic M. Def. by 30%, Speed by 20, P. Atk. by 10%, and magic M. Atk. by 20%. Decreases MP consumption for skill use by 15%. Reuse delay 5 minutes. Consumes 10 Rose Essence(s) during skill use. -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of lightning. -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack upon contacted enemies nearby. -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Restricts to prevent the use of a buff upon the master. 5 minute duration. -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Inflicts a powerful attack that seems to pierce through the target. -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies. -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impales an enemy with a sword. -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Raises one's own abilities. -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Gathered energy within ones self can be focused and used to attack an enemy. -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Fires a shock wave to attack enemies at the front. -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Amplifies one's own abilities. -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switches between attack mode and support mode. -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Instantly restores the master's HP by 10%. Increases the master's Debuff Resistance by 80%, Buff-canceling Attack Resistance by 40%, Speed by 10, P. Def. by 20%, and M. Def. by 20%, and decreases MP consumption for all skills by 50% for 1 minute. -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/DoorData.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/DoorData.xml
index 6359925c81..5756103fc7 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/DoorData.xml
@@ -11539,6 +11539,176 @@
 		<openStatus default="open" />
 	</door>
 	
+	<!-- 21_16 FIXME: Rune clanhall doors cannot be found in client. -->
+	<door id="21160001" name="rune_castle_agit_002_001">
+		<nodes nodeZ="872">
+			<node x="37679" y="-50432" />
+			<node x="37726" y="-50433" />
+			<node x="37726" y="-50423" />
+			<node x="37678" y="-50424" />
+		</nodes>
+		<location x="37680" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160002" name="rune_castle_agit_002_002">
+		<nodes nodeZ="872">
+			<node x="37724" y="-50432" />
+			<node x="37771" y="-50432" />
+			<node x="37771" y="-50423" />
+			<node x="37723" y="-50424" />
+		</nodes>
+		<location x="37770" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160003" name="rune_castle_agit_003_001">
+		<nodes nodeZ="872">
+			<node x="38527" y="-50151" />
+			<node x="38570" y="-50131" />
+			<node x="38566" y="-50122" />
+			<node x="38524" y="-50144" />
+		</nodes>
+		<location x="38527" y="-50147" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160004" name="rune_castle_agit_003_002">
+		<nodes nodeZ="872">
+			<node x="38569" y="-50132" />
+			<node x="38610" y="-50111" />
+			<node x="38606" y="-50103" />
+			<node x="38564" y="-50124" />
+		</nodes>
+		<location x="38607" y="-50108" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160005" name="rune_castle_agit_004_001">
+		<nodes nodeZ="872">
+			<node x="39122" y="-49542" />
+			<node x="39145" y="-49501" />
+			<node x="39137" y="-49498" />
+			<node x="39115" y="-49539" />
+		</nodes>
+		<location x="39119" y="-49539" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160006" name="rune_castle_agit_004_002">
+		<nodes nodeZ="872">
+			<node x="39145" y="-49503" />
+			<node x="39167" y="-49462" />
+			<node x="39160" y="-49459" />
+			<node x="39136" y="-49498" />
+		</nodes>
+		<location x="39163" y="-49461" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160007" name="rune_castle_agit_001_001">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48291" />
+			<node x="39341" y="-48245" />
+			<node x="39335" y="-48245" />
+			<node x="39334" y="-48290" />
+		</nodes>
+		<location x="39338" y="-48290" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160008" name="rune_castle_agit_001_002">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48246" />
+			<node x="39342" y="-48199" />
+			<node x="39334" y="-48199" />
+			<node x="39334" y="-48246" />
+		</nodes>
+		<location x="39338" y="-48200" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160009" name="rune_castle_agit_005_001">
+		<nodes nodeZ="872">
+			<node x="39176" y="-47024" />
+			<node x="39155" y="-46982" />
+			<node x="39147" y="-46986" />
+			<node x="39169" y="-47026" />
+		</nodes>
+		<location x="39172" y="-47024" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160010" name="rune_castle_agit_005_002">
+		<nodes nodeZ="872">
+			<node x="39154" y="-46982" />
+			<node x="39133" y="-46942" />
+			<node x="39127" y="-46945" />
+			<node x="39148" y="-46986" />
+		</nodes>
+		<location x="39130" y="-46944" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160011" name="rune_castle_agit_006_001">
+		<nodes nodeZ="872">
+			<node x="38626" y="-46372" />
+			<node x="38586" y="-46350" />
+			<node x="38581" y="-46358" />
+			<node x="38623" y="-46379" />
+		</nodes>
+		<location x="38624" y="-46375" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160012" name="rune_castle_agit_006_002">
+		<nodes nodeZ="872">
+			<node x="38587" y="-46350" />
+			<node x="38545" y="-46330" />
+			<node x="38542" y="-46336" />
+			<node x="38583" y="-46358" />
+		</nodes>
+		<location x="38544" y="-46333" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160013" name="rune_castle_agit_007_001">
+		<nodes nodeZ="873">
+			<node x="37787" y="-46044" />
+			<node x="37741" y="-46044" />
+			<node x="37741" y="-46051" />
+			<node x="37787" y="-46050" />
+		</nodes>
+		<location x="37787" y="-46047" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160014" name="rune_castle_agit_007_002">
+		<nodes nodeZ="873">
+			<node x="37743" y="-46043" />
+			<node x="37697" y="-46045" />
+			<node x="37697" y="-46051" />
+			<node x="37742" y="-46051" />
+		</nodes>
+		<location x="37697" y="-46048" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	
 	<!-- 21_17 -->
 	<door id="21170001" name="Rune_bodeful_fortress_s.Rune_bf_azit_gate_door">
 		<nodes nodeZ="544">
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/multisell/3160302.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/multisell/3160302.xml
index 649c3f4856..c9ee0fe75e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/multisell/3160302.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/multisell/3160302.xml
@@ -42,7 +42,7 @@
 		<production count="1" id="38568" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
@@ -50,7 +50,7 @@
 		<production count="1" id="38569" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 5a5354674c..d83f874085 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -250,6 +251,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java
index e6a82043f1..73348a7dba 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -41,6 +41,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AgathionSlot", AgathionSlot::new);
@@ -234,7 +236,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
index 163645cc95..17726d3831 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
@@ -26,7 +26,9 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.network.serverpackets.AbnormalStatusUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
 
@@ -73,7 +75,36 @@ public class ReplaceSkillBySkill extends AbstractEffect
 				player.deleteShortCut(slot, page);
 				final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
 				player.registerShortCut(newShortcut);
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
+			}
+		}
+		
+		// Replace continuous effects.
+		if (knownSkill.isContinuous() && player.isAffectedBySkill(knownSkill.getId()))
+		{
+			int abnormalTime = 0;
+			for (BuffInfo info : player.getEffectList().getEffects())
+			{
+				if (info.getSkill().getId() == knownSkill.getId())
+				{
+					abnormalTime = info.getAbnormalTime();
+					break;
+				}
+			}
+			
+			if (abnormalTime > 2000)
+			{
+				addedSkill.applyEffects(player, player);
+				final AbnormalStatusUpdate asu = new AbnormalStatusUpdate();
+				for (BuffInfo info : player.getEffectList().getEffects())
+				{
+					if (info.getSkill().getId() == addedSkill.getId())
+					{
+						info.resetAbnormalTime(abnormalTime);
+						asu.addSkill(info);
+					}
+				}
+				player.sendPacket(asu);
 			}
 		}
 		
@@ -105,7 +136,36 @@ public class ReplaceSkillBySkill extends AbstractEffect
 				player.deleteShortCut(slot, page);
 				final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
 				player.registerShortCut(newShortcut);
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
+			}
+		}
+		
+		// Replace continuous effects.
+		if (knownSkill.isContinuous() && player.isAffectedBySkill(knownSkill.getId()))
+		{
+			int abnormalTime = 0;
+			for (BuffInfo info : player.getEffectList().getEffects())
+			{
+				if (info.getSkill().getId() == knownSkill.getId())
+				{
+					abnormalTime = info.getAbnormalTime();
+					break;
+				}
+			}
+			
+			if (abnormalTime > 2000)
+			{
+				addedSkill.applyEffects(player, player);
+				final AbnormalStatusUpdate asu = new AbnormalStatusUpdate();
+				for (BuffInfo info : player.getEffectList().getEffects())
+				{
+					if (info.getSkill().getId() == addedSkill.getId())
+					{
+						info.resetAbnormalTime(abnormalTime);
+						asu.addSkill(info);
+					}
+				}
+				player.sendPacket(asu);
 			}
 		}
 		
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index cd446ab812..2775ff29a4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -182,6 +182,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()))
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index b7434abd2e..1ba322bbe3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,55 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
 }
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..798a363468 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,46 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 68c2f77658..7e9df354f4 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.quest.QuestState;
@@ -46,10 +47,11 @@ public class ChamberOfProphecies extends AbstractInstance
 {
 	// NPCs
 	private static final int KAIN_VAN_HALTER = 31639;
-	private static final int VAN_HALTER = 33999;
-	private static final int FERIN = 34001;
 	private static final int GRAIL = 33996;
 	private static final int MYSTERIOUS_WIZARD = 33980;
+	// Helper NPCs
+	private static final int HELPER_VAN_HALTER = 33999;
+	private static final int HELPER_FERIN = 34001;
 	// Misc
 	private static final int DOOR_2 = 17230102;
 	private static final int DOOR_3 = 17230103;
@@ -66,7 +68,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		addStartNpc(KAIN_VAN_HALTER);
 		addFirstTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
 		addTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
-		addCreatureSeeId(FERIN, VAN_HALTER);
+		addCreatureSeeId(HELPER_FERIN, HELPER_VAN_HALTER);
 	}
 	
 	@Override
@@ -145,12 +147,12 @@ public class ChamberOfProphecies extends AbstractInstance
 				{
 					return null;
 				}
-				final Npc valHalter = world.getNpc(VAN_HALTER);
-				if (valHalter != null)
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
+				if (vanHalter != null)
 				{
-					valHalter.deleteMe(); // probably needs another npc id for initial room
+					vanHalter.deleteMe(); // probably needs another npc id for initial room
 				}
-				final Npc ferin = world.getNpc(FERIN);
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
 				if (ferin != null)
 				{
 					ferin.deleteMe(); // probably needs another npc id for initial room
@@ -190,6 +192,8 @@ public class ChamberOfProphecies extends AbstractInstance
 			case "CHECK_STATUS":
 			{
 				final Instance world = player.getInstanceWorld();
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
 				if (!isInInstance(world))
 				{
 					return null;
@@ -200,8 +204,8 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
-							startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY2", 14000, ferin, player);
+							startQuestTimer("SEY_KAIN", 24000, vanHalter, player);
 							startQuestTimer("OPEN_DOOR1", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -221,7 +225,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY3", 8000, ferin, player);
 							startQuestTimer("OPEN_DOOR2", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -234,7 +238,7 @@ public class ChamberOfProphecies extends AbstractInstance
 							world.setStatus(4);
 							world.spawnGroup("wof_room3_2");
 							world.openCloseDoor(DOOR_3, false);
-							startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY_KAIN_1", 5000, vanHalter, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
 						break;
@@ -245,8 +249,8 @@ public class ChamberOfProphecies extends AbstractInstance
 						{
 							world.setStatus(5);
 							world.spawnGroup("wof_room4");
-							startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
-							startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY_KAIN_2", 3000, vanHalter, player);
+							startQuestTimer("SEY4", 7000, ferin, player);
 						}
 						else
 						{
@@ -304,7 +308,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					return null;
 				}
 				cancelQuestTimer("ATTACK1", npc, player);
-				startQuestTimer("ATTACK2", 200, world.getNpc(VAN_HALTER), player, true);
+				startQuestTimer("ATTACK2", 200, world.getNpc(HELPER_VAN_HALTER), player, true);
 				world.setStatus(3);
 				world.spawnGroup("wof_room3");
 				world.openCloseDoor(DOOR_3, true);
@@ -321,7 +325,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY2":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.YOU_CAN_T_DIE_HERE_I_DIDN_T_LEARN_RESURRECT_YET));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_4", 0, 0, 0, 0, 0));
@@ -330,7 +334,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GISELLE_WAS_SUCH_A_SWEET_CHILD));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_1", 0, 0, 0, 0, 0));
@@ -340,7 +344,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY3":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.DO_YOU_THINK_I_LL_GROW_TALLER_IF_I_EAT_LOTS_AND_LOTS));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_6", 0, 0, 0, 0, 0));
@@ -349,7 +353,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_1":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.SUCH_MONSTERS_IN_A_PLACE_LIKE_THIS_UNBELIEVABLE));
 				}
@@ -357,7 +361,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_2":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THAT_S_THE_MONSTER_THAT_ATTACKED_FAERON_YOU_RE_OUTMATCHED_HERE_GO_AHEAD_I_LL_CATCH_UP));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_6", 0, 0, 0, 0, 0));
@@ -367,7 +371,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY4":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GO_NOW_KAIN_CAN_HANDLE_THIS));
 					npc.setScriptValue(1);
@@ -377,7 +381,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_3":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.LEAVE_THIS_TO_ME_GO));
 					npc.setScriptValue(1);
@@ -387,7 +391,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "REST":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, player);
 				}
@@ -508,7 +512,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		{
 			switch (npc.getId())
 			{
-				case FERIN:
+				case HELPER_FERIN:
 				{
 					if (creature.isPlayer() && !creature.isDead() && npc.isScriptValue(0))
 					{
@@ -516,7 +520,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					}
 					break;
 				}
-				case VAN_HALTER:
+				case HELPER_VAN_HALTER:
 				{
 					if (creature.isPlayer() && !creature.isDead() && world.isStatus(0))
 					{
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/items/46200-46299.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/items/46200-46299.xml
index 798c787a65..3755d71a6a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/items/46200-46299.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/items/46200-46299.xml
@@ -796,14 +796,19 @@
 	<item id="46254" name="Dandy's Golden Ball" type="EtcItem">
 		<!-- For 1 hr., Acquired XP/ SP +100%, and changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or XP Buff 50%. -->
 		<set name="icon" val="BranchIcon.icon.g_ev_goldenball" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_stackable" val="true" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="is_freightable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="18471" level="1" /> <!-- Dandy's Golden Ball -->
+		</skills>
 	</item>
 	<item id="46255" name="Automatic Appearance: Halloween Outfit" type="EtcItem">
 		<!-- Changes the appearance of upper armor into that of a Halloween Outfit. Works on one-pieces too. -->
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/npcs/33900-33999.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/npcs/33900-33999.xml
index 303a0bfeb1..e1b6dd79e9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/npcs/33900-33999.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/npcs/33900-33999.xml
@@ -2287,26 +2287,37 @@
 			<param name="SpiritShotRate" value="10" />
 			<skill name="Skill01_ID" id="16387" level="1" />
 		</parameters>
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<race>FRIEND</race>
+		<sex>MALE</sex>
 		<equipment rhand="36218" />
+		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234" hpRegen="9.5" mp="1846" mpRegen="3.3" />
+			<vitals hp="42340.06312688557" hpRegen="8.5" mp="18046.8" mpRegen="3" />
+			<attack physical="25000" magical="2811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="430" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="10085.36442" magical="2064.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
 			</speed>
-			<attack physical="12289.0459514498" magical="811.85773400546" critical="4" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="5362.06896551724" magical="264.78509919958" />
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" talkable="false" canBeSown="true" />
+		<status attackable="false" talkable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4414" level="1" /> <!-- Heavy Armor Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="14" /> <!-- Humans -->
+			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
 			<skill id="16387" level="1" /> <!-- Chain Smash -->
 			<skill id="16388" level="1" /> <!-- Kain's Wrath -->
 		</skillList>
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/npcs/34000-34099.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/npcs/34000-34099.xml
index bc3608afaf..938e59a205 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/npcs/34000-34099.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/npcs/34000-34099.xml
@@ -17,22 +17,43 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="34001" level="85" type="Folk" name="Ferin">
+	<npc id="34001" level="85" type="FriendlyNpc" name="Ferin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+		<race>FRIEND</race>
 		<sex>FEMALE</sex>
+		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234" hpRegen="7.5" mp="1846" mpRegen="2.7" />
+			<vitals hp="4234.06312688557" hpRegen="8.5" mp="1846.8" mpRegen="3" />
+			<attack physical="1188.87259499001" magical="811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
 			</speed>
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" talkable="false" />
+		<status attackable="false" talkable="false" undying="true" />
 		<collision>
 			<radius normal="8" />
 			<height normal="16" />
 		</collision>
+		<skillList>
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="1" /> <!-- Heavy Armor Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
+		</skillList>
 	</npc>
 	<npc id="34002" level="99" type="Folk" name="Dolkin" title="Maestro">
 		<race>DWARF</race>
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/16300-16399.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/16300-16399.xml
index bbc7885d2c..dbd1a42d90 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/16300-16399.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/16300-16399.xml
@@ -794,6 +794,22 @@
 		<reuseDelay>5000</reuseDelay>
 		<effectPoint>-150</effectPoint>
 		<isDebuff>true</isDebuff>
+		<activateRate>80</activateRate>
+		<affectRange>900</affectRange>
+		<basicProperty>PHYSICAL</basicProperty>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<trait>PULL</trait>
+		<effects>
+			<effect name="AirBind" />
+			<effect name="Bluff">
+				<chance>100</chance>
+			</effect>
+			<effect name="PullBack">
+				<speed>600</speed>
+				<delay>600</delay>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="16388" toLevel="1" name="Kain's Wrath">
 		<!-- Consumed by vengeful fury toward all who harm Giselle. -->
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/18400-18499.xml
index 0af1be1fc4..dc71557566 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/18400-18499.xml
@@ -877,8 +877,30 @@
 		<!-- For 1 hr., Acquired XP/ SP +100%, and changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or XP Buff 50%. -->
 		<icon>BranchIcon.icon.g_ev_goldenball</icon>
 		<operateType>A2</operateType>
+		<effectPoint>1</effectPoint>
+		<abnormalType>CHANGEBODY</abnormalType>
+		<abnormalVisualEffect>CHANGE_DINOS</abnormalVisualEffect>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>46254</itemConsumeId> <!-- Dandy's Home Run Ball -->
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>-3</magicLevel>
+		<abnormalLevel>2</abnormalLevel>
+		<abnormalTime>3600</abnormalTime>
 		<reuseDelay>15000</reuseDelay>
+		<irreplacableBuff>true</irreplacableBuff>
+		<stayAfterDeath>true</stayAfterDeath>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="ExpModify">
+				<amount>100</amount>
+			</effect>
+			<effect name="SpModify">
+				<amount>100</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18472" toLevel="6" name="Giveaway Number 1">
 		<icon>icon.skill0000</icon>
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/30000-30099.xml
index 73242ff0ec..26327d85e0 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/30000-30099.xml
@@ -1841,8 +1841,8 @@
 		<operateType>P</operateType>
 		<magicLevel>85</magicLevel>
 		<effects>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>350</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/documentation.txt
index 998f4bc0a2..b176e1077d 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/documentation.txt
@@ -10,6 +10,8 @@ AddHate: Instant effect that increases target's hate towards you.
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -205,7 +207,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/Config.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/Config.java
index 5599bd54a4..53821ec9a5 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/Config.java
@@ -1256,6 +1256,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static boolean AUTO_PLAY_PREMIUM;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
@@ -1331,6 +1332,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2620,6 +2622,7 @@ public class Config
 			ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 			AUTO_PLAY_PREMIUM = autoPlayConfig.getBoolean("AutoPlayPremium", false);
 			DISABLED_AUTO_SKILLS.clear();
 			final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
@@ -3377,6 +3380,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 6485e6c47d..2208f823ee 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index c5839831ba..deb0eec41a 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -546,9 +546,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 2260001e17..380989e049 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 36f3461010..efc07efb38 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -230,7 +230,7 @@ public class ShortCuts implements IRestorable
 			if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL))
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 8f070057a2..a2c1396ce8 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1288,7 +1288,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2816,7 +2816,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2829,178 +2829,140 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						player.refreshExpertisePenalty();
-						sendPacket(info);
+					}
+					player.refreshExpertisePenalty();
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
index df9b355780..3dfda86a9f 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4627,7 +4627,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8415,9 +8415,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Summon.java
index d3f774596c..66a299ce8e 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -846,7 +847,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -867,7 +868,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -892,7 +900,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -900,7 +908,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -946,7 +961,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index eb31dfcf3e..3a1e8faafa 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -873,15 +872,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -892,8 +889,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -902,7 +903,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -975,45 +976,26 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
 		
-		// Notify recalculation to child classes.
+		// Notify recalculation to child classes
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 3a6780326a..821ff7ca76 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
index 97397f753f..9d5faa0c61 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
@@ -57,7 +57,10 @@ public enum CommissionItemType
 	NECKLACE(31),
 	BELT(32),
 	BRACELET(33),
+	AGATHION(62),
 	HAIR_ACCESSORY(34),
+	BROOCH_JEWEL(63),
+	ARTIFACT(64),
 	// Supplies
 	POTION(35),
 	SCROLL_ENCHANT_WEAPON(36),
@@ -65,6 +68,7 @@ public enum CommissionItemType
 	SCROLL_OTHER(38),
 	SOULSHOT(39),
 	SPIRITSHOT(40),
+	OTHER_SUPPLIES(41),
 	// Pet Goods
 	PET_EQUIPMENT(42),
 	PET_SUPPLIES(43),
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
index eb10918430..3a194d1660 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
@@ -47,8 +47,8 @@ public enum CommissionTreeType
 		CommissionItemType.SPEAR,
 		CommissionItemType.OTHER_WEAPON),
 	ARMOR(1, CommissionItemType.HELMET, CommissionItemType.ARMOR_TOP, CommissionItemType.ARMOR_PANTS, CommissionItemType.FULL_BODY, CommissionItemType.GLOVES, CommissionItemType.FEET, CommissionItemType.SHIELD, CommissionItemType.SIGIL, CommissionItemType.UNDERWEAR, CommissionItemType.CLOAK),
-	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.HAIR_ACCESSORY),
-	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT),
+	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.AGATHION, CommissionItemType.HAIR_ACCESSORY, CommissionItemType.BROOCH_JEWEL, CommissionItemType.ARTIFACT),
+	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT, CommissionItemType.OTHER_SUPPLIES),
 	PET_GOODS(4, CommissionItemType.PET_EQUIPMENT, CommissionItemType.PET_SUPPLIES),
 	MISC(
 		5,
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0c1b384f4b..f3f6a9b3f8 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2242,6 +2242,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index e9fd1cbbd6..c62cb2e398 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -39,6 +39,7 @@ import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AgathionData;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -52,6 +53,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -74,12 +76,14 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemEnchantAdd;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemSoulCrystalAdd;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
 import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -94,6 +98,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1652,7 +1657,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2578,6 +2585,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2602,6 +2614,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2627,6 +2641,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 02c945c630..c2fd0080ac 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -778,7 +778,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -930,7 +931,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index b5c422461f..f0419f52eb 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -652,7 +652,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -675,7 +675,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -710,7 +710,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 0bd8f9e76e..5df5ea8eaa 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -131,7 +131,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index 8f916369b4..b7b0c4ef53 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index 265cef95f4..4211092a85 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -97,6 +97,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 8c7e94c1d5..cd579821fe 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -651,7 +651,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList();
 		player.updateShortCuts(_id, _level, 0);
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index c16d3301f0..7c284015a5 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -63,6 +63,6 @@ public class RequestShortCutReg implements ClientPacket
 		
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 	}
 }
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index d78d842163..07ed7641a9 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,127 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 38, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 49, 50, 51,
-		52, 53, 54, 55,
-		56, 57, 58, 59,
-		60, 61, 62, 63,
-		64, 65, 66, 67,
-		68, 69, 70, 71,
-		72, 73, 74, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index dcc44cb9f3..2e152e2e29 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -207,7 +207,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		ServerPackets.EX_PET_INFO.writeId(this);
 		writeInt(_summon.getObjectId());
-		writeByte(_value); // // 0=teleported 1=default 2=summoned
+		writeByte(_value); // 0=teleported 1=default 2=summoned
 		writeShort(37); // mask_bits_37
 		writeBytes(_masks);
 		// Block 1
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
index a4539909c2..f7ac12028d 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
@@ -167,7 +167,7 @@ public class FakePlayerInfo extends ServerPacket
 		writeByte(_npc.getTeam().getId());
 		writeInt(_clan != null ? _clan.getCrestLargeId() : 0);
 		writeByte(_fpcHolder.getNobleLevel());
-		writeByte(_fpcHolder.isHero());
+		writeByte(_fpcHolder.isHero() ? 2 : 0); // 152 - Value for enabled changed to 2
 		writeByte(_fpcHolder.isFishing());
 		writeInt(_fpcHolder.getBaitLocationX());
 		writeInt(_fpcHolder.getBaitLocationY());
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index f93c9e5e69..03909a2746 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
deleted file mode 100644
index 52a4032d14..0000000000
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
new file mode 100644
index 0000000000..62bb425a5a
--- /dev/null
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -0,0 +1,182 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeByte(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 83e29f7bed..3ee2b1ef96 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,19 +19,19 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
 	}
 	
@@ -53,8 +53,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 8872c0cf63..c2b8c8f51a 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -42,13 +48,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -59,8 +68,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 68ca369edf..37f3211b0a 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1f54b5040f..0d5d066d25 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,6 +25,7 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -95,6 +98,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							if (player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -120,23 +134,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -144,6 +167,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -178,32 +204,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -302,6 +351,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 7cd7dd9696..c56221841f 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
@@ -51,7 +52,6 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +381,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle.sql
index 7ffcebed6b..3445dea47a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/characters.sql
index ea2aace011..60e1a786a2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/characters.sql
@@ -60,4 +60,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort.sql
index c1f09a3f79..c8e7f5458c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort_siege_guards.sql
index 4872d0110c..40ed7619dc 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_siege_guards` VALUES
 -- Shanty Guards
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort_spawnlist.sql
index 0285fa6edd..d3caf9312e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,7 +11,7 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_spawnlist` VALUES
 (101,null,35658,-53273,156650,-1896,62000,0,0),
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/grandboss_data.sql
index 853bbd704b..50fbf93b87 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 40218408, 300), -- Queen Ant
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/heroes.sql
index 2fc8753f90..49a371cbd5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/heroes.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/items.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/olympiad_fights.sql
index 618ee73db0..662f1c4a7e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(1) unsigned NOT NULL DEFAULT '0',
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_06.0_Fafurion/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/config/Custom/AutoPlay.ini b/L2J_Mobius_06.0_Fafurion/dist/game/config/Custom/AutoPlay.ini
index 9a4fd4bf2e..6e9d9628be 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/config/Custom/AutoPlay.ini
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/config/Custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # Enable .play command only for premium players.
 # Premium System must be enabled.
 # Default: False
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_06.0_Fafurion/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/config/General.ini b/L2J_Mobius_06.0_Fafurion/dist/game/config/General.ini
index ff90e7e58e..d765d7ce87 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/config/General.ini
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/config/General.ini
@@ -434,8 +434,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/ActionData.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/ActionData.xml
index 965751da7b..13073a75da 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/ActionData.xml
@@ -1,219 +1,266 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
-	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
-	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="38" handler="Ride" /> <!-- Mount/Dismount -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
-	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
-	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
-	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
-	<action id="70" handler="AirshipAction" option="4" /> <!-- Exit Airship -->
-	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
-	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
-	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
-	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
-	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Nightshade - Shade Sacrifice -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
-	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="0" handler="SitStand" /> <!-- Toggle Sit/Stand. (/sit, /stand) -->
+	<action id="1" handler="RunWalk" /> <!-- Toggle Walk/Run. (/walk, /run) -->
+	<action id="2" handler="None" /> <!-- Attacks selected target(s), or takes a general action if the target cannot be attacked. Hold down the Ctrl key and click to attack by force. (/attack, /attackforce) -->
+	<action id="3" handler="None" /> <!-- Request a trade from the selected target. (/trade) -->
+	<action id="4" handler="None" /> <!-- Select the nearest attackable target. (/targetnext) -->
+	<action id="5" handler="None" /> <!-- Pick up items that are scattered nearby. (/pickup) -->
+	<action id="6" handler="None" /> <!-- Change to the target of the currently selected player. (/assist) -->
+	<action id="7" handler="None" /> <!-- Invite the selected person to your party. (/invite) -->
+	<action id="8" handler="None" /> <!-- Leave the party. (/leave) -->
+	<action id="9" handler="None" /> <!-- If you are the leader of the party, dismiss selected members from your party. (/dismiss) -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Sets up a private store to sell your items. (/vendor) -->
+	<action id="11" handler="None" /> <!-- Display the party matching window to search for parties or to add members to your party. (/partymatching) -->
+	<action id="12" handler="SocialAction" option="2" /> <!-- Emote: Greet others with a kind "hello." (/socialhello) -->
+	<action id="13" handler="SocialAction" option="3" /> <!-- Emote: Let everyone know that you or someone else is victorious! (/socialvictory) -->
+	<action id="14" handler="SocialAction" option="4" /> <!-- Emote: Rouse your allies and charge! (/socialcharge) -->
+	<action id="15" handler="PetHold" /> <!-- Have your pet follow you or stay and hold its ground. -->
+	<action id="16" handler="PetAttack" /> <!-- Attack target. -->
+	<action id="17" handler="PetStop" /> <!-- Stop current action. -->
+	<action id="18" handler="None" /> <!-- Pick up nearby items. -->
+	<action id="19" handler="UnsummonPet" /> <!-- Returns your pet back to its home. -->
+	<action id="20" handler="None" /> <!-- Use special skill. -->
+	<action id="21" handler="ServitorHold" /> <!-- Have your summons follow you or stay and hold its ground. -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attack target. -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="24" handler="SocialAction" option="6" /> <!-- Emote: Respond positively. (/socialyes) -->
+	<action id="25" handler="SocialAction" option="5" /> <!-- Emote: Respond negatively. (/socialno) -->
+	<action id="26" handler="SocialAction" option="7" /> <!-- Emote: Show your respect and bow. (/socialbow) -->
+	<action id="27" handler="None" /> <!-- Use special skill. -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Sets up a private store to purchase items. (/buy) -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Emote: You have no idea what's going on. (/socialunaware) -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Emote: I'm waiting... (/socialwaiting) -->
+	<action id="31" handler="SocialAction" option="10" /> <!-- Emote: Have a good laugh. (/sociallaugh) -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Toggle between Attack/Move modes. -->
+	<action id="33" handler="SocialAction" option="11" /> <!-- Emote: Applaud. (/socialapplause) -->
+	<action id="34" handler="SocialAction" option="12" /> <!-- Emote: Serve them up your best dance moves. (/socialdance) -->
+	<action id="35" handler="SocialAction" option="13" /> <!-- Emote: Show grief. (/socialsad) -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Poison gas attack. -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Set up a private workshop that creates items by using Dwarven recipes in exchange for a fee. (/dwarvenmanufacture) -->
+	<action id="38" handler="Ride" /> <!-- Toggle mount/dismount when near or on an NPC that can be ridden. (/mount, /dismount, /mountdismount) -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Exploding corpse attack. -->
+	<action id="40" handler="None" /> <!-- Enhances a target's evaluation score. (/evaluate) -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Attacks castle gates, walls, or headquarters by shooting a cannon. -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Reflects damage back to an enemy. -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Attacks an enemy by creating a whirling surge of water. -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Attacks an enemy with a powerful explosion. -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Restores the summoner's MP. -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Attacks an enemy by summoning up a devastating storm. -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Damages an enemy and heals the servitor at the same time. -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Attacks the enemy by shooting a cannon. -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Attack with a fit of rage. -->
+	<action id="50" handler="None" /> <!-- The selected party member will become the new party leader. (/changepartyleader) -->
+	<action id="51" handler="None" /> <!-- Creates an item using a common recipe in exchange for a fee. (/generalmanufacture) -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Removes the bonds from the summons and releases it. -->
+	<action id="53" handler="ServitorMove" /> <!-- Move to the target. -->
+	<action id="54" handler="PetMove" /> <!-- Move to the target. -->
+	<action id="55" handler="None" /> <!-- Toggle recording and stop recording of replay files. (/replayrecstart, /replayrecstop, /replayrecstartstop) -->
+	<action id="56" handler="None" /> <!-- Invite the selected target to a command channel. (/channelinvite) -->
+	<action id="57" handler="None" /> <!-- Highlights private store and private workshop messages that contain the search word. (/findprivatestore) -->
+	<action id="58" handler="None" /> <!-- Challenge another player to a duel. (/duel) -->
+	<action id="59" handler="None" /> <!-- Withdraw from a duel. A withdrawal is treated as a defeat. (/withdraw) -->
+	<action id="60" handler="None" /> <!-- Challenge another party to a duel. Note : Cannot teleport to the Coliseum when in an instanced zone. (/partyduel) -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Open a personal store for package sale. (/packagesale) -->
+	<action id="62" handler="SocialAction" option="14" /> <!-- Charm Pose (Command: /charm) -->
+	<action id="63" handler="None" /> <!-- Begins a fun and easy mini-game. (command: /minigame) -->
+	<action id="64" handler="TeleportBookmark" /> <!-- Displays My Teleports window you can use to save and manage my teleport locations (command: /myteleport). -->
+	<action id="65" handler="BotReport" /> <!-- Reports the targeted player as a suspected bot. (Command: /botreport) -->
+	<action id="66" handler="SocialAction" option="15" /> <!-- Allows character to strike shy pose. (command: /shyness) -->
+	<action id="67" handler="AirshipAction" option="1" /> <!-- Allows you to control the Airship. -->
+	<action id="68" handler="AirshipAction" option="2" /> <!-- Relinquishes control of the Airship. -->
+	<action id="69" handler="AirshipAction" option="3" /> <!-- Choose from pre-designated locations. -->
+	<action id="70" handler="AirshipAction" option="4" /> <!-- Disembarks from the Airship. -->
+	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange bows with another person. (command: /couplebow) -->
+	<action id="72" handler="SocialAction" option="17" /> <!-- High Five another person. (command: /couplehighfive) -->
+	<action id="73" handler="SocialAction" option="18" /> <!-- Dance with another player. (command: /coupledance) -->
+	<action id="74" handler="None" /> <!-- It turns on or off the entire status information gauge above the player's head. (Commands: /statusbaroff, /statusbaron, /statusbaronoff) -->
+	<action id="76" handler="None" /> <!-- Invite the selected target as friends. (Commands: /friendinvite, /friendadd, /friendreg) -->
+	<action id="77" handler="None" /> <!-- Start or end recording videos. (Commands: /startrecording, /stoprecording, /startstoprecording) -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Use Token 1 on the target. It is only available with party status. (Command: /usetoken1) -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Use Token 2 on the target. It is only available with party status. (Command: /usetoken2) -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Use Token 3 on the target. It is only available with party status. (Command: /usetoken3) -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Use Token 4 on the target. It is only available with party status. (Command: /usetoken4) -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Make a target of an object that was applied with the token 1. It is only available with party status. (Command: /targettoken1) -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Make a target of an object that was applied with the token 2. It is only available with party status. (Command: /targettoken2) -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Make a target of an object that was applied with the token 3. It is only available with party status. (Command: /targettoken3) -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Make a target of an object that was applied with the token 4. It is only available with party status. (Command: /targettoken4) -->
+	<action id="87" handler="SocialAction" option="28" /> <!-- Gesture of Proposal (Command: /socialpropose) -->
+	<action id="88" handler="SocialAction" option="29" /> <!-- Gesture of Provocation (Command: /socialprovocation) -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off (Command: /showoff) -->
+	<action id="90" handler="InstanceZoneInfo" /> <!-- Display list of usage times for instanced zones. (Command: /instancezone) -->
+	<action id="92" handler="None" /> <!-- Select target that was selected previously. (Command: /previoustarget) -->
+	<action id="93" handler="None" /> <!-- Select the nearest attackable target within 1400. (/targetnext2) -->
+	<action id="94" handler="None" /> <!-- Select target that was selected previously within 1400. (Command: /previoustarget2) -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Attacks castle gates, walls, or headquarters with a powerful strike. -->
+	<action id="1001" handler="None" /> <!-- A reckless yet powerful attack that must be used with extreme caution. -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Incites those around the summon to attack you. -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Instantly increases P. Def. and M. Def. significantly. Character is immovable while this skill is in effect. -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- A magical attack. -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Recovers the pet's HP. -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Temporarily increases your party's chance to land a critical attack and also increases the power of the attack if successful. -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Temporarily increases your party's P. Atk and accuracy. -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Has a chance to remove curses from party members. -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Temporarily increases your party's MP regeneration. -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Temporarily shortens your party's spell re-use timer. -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Remove a curse from your party. -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Provokes an opponent to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Provokes multiple enemies around the caster to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Sacrifice HP in order to regenerate the HP of a selected target. -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Attempt a powerful, critical attack on an opponent. -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- A stunning blow that inflicts damage and instantly throws an enemy into a state of stun. -->
+	
+	<!-- TODO: Find skill ids. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Inflict a deadly curse on an enemy that absorbs their HP. -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kat the Cat -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mew the Cat -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kai the Cat -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Boxer the Unicorn -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mirage the Unicorn -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Merrow the Unicorn -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Shadow -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by Shadow -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Silhouette -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by reanimated man -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by reanimated man -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by corrupted man -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King: A powerful slashing attack. Over-hit is possible. -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King: Slashes at surrounding enemies while spinning in the air. Over-hit is possible. -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King: Immobilizes all nearby enemies. -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn: Powerful rear kicks that stun and damage an enemy. Over-hit is possible. -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn: Pounds multiple enemies with a tremendous onrush of water. -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord: Detonates a corpse, inflicting damage to nearby enemies. -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord: Blades attached to each arm slash out in a devastating attack. Over-hit is possible. -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord: Curses nearby enemies, poisoning them and reducing their Atk. Spd. -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon: Fires a projectile a short distance. Consumes 4 Flash Gunpowder. -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon: Fires a projectile a long distance. Consumes 5 Flash Gunpowder. -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Viciously bite an enemy. -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Scratch an enemy with both paws. Causes bleeding. -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awaken hidden powers. -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Decrease a nearby enemy's P. Atk./M. Atk. with a wolf cry. -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Decrease a nearby enemy's attack speed/magic speed with a strider roar. -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Viciously bite an enemy. -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Cause both damage and shock at the same time. Instantly stuns an enemy. -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Breath fire in front of you. -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Increases maximum HP temporarily. -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Increases maximum MP temporarily. -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Increases Atk. Spd. temporarily. -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Increases Casting Spd. temporarily. -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Temporarily decreases the target's MP consumption of skills. Consumes Spirit Ore. -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Increases M. Atk. power temporarily. -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Temporarily increases the critical rate of damage attack magic. -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Temporarily increases the critical attack power. -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Temporarily increases the probability of critical attack. -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Temporarily increases Accuracy. -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Rapidly attacks the enemy twice. -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Inflicts shock and damage to the enemy at the same time with a powerful spin attack. -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Attacks nearby enemies with a doll heap attack. -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakens a hidden ability. -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of thunder. -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack on nearby enemies when hit. -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Control put in place to prevent the use of a buff upon the master. 5-minute duration. -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Powerfully attacks the target. -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- A powerful attack that pierces through a target. -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies by spinning your own body like a whirlwind. -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Attacks a front-line enemy with a powerful lance thrust. -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Shouts a victory cry that increases your abilities. -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Gathers energy into your body, then releases it in a destructive blast. -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Hits enemies with a powerful wave of force. -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Emits a loud roar that amplifies your abilities. -->
+	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Charges toward the enemy and inflicts damage. -->
+	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Cancels the target's de-buff. -->
+	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Emits a spread of ring-shaped flames. -->
+	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Attacks the enemy with a powerful flaming beak. -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Toggles you between Attack and Support modes. -->
+	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Cancels more than one of the enemy's buffs. -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Decreases the enemy's Dark attribute by 25. -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Strike multiple enemies at the front with the tail. -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Bites the enemies at the front. -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Causes nearby enemies to flee in fear. -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Increases your speed. -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Greatly increases its master's speed. -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Increases the speed of its master and their party. -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Teleports its master to the Seed of Annihilation. -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Teleports its master and their party to the Seed of Annihilation. -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attack the target. -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move to a designated location. -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Make the servitor disappear by cancelling the summoning. -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Do not counter-attack. -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Counter-attack when the master or itself is attacked. -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Damages and provokes the target. -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Roll over and deliver a shock to the ground stunning nearby targets. -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Bites the target to inflict damage. -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Damages the target and absorbs some of its HP. -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Attack nearby enemies and block their physical skills. -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Flourishes claws and frontally attacks enemies. -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Dashes toward enemies to inflict damage and Stun them. -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Inflicts damage onto the enemies with a flame. -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Flies straight into the enemy. -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Purifies the master. -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Attack the enemy by darting a feather. -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Hurt the enemy by attacking them with sharp claws. -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Recover the targets near the tree and clear any debuff. -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Attacks nearby targets with a powerful punch. -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Provokes nearby enemies. -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Bites the enemy. -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Provokes nearby enemies. -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Bites the enemy. -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Provokes nearby enemies. -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Bites the enemy. -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Pounces on the enemy to inflict damage and decreases their Speed by 100. -->
+	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Deals damage to the target and knocks down for 3 seconds. -->
+	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Pushes the target and those around while inflicting damage. -->
+	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Rushes to the enemy to inflict damage and Stun for 5 seconds. -->
+	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Deals damage to enemies around and pushes them back. -->
+	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Deals damage to the target and those around, and decreases their Speed for 5 seconds. -->
+	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Deals damage to the target and those around. -->
+	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Launches a powerful slashing attack. -->
+	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Aims at the enemy's vital spot from long range. -->
+	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Deals damage to the target. -->
+	<action id="1156" handler="ServitorSkillUse" option="19406" /> <!-- Deals 620 Dark Magic damage to enemies around and reduces Speed by 120 and HP Heal Amount by 20% for 5 seconds. -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Can express affection to Rudolph. Affection Level rises by 25%. Warning: Can be used only when a Rudolph requests expression of affection, and cannot be used while transformed! -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Increases Max HP by 20%, Max MP by 20%, and the Speed by 20% for 5 minutes. Increases the Debuff Resistance by 10%. Reuse delay 10 minutes. Consumes 3 Rose Essence(s) during skill use. Doesn't overlap with other buffs except Critical Seduction. -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- For 30 minutes, increases party members' Max HP by 30%, Max MP by 30%, Max CP by 30%, P. Def. by 30%, magic M. Def. by 30%, Speed by 20, P. Atk. by 10%, and magic M. Atk. by 20%. Decreases MP consumption for skill use by 15%. Reuse delay 5 minutes. Consumes 10 Rose Essence(s) during skill use. -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of lightning. -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack upon contacted enemies nearby. -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Restricts to prevent the use of a buff upon the master. 5 minute duration. -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Inflicts a powerful attack that seems to pierce through the target. -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies. -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impales an enemy with a sword. -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Raises one's own abilities. -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Gathered energy within ones self can be focused and used to attack an enemy. -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Fires a shock wave to attack enemies at the front. -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Amplifies one's own abilities. -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switches between attack mode and support mode. -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Instantly restores the master's HP by 10%. Increases the master's Debuff Resistance by 80%, Buff-canceling Attack Resistance by 40%, Speed by 10, P. Def. by 20%, and M. Def. by 20%, and decreases MP consumption for all skills by 50% for 1 minute. -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/DoorData.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/DoorData.xml
index 0a293a1b6d..613c4b0cb4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/DoorData.xml
@@ -11733,6 +11733,176 @@
 		<openStatus default="open" />
 	</door>
 	
+	<!-- 21_16 FIXME: Rune clanhall doors cannot be found in client. -->
+	<door id="21160001" name="rune_castle_agit_002_001">
+		<nodes nodeZ="872">
+			<node x="37679" y="-50432" />
+			<node x="37726" y="-50433" />
+			<node x="37726" y="-50423" />
+			<node x="37678" y="-50424" />
+		</nodes>
+		<location x="37680" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160002" name="rune_castle_agit_002_002">
+		<nodes nodeZ="872">
+			<node x="37724" y="-50432" />
+			<node x="37771" y="-50432" />
+			<node x="37771" y="-50423" />
+			<node x="37723" y="-50424" />
+		</nodes>
+		<location x="37770" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160003" name="rune_castle_agit_003_001">
+		<nodes nodeZ="872">
+			<node x="38527" y="-50151" />
+			<node x="38570" y="-50131" />
+			<node x="38566" y="-50122" />
+			<node x="38524" y="-50144" />
+		</nodes>
+		<location x="38527" y="-50147" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160004" name="rune_castle_agit_003_002">
+		<nodes nodeZ="872">
+			<node x="38569" y="-50132" />
+			<node x="38610" y="-50111" />
+			<node x="38606" y="-50103" />
+			<node x="38564" y="-50124" />
+		</nodes>
+		<location x="38607" y="-50108" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160005" name="rune_castle_agit_004_001">
+		<nodes nodeZ="872">
+			<node x="39122" y="-49542" />
+			<node x="39145" y="-49501" />
+			<node x="39137" y="-49498" />
+			<node x="39115" y="-49539" />
+		</nodes>
+		<location x="39119" y="-49539" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160006" name="rune_castle_agit_004_002">
+		<nodes nodeZ="872">
+			<node x="39145" y="-49503" />
+			<node x="39167" y="-49462" />
+			<node x="39160" y="-49459" />
+			<node x="39136" y="-49498" />
+		</nodes>
+		<location x="39163" y="-49461" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160007" name="rune_castle_agit_001_001">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48291" />
+			<node x="39341" y="-48245" />
+			<node x="39335" y="-48245" />
+			<node x="39334" y="-48290" />
+		</nodes>
+		<location x="39338" y="-48290" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160008" name="rune_castle_agit_001_002">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48246" />
+			<node x="39342" y="-48199" />
+			<node x="39334" y="-48199" />
+			<node x="39334" y="-48246" />
+		</nodes>
+		<location x="39338" y="-48200" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160009" name="rune_castle_agit_005_001">
+		<nodes nodeZ="872">
+			<node x="39176" y="-47024" />
+			<node x="39155" y="-46982" />
+			<node x="39147" y="-46986" />
+			<node x="39169" y="-47026" />
+		</nodes>
+		<location x="39172" y="-47024" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160010" name="rune_castle_agit_005_002">
+		<nodes nodeZ="872">
+			<node x="39154" y="-46982" />
+			<node x="39133" y="-46942" />
+			<node x="39127" y="-46945" />
+			<node x="39148" y="-46986" />
+		</nodes>
+		<location x="39130" y="-46944" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160011" name="rune_castle_agit_006_001">
+		<nodes nodeZ="872">
+			<node x="38626" y="-46372" />
+			<node x="38586" y="-46350" />
+			<node x="38581" y="-46358" />
+			<node x="38623" y="-46379" />
+		</nodes>
+		<location x="38624" y="-46375" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160012" name="rune_castle_agit_006_002">
+		<nodes nodeZ="872">
+			<node x="38587" y="-46350" />
+			<node x="38545" y="-46330" />
+			<node x="38542" y="-46336" />
+			<node x="38583" y="-46358" />
+		</nodes>
+		<location x="38544" y="-46333" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160013" name="rune_castle_agit_007_001">
+		<nodes nodeZ="873">
+			<node x="37787" y="-46044" />
+			<node x="37741" y="-46044" />
+			<node x="37741" y="-46051" />
+			<node x="37787" y="-46050" />
+		</nodes>
+		<location x="37787" y="-46047" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160014" name="rune_castle_agit_007_002">
+		<nodes nodeZ="873">
+			<node x="37743" y="-46043" />
+			<node x="37697" y="-46045" />
+			<node x="37697" y="-46051" />
+			<node x="37742" y="-46051" />
+		</nodes>
+		<location x="37697" y="-46048" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	
 	<!-- 21_17 -->
 	<door id="21170001" name="Rune_bodeful_fortress_s.Rune_bf_azit_gate_door">
 		<nodes nodeZ="544">
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/multisell/3160302.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/multisell/3160302.xml
index 649c3f4856..c9ee0fe75e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/multisell/3160302.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/multisell/3160302.xml
@@ -42,7 +42,7 @@
 		<production count="1" id="38568" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
@@ -50,7 +50,7 @@
 		<production count="1" id="38569" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 5a5354674c..d83f874085 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -250,6 +251,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java
index e6a82043f1..73348a7dba 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -41,6 +41,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AgathionSlot", AgathionSlot::new);
@@ -234,7 +236,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
index 163645cc95..17726d3831 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
@@ -26,7 +26,9 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.network.serverpackets.AbnormalStatusUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
 
@@ -73,7 +75,36 @@ public class ReplaceSkillBySkill extends AbstractEffect
 				player.deleteShortCut(slot, page);
 				final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
 				player.registerShortCut(newShortcut);
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
+			}
+		}
+		
+		// Replace continuous effects.
+		if (knownSkill.isContinuous() && player.isAffectedBySkill(knownSkill.getId()))
+		{
+			int abnormalTime = 0;
+			for (BuffInfo info : player.getEffectList().getEffects())
+			{
+				if (info.getSkill().getId() == knownSkill.getId())
+				{
+					abnormalTime = info.getAbnormalTime();
+					break;
+				}
+			}
+			
+			if (abnormalTime > 2000)
+			{
+				addedSkill.applyEffects(player, player);
+				final AbnormalStatusUpdate asu = new AbnormalStatusUpdate();
+				for (BuffInfo info : player.getEffectList().getEffects())
+				{
+					if (info.getSkill().getId() == addedSkill.getId())
+					{
+						info.resetAbnormalTime(abnormalTime);
+						asu.addSkill(info);
+					}
+				}
+				player.sendPacket(asu);
 			}
 		}
 		
@@ -105,7 +136,36 @@ public class ReplaceSkillBySkill extends AbstractEffect
 				player.deleteShortCut(slot, page);
 				final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
 				player.registerShortCut(newShortcut);
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
+			}
+		}
+		
+		// Replace continuous effects.
+		if (knownSkill.isContinuous() && player.isAffectedBySkill(knownSkill.getId()))
+		{
+			int abnormalTime = 0;
+			for (BuffInfo info : player.getEffectList().getEffects())
+			{
+				if (info.getSkill().getId() == knownSkill.getId())
+				{
+					abnormalTime = info.getAbnormalTime();
+					break;
+				}
+			}
+			
+			if (abnormalTime > 2000)
+			{
+				addedSkill.applyEffects(player, player);
+				final AbnormalStatusUpdate asu = new AbnormalStatusUpdate();
+				for (BuffInfo info : player.getEffectList().getEffects())
+				{
+					if (info.getSkill().getId() == addedSkill.getId())
+					{
+						info.resetAbnormalTime(abnormalTime);
+						asu.addSkill(info);
+					}
+				}
+				player.sendPacket(asu);
 			}
 		}
 		
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index cd446ab812..2775ff29a4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -182,6 +182,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()))
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index b7434abd2e..1ba322bbe3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,55 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
 }
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..798a363468 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,46 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 68c2f77658..7e9df354f4 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.quest.QuestState;
@@ -46,10 +47,11 @@ public class ChamberOfProphecies extends AbstractInstance
 {
 	// NPCs
 	private static final int KAIN_VAN_HALTER = 31639;
-	private static final int VAN_HALTER = 33999;
-	private static final int FERIN = 34001;
 	private static final int GRAIL = 33996;
 	private static final int MYSTERIOUS_WIZARD = 33980;
+	// Helper NPCs
+	private static final int HELPER_VAN_HALTER = 33999;
+	private static final int HELPER_FERIN = 34001;
 	// Misc
 	private static final int DOOR_2 = 17230102;
 	private static final int DOOR_3 = 17230103;
@@ -66,7 +68,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		addStartNpc(KAIN_VAN_HALTER);
 		addFirstTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
 		addTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
-		addCreatureSeeId(FERIN, VAN_HALTER);
+		addCreatureSeeId(HELPER_FERIN, HELPER_VAN_HALTER);
 	}
 	
 	@Override
@@ -145,12 +147,12 @@ public class ChamberOfProphecies extends AbstractInstance
 				{
 					return null;
 				}
-				final Npc valHalter = world.getNpc(VAN_HALTER);
-				if (valHalter != null)
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
+				if (vanHalter != null)
 				{
-					valHalter.deleteMe(); // probably needs another npc id for initial room
+					vanHalter.deleteMe(); // probably needs another npc id for initial room
 				}
-				final Npc ferin = world.getNpc(FERIN);
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
 				if (ferin != null)
 				{
 					ferin.deleteMe(); // probably needs another npc id for initial room
@@ -190,6 +192,8 @@ public class ChamberOfProphecies extends AbstractInstance
 			case "CHECK_STATUS":
 			{
 				final Instance world = player.getInstanceWorld();
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
 				if (!isInInstance(world))
 				{
 					return null;
@@ -200,8 +204,8 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
-							startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY2", 14000, ferin, player);
+							startQuestTimer("SEY_KAIN", 24000, vanHalter, player);
 							startQuestTimer("OPEN_DOOR1", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -221,7 +225,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY3", 8000, ferin, player);
 							startQuestTimer("OPEN_DOOR2", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -234,7 +238,7 @@ public class ChamberOfProphecies extends AbstractInstance
 							world.setStatus(4);
 							world.spawnGroup("wof_room3_2");
 							world.openCloseDoor(DOOR_3, false);
-							startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY_KAIN_1", 5000, vanHalter, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
 						break;
@@ -245,8 +249,8 @@ public class ChamberOfProphecies extends AbstractInstance
 						{
 							world.setStatus(5);
 							world.spawnGroup("wof_room4");
-							startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
-							startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY_KAIN_2", 3000, vanHalter, player);
+							startQuestTimer("SEY4", 7000, ferin, player);
 						}
 						else
 						{
@@ -304,7 +308,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					return null;
 				}
 				cancelQuestTimer("ATTACK1", npc, player);
-				startQuestTimer("ATTACK2", 200, world.getNpc(VAN_HALTER), player, true);
+				startQuestTimer("ATTACK2", 200, world.getNpc(HELPER_VAN_HALTER), player, true);
 				world.setStatus(3);
 				world.spawnGroup("wof_room3");
 				world.openCloseDoor(DOOR_3, true);
@@ -321,7 +325,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY2":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.YOU_CAN_T_DIE_HERE_I_DIDN_T_LEARN_RESURRECT_YET));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_4", 0, 0, 0, 0, 0));
@@ -330,7 +334,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GISELLE_WAS_SUCH_A_SWEET_CHILD));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_1", 0, 0, 0, 0, 0));
@@ -340,7 +344,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY3":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.DO_YOU_THINK_I_LL_GROW_TALLER_IF_I_EAT_LOTS_AND_LOTS));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_6", 0, 0, 0, 0, 0));
@@ -349,7 +353,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_1":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.SUCH_MONSTERS_IN_A_PLACE_LIKE_THIS_UNBELIEVABLE));
 				}
@@ -357,7 +361,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_2":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THAT_S_THE_MONSTER_THAT_ATTACKED_FAERON_YOU_RE_OUTMATCHED_HERE_GO_AHEAD_I_LL_CATCH_UP));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_6", 0, 0, 0, 0, 0));
@@ -367,7 +371,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY4":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GO_NOW_KAIN_CAN_HANDLE_THIS));
 					npc.setScriptValue(1);
@@ -377,7 +381,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_3":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.LEAVE_THIS_TO_ME_GO));
 					npc.setScriptValue(1);
@@ -387,7 +391,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "REST":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, player);
 				}
@@ -508,7 +512,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		{
 			switch (npc.getId())
 			{
-				case FERIN:
+				case HELPER_FERIN:
 				{
 					if (creature.isPlayer() && !creature.isDead() && npc.isScriptValue(0))
 					{
@@ -516,7 +520,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					}
 					break;
 				}
-				case VAN_HALTER:
+				case HELPER_VAN_HALTER:
 				{
 					if (creature.isPlayer() && !creature.isDead() && world.isStatus(0))
 					{
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/armorsets/Sets.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/armorsets/Sets.xml
index df948dd3ec..ab82727579 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/armorsets/Sets.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/armorsets/Sets.xml
@@ -6995,11 +6995,11 @@
 	<set id="307" minimumPieces="5">
 		<!-- Paulina's Heavy Armor set R garde in 5 pieces -->
 		<requiredItems>
-			<item id="80035" /> <!-- Paulina’s Eternal Breastplate Heavy Armor -->
-			<item id="80036" /> <!-- Paulina’s Eternal Gaiters Heavy Armor -->
-			<item id="80037" /> <!-- Paulina’s Eternal Boots Heavy Armor -->
-			<item id="80038" /> <!-- Paulina’s Eternal Gauntlets Heavy Armor -->
-			<item id="80039" /> <!-- Paulina’s Eternal Helmet Heavy Armor -->
+			<item id="80035" /> <!-- Paulina's Eternal Breastplate Heavy Armor -->
+			<item id="80036" /> <!-- Paulina's Eternal Gaiters Heavy Armor -->
+			<item id="80037" /> <!-- Paulina's Eternal Boots Heavy Armor -->
+			<item id="80038" /> <!-- Paulina's Eternal Gauntlets Heavy Armor -->
+			<item id="80039" /> <!-- Paulina's Eternal Helmet Heavy Armor -->
 		</requiredItems>
 		<skills>
 			<skill id="35263" level="1" minimumPieces="5" /> <!-- Set Effect - Paulina's Eternal Heavy Armor, 5-piece -->
@@ -7008,11 +7008,11 @@
 	<set id="308" minimumPieces="5">
 		<!-- Paulina's Light Armor set R garde in 5 pieces -->
 		<requiredItems>
-			<item id="80041" /> <!-- Paulina’s Eternal Leather Armor Light Armor -->
-			<item id="80042" /> <!-- Paulina’s Eternal Leather Leggings Light Armor -->
-			<item id="80043" /> <!-- Paulina’s Eternal Leather Boots Light Armor -->
-			<item id="80044" /> <!-- Paulina’s Eternal Leather Gloves Light Armor -->
-			<item id="80045" /> <!-- Paulina’s Eternal Leather Helmet Light Armor -->
+			<item id="80041" /> <!-- Paulina's Eternal Leather Armor Light Armor -->
+			<item id="80042" /> <!-- Paulina's Eternal Leather Leggings Light Armor -->
+			<item id="80043" /> <!-- Paulina's Eternal Leather Boots Light Armor -->
+			<item id="80044" /> <!-- Paulina's Eternal Leather Gloves Light Armor -->
+			<item id="80045" /> <!-- Paulina's Eternal Leather Helmet Light Armor -->
 		</requiredItems>
 		<skills>
 			<skill id="35264" level="1" minimumPieces="5" /> <!-- Set Effect - Paulina's Eternal Light Armor, 5-piece -->
@@ -7021,11 +7021,11 @@
 	<set id="309" minimumPieces="5">
 		<!-- Paulina's Robe set R garde in 5 pieces -->
 		<requiredItems>
-			<item id="80046" /> <!-- Paulina’s Eternal Tunic Robe -->
-			<item id="80047" /> <!-- Paulina’s Eternal Stockings Robe -->
-			<item id="80048" /> <!-- Paulina’s Eternal Shoes Robe -->
-			<item id="80049" /> <!-- Paulina’s Eternal Gloves Robe -->
-			<item id="80050" /> <!-- Paulina’s Eternal Circlet Robe -->
+			<item id="80046" /> <!-- Paulina's Eternal Tunic Robe -->
+			<item id="80047" /> <!-- Paulina's Eternal Stockings Robe -->
+			<item id="80048" /> <!-- Paulina's Eternal Shoes Robe -->
+			<item id="80049" /> <!-- Paulina's Eternal Gloves Robe -->
+			<item id="80050" /> <!-- Paulina's Eternal Circlet Robe -->
 		</requiredItems>
 		<skills>
 			<skill id="35265" level="1" minimumPieces="5" /> <!-- Set Effect - Paulina's Eternal Robe, 5-piece -->
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/items/46200-46299.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/items/46200-46299.xml
index 94b13222e2..1268056a84 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/items/46200-46299.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/items/46200-46299.xml
@@ -796,14 +796,19 @@
 	<item id="46254" name="Dandy's Golden Ball" type="EtcItem">
 		<!-- For 1 h., Acquired XP/ SP +100%, and changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or XP Buff 50%. -->
 		<set name="icon" val="BranchIcon.icon.g_ev_goldenball" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_stackable" val="true" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="is_freightable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="18471" level="1" /> <!-- Dandy's Golden Ball -->
+		</skills>
 	</item>
 	<item id="46255" name="Automatic Appearance: Halloween Outfit" type="EtcItem">
 		<!-- Changes the appearance of upper armor into that of a Halloween Outfit. Works on one-pieces too. -->
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/npcs/33900-33999.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/npcs/33900-33999.xml
index fd03eb39db..5cbd59bfe2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/npcs/33900-33999.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/npcs/33900-33999.xml
@@ -2288,26 +2288,37 @@
 			<param name="SpiritShotRate" value="10" />
 			<skill name="Skill01_ID" id="16387" level="1" />
 		</parameters>
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<race>FRIEND</race>
+		<sex>MALE</sex>
 		<equipment rhand="36218" />
+		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234" hpRegen="9.5" mp="1846" mpRegen="3.3" />
+			<vitals hp="42340.06312688557" hpRegen="8.5" mp="18046.8" mpRegen="3" />
+			<attack physical="25000" magical="2811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="430" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="10085.36442" magical="2064.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
 			</speed>
-			<attack physical="12289.0459514498" magical="811.85773400546" critical="4" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="5362.06896551724" magical="264.78509919958" />
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" talkable="false" canBeSown="true" />
+		<status attackable="false" talkable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4414" level="1" /> <!-- Heavy Armor Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="14" /> <!-- Humans -->
+			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
 			<skill id="16387" level="1" /> <!-- Chain Smash -->
 			<skill id="16388" level="1" /> <!-- Kain's Wrath -->
 		</skillList>
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/npcs/34000-34099.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/npcs/34000-34099.xml
index bf754d796b..94008f3f8f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/npcs/34000-34099.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/npcs/34000-34099.xml
@@ -17,22 +17,43 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="34001" level="85" type="Folk" name="Ferin">
+	<npc id="34001" level="85" type="FriendlyNpc" name="Ferin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+		<race>FRIEND</race>
 		<sex>FEMALE</sex>
+		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234" hpRegen="7.5" mp="1846" mpRegen="2.7" />
+			<vitals hp="4234.06312688557" hpRegen="8.5" mp="1846.8" mpRegen="3" />
+			<attack physical="1188.87259499001" magical="811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
 			</speed>
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" talkable="false" />
+		<status attackable="false" talkable="false" undying="true" />
 		<collision>
 			<radius normal="8" />
 			<height normal="16" />
 		</collision>
+		<skillList>
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="1" /> <!-- Heavy Armor Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
+		</skillList>
 	</npc>
 	<npc id="34002" level="99" type="Folk" name="Dolkin" title="Maestro">
 		<race>DWARF</race>
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/16300-16399.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/16300-16399.xml
index 9b44023c67..17f1a9b27d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/16300-16399.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/16300-16399.xml
@@ -797,6 +797,22 @@
 		<reuseDelay>5000</reuseDelay>
 		<effectPoint>-150</effectPoint>
 		<isDebuff>true</isDebuff>
+		<activateRate>80</activateRate>
+		<affectRange>900</affectRange>
+		<basicProperty>PHYSICAL</basicProperty>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<trait>PULL</trait>
+		<effects>
+			<effect name="AirBind" />
+			<effect name="Bluff">
+				<chance>100</chance>
+			</effect>
+			<effect name="PullBack">
+				<speed>600</speed>
+				<delay>600</delay>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="16388" toLevel="1" name="Kain's Wrath">
 		<!-- Consumed by vengeful fury toward all who harm Giselle. -->
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/18400-18499.xml
index 810844bae0..1715d1ffd8 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/18400-18499.xml
@@ -877,8 +877,30 @@
 		<!-- For 1 h., Acquired XP/ SP +100%, and changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or XP Buff 50%. -->
 		<icon>BranchIcon.icon.g_ev_goldenball</icon>
 		<operateType>A2</operateType>
+		<effectPoint>1</effectPoint>
+		<abnormalType>CHANGEBODY</abnormalType>
+		<abnormalVisualEffect>CHANGE_DINOS</abnormalVisualEffect>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>46254</itemConsumeId> <!-- Dandy's Home Run Ball -->
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>-3</magicLevel>
+		<abnormalLevel>2</abnormalLevel>
+		<abnormalTime>3600</abnormalTime>
 		<reuseDelay>15000</reuseDelay>
+		<irreplacableBuff>true</irreplacableBuff>
+		<stayAfterDeath>true</stayAfterDeath>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="ExpModify">
+				<amount>100</amount>
+			</effect>
+			<effect name="SpModify">
+				<amount>100</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18472" toLevel="6" name="Giveaway Number 1">
 		<icon>icon.skill0000</icon>
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/30000-30099.xml
index 468244352a..e79aa6d5d0 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/30000-30099.xml
@@ -1931,8 +1931,8 @@
 		<operateType>P</operateType>
 		<magicLevel>85</magicLevel>
 		<effects>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>350</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/documentation.txt
index 998f4bc0a2..b176e1077d 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/documentation.txt
@@ -10,6 +10,8 @@ AddHate: Instant effect that increases target's hate towards you.
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -205,7 +207,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/Config.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/Config.java
index 131c66538b..963cbf83ab 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/Config.java
@@ -1277,6 +1277,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static boolean AUTO_PLAY_PREMIUM;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
@@ -1352,6 +1353,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2662,6 +2664,7 @@ public class Config
 			ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 			AUTO_PLAY_PREMIUM = autoPlayConfig.getBoolean("AutoPlayPremium", false);
 			DISABLED_AUTO_SKILLS.clear();
 			final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
@@ -3419,6 +3422,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 6485e6c47d..2208f823ee 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index c5839831ba..deb0eec41a 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -546,9 +546,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 2260001e17..380989e049 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 36f3461010..efc07efb38 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -230,7 +230,7 @@ public class ShortCuts implements IRestorable
 			if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL))
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 8f070057a2..a2c1396ce8 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1288,7 +1288,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2816,7 +2816,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2829,178 +2829,140 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						player.refreshExpertisePenalty();
-						sendPacket(info);
+					}
+					player.refreshExpertisePenalty();
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
index 4463f8a48c..1ec94d7ddb 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4628,7 +4628,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8416,9 +8416,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Summon.java
index d3f774596c..66a299ce8e 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -846,7 +847,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -867,7 +868,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -892,7 +900,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -900,7 +908,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -946,7 +961,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index eb31dfcf3e..3a1e8faafa 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -873,15 +872,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -892,8 +889,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -902,7 +903,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -975,45 +976,26 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
 		
-		// Notify recalculation to child classes.
+		// Notify recalculation to child classes
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 3a6780326a..821ff7ca76 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
index 97397f753f..9d5faa0c61 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
@@ -57,7 +57,10 @@ public enum CommissionItemType
 	NECKLACE(31),
 	BELT(32),
 	BRACELET(33),
+	AGATHION(62),
 	HAIR_ACCESSORY(34),
+	BROOCH_JEWEL(63),
+	ARTIFACT(64),
 	// Supplies
 	POTION(35),
 	SCROLL_ENCHANT_WEAPON(36),
@@ -65,6 +68,7 @@ public enum CommissionItemType
 	SCROLL_OTHER(38),
 	SOULSHOT(39),
 	SPIRITSHOT(40),
+	OTHER_SUPPLIES(41),
 	// Pet Goods
 	PET_EQUIPMENT(42),
 	PET_SUPPLIES(43),
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
index eb10918430..3a194d1660 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
@@ -47,8 +47,8 @@ public enum CommissionTreeType
 		CommissionItemType.SPEAR,
 		CommissionItemType.OTHER_WEAPON),
 	ARMOR(1, CommissionItemType.HELMET, CommissionItemType.ARMOR_TOP, CommissionItemType.ARMOR_PANTS, CommissionItemType.FULL_BODY, CommissionItemType.GLOVES, CommissionItemType.FEET, CommissionItemType.SHIELD, CommissionItemType.SIGIL, CommissionItemType.UNDERWEAR, CommissionItemType.CLOAK),
-	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.HAIR_ACCESSORY),
-	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT),
+	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.AGATHION, CommissionItemType.HAIR_ACCESSORY, CommissionItemType.BROOCH_JEWEL, CommissionItemType.ARTIFACT),
+	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT, CommissionItemType.OTHER_SUPPLIES),
 	PET_GOODS(4, CommissionItemType.PET_EQUIPMENT, CommissionItemType.PET_SUPPLIES),
 	MISC(
 		5,
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0c1b384f4b..f3f6a9b3f8 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2242,6 +2242,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index e9fd1cbbd6..c62cb2e398 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -39,6 +39,7 @@ import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AgathionData;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -52,6 +53,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -74,12 +76,14 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemEnchantAdd;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemSoulCrystalAdd;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
 import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -94,6 +98,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1652,7 +1657,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2578,6 +2585,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2602,6 +2614,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2627,6 +2641,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 02c945c630..c2fd0080ac 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -778,7 +778,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -930,7 +931,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index b5c422461f..f0419f52eb 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -652,7 +652,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -675,7 +675,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -710,7 +710,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 0bd8f9e76e..5df5ea8eaa 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -131,7 +131,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index 8f916369b4..b7b0c4ef53 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index 265cef95f4..4211092a85 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -97,6 +97,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 8c7e94c1d5..cd579821fe 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -651,7 +651,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList();
 		player.updateShortCuts(_id, _level, 0);
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index c16d3301f0..7c284015a5 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -63,6 +63,6 @@ public class RequestShortCutReg implements ClientPacket
 		
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 	}
 }
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index f0188f7bc0..07ed7641a9 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,128 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 38, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 49, 50, 51,
-		52, 53, 54, 55,
-		56, 57, 58, 59,
-		60, 61, 62, 63,
-		64, 65, 66, 67,
-		68, 69, 70, 71,
-		72, 73, 74, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 92, 93,
-		94,	1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index dcc44cb9f3..2e152e2e29 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -207,7 +207,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		ServerPackets.EX_PET_INFO.writeId(this);
 		writeInt(_summon.getObjectId());
-		writeByte(_value); // // 0=teleported 1=default 2=summoned
+		writeByte(_value); // 0=teleported 1=default 2=summoned
 		writeShort(37); // mask_bits_37
 		writeBytes(_masks);
 		// Block 1
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
index a4539909c2..f7ac12028d 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
@@ -167,7 +167,7 @@ public class FakePlayerInfo extends ServerPacket
 		writeByte(_npc.getTeam().getId());
 		writeInt(_clan != null ? _clan.getCrestLargeId() : 0);
 		writeByte(_fpcHolder.getNobleLevel());
-		writeByte(_fpcHolder.isHero());
+		writeByte(_fpcHolder.isHero() ? 2 : 0); // 152 - Value for enabled changed to 2
 		writeByte(_fpcHolder.isFishing());
 		writeInt(_fpcHolder.getBaitLocationX());
 		writeInt(_fpcHolder.getBaitLocationY());
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index f93c9e5e69..03909a2746 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
deleted file mode 100644
index 52a4032d14..0000000000
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
new file mode 100644
index 0000000000..62bb425a5a
--- /dev/null
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -0,0 +1,182 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeByte(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 83e29f7bed..3ee2b1ef96 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,19 +19,19 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
 	}
 	
@@ -53,8 +53,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 8872c0cf63..c2b8c8f51a 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -42,13 +48,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -59,8 +68,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 68ca369edf..37f3211b0a 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1f54b5040f..0d5d066d25 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,6 +25,7 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -95,6 +98,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							if (player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -120,23 +134,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -144,6 +167,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -178,32 +204,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -302,6 +351,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 7cd7dd9696..c56221841f 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
@@ -51,7 +52,6 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +381,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle.sql
index 7ffcebed6b..3445dea47a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_ranking_history.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_ranking_history.sql
index 3f938ba850..d2da345dec 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_ranking_history.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_ranking_history.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_ranking_history` (
   `ranking` int(20) NOT NULL,
   `exp` bigint(20) NOT NULL,
   PRIMARY KEY (`charId`,`day`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/characters.sql
index ea2aace011..60e1a786a2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/characters.sql
@@ -60,4 +60,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort.sql
index c1f09a3f79..c8e7f5458c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort_siege_guards.sql
index 4872d0110c..40ed7619dc 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_siege_guards` VALUES
 -- Shanty Guards
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort_spawnlist.sql
index 0285fa6edd..d3caf9312e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,7 +11,7 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_spawnlist` VALUES
 (101,null,35658,-53273,156650,-1896,62000,0,0),
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/grandboss_data.sql
index 853bbd704b..50fbf93b87 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 40218408, 300), -- Queen Ant
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/heroes.sql
index ae59eb8ba1..f2ee5692a8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/heroes.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/items.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/olympiad_fights.sql
index 618ee73db0..662f1c4a7e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(1) unsigned NOT NULL DEFAULT '0',
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_07.0_PreludeOfWar/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/config/General.ini b/L2J_Mobius_07.0_PreludeOfWar/dist/game/config/General.ini
index 7853628cdd..4d1d58170e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/config/General.ini
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/config/General.ini
@@ -435,8 +435,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
@@ -660,6 +660,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 
 # ---------------------------------------------------------------------------
 # Developer Settings
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/ActionData.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/ActionData.xml
index 965751da7b..58bf44b733 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/ActionData.xml
@@ -1,219 +1,269 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
-	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
-	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="38" handler="Ride" /> <!-- Mount/Dismount -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
-	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
-	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
-	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
-	<action id="70" handler="AirshipAction" option="4" /> <!-- Exit Airship -->
-	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
-	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
-	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
-	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
-	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Nightshade - Shade Sacrifice -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
-	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="0" handler="SitStand" /> <!-- Toggle Sit/Stand. (Command: /sit, /stand) -->
+	<action id="1" handler="RunWalk" /> <!-- Toggle Walk/Run. (Command: /walk, /run) -->
+	<action id="2" handler="None" /> <!-- Attacks selected target(s), or takes a general action if the target cannot be attacked. Hold down the Ctrl key and click to attack by force. (Command: /attack, /attackforce) -->
+	<action id="3" handler="None" /> <!-- Request a trade from the selected target. (Command: /trade) -->
+	<action id="4" handler="None" /> <!-- Select the nearest available target. (Command: /targetnext) -->
+	<action id="5" handler="None" /> <!-- Pick up items that are scattered nearby. (Command: /pickup) -->
+	<action id="6" handler="None" /> <!-- Change to the target of the currently selected player. (Command: /assist) -->
+	<action id="7" handler="None" /> <!-- Invite the selected person to your party. (Command: /invite) -->
+	<action id="8" handler="None" /> <!-- Leave the party. (Command: /leave) -->
+	<action id="9" handler="None" /> <!-- If you are the leader of the party, dismiss selected members from your party. (Command: /dismiss) -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Sets up a private store to sell your items. (Command: /vendor) -->
+	<action id="11" handler="None" /> <!-- Display the party matching window to search for parties or to add members to your party. (Command: /partymatching) -->
+	<action id="12" handler="SocialAction" option="2" /> <!-- Emote: Greet others with a kind "hello." (Command: /socialhello) -->
+	<action id="13" handler="SocialAction" option="3" /> <!-- Emote: Let everyone know that you or someone else is victorious! (Command: /socialvictory) -->
+	<action id="14" handler="SocialAction" option="4" /> <!-- Emote: Rouse your allies and charge! (Command: /socialcharge) -->
+	<action id="15" handler="PetHold" /> <!-- Have your pet follow you or stay and hold its ground. -->
+	<action id="16" handler="PetAttack" /> <!-- Attack target. -->
+	<action id="17" handler="PetStop" /> <!-- Stop current action. -->
+	<action id="18" handler="None" /> <!-- Pick up nearby items. -->
+	<action id="19" handler="UnsummonPet" /> <!-- Returns your pet back to its home. -->
+	<action id="20" handler="None" /> <!-- Use special skill. -->
+	<action id="21" handler="ServitorHold" /> <!-- Have your summons follow you or stay and hold its ground. -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attack target. -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="24" handler="SocialAction" option="6" /> <!-- Emote: Respond positively. (Command: /socialyes) -->
+	<action id="25" handler="SocialAction" option="5" /> <!-- Emote: Respond negatively. (Command: /socialno) -->
+	<action id="26" handler="SocialAction" option="7" /> <!-- Emote: Show your respect and bow. (Command: /socialbow) -->
+	<action id="27" handler="None" /> <!-- Use special skill. -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Sets up a private store to purchase items. (Command: /buy) -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Emote: You have no idea what's going on. (/socialunaware) -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Emote: I'm waiting... (/socialwaiting) -->
+	<action id="31" handler="SocialAction" option="10" /> <!-- Emote: Have a good laugh. (Command: /sociallaugh) -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Toggle between Attack/Move modes. -->
+	<action id="33" handler="SocialAction" option="11" /> <!-- Emote: Applaud. (Command: /socialapplause) -->
+	<action id="34" handler="SocialAction" option="12" /> <!-- Emote: Serve them up your best dance moves. (/socialdance) -->
+	<action id="35" handler="SocialAction" option="13" /> <!-- Emote: Show grief. (/socialsad) -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Poison gas attack. -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Set up a private workshop that creates items by using Dwarven recipes in exchange for a fee. (Command: /dwarvenmanufacture) -->
+	<action id="38" handler="Ride" /> <!-- Toggle mount/dismount when near or on an NPC that can be ridden. (Commands: /mount, /dismount, /mountdismount) -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Exploding corpse attack. -->
+	<action id="40" handler="None" /> <!-- Enhances a target's evaluation score. (Command: /evaluate) -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Attacks castle gates, walls, or headquarters by shooting a cannon. -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Reflects damage back to an enemy. -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Attacks an enemy by creating a whirling surge of water. -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Attacks an enemy with a powerful explosion. -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Restores the summoner's MP. -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Attacks an enemy by summoning up a devastating storm. -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Damages an enemy and heals the servitor at the same time. -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Attacks the enemy by shooting a cannon. -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Attack with a fit of rage. -->
+	<action id="50" handler="None" /> <!-- The selected party member will become the new party leader. (Command: /changepartyleader) -->
+	<action id="51" handler="None" /> <!-- Creates an item using a common recipe in exchange for a fee. (/generalmanufacture) -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Removes the bonds from the summons and releases it. -->
+	<action id="53" handler="ServitorMove" /> <!-- Move to the target. -->
+	<action id="54" handler="PetMove" /> <!-- Move to the target. -->
+	<action id="55" handler="None" /> <!-- Toggle recording and stop recording of replay files. (Commands: /replayrecstart, /replayrecstop, /replayrecstartstop) -->
+	<action id="56" handler="None" /> <!-- Invite the selected target to a command channel. (Command: /channelinvite) -->
+	<action id="57" handler="None" /> <!-- Highlights private store and private workshop messages that contain the search word. (Command: /findprivatestore) -->
+	<action id="58" handler="None" /> <!-- Challenges another character to a duel. (Command: /duel) -->
+	<action id="59" handler="None" /> <!-- Withdrawing from a duel means losing it. (Command: /withdraw) -->
+	<action id="60" handler="None" /> <!-- Challenge another party to a duel. Note : Cannot teleport to the Coliseum when in an instanced zone. (/partyduel) -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Open a personal store for package sale. (Command: /packagesale) -->
+	<action id="62" handler="SocialAction" option="14" /> <!-- Charm Pose (Command: /charm) -->
+	<action id="63" handler="None" /> <!-- Begins a fun and easy mini-game. (command: /minigame) -->
+	<action id="64" handler="TeleportBookmark" /> <!-- Displays My Teleports window you can use to save and manage teleport locations. (Command: /teleportbookmark) -->
+	<action id="65" handler="BotReport" /> <!-- Reports the targeted player as a suspected bot. (Command: /botreport) -->
+	<action id="66" handler="SocialAction" option="15" /> <!-- Allows character to strike shy pose. (command: /shyness) -->
+	<action id="67" handler="AirshipAction" option="1" /> <!-- Allows you to control the Airship. -->
+	<action id="68" handler="AirshipAction" option="2" /> <!-- Relinquishes control of the Airship. -->
+	<action id="69" handler="AirshipAction" option="3" /> <!-- Choose from pre-designated locations. -->
+	<action id="70" handler="AirshipAction" option="4" /> <!-- Disembarks from the Airship. -->
+	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange bows with another person. (Command: /couplebow) -->
+	<action id="72" handler="SocialAction" option="17" /> <!-- High Five another person. (Command: /couplehighfive) -->
+	<action id="73" handler="SocialAction" option="18" /> <!-- Dance with another player. (Command: /coupledance) -->
+	<action id="74" handler="None" /> <!-- It turns on or off the entire status information gauge above the player's head. (Commands: /statusbaroff, /statusbaron, /statusbaronoff) -->
+	<action id="76" handler="None" /> <!-- Invite the selected target as friends. (Commands: /friendinvite, /friendadd, /friendreg) -->
+	<action id="77" handler="None" /> <!-- Start or end recording videos. (Commands: /recstart, /recstop, /recstartstop) -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Applies Token 1 to the target. Can be only used in a group. (Command: /tacticalsign1) -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Applies Token 2 to the target. Can be only used in a group. (Command: /tacticalsign2) -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Applies Token 3 to the target. Can be only used in a group. (Command: /tacticalsign3) -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Applies Token 4 to the target. Can be only used in a group. (Command: /tacticalsign4) -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Automatically focuses on the target marked with Token 1. Can be only used in a group. (Command: /targettacticalsign1) -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Automatically focuses on the target marked with Token 2. Can be only used in a group. (Command: /targettacticalsign2) -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Automatically focuses on the target marked with Token 3. Can be only used in a group. (Command: /targettacticalsign3) -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Automatically focuses on the target marked with Token 4. Can be only used in a group. (Command: /targettacticalsign4) -->
+	<action id="87" handler="SocialAction" option="28" /> <!-- Gesture of Proposal (Command: /socialpropose) -->
+	<action id="88" handler="SocialAction" option="29" /> <!-- Gesture of Provocation (Command: /socialprovocation) -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off (Command: /showoff) -->
+	<action id="90" handler="InstanceZoneInfo" /> <!-- Display list of usage times for instanced zones. (Command: /instancezone) -->
+	<action id="92" handler="None" /> <!-- Select target that was selected previously. (Command: /previoustarget) -->
+	<action id="93" handler="None" /> <!-- Select the nearest attackable target within 1400. (/targetnext2) -->
+	<action id="94" handler="None" /> <!-- Select target that was selected previously within 1400. (Command: /previoustarget2) -->
+	<action id="95" handler="WaitingAction" /> <!-- Performs the set waiting action. (/waitingaction) -->
+	<action id="96" handler="StrikeBack" /> <!-- Activates when attacked by an enemy. (Command: /strikeback) -->
+	<action id="97" handler="CombatMode" /> <!-- Makes it possible to attack the target with heavy blows and skills without pressing CTRL. (Command: /combatmode) -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Attacks castle gates, walls, or headquarters with a powerful strike. -->
+	<action id="1001" handler="None" /> <!-- A reckless yet powerful attack that must be used with extreme caution. -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Provokes surrounding enemies to attack you. -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Instantly increases P. Def. and M. Def. significantly. Character is immovable while this skill is in effect. -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- A magical attack. -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Recovers the pet's HP. -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Temporarily increases your party's chance to land a critical attack and also increases the power of the attack if successful. -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Temporarily increases your party's P. Atk and accuracy. -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Has a chance to remove curses from party members. -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Temporarily increases your party's MP regeneration. -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Temporarily shortens your party's spell re-use timer. -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Remove a curse from your party. -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Provokes an opponent to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Provokes multiple enemies around the caster to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Sacrifice HP in order to regenerate the HP of a selected target. -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Attempt a powerful, critical attack on an opponent. -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- A stunning blow that inflicts damage and instantly throws an enemy into a state of stun. -->
+	
+	<!-- TODO: Find skill ids. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Inflict a deadly curse on an enemy that absorbs their HP. -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kat the Cat -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mew the Cat -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kai the Cat -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Boxer the Unicorn -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mirage the Unicorn -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Merrow the Unicorn. -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Shadow. -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by Shadow. -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Silhouette -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by reanimated man -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by reanimated man -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by corrupted man -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- A powerful slashing attack. Over-hit is possible. -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King: Slashes at surrounding enemies while spinning in the air. Over-hit is possible. -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King: Immobilizes all nearby enemies. -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn: Powerful rear kicks that stun and damage an enemy. Over-hit is possible. -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn: Pounds multiple enemies with a tremendous onrush of water. -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord: Detonates a corpse, inflicting damage to nearby enemies. -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord: Blades attached to each arm slash out in a devastating attack. Over-hit is possible. -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord: Curses nearby enemies, poisoning them and reducing their Atk. Spd. -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon: Fires a projectile a short distance. Consumes 4 Flash Gunpowder. -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon: Fires a projectile a long distance. Consumes 5 Flash Gunpowder. -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Viciously bite an enemy. -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Scratch an enemy with both paws. Causes bleeding. -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awaken hidden powers. -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Decrease a nearby enemy's P. Atk./M. Atk. with a wolf cry. -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Decrease a nearby enemy's attack speed/magic speed with a strider roar. -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Viciously bite an enemy. -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Cause both damage and shock at the same time. Instantly stuns an enemy. -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Breath fire in front of you. -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Increases maximum HP temporarily. -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Increases maximum MP temporarily. -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Increases Atk. Spd. temporarily. -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Increases Casting Spd. temporarily. -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Temporarily decreases the target's MP consumption of skills. Consumes Spirit Ore. -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Increases M. Atk. power temporarily. -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Temporarily increases M. Skill Critical Rate / Damage . -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Temporarily increases the critical attack power. -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Temporarily increases the probability of critical attack. -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Temporarily increases Accuracy. -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Rapidly attacks the enemy twice. -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Inflicts shock and damage to the enemy at the same time with a powerful spin attack. -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Attacks nearby enemies with a doll heap attack. -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakens a hidden ability. -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of thunder. -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack on nearby enemies when hit. -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Control put in place to prevent the use of a buff upon the master. 5-minute duration. -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Powerfully attacks the target. -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- A powerful attack that pierces through a target. -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies by spinning your own body like a whirlwind. -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Attacks a front-line enemy with a powerful lance thrust. -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Shouts a victory cry that increases your abilities. -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Powerfully attacks the target. -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Gathers energy into your body, then releases it in a destructive blast. -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Hits enemies with a powerful wave of force. -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Emits a loud roar that amplifies your abilities. -->
+	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Charges toward the enemy and inflicts damage. -->
+	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Cancels the target's de-buff. -->
+	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Emits a spread of ring-shaped flames. -->
+	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Attacks the enemy with a powerful flaming beak. -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Toggles you between Attack and Support modes. -->
+	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Cancels more than one of the enemy's buffs. -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Decreases the enemy's Dark attribute by 25. -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Strike multiple enemies at the front with the tail. -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Bites the enemies at the front. -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Causes nearby enemies to flee in fear. -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Increases your speed. -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Greatly increases its master's speed. -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Increases the speed of its master and their party. -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Teleports its master to the Seed of Annihilation. -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Teleports its master and their party to the Seed of Annihilation. -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attack the target. -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move to a designated location. -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Make the servitor disappear by cancelling the summoning. -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Do not counter-attack. -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Counter-attack when the master or itself is attacked. -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Damages and provokes the target. -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Roll over and deliver a shock to the ground stunning nearby targets. -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Bites the target to inflict damage. -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Pounces on the target to inflict damage. Target's Speed -100. -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Damages the target and absorbs some of its HP. -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Attack nearby enemies and block their physical skills. -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Flourishes claws and frontally attacks enemies. -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Dashes toward enemies to inflict damage and to stun them. -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Inflicts damage onto the enemies with a flame. -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Flies straight into the enemy. -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Purifies the master. -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Attack the enemy by darting a feather. -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Hurt the enemy by attacking them with sharp claws. -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Recover the targets near the tree and clear any debuff. -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Attacks nearby targets with a powerful punch. -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Provokes nearby enemies. -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Bites the enemy. -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Pounces on the target to inflict damage. Target's Speed -100. -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Provokes nearby enemies. -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Bites the enemy. -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Pounces on the target to inflict damage. Target's Speed -100. -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Provokes nearby enemies. -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Bites the enemy. -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Pounces on the target to inflict damage. Target's Speed -100. -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Pounces on the enemy to inflict damage and decreases their Speed by 100. -->
+	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Deals damage to the target and knocks down for 3 seconds. -->
+	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Pushes the target and those around while inflicting damage. -->
+	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Rushes to the enemy to inflict damage and Stun for 5 seconds. -->
+	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Deals damage to enemies around and pushes them back. -->
+	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Deals damage to the target and those around, and decreases their Speed for 5 seconds. -->
+	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Deals damage to the target and those around. -->
+	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Launches a powerful slashing attack. -->
+	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Aims at the enemy's vital spot from long range. -->
+	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Deals damage to the target. -->
+	<action id="1156" handler="ServitorSkillUse" option="19406" /> <!-- Deals 620 Dark Magic damage to enemies around and reduces Speed by 120 and HP Heal Amount by 20% for 5 seconds. -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Can express affection to Rudolph. Affection Level rises by 25%. Warning: Can be used only when a Rudolph requests expression of affection, and cannot be used while transformed! -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Increases Max HP by 20%, Max MP by 20%, and the Speed by 20% for 5 minutes. Increases the Debuff Resistance by 10%. Reuse delay 10 minutes. Consumes 3 Rose Essence(s) during skill use. Doesn't overlap with other buffs except Critical Seduction. -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- For 30 minutes, increases party members' Max HP by 30%, Max MP by 30%, Max CP by 30%, P. Def. by 30%, magic M. Def. by 30%, Speed by 20, P. Atk. by 10%, and magic M. Atk. by 20%. Decreases MP consumption for skill use by 15%. Reuse delay 5 minutes. Consumes 10 Rose Essence(s) during skill use. -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of lightning. -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack upon contacted enemies nearby. -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Restricts to prevent the use of a buff upon the master. 5 minute duration. -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Inflicts a powerful attack that seems to pierce through the target. -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies. -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impales an enemy with a sword. -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Raises one's own abilities. -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Gathered energy within ones self can be focused and used to attack an enemy. -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Fires a shock wave to attack enemies at the front. -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Raises one's own abilities. -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switches between attack mode and support mode. -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Instantly restores the master's HP by 10%. For 1 min., master's Debuff Resistance +80%, Buff-canceling Attack Resistance +40%, Speed +10, P. Def. +20%, and M. Def. by 20%, and MP consumption for all skills -50%. Can be used if the master's HP is 30% or lower. Cooldown: 10 min. -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/DoorData.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/DoorData.xml
index ea6f1372ba..a7084241c9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/DoorData.xml
@@ -11645,6 +11645,176 @@
 		<openStatus default="open" />
 	</door>
 	
+	<!-- 21_16 FIXME: Rune clanhall doors cannot be found in client. -->
+	<door id="21160001" name="rune_castle_agit_002_001">
+		<nodes nodeZ="872">
+			<node x="37679" y="-50432" />
+			<node x="37726" y="-50433" />
+			<node x="37726" y="-50423" />
+			<node x="37678" y="-50424" />
+		</nodes>
+		<location x="37680" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160002" name="rune_castle_agit_002_002">
+		<nodes nodeZ="872">
+			<node x="37724" y="-50432" />
+			<node x="37771" y="-50432" />
+			<node x="37771" y="-50423" />
+			<node x="37723" y="-50424" />
+		</nodes>
+		<location x="37770" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160003" name="rune_castle_agit_003_001">
+		<nodes nodeZ="872">
+			<node x="38527" y="-50151" />
+			<node x="38570" y="-50131" />
+			<node x="38566" y="-50122" />
+			<node x="38524" y="-50144" />
+		</nodes>
+		<location x="38527" y="-50147" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160004" name="rune_castle_agit_003_002">
+		<nodes nodeZ="872">
+			<node x="38569" y="-50132" />
+			<node x="38610" y="-50111" />
+			<node x="38606" y="-50103" />
+			<node x="38564" y="-50124" />
+		</nodes>
+		<location x="38607" y="-50108" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160005" name="rune_castle_agit_004_001">
+		<nodes nodeZ="872">
+			<node x="39122" y="-49542" />
+			<node x="39145" y="-49501" />
+			<node x="39137" y="-49498" />
+			<node x="39115" y="-49539" />
+		</nodes>
+		<location x="39119" y="-49539" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160006" name="rune_castle_agit_004_002">
+		<nodes nodeZ="872">
+			<node x="39145" y="-49503" />
+			<node x="39167" y="-49462" />
+			<node x="39160" y="-49459" />
+			<node x="39136" y="-49498" />
+		</nodes>
+		<location x="39163" y="-49461" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160007" name="rune_castle_agit_001_001">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48291" />
+			<node x="39341" y="-48245" />
+			<node x="39335" y="-48245" />
+			<node x="39334" y="-48290" />
+		</nodes>
+		<location x="39338" y="-48290" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160008" name="rune_castle_agit_001_002">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48246" />
+			<node x="39342" y="-48199" />
+			<node x="39334" y="-48199" />
+			<node x="39334" y="-48246" />
+		</nodes>
+		<location x="39338" y="-48200" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160009" name="rune_castle_agit_005_001">
+		<nodes nodeZ="872">
+			<node x="39176" y="-47024" />
+			<node x="39155" y="-46982" />
+			<node x="39147" y="-46986" />
+			<node x="39169" y="-47026" />
+		</nodes>
+		<location x="39172" y="-47024" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160010" name="rune_castle_agit_005_002">
+		<nodes nodeZ="872">
+			<node x="39154" y="-46982" />
+			<node x="39133" y="-46942" />
+			<node x="39127" y="-46945" />
+			<node x="39148" y="-46986" />
+		</nodes>
+		<location x="39130" y="-46944" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160011" name="rune_castle_agit_006_001">
+		<nodes nodeZ="872">
+			<node x="38626" y="-46372" />
+			<node x="38586" y="-46350" />
+			<node x="38581" y="-46358" />
+			<node x="38623" y="-46379" />
+		</nodes>
+		<location x="38624" y="-46375" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160012" name="rune_castle_agit_006_002">
+		<nodes nodeZ="872">
+			<node x="38587" y="-46350" />
+			<node x="38545" y="-46330" />
+			<node x="38542" y="-46336" />
+			<node x="38583" y="-46358" />
+		</nodes>
+		<location x="38544" y="-46333" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160013" name="rune_castle_agit_007_001">
+		<nodes nodeZ="873">
+			<node x="37787" y="-46044" />
+			<node x="37741" y="-46044" />
+			<node x="37741" y="-46051" />
+			<node x="37787" y="-46050" />
+		</nodes>
+		<location x="37787" y="-46047" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160014" name="rune_castle_agit_007_002">
+		<nodes nodeZ="873">
+			<node x="37743" y="-46043" />
+			<node x="37697" y="-46045" />
+			<node x="37697" y="-46051" />
+			<node x="37742" y="-46051" />
+		</nodes>
+		<location x="37697" y="-46048" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	
 	<!-- 21_17 -->
 	<door id="21170001" name="Rune_bodeful_fortress_s.Rune_bf_azit_gate_door">
 		<nodes nodeZ="544">
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/multisell/3160302.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/multisell/3160302.xml
index 649c3f4856..c9ee0fe75e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/multisell/3160302.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/multisell/3160302.xml
@@ -42,7 +42,7 @@
 		<production count="1" id="38568" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
@@ -50,7 +50,7 @@
 		<production count="1" id="38569" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index d3d1a6bbcf..6c678e8c19 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -235,6 +236,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 8651ac7de8..460b8efb5a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -42,6 +42,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AgathionSlot", AgathionSlot::new);
@@ -195,6 +197,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("HpRegen", HpRegen::new);
 		EffectHandler.getInstance().registerHandler("HpToOwner", HpToOwner::new);
 		EffectHandler.getInstance().registerHandler("IgnoreDeath", IgnoreDeath::new);
+		EffectHandler.getInstance().registerHandler("IgnoreReduceDamage", IgnoreReduceDamage::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageBonus", ImmobileDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageResist", ImmobileDamageResist::new);
 		EffectHandler.getInstance().registerHandler("ImmobilePetBuff", ImmobilePetBuff::new);
@@ -234,7 +237,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java
index b74a7564f7..c54d8970d1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java
@@ -47,6 +47,7 @@ public class SkillConditionMasterHandler
 		SkillConditionHandler.getInstance().registerHandler("CanUseInBattlefield", CanUseInBattlefieldSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CanUseInDragonLair", CanUseInDragonLairSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CanUseSwoopCannon", CanUseSwoopCannonSkillCondition::new);
+		SkillConditionHandler.getInstance().registerHandler("CanUseSymbolSealIncreaseItem", CanUseSymbolSealIncreaseItemSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
similarity index 83%
rename from L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
rename to L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
index 9b5e021318..5405ccd4be 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
@@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Mobius
+ * @author fruit
  */
-public class MaxMagicCriticalRate extends AbstractStatEffect
+public class IgnoreReduceDamage extends AbstractStatEffect
 {
-	public MaxMagicCriticalRate(StatSet params)
+	public IgnoreReduceDamage(StatSet params)
 	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
+		super(params, Stat.IGNORE_REDUCE_DAMAGE);
 	}
 }
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
index 951002a2c2..35bfbcb6bc 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.enums.StatModifierType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener;
 import org.l2jmobius.gameserver.model.events.returns.DamageReturn;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author Sdw
@@ -32,10 +34,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 public class ReduceDamage extends AbstractEffect
 {
 	private final double _amount;
+	private final StatModifierType _mode;
 	
 	public ReduceDamage(StatSet params)
 	{
 		_amount = params.getDouble("amount");
+		_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
 	}
 	
 	private DamageReturn onDamageReceivedEvent(OnCreatureDamageReceived event)
@@ -46,7 +50,15 @@ public class ReduceDamage extends AbstractEffect
 			return null;
 		}
 		
-		final double newDamage = event.getDamage() * (_amount / 100);
+		final double newDamage;
+		if (_mode == StatModifierType.PER)
+		{
+			newDamage = event.getDamage() - (event.getDamage() * (_amount / 100));
+		}
+		else // DIFF
+		{
+			newDamage = event.getDamage() - Math.max((_amount - event.getAttacker().getStat().getAdd(Stat.IGNORE_REDUCE_DAMAGE)), 0.0);
+		}
 		
 		return new DamageReturn(false, true, false, newDamage);
 	}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java
index 03d9e8638b..634ea96c64 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java
@@ -16,14 +16,21 @@
  */
 package handlers.effecthandlers;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import org.l2jmobius.Config;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.enums.StatModifierType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.effects.EffectType;
+import org.l2jmobius.gameserver.model.holders.ItemSkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author NviX
@@ -39,6 +46,12 @@ public class RestoreSymbolSeal extends AbstractEffect
 		_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.PER);
 	}
 	
+	@Override
+	public EffectType getEffectType()
+	{
+		return EffectType.RESTORE_SYMBOL_SEAL;
+	}
+	
 	@Override
 	public boolean isInstant()
 	{
@@ -77,6 +90,33 @@ public class RestoreSymbolSeal extends AbstractEffect
 			player.updateSymbolSealSkills();
 			player.sendSkillList();
 			player.broadcastUserInfo();
+			
+			// Send item list to update Dye Powder with red icon in inventory.
+			ThreadPool.schedule(() ->
+			{
+				final List<Item> items = new LinkedList<>();
+				ITEMS: for (Item i : effected.getActingPlayer().getInventory().getItems())
+				{
+					if (i.getTemplate().hasSkills())
+					{
+						for (ItemSkillHolder s : i.getTemplate().getAllSkills())
+						{
+							if (s.getSkill().hasEffectType(EffectType.RESTORE_SYMBOL_SEAL))
+							{
+								items.add(i);
+								continue ITEMS;
+							}
+						}
+					}
+				}
+				
+				if (!items.isEmpty())
+				{
+					final InventoryUpdate iu = new InventoryUpdate();
+					iu.addItems(items);
+					effected.getActingPlayer().sendInventoryUpdate(iu);
+				}
+			}, 1000);
 		}
 	}
 }
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index cd446ab812..2775ff29a4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -182,6 +182,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index b7434abd2e..854051b04c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,61 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetHold.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetHold.java
index 5e726bae7b..5688e59b8b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetHold.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetHold.java
@@ -52,4 +52,10 @@ public class PetHold implements IPlayerActionHandler
 			((SummonAI) pet.getAI()).notifyFollowStatusChange();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetMove.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetMove.java
index e5198fda6f..7b37a62148 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetMove.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetMove.java
@@ -53,4 +53,10 @@ public class PetMove implements IPlayerActionHandler
 			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, player.getTarget().getLocation());
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
index 80c073b1dc..f2044ed108 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
@@ -77,4 +77,10 @@ public class PetSkillUse implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetStop.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetStop.java
index 7ba96efec2..bcf54c7e96 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetStop.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetStop.java
@@ -51,4 +51,10 @@ public class PetStop implements IPlayerActionHandler
 			pet.cancelAction();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..b681353b73 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,52 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorHold.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
index 4bbeee8387..1931066222 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
@@ -48,4 +48,10 @@ public class ServitorHold implements IPlayerActionHandler
 			((SummonAI) s.getAI()).notifyFollowStatusChange();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorMode.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
index 456a2e042b..14159b2066 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
@@ -68,4 +68,10 @@ public class ServitorMode implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorMove.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
index 36528e0063..a5269a3d15 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
@@ -56,4 +56,10 @@ public class ServitorMove implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
index b67b13f2cc..133040fba4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
@@ -62,4 +62,10 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			}
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorStop.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
index 24db478dc7..3dda0b9c15 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
@@ -47,4 +47,10 @@ public class ServitorStop implements IPlayerActionHandler
 			s.cancelAction();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
index 390822a7b1..eaace592ee 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
@@ -62,4 +62,10 @@ public class UnsummonPet implements IPlayerActionHandler
 			pet.unSummon(player);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
index e4944df496..937dcaad1a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
@@ -69,4 +69,10 @@ public class UnsummonServitor implements IPlayerActionHandler
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSymbolSealIncreaseItemSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSymbolSealIncreaseItemSkillCondition.java
new file mode 100644
index 0000000000..3ab0d0bb69
--- /dev/null
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSymbolSealIncreaseItemSkillCondition.java
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.skillconditionhandlers;
+
+import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.skill.ISkillCondition;
+import org.l2jmobius.gameserver.model.skill.Skill;
+
+/**
+ * @author CostyKiller
+ */
+public class CanUseSymbolSealIncreaseItemSkillCondition implements ISkillCondition
+{
+	private final int _amount;
+	
+	public CanUseSymbolSealIncreaseItemSkillCondition(StatSet params)
+	{
+		_amount = params.getInt("amount", 0);
+	}
+	
+	@Override
+	public boolean canUse(Creature caster, Skill skill, WorldObject target)
+	{
+		return caster.isPlayer() && ((caster.getActingPlayer().getSymbolSealPoints() + ((Config.MAX_SYMBOL_SEAL_POINTS * _amount) / 100)) <= Config.MAX_SYMBOL_SEAL_POINTS);
+	}
+}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 8ce0fc9393..c9ee4ab62a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.quest.QuestState;
@@ -46,10 +47,11 @@ public class ChamberOfProphecies extends AbstractInstance
 {
 	// NPCs
 	private static final int KAIN_VAN_HALTER = 31639;
-	private static final int VAN_HALTER = 33999;
-	private static final int FERIN = 34001;
 	private static final int GRAIL = 33996;
 	private static final int MYSTERIOUS_WIZARD = 33980;
+	// Helper NPCs
+	private static final int HELPER_VAN_HALTER = 33999;
+	private static final int HELPER_FERIN = 34001;
 	// Misc
 	private static final int DOOR_2 = 17230102;
 	private static final int DOOR_3 = 17230103;
@@ -66,7 +68,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		addStartNpc(KAIN_VAN_HALTER);
 		addFirstTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
 		addTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
-		addCreatureSeeId(FERIN, VAN_HALTER);
+		addCreatureSeeId(HELPER_FERIN, HELPER_VAN_HALTER);
 	}
 	
 	@Override
@@ -145,12 +147,12 @@ public class ChamberOfProphecies extends AbstractInstance
 				{
 					return null;
 				}
-				final Npc valHalter = world.getNpc(VAN_HALTER);
-				if (valHalter != null)
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
+				if (vanHalter != null)
 				{
-					valHalter.deleteMe(); // probably needs another npc id for initial room
+					vanHalter.deleteMe(); // probably needs another npc id for initial room
 				}
-				final Npc ferin = world.getNpc(FERIN);
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
 				if (ferin != null)
 				{
 					ferin.deleteMe(); // probably needs another npc id for initial room
@@ -190,6 +192,8 @@ public class ChamberOfProphecies extends AbstractInstance
 			case "CHECK_STATUS":
 			{
 				final Instance world = player.getInstanceWorld();
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
 				if (!isInInstance(world))
 				{
 					return null;
@@ -200,8 +204,8 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
-							startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY2", 14000, ferin, player);
+							startQuestTimer("SEY_KAIN", 24000, vanHalter, player);
 							startQuestTimer("OPEN_DOOR1", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -221,7 +225,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY3", 8000, ferin, player);
 							startQuestTimer("OPEN_DOOR2", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -234,7 +238,7 @@ public class ChamberOfProphecies extends AbstractInstance
 							world.setStatus(4);
 							world.spawnGroup("wof_room3_2");
 							world.openCloseDoor(DOOR_3, false);
-							startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY_KAIN_1", 5000, vanHalter, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
 						break;
@@ -245,8 +249,8 @@ public class ChamberOfProphecies extends AbstractInstance
 						{
 							world.setStatus(5);
 							world.spawnGroup("wof_room4");
-							startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
-							startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY_KAIN_2", 3000, vanHalter, player);
+							startQuestTimer("SEY4", 7000, ferin, player);
 						}
 						else
 						{
@@ -304,7 +308,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					return null;
 				}
 				cancelQuestTimer("ATTACK1", npc, player);
-				startQuestTimer("ATTACK2", 200, world.getNpc(VAN_HALTER), player, true);
+				startQuestTimer("ATTACK2", 200, world.getNpc(HELPER_VAN_HALTER), player, true);
 				world.setStatus(3);
 				world.spawnGroup("wof_room3");
 				world.openCloseDoor(DOOR_3, true);
@@ -321,7 +325,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY2":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.YOU_CAN_T_DIE_HERE_I_DIDN_T_LEARN_RESURRECT_YET));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_4", 0, 0, 0, 0, 0));
@@ -330,7 +334,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GISELLE_WAS_SUCH_A_SWEET_CHILD));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_1", 0, 0, 0, 0, 0));
@@ -340,7 +344,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY3":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.DO_YOU_THINK_I_LL_GROW_TALLER_IF_I_EAT_LOTS_AND_LOTS));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_6", 0, 0, 0, 0, 0));
@@ -349,7 +353,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_1":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.SUCH_MONSTERS_IN_A_PLACE_LIKE_THIS_UNBELIEVABLE));
 				}
@@ -357,7 +361,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_2":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THAT_S_THE_MONSTER_THAT_ATTACKED_FAERON_YOU_RE_OUTMATCHED_HERE_GO_AHEAD_I_LL_CATCH_UP));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_6", 0, 0, 0, 0, 0));
@@ -367,7 +371,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY4":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GO_NOW_KAIN_CAN_HANDLE_THIS));
 					npc.setScriptValue(1);
@@ -377,7 +381,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_3":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.LEAVE_THIS_TO_ME_GO));
 					npc.setScriptValue(1);
@@ -387,7 +391,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "REST":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, player);
 				}
@@ -508,7 +512,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		{
 			switch (npc.getId())
 			{
-				case FERIN:
+				case HELPER_FERIN:
 				{
 					if (creature.isPlayer() && !creature.isDead() && npc.isScriptValue(0))
 					{
@@ -516,7 +520,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					}
 					break;
 				}
-				case VAN_HALTER:
+				case HELPER_VAN_HALTER:
 				{
 					if (creature.isPlayer() && !creature.isDead() && world.isStatus(0))
 					{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/items/46200-46299.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/items/46200-46299.xml
index 434e028a8e..7a69f2c515 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/items/46200-46299.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/items/46200-46299.xml
@@ -796,14 +796,19 @@
 	<item id="46254" name="Dandy's Golden Ball" type="EtcItem">
 		<!-- For 1 hour, acquired XP/ SP +100%. Changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or Nevit's Hourglass. -->
 		<set name="icon" val="BranchIcon.icon.g_ev_goldenball" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_stackable" val="true" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="is_freightable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="18471" level="1" /> <!-- Dandy's Golden Ball -->
+		</skills>
 	</item>
 	<item id="46255" name="Automatic Appearance: Halloween Outfit" type="EtcItem">
 		<!-- Changes the appearance of upper armor into that of a Halloween Outfit. Works on one-pieces too. -->
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/items/80500-80599.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/items/80500-80599.xml
index 96f57c71cf..095701293c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/items/80500-80599.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/items/80500-80599.xml
@@ -377,6 +377,13 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="time" val="360" />
+		<skills>
+			<skill id="35363" level="1" /> <!-- Freya's Bloody Rune -->
+		</skills>
 	</item>
 	<item id="80544" name="Snow's Plea for Help - Altar of Evil" type="EtcItem">
 		<!-- A purifying mission requested by Snow for the 15th Anniversary. Snow wishes to celebrate the 15th Anniversary of Lineage by eradicating monsters in the Altar of Evil and Bloody Swampland. Characters of level 85-95 can receive the request by double-clicking the item. Can be played once a day. -->
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/npcs/33900-33999.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/npcs/33900-33999.xml
index 2eda1cfe8d..4d5f210282 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/npcs/33900-33999.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/npcs/33900-33999.xml
@@ -2266,26 +2266,37 @@
 			<param name="SpiritShotRate" value="10" />
 			<skill name="Skill01_ID" id="16387" level="1" />
 		</parameters>
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<race>FRIEND</race>
+		<sex>MALE</sex>
 		<equipment rhand="36218" />
+		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234" hpRegen="9.5" mp="1846" mpRegen="3.3" />
+			<vitals hp="42340.06312688557" hpRegen="8.5" mp="18046.8" mpRegen="3" />
+			<attack physical="25000" magical="2811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="430" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="10085.36442" magical="2064.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
 			</speed>
-			<attack physical="12289.0459514498" magical="811.85773400546" critical="4" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="5362.06896551724" magical="264.78509919958" />
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" talkable="false" canBeSown="true" />
+		<status attackable="false" talkable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4414" level="1" /> <!-- Heavy Armor Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="14" /> <!-- Humans -->
+			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
 			<skill id="16387" level="1" /> <!-- Chain Smash -->
 			<skill id="16388" level="1" /> <!-- Kain's Wrath -->
 		</skillList>
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/npcs/34000-34099.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/npcs/34000-34099.xml
index bf754d796b..94008f3f8f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/npcs/34000-34099.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/npcs/34000-34099.xml
@@ -17,22 +17,43 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="34001" level="85" type="Folk" name="Ferin">
+	<npc id="34001" level="85" type="FriendlyNpc" name="Ferin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
+		<race>FRIEND</race>
 		<sex>FEMALE</sex>
+		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234" hpRegen="7.5" mp="1846" mpRegen="2.7" />
+			<vitals hp="4234.06312688557" hpRegen="8.5" mp="1846.8" mpRegen="3" />
+			<attack physical="1188.87259499001" magical="811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
 			</speed>
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="20" water="20" wind="20" earth="20" holy="20" dark="20" />
+			</attribute>
+			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" talkable="false" />
+		<status attackable="false" talkable="false" undying="true" />
 		<collision>
 			<radius normal="8" />
 			<height normal="16" />
 		</collision>
+		<skillList>
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="1" /> <!-- Heavy Armor Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
+		</skillList>
 	</npc>
 	<npc id="34002" level="99" type="Folk" name="Dolkin" title="Maestro">
 		<race>DWARF</race>
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/16300-16399.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/16300-16399.xml
index 0dc591aae9..272e72b9b8 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/16300-16399.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/16300-16399.xml
@@ -799,6 +799,22 @@
 		<reuseDelay>5000</reuseDelay>
 		<effectPoint>-150</effectPoint>
 		<isDebuff>true</isDebuff>
+		<activateRate>80</activateRate>
+		<affectRange>900</affectRange>
+		<basicProperty>PHYSICAL</basicProperty>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<trait>PULL</trait>
+		<effects>
+			<effect name="AirBind" />
+			<effect name="Bluff">
+				<chance>100</chance>
+			</effect>
+			<effect name="PullBack">
+				<speed>600</speed>
+				<delay>600</delay>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="16388" toLevel="1" name="Kain's Wrath">
 		<!-- Consumed by vengeful fury toward all who harm Giselle. -->
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/18400-18499.xml
index 1109b35ba3..67cb44b4fd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/18400-18499.xml
@@ -877,8 +877,30 @@
 		<!-- For 1 h., acquired XP/ SP +100%, recovers Vitality to the maximum. Changes the appearance of your armor into that of an NC Dinos Uniform. Cannot be stacked with the Fall of the Dragon or Nevit's Hourglass. -->
 		<icon>BranchIcon.icon.g_ev_goldenball</icon>
 		<operateType>A2</operateType>
+		<effectPoint>1</effectPoint>
+		<abnormalType>CHANGEBODY</abnormalType>
+		<abnormalVisualEffect>CHANGE_DINOS</abnormalVisualEffect>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>46254</itemConsumeId> <!-- Dandy's Home Run Ball -->
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>-3</magicLevel>
+		<abnormalLevel>2</abnormalLevel>
+		<abnormalTime>3600</abnormalTime>
 		<reuseDelay>15000</reuseDelay>
+		<irreplacableBuff>true</irreplacableBuff>
+		<stayAfterDeath>true</stayAfterDeath>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="ExpModify">
+				<amount>100</amount>
+			</effect>
+			<effect name="SpModify">
+				<amount>100</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18472" toLevel="6" name="Giveaway Number 1">
 		<icon>icon.skill0000</icon>
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/30000-30099.xml
index efb2d37899..cda039eff7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/30000-30099.xml
@@ -1948,8 +1948,8 @@
 		<operateType>P</operateType>
 		<magicLevel>85</magicLevel>
 		<effects>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>350</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/39400-39499.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/39400-39499.xml
index 1e50c6473d..8e37994268 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/39400-39499.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/39400-39499.xml
@@ -2091,6 +2091,7 @@
 		</effects>
 	</skill>
 	<skill id="39494" toLevel="1" name="Dye Powder">
+		<!-- Powder for replenishing the Dye Engraving scale. Restores 25% of the full scale. -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -2100,6 +2101,11 @@
 		<itemConsumeCount>1</itemConsumeCount>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="CanUseSymbolSealIncreaseItem">
+				<amount>25</amount> <!-- 25% from max symbol seal points -->
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="RestoreSymbolSeal">
 				<amount>25</amount>
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt
index 5515f67c62..09511c772f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt
@@ -11,6 +11,8 @@ AddHuntingTime: Add time for time limited hunting zones. (l2jmobius)
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -163,10 +165,11 @@ HpCpHealCritical: HpCp heal effects always trigger Magic Critical Hit.
 HpCpHeal: Increases current HP by a given amount. If the given amount exceeds maximum HP, it increases current CP with the rest value as well.
 HpDrain: Magical attack that absorbs given percentage of the damage inflicted as HP.
 Hp: Increases current HP by a static value.
-HpLimit: Increase a character's max hp limit (l2jmobius)
+HpLimit: Increase a character's max hp limit. (l2jmobius)
 HpRegen: HP Regeneration stat.
 HpToOwner: DOT effect that absorbs HP over time.
 IgnoreDeath: Become undying. Hp cannot decrease below 1.
+IgnoreReduceDamage: Ignore ReduceDamage effect implementation. (l2jmobius)
 ImmobileDamageBonus: Bonus damage to immobile targets. (l2jmobius)
 ImmobileDamageResist: Resist damage while immobile. (l2jmobius)
 ImmobilePetBuff: Causes your pet to become immobilized.
@@ -205,7 +208,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
@@ -270,6 +272,7 @@ RebalanceHP: Balances targets' current HP.
 RebalanceHPSummon: Balances targets' current HP for summons.
 RecoverVitalityInPeaceZone: Recover periodically vitality when player is in a peace zone. (l2jmobius)
 Recovery: Decreases death penalty level.
+ReduceDamage: Reduce damage effect implementation.
 ReduceCancel: Magic skill casting interruption stat.
 ReduceDropPenalty: Reduces EXP lost and death penalty chance.
 ReflectMagic: Deflects magical damage back to the attacker.
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/Config.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/Config.java
index 2feb6a811c..e04942b524 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/Config.java
@@ -614,6 +614,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	
 	// --------------------------------------------------
 	// FloodProtector Settings
@@ -1355,6 +1356,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2241,6 +2243,7 @@ public class Config
 			ENABLE_AUTO_SKILL = generalConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = generalConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = generalConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = generalConfig.getBoolean("AssistLeader", false);
 			
 			// Load FloodProtector config file
 			final PropertiesParser floodProtectorConfig = new PropertiesParser(FLOOD_PROTECTOR_CONFIG_FILE);
@@ -3416,6 +3419,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 6485e6c47d..2208f823ee 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index c5839831ba..deb0eec41a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -546,9 +546,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 2260001e17..380989e049 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
index 40b4ea1c3d..ae43e8d744 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
@@ -25,4 +25,9 @@ import org.l2jmobius.gameserver.model.actor.Player;
 public interface IPlayerActionHandler
 {
 	void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed);
+	
+	default boolean isPetAction()
+	{
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 0c2f5d59de..0b7ad4e019 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -215,7 +215,7 @@ public class ShortCuts implements IRestorable
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
 				newsc.setAutoUse(sc.isAutoUse());
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 0b200f31f2..492e746f51 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1288,7 +1288,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2816,7 +2816,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2829,177 +2829,139 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						sendPacket(info);
+					}
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
index 6feb134eb5..68e6b87b22 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4573,7 +4573,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8455,9 +8455,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 196de38709..4213dec3ad 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -854,7 +855,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -875,7 +876,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -900,7 +908,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -908,7 +916,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -954,7 +969,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index eb31dfcf3e..3a1e8faafa 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -873,15 +872,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -892,8 +889,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -902,7 +903,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -975,45 +976,26 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
 		
-		// Notify recalculation to child classes.
+		// Notify recalculation to child classes
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 8c535a998e..572963818b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
index 97397f753f..9d5faa0c61 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
@@ -57,7 +57,10 @@ public enum CommissionItemType
 	NECKLACE(31),
 	BELT(32),
 	BRACELET(33),
+	AGATHION(62),
 	HAIR_ACCESSORY(34),
+	BROOCH_JEWEL(63),
+	ARTIFACT(64),
 	// Supplies
 	POTION(35),
 	SCROLL_ENCHANT_WEAPON(36),
@@ -65,6 +68,7 @@ public enum CommissionItemType
 	SCROLL_OTHER(38),
 	SOULSHOT(39),
 	SPIRITSHOT(40),
+	OTHER_SUPPLIES(41),
 	// Pet Goods
 	PET_EQUIPMENT(42),
 	PET_SUPPLIES(43),
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
index eb10918430..3a194d1660 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
@@ -47,8 +47,8 @@ public enum CommissionTreeType
 		CommissionItemType.SPEAR,
 		CommissionItemType.OTHER_WEAPON),
 	ARMOR(1, CommissionItemType.HELMET, CommissionItemType.ARMOR_TOP, CommissionItemType.ARMOR_PANTS, CommissionItemType.FULL_BODY, CommissionItemType.GLOVES, CommissionItemType.FEET, CommissionItemType.SHIELD, CommissionItemType.SIGIL, CommissionItemType.UNDERWEAR, CommissionItemType.CLOAK),
-	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.HAIR_ACCESSORY),
-	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT),
+	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.AGATHION, CommissionItemType.HAIR_ACCESSORY, CommissionItemType.BROOCH_JEWEL, CommissionItemType.ARTIFACT),
+	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT, CommissionItemType.OTHER_SUPPLIES),
 	PET_GOODS(4, CommissionItemType.PET_EQUIPMENT, CommissionItemType.PET_SUPPLIES),
 	MISC(
 		5,
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/effects/EffectType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/effects/EffectType.java
index 6d88f42f03..bc0c4a1f90 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/effects/EffectType.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/effects/EffectType.java
@@ -62,5 +62,6 @@ public enum EffectType
 	SUMMON_NPC,
 	TELEPORT,
 	TELEPORT_TO_TARGET,
-	ABNORMAL_SHIELD
+	ABNORMAL_SHIELD,
+	RESTORE_SYMBOL_SEAL
 }
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index e17d405a46..fba22cdb8c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2242,6 +2242,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index e9fd1cbbd6..c62cb2e398 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -39,6 +39,7 @@ import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AgathionData;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -52,6 +53,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -74,12 +76,14 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemEnchantAdd;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemSoulCrystalAdd;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
 import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -94,6 +98,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1652,7 +1657,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2578,6 +2585,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2602,6 +2614,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2627,6 +2641,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index f702ab70ee..3c841fbc9c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -772,7 +772,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -924,7 +925,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 7fb3323b75..6b58a96064 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -652,7 +652,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -675,7 +675,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -710,7 +710,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 05d358efa9..3280a26c17 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -91,6 +91,7 @@ public enum Stat
 	REAR_DAMAGE_RATE("rearDamage"),
 	DRAGON_WEAPON_DEFENCE("dragonWeaponDefence"),
 	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
+	IGNORE_REDUCE_DAMAGE("ignoreReduceDamage"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
@@ -131,7 +132,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index 8f916369b4..b7b0c4ef53 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index 265cef95f4..4211092a85 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -97,6 +97,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 72613c1665..39d835b74b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -117,6 +117,11 @@ public class RequestAcquireSkill implements ClientPacket
 		
 		final int skillId = player.getReplacementSkill(_id);
 		final Skill existingSkill = player.getKnownSkill(skillId); // Mobius: Keep existing sublevel.
+		if ((_level > 65536000) && (existingSkill != null) && (existingSkill.getSubLevel() > 1000))
+		{
+			_level -= existingSkill.getSubLevel() * 65536;
+		}
+		
 		final Skill skill = SkillData.getInstance().getSkill(skillId, _level, existingSkill == null ? 0 : existingSkill.getSubLevel());
 		if (skill == null)
 		{
@@ -652,7 +657,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList();
 		player.updateShortCuts(_id, skill.getLevel(), skill.getSubLevel());
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 14c84055da..63f5c4a527 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -87,7 +87,7 @@ public class RequestShortCutReg implements ClientPacket
 		else if (_page == 23)
 		{
 			final Item item = player.getInventory().getItemByObjectId(_id);
-			if ((item != null) && !item.isPotion())
+			if (((item != null) && !item.isPotion()) || (_type == ShortcutType.ACTION))
 			{
 				return;
 			}
@@ -148,7 +148,7 @@ public class RequestShortCutReg implements ClientPacket
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		sc.setAutoUse(_active);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 		player.sendPacket(new ExActivateAutoShortcut(sc, _active));
 		
 		// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index f0188f7bc0..07ed7641a9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,128 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 38, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 49, 50, 51,
-		52, 53, 54, 55,
-		56, 57, 58, 59,
-		60, 61, 62, 63,
-		64, 65, 66, 67,
-		68, 69, 70, 71,
-		72, 73, 74, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 92, 93,
-		94,	1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index dcc44cb9f3..2e152e2e29 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -207,7 +207,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		ServerPackets.EX_PET_INFO.writeId(this);
 		writeInt(_summon.getObjectId());
-		writeByte(_value); // // 0=teleported 1=default 2=summoned
+		writeByte(_value); // 0=teleported 1=default 2=summoned
 		writeShort(37); // mask_bits_37
 		writeBytes(_masks);
 		// Block 1
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
index a4539909c2..f7ac12028d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
@@ -167,7 +167,7 @@ public class FakePlayerInfo extends ServerPacket
 		writeByte(_npc.getTeam().getId());
 		writeInt(_clan != null ? _clan.getCrestLargeId() : 0);
 		writeByte(_fpcHolder.getNobleLevel());
-		writeByte(_fpcHolder.isHero());
+		writeByte(_fpcHolder.isHero() ? 2 : 0); // 152 - Value for enabled changed to 2
 		writeByte(_fpcHolder.isFishing());
 		writeInt(_fpcHolder.getBaitLocationX());
 		writeInt(_fpcHolder.getBaitLocationY());
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index f93c9e5e69..03909a2746 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
deleted file mode 100644
index 52a4032d14..0000000000
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
new file mode 100644
index 0000000000..62bb425a5a
--- /dev/null
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -0,0 +1,182 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeByte(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 05aaedf2c5..46c9ccb5a9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,20 +19,21 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
+		player.restoreAutoShortcutVisual();
 	}
 	
 	@Override
@@ -54,8 +55,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 9c1fbbcab8..851b53dc09 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -43,13 +49,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -60,8 +69,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 68ca369edf..37f3211b0a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1544a20c14..e9f977858a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -42,6 +44,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	
@@ -96,6 +99,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking when in offline play.
+							if (player.isOfflinePlay() && player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -121,23 +135,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -145,6 +168,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -179,32 +205,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -310,6 +359,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 5899235fcb..66c93af753 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,7 +35,9 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.effects.EffectType;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemUse;
@@ -46,12 +48,12 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.EffectScope;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +383,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
@@ -394,7 +397,24 @@ public class AutoUseTaskManager
 							final IPlayerActionHandler actionHandler = PlayerActionHandler.getInstance().getHandler(actionHolder.getHandler());
 							if (actionHandler != null)
 							{
-								actionHandler.useAction(player, actionHolder, false, false);
+								if (!actionHandler.isPetAction())
+								{
+									actionHandler.useAction(player, actionHolder, false, false);
+								}
+								else
+								{
+									final Summon summon = player.getAnyServitor();
+									if ((summon != null) && !summon.isAlikeDead())
+									{
+										final Skill skill = summon.getKnownSkill(actionHolder.getOptionId());
+										if ((skill != null) && !canSummonCastSkill(player, summon, skill))
+										{
+											continue ACTIONS;
+										}
+										
+										actionHandler.useAction(player, actionHolder, false, false);
+									}
+								}
 							}
 						}
 					}
@@ -477,6 +497,59 @@ public class AutoUseTaskManager
 			
 			return !player.isSkillDisabled(skill) && skill.checkCondition(player, target, false);
 		}
+		
+		private boolean canSummonCastSkill(Player player, Summon summon, Skill skill)
+		{
+			if (skill.isBad() && (player.getTarget() == null))
+			{
+				return false;
+			}
+			
+			final int mpConsume = skill.getMpConsume() + skill.getMpInitialConsume();
+			if ((((mpConsume != 0) && (mpConsume > (int) Math.floor(summon.getCurrentMp()))) || ((skill.getHpConsume() != 0) && (skill.getHpConsume() > (int) Math.floor(summon.getCurrentHp())))))
+			{
+				return false;
+			}
+			
+			if (summon.isSkillDisabled(skill))
+			{
+				return false;
+			}
+			
+			if (((player.getTarget() != null) && !skill.checkCondition(summon, player.getTarget(), false)) || ((player.getTarget() == null) && !skill.checkCondition(summon, player, false)))
+			{
+				return false;
+			}
+			
+			if ((skill.getItemConsumeCount() > 0) && (summon.getInventory().getInventoryItemCount(skill.getItemConsumeId(), -1) < skill.getItemConsumeCount()))
+			{
+				return false;
+			}
+			
+			if (skill.getTargetType().equals(TargetType.SELF) || skill.getTargetType().equals(TargetType.SUMMON))
+			{
+				final BuffInfo summonInfo = summon.getEffectList().getBuffInfoBySkillId(skill.getId());
+				return (summonInfo != null) && (summonInfo.getTime() >= REUSE_MARGIN_TIME);
+			}
+			
+			if ((skill.getEffects(EffectScope.GENERAL) != null) && skill.getEffects(EffectScope.GENERAL).stream().anyMatch(a -> a.getEffectType().equals(EffectType.MANAHEAL_BY_LEVEL)) && (player.getCurrentMpPercent() > 80))
+			{
+				return false;
+			}
+			
+			final BuffInfo buffInfo = player.getEffectList().getBuffInfoBySkillId(skill.getId());
+			final BuffInfo abnormalBuffInfo = player.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
+			if (abnormalBuffInfo != null)
+			{
+				if (buffInfo != null)
+				{
+					return (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()));
+				}
+				return (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel()) || abnormalBuffInfo.isAbnormalType(AbnormalType.NONE);
+			}
+			
+			return true;
+		}
 	}
 	
 	public synchronized void startAutoUseTask(Player player)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle.sql
index 7ffcebed6b..3445dea47a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_homunculus.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_homunculus.sql
index 24d6a4e5ff..d8beec306a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_homunculus.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_homunculus.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_homunculus` (
 	`skillLevel4` TINYINT UNSIGNED NOT NULL DEFAULT '0',
 	`skillLevel5` TINYINT UNSIGNED NOT NULL DEFAULT '0',
 	`active` TINYINT UNSIGNED NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_ranking_history.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_ranking_history.sql
index 3f938ba850..d2da345dec 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_ranking_history.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_ranking_history.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_ranking_history` (
   `ranking` int(20) NOT NULL,
   `exp` bigint(20) NOT NULL,
   PRIMARY KEY (`charId`,`day`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/characters.sql
index 4df7d3f88c..f39a66c2db 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/characters.sql
@@ -62,4 +62,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort.sql
index c1f09a3f79..c8e7f5458c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort_siege_guards.sql
index 4872d0110c..40ed7619dc 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_siege_guards` VALUES
 -- Shanty Guards
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort_spawnlist.sql
index 0285fa6edd..d3caf9312e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,7 +11,7 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_spawnlist` VALUES
 (101,null,35658,-53273,156650,-1896,62000,0,0),
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/grandboss_data.sql
index 853bbd704b..50fbf93b87 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 40218408, 300), -- Queen Ant
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/heroes.sql
index ae59eb8ba1..f2ee5692a8 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/heroes.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/items.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/olympiad_fights.sql
index 15ffc8332b..1e88116dfc 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/olympiad_fights.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(1) unsigned NOT NULL DEFAULT '0',
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_08.2_Homunculus/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_08.2_Homunculus/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/config/General.ini b/L2J_Mobius_08.2_Homunculus/dist/game/config/General.ini
index 1dfe725af3..e9b5d1cfbd 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/config/General.ini
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/config/General.ini
@@ -430,8 +430,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
@@ -655,6 +655,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 
 # ---------------------------------------------------------------------------
 # Developer Settings
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/config/Rates.ini b/L2J_Mobius_08.2_Homunculus/dist/game/config/Rates.ini
index d4f5606320..09b75dc15e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/config/Rates.ini
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/config/Rates.ini
@@ -159,11 +159,13 @@ EventItemMaxLevelDifference = 9
 # Vitality system rates. Works only if EnableVitality = True
 # ---------------------------------------------------------------------------
 
-# The following configures the XP multiplier of each vitality level. Basically, you have
-# Default: 2
+# The following configures the XP multiplier of each vitality level.
 # Take care setting these values according to your server rates, as the can lead to huge differences!
 # Example with a server rate 15x and vitality = 2. => final server rate = 30 (15x2)!
+# Retail: 2
 RateVitalityExpMultiplier = 2.
+# Retail: 3
+RateVitalityExpPremiumMultiplier = 3.
 
 # Maximum vitality items allowed to be used for a week by a player.
 # Default: 999
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/ActionData.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/ActionData.xml
index 965751da7b..d538403527 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/ActionData.xml
@@ -1,48 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
+	<action id="0" handler="SitStand" /> <!-- Sit/Stand -->
+	<action id="1" handler="RunWalk" /> <!-- Walk/Run -->
+	<action id="2" handler="None" /> <!-- Attack -->
+	<action id="3" handler="None" /> <!-- Trade -->
+	<action id="4" handler="None" /> <!-- Next Target (Melee) -->
+	<action id="5" handler="None" /> <!-- Pick Up -->
+	<action id="6" handler="None" /> <!-- Assist -->
+	<action id="7" handler="None" /> <!-- Invite -->
+	<action id="8" handler="None" /> <!-- Leave Party -->
+	<action id="9" handler="None" /> <!-- Dismiss Party Member -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store - Sell -->
+	<action id="11" handler="None" /> <!-- Party Matching -->
 	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
 	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
 	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
 	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
+	<action id="16" handler="PetAttack" /> <!-- Attackers -->
 	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
+	<action id="18" handler="None" /> <!-- Pick Up -->
+	<action id="19" handler="UnsummonPet" /> <!-- Recall a pet -->
+	<action id="20" handler="None" /> <!-- Special skill -->
 	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attackers -->
 	<action id="23" handler="ServitorStop" /> <!-- Stop -->
 	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
 	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
 	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
+	<action id="27" handler="None" /> <!-- Special skill -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store - Buy -->
 	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
 	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
 	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Switch Mode -->
 	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
 	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
 	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Toxic Smoke -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Workshop -->
 	<action id="38" handler="Ride" /> <!-- Mount/Dismount -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Parasite Burst -->
+	<action id="40" handler="None" /> <!-- Recommend -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Cannon -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Self Damage Shield -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Hydro Screw -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Boom Attack -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Master Recharge -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mega Storm Strike -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Steal Blood -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mech. Cannon -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Wield Temper -->
+	<action id="50" handler="None" /> <!-- Change Party Leader -->
+	<action id="51" handler="None" /> <!-- General Workshop -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Unsummon -->
+	<action id="53" handler="ServitorMove" /> <!-- Move -->
+	<action id="54" handler="PetMove" /> <!-- Move -->
+	<action id="55" handler="None" /> <!-- Start/End Recording Replay -->
+	<action id="56" handler="None" /> <!-- Command Channel Invite -->
+	<action id="57" handler="None" /> <!-- Find Store -->
+	<action id="58" handler="None" /> <!-- Duel -->
+	<action id="59" handler="None" /> <!-- Duel Withdrawal -->
+	<action id="60" handler="None" /> <!-- Party Duel -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store - Wholesale -->
 	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
+	<action id="63" handler="None" /> <!-- Mini-Game -->
+	<action id="64" handler="TeleportBookmark" /> <!-- My Teleports -->
 	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
 	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
 	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
@@ -51,169 +73,196 @@
 	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
 	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
 	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
+	<action id="74" handler="None" /> <!-- Turn On/Off the Status Information -->
+	<action id="76" handler="None" /> <!-- Invite Friends -->
+	<action id="77" handler="None" /> <!-- Start/End Recording -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Use of Token 1 -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Use of Token 2 -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Use of Token 3 -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Use of Token 4 -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Target by Token 1 -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Target by Token 2 -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Target by Token 3 -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Target by Token 4 -->
 	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
 	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Nightshade - Shade Sacrifice -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off -->
+	<action id="90" handler="InstanceZoneInfo" /> <!-- Instance Zone -->
+	<action id="92" handler="None" /> <!-- Previous Target (Melee) -->
+	<action id="93" handler="None" /> <!-- Next Target (Range) -->
+	<action id="94" handler="None" /> <!-- Previous Target (Range) -->
+	<action id="95" handler="WaitingAction" /> <!-- Waiting Action -->
+	<action id="96" handler="StrikeBack" /> <!-- Strike Back -->
+	<action id="97" handler="CombatMode" /> <!-- Combat Mode -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Hammer -->
+	<action id="1001" handler="None" /> <!-- Ultimate Bombastic Buster -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Hostile Feeling -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wild Stun -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wild Defense -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Bright Burst -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Bright Heal -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Blessing of Queen -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Gift of Queen -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cure of Queen -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Blessing of Seraphim -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Gift of Seraphim -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Cure of Seraphim -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Curse of Shade -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Mass Curse of Shade -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Shade Sacrifice -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Blow -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Strike -->
+	
+	<!-- TODO: Find skill ids. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Cursed Drain Energy -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Kat the Cat Skill 2 -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Mew the Cat Skill 2 -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Kai the Cat Skill 2 -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Boxer the Unicorn Skill 2 -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Mirage the Unicorn Skill 2 -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Merrow the Unicorn Skill 2 -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Shadow Skill 1 -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Shadow Skill 2 -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Silhouette Skill 2 -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Reanimated Man Skill 1 -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Reanimated Man Skill 2 -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Corrupted Man Skill 2 -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Slash -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Spin Slash -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Grip of the Cat -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Whiplash -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Tidal Wave -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Corpse Burst -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Dicing Death -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Dark Curse -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Cannon Fodder -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Big Bang -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Bite Attack -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Maul -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Cry of the Wolf -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awakening -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Wolf Howl -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider Roar -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast Bite -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast Stun Attack -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast Fire Breath -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast Roar -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Blessed Body -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Blessed Soul -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Haste -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Acumen -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Clarity -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Empower -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Wild Magic -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Death Whisper -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Focus -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Guidance -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Death Blow -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Double Attack -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Spin Attack -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Meteor Shower -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakening -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Thunder Bolt -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Flash -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Lightning Wave -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Flare -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Buff Control -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Power Striker -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Piercing Attack -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Whirlwind -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Lance Smash -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Battle Cry -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Power Smash -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Energy Burst -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Shock Wave -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Howl -->
 	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
 	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
 	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
 	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch Tactics -->
 	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
 	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
 	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Tail Strike -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Strider Bite -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Strider Fear -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Strider Dash -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen Strike -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen Wind Walk -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Maguen Power Strike -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen Wind Walk -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen Return -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Maguen Party Return -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attackers -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Unsummon -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Passive -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Key Security -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Bear Claw -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Bear Tumbling -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Cougar Bite -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Cougar Pounce -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Reaper Touch -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Reaper Power -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Lion Roar -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Lion Claw -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Lion Dash -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Lion Flame -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Flight -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Purity -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Feather -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Sharp Claw -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Blessing of Life -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Punch -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Feline Aggression -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Feline Stun -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Feline Bite -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Feline Pounce -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Feline Touch -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Feline Power -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Unicorn's Aggression -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Unicorn's Stun -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Unicorn's Bite -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Unicorn's Pounce -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Unicorn's Touch -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Unicorn's Power -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Phantom Aggression -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Phantom Stun -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Phantom Bite -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Phantom Pounce -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Phantom Touch -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Phantom Power -->
+	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Jumping Attack -->
+	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Double Slash -->
+	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Elemental Slam -->
+	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat Power -->
+	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Lancer Rush -->
+	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Power Stamp -->
+	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Multiple Icicles -->
+	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Cherub Power -->
+	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Phantom Sword Attack -->
+	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Phantom Blow -->
+	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Phantom Spike -->
+	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Phantom Crash -->
+	<action id="1156" handler="ServitorSkillUse" option="19406" /> <!-- Curse from the Deadland -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Hand of Warmth -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Rosy Seduction -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Art of Seduction -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Thunder Bolt -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Flash -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Lightning Wave -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Buff Control -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Piercing Attack -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Spin Attack -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impale -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Battle Cry -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Power Smash -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Energy Burst -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Shock Wave -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Burst -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switch Tactics -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Cat the Ranger Boost -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/DoorData.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/DoorData.xml
index 28a76d706e..4cd7836a06 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/DoorData.xml
@@ -11645,6 +11645,176 @@
 		<openStatus default="open" />
 	</door>
 	
+	<!-- 21_16 FIXME: Rune clanhall doors cannot be found in client. -->
+	<door id="21160001" name="rune_castle_agit_002_001">
+		<nodes nodeZ="872">
+			<node x="37679" y="-50432" />
+			<node x="37726" y="-50433" />
+			<node x="37726" y="-50423" />
+			<node x="37678" y="-50424" />
+		</nodes>
+		<location x="37680" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160002" name="rune_castle_agit_002_002">
+		<nodes nodeZ="872">
+			<node x="37724" y="-50432" />
+			<node x="37771" y="-50432" />
+			<node x="37771" y="-50423" />
+			<node x="37723" y="-50424" />
+		</nodes>
+		<location x="37770" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160003" name="rune_castle_agit_003_001">
+		<nodes nodeZ="872">
+			<node x="38527" y="-50151" />
+			<node x="38570" y="-50131" />
+			<node x="38566" y="-50122" />
+			<node x="38524" y="-50144" />
+		</nodes>
+		<location x="38527" y="-50147" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160004" name="rune_castle_agit_003_002">
+		<nodes nodeZ="872">
+			<node x="38569" y="-50132" />
+			<node x="38610" y="-50111" />
+			<node x="38606" y="-50103" />
+			<node x="38564" y="-50124" />
+		</nodes>
+		<location x="38607" y="-50108" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160005" name="rune_castle_agit_004_001">
+		<nodes nodeZ="872">
+			<node x="39122" y="-49542" />
+			<node x="39145" y="-49501" />
+			<node x="39137" y="-49498" />
+			<node x="39115" y="-49539" />
+		</nodes>
+		<location x="39119" y="-49539" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160006" name="rune_castle_agit_004_002">
+		<nodes nodeZ="872">
+			<node x="39145" y="-49503" />
+			<node x="39167" y="-49462" />
+			<node x="39160" y="-49459" />
+			<node x="39136" y="-49498" />
+		</nodes>
+		<location x="39163" y="-49461" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160007" name="rune_castle_agit_001_001">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48291" />
+			<node x="39341" y="-48245" />
+			<node x="39335" y="-48245" />
+			<node x="39334" y="-48290" />
+		</nodes>
+		<location x="39338" y="-48290" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160008" name="rune_castle_agit_001_002">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48246" />
+			<node x="39342" y="-48199" />
+			<node x="39334" y="-48199" />
+			<node x="39334" y="-48246" />
+		</nodes>
+		<location x="39338" y="-48200" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160009" name="rune_castle_agit_005_001">
+		<nodes nodeZ="872">
+			<node x="39176" y="-47024" />
+			<node x="39155" y="-46982" />
+			<node x="39147" y="-46986" />
+			<node x="39169" y="-47026" />
+		</nodes>
+		<location x="39172" y="-47024" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160010" name="rune_castle_agit_005_002">
+		<nodes nodeZ="872">
+			<node x="39154" y="-46982" />
+			<node x="39133" y="-46942" />
+			<node x="39127" y="-46945" />
+			<node x="39148" y="-46986" />
+		</nodes>
+		<location x="39130" y="-46944" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160011" name="rune_castle_agit_006_001">
+		<nodes nodeZ="872">
+			<node x="38626" y="-46372" />
+			<node x="38586" y="-46350" />
+			<node x="38581" y="-46358" />
+			<node x="38623" y="-46379" />
+		</nodes>
+		<location x="38624" y="-46375" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160012" name="rune_castle_agit_006_002">
+		<nodes nodeZ="872">
+			<node x="38587" y="-46350" />
+			<node x="38545" y="-46330" />
+			<node x="38542" y="-46336" />
+			<node x="38583" y="-46358" />
+		</nodes>
+		<location x="38544" y="-46333" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160013" name="rune_castle_agit_007_001">
+		<nodes nodeZ="873">
+			<node x="37787" y="-46044" />
+			<node x="37741" y="-46044" />
+			<node x="37741" y="-46051" />
+			<node x="37787" y="-46050" />
+		</nodes>
+		<location x="37787" y="-46047" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160014" name="rune_castle_agit_007_002">
+		<nodes nodeZ="873">
+			<node x="37743" y="-46043" />
+			<node x="37697" y="-46045" />
+			<node x="37697" y="-46051" />
+			<node x="37742" y="-46051" />
+		</nodes>
+		<location x="37697" y="-46048" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	
 	<!-- 21_17 -->
 	<door id="21170001" name="Rune_bodeful_fortress_s.Rune_bf_azit_gate_door">
 		<nodes nodeZ="544">
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/34426.htm b/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/34426.htm
new file mode 100644
index 0000000000..9d70e30f05
--- /dev/null
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/34426.htm
@@ -0,0 +1,6 @@
+<html><body>Blackbird Clan Lord Leona Blackbird:<br>
+This place is the Atelia Outlet, the most important place of Atelia Refinery.<br>
+Embryos might sense your presence, so please be very careful.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10889_SaviorsPathFallenEmperorsThrone teleport">Teleport to the inside of Atelia Refinery.</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/multisell/3160302.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/multisell/3160302.xml
index 649c3f4856..c9ee0fe75e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/multisell/3160302.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/multisell/3160302.xml
@@ -42,7 +42,7 @@
 		<production count="1" id="38568" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
@@ -50,7 +50,7 @@
 		<production count="1" id="38569" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/multisell/3368502.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/multisell/3368502.xml
index ef405f5112..0e961b13f5 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/multisell/3368502.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/multisell/3368502.xml
@@ -20,7 +20,7 @@
 	<item>
 		<ingredient count="10" id="45584" />
 		<ingredient count="500000" id="57" />
-		<production count="1" id="37894" /> <!-- Hero’s Recovery Potion -->
+		<production count="1" id="37894" /> <!-- Hero's Recovery Potion -->
 	</item>
 	<item>
 		<ingredient count="2" id="45584" />
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
index 1ec233eb7f..a62bbab9b4 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
@@ -170,7 +170,6 @@ public class LionelHunter extends AbstractNpcAI
 					htmltext = "33907-not-completed.html";
 				}
 				break;
-				
 			}
 		}
 		return htmltext;
@@ -186,4 +185,4 @@ public class LionelHunter extends AbstractNpcAI
 	{
 		new LionelHunter();
 	}
-}
\ No newline at end of file
+}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
new file mode 100644
index 0000000000..5eacdf1f03
--- /dev/null
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
@@ -0,0 +1,181 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.Rune.SwampOfScreams;
+
+import java.util.Calendar;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.l2jmobius.commons.util.CommonUtil;
+import org.l2jmobius.gameserver.data.xml.SpawnData;
+import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.spawns.SpawnGroup;
+import org.l2jmobius.gameserver.model.spawns.SpawnTemplate;
+import org.l2jmobius.gameserver.network.NpcStringId;
+
+import ai.AbstractNpcAI;
+
+/**
+ * @author Tanatos
+ */
+public class SwampOfScreamsSiege extends AbstractNpcAI
+{
+	// NPCs
+	private static final int[] SWAMP_MONSTERS =
+	{
+		24570,
+		24571,
+		24572,
+		24573
+	};
+	private static final int SWAMP_PETRA = 24574;
+	private static final AtomicReference<SpawnTemplate> SPAWN_SWAMP_MONSTERS = new AtomicReference<>();
+	// Misc
+	private static final int[] DAYS_OF_WEEK =
+	{
+		Calendar.MONDAY,
+		Calendar.TUESDAY,
+		Calendar.WEDNESDAY,
+		Calendar.THURSDAY,
+		Calendar.FRIDAY,
+		Calendar.SATURDAY,
+		Calendar.SUNDAY
+	};
+	// Schedule: 13-15 & 22-24
+	private static final int[] DAY_TIME =
+	{
+		13,
+		00
+	};
+	private static final int[] NIGHT_TIME =
+	{
+		22,
+		00
+	};
+	private static final long DESPAWN_DELAY = 7200000;
+	private static boolean _daytime = false;
+	
+	private SwampOfScreamsSiege()
+	{
+		addKillId(SWAMP_MONSTERS);
+		scheduleDayTime();
+		scheduleNightTime();
+		LOGGER.info("Swamp of Screams siege starts from 13:00 to 15:00 and from 22:00 to 00:00.");
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "day_time_spawn":
+			{
+				World.getInstance().getPlayers().forEach(p -> showOnScreenMsg(p, NpcStringId.EVENT_ALARM_13_00_15_00_NKILL_THE_MONSTERS_APPEARED_IN_THE_SWAMP_OF_SCREAMS, 2, 10000, true));
+				SPAWN_SWAMP_MONSTERS.set(SpawnData.getInstance().getSpawnByName("SwampOfScreamsMonsters"));
+				SPAWN_SWAMP_MONSTERS.get().getGroups().forEach(SpawnGroup::spawnAll);
+				_daytime = true;
+				startQuestTimer("despawn", DESPAWN_DELAY, null, null);
+				break;
+			}
+			case "night_time_spawn":
+			{
+				World.getInstance().getPlayers().forEach(p -> showOnScreenMsg(p, NpcStringId.EVENT_ALARM_22_00_24_00_NKILL_THE_MONSTERS_APPEARED_IN_THE_SWAMP_OF_SCREAMS, 2, 10000, true));
+				SPAWN_SWAMP_MONSTERS.set(SpawnData.getInstance().getSpawnByName("SwampOfScreamsMonsters"));
+				SPAWN_SWAMP_MONSTERS.get().getGroups().forEach(SpawnGroup::spawnAll);
+				_daytime = false;
+				startQuestTimer("despawn", DESPAWN_DELAY, null, null);
+				break;
+			}
+			case "despawn":
+			{
+				if (_daytime)
+				{
+					World.getInstance().getPlayers().forEach(p -> showOnScreenMsg(p, NpcStringId.EVENT_ALARM_22_00_24_00_NMONSTERS_OF_THE_SWAMP_OF_SCREAMS_ARE_DEFEATED, 2, 10000, true));
+				}
+				else
+				{
+					World.getInstance().getPlayers().forEach(p -> showOnScreenMsg(p, NpcStringId.EVENT_ALARM_13_00_15_00_NMONSTERS_OF_THE_SWAMP_OF_SCREAMS_ARE_DEFEATED, 2, 10000, true));
+				}
+				SPAWN_SWAMP_MONSTERS.set(SpawnData.getInstance().getSpawnByName("SwampOfScreamsMonsters"));
+				SPAWN_SWAMP_MONSTERS.get().getGroups().forEach(SpawnGroup::despawnAll);
+				break;
+			}
+		}
+		return super.onAdvEvent(event, npc, player);
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player killer, boolean isSummon)
+	{
+		if ((CommonUtil.contains(SWAMP_MONSTERS, npc.getId())) && (getRandom(100) < 3))
+		{
+			addSpawn(SWAMP_PETRA, npc.getLocation(), false, 600000, false);
+		}
+		return super.onKill(npc, killer, isSummon);
+	}
+	
+	private void scheduleDayTime()
+	{
+		long time = Long.MAX_VALUE;
+		for (int day : DAYS_OF_WEEK)
+		{
+			final long nextDateMillis = getNextDateMilis(day, DAY_TIME[0], DAY_TIME[1]);
+			if (nextDateMillis < time)
+			{
+				time = nextDateMillis;
+			}
+		}
+		startQuestTimer("day_time_spawn", time - System.currentTimeMillis(), null, null);
+	}
+	
+	private void scheduleNightTime()
+	{
+		long time = Long.MAX_VALUE;
+		for (int day : DAYS_OF_WEEK)
+		{
+			final long nextDateMillis = getNextDateMilis(day, NIGHT_TIME[0], NIGHT_TIME[1]);
+			if (nextDateMillis < time)
+			{
+				time = nextDateMillis;
+			}
+		}
+		startQuestTimer("night_time_spawn", time - System.currentTimeMillis(), null, null);
+	}
+	
+	private long getNextDateMilis(int dayOfWeek, int hour, int minute)
+	{
+		final Calendar calendar = Calendar.getInstance();
+		calendar.set(Calendar.HOUR_OF_DAY, hour);
+		calendar.set(Calendar.MINUTE, minute);
+		calendar.set(Calendar.SECOND, 0);
+		for (int i = 0; i < 7; i++)
+		{
+			if ((calendar.get(Calendar.DAY_OF_WEEK) == dayOfWeek) && (calendar.getTimeInMillis() > System.currentTimeMillis()))
+			{
+				return calendar.getTimeInMillis();
+			}
+			calendar.add(Calendar.DAY_OF_WEEK, 1);
+		}
+		return calendar.getTimeInMillis();
+	}
+	
+	public static void main(String[] args)
+	{
+		new SwampOfScreamsSiege();
+	}
+}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index d3d1a6bbcf..6c678e8c19 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -235,6 +236,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 9d9c1c0e83..bb04e89014 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -43,6 +43,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AgathionSlot", AgathionSlot::new);
@@ -198,6 +200,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("HpRegen", HpRegen::new);
 		EffectHandler.getInstance().registerHandler("HpToOwner", HpToOwner::new);
 		EffectHandler.getInstance().registerHandler("IgnoreDeath", IgnoreDeath::new);
+		EffectHandler.getInstance().registerHandler("IgnoreReduceDamage", IgnoreReduceDamage::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageBonus", ImmobileDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageResist", ImmobileDamageResist::new);
 		EffectHandler.getInstance().registerHandler("ImmobilePetBuff", ImmobilePetBuff::new);
@@ -237,7 +240,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java
index ffc903fd3f..bc95845925 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java
@@ -48,6 +48,7 @@ public class SkillConditionMasterHandler
 		SkillConditionHandler.getInstance().registerHandler("CanUseInDragonLair", CanUseInDragonLairSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CanUseSwoopCannon", CanUseSwoopCannonSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("HasVitalityPoints", HasVitalityPointsSkillCondition::new);
+		SkillConditionHandler.getInstance().registerHandler("CanUseSymbolSealIncreaseItem", CanUseSymbolSealIncreaseItemSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
similarity index 83%
rename from L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
rename to L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
index 9b5e021318..5405ccd4be 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
@@ -20,12 +20,12 @@ import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Mobius
+ * @author fruit
  */
-public class MaxMagicCriticalRate extends AbstractStatEffect
+public class IgnoreReduceDamage extends AbstractStatEffect
 {
-	public MaxMagicCriticalRate(StatSet params)
+	public IgnoreReduceDamage(StatSet params)
 	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
+		super(params, Stat.IGNORE_REDUCE_DAMAGE);
 	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
index 951002a2c2..35bfbcb6bc 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.enums.StatModifierType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener;
 import org.l2jmobius.gameserver.model.events.returns.DamageReturn;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author Sdw
@@ -32,10 +34,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 public class ReduceDamage extends AbstractEffect
 {
 	private final double _amount;
+	private final StatModifierType _mode;
 	
 	public ReduceDamage(StatSet params)
 	{
 		_amount = params.getDouble("amount");
+		_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
 	}
 	
 	private DamageReturn onDamageReceivedEvent(OnCreatureDamageReceived event)
@@ -46,7 +50,15 @@ public class ReduceDamage extends AbstractEffect
 			return null;
 		}
 		
-		final double newDamage = event.getDamage() * (_amount / 100);
+		final double newDamage;
+		if (_mode == StatModifierType.PER)
+		{
+			newDamage = event.getDamage() - (event.getDamage() * (_amount / 100));
+		}
+		else // DIFF
+		{
+			newDamage = event.getDamage() - Math.max((_amount - event.getAttacker().getStat().getAdd(Stat.IGNORE_REDUCE_DAMAGE)), 0.0);
+		}
 		
 		return new DamageReturn(false, true, false, newDamage);
 	}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java
index 03d9e8638b..634ea96c64 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java
@@ -16,14 +16,21 @@
  */
 package handlers.effecthandlers;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import org.l2jmobius.Config;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.enums.StatModifierType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.effects.EffectType;
+import org.l2jmobius.gameserver.model.holders.ItemSkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author NviX
@@ -39,6 +46,12 @@ public class RestoreSymbolSeal extends AbstractEffect
 		_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.PER);
 	}
 	
+	@Override
+	public EffectType getEffectType()
+	{
+		return EffectType.RESTORE_SYMBOL_SEAL;
+	}
+	
 	@Override
 	public boolean isInstant()
 	{
@@ -77,6 +90,33 @@ public class RestoreSymbolSeal extends AbstractEffect
 			player.updateSymbolSealSkills();
 			player.sendSkillList();
 			player.broadcastUserInfo();
+			
+			// Send item list to update Dye Powder with red icon in inventory.
+			ThreadPool.schedule(() ->
+			{
+				final List<Item> items = new LinkedList<>();
+				ITEMS: for (Item i : effected.getActingPlayer().getInventory().getItems())
+				{
+					if (i.getTemplate().hasSkills())
+					{
+						for (ItemSkillHolder s : i.getTemplate().getAllSkills())
+						{
+							if (s.getSkill().hasEffectType(EffectType.RESTORE_SYMBOL_SEAL))
+							{
+								items.add(i);
+								continue ITEMS;
+							}
+						}
+					}
+				}
+				
+				if (!items.isEmpty())
+				{
+					final InventoryUpdate iu = new InventoryUpdate();
+					iu.addItems(items);
+					effected.getActingPlayer().sendInventoryUpdate(iu);
+				}
+			}, 1000);
 		}
 	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index 7e02e79abc..bff5a1734b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -210,6 +210,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()) || _renewDuration)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
index 70789354f3..fd41f09a9a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
@@ -17,7 +17,13 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author Sero
@@ -28,4 +34,46 @@ public class WeaponBonusMAtk extends AbstractStatAddEffect
 	{
 		super(params, Stat.WEAPON_BONUS_MAGIC_ATTACK);
 	}
+	
+	@Override
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
index df05ef8607..b36b10a92e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
@@ -17,7 +17,13 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author Sero
@@ -28,4 +34,46 @@ public class WeaponBonusPAtk extends AbstractStatAddEffect
 	{
 		super(params, Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
 	}
+	
+	@Override
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index b7434abd2e..854051b04c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,61 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetHold.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetHold.java
index 5e726bae7b..5688e59b8b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetHold.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetHold.java
@@ -52,4 +52,10 @@ public class PetHold implements IPlayerActionHandler
 			((SummonAI) pet.getAI()).notifyFollowStatusChange();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetMove.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetMove.java
index e5198fda6f..7b37a62148 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetMove.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetMove.java
@@ -53,4 +53,10 @@ public class PetMove implements IPlayerActionHandler
 			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, player.getTarget().getLocation());
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
index 80c073b1dc..f2044ed108 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
@@ -77,4 +77,10 @@ public class PetSkillUse implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetStop.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetStop.java
index 7ba96efec2..bcf54c7e96 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetStop.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetStop.java
@@ -51,4 +51,10 @@ public class PetStop implements IPlayerActionHandler
 			pet.cancelAction();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..b681353b73 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,52 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorHold.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
index 4bbeee8387..1931066222 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
@@ -48,4 +48,10 @@ public class ServitorHold implements IPlayerActionHandler
 			((SummonAI) s.getAI()).notifyFollowStatusChange();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorMode.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
index 456a2e042b..14159b2066 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
@@ -68,4 +68,10 @@ public class ServitorMode implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorMove.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
index 36528e0063..a5269a3d15 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
@@ -56,4 +56,10 @@ public class ServitorMove implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
index b67b13f2cc..133040fba4 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
@@ -62,4 +62,10 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			}
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorStop.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
index 24db478dc7..3dda0b9c15 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
@@ -47,4 +47,10 @@ public class ServitorStop implements IPlayerActionHandler
 			s.cancelAction();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
index 390822a7b1..eaace592ee 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
@@ -62,4 +62,10 @@ public class UnsummonPet implements IPlayerActionHandler
 			pet.unSummon(player);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
index e4944df496..937dcaad1a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
@@ -69,4 +69,10 @@ public class UnsummonServitor implements IPlayerActionHandler
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSymbolSealIncreaseItemSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSymbolSealIncreaseItemSkillCondition.java
new file mode 100644
index 0000000000..3ab0d0bb69
--- /dev/null
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSymbolSealIncreaseItemSkillCondition.java
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.skillconditionhandlers;
+
+import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.skill.ISkillCondition;
+import org.l2jmobius.gameserver.model.skill.Skill;
+
+/**
+ * @author CostyKiller
+ */
+public class CanUseSymbolSealIncreaseItemSkillCondition implements ISkillCondition
+{
+	private final int _amount;
+	
+	public CanUseSymbolSealIncreaseItemSkillCondition(StatSet params)
+	{
+		_amount = params.getInt("amount", 0);
+	}
+	
+	@Override
+	public boolean canUse(Creature caster, Skill skill, WorldObject target)
+	{
+		return caster.isPlayer() && ((caster.getActingPlayer().getSymbolSealPoints() + ((Config.MAX_SYMBOL_SEAL_POINTS * _amount) / 100)) <= Config.MAX_SYMBOL_SEAL_POINTS);
+	}
+}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 89e06fc91d..7e94e156e6 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.quest.QuestState;
@@ -46,10 +47,11 @@ public class ChamberOfProphecies extends AbstractInstance
 {
 	// NPCs
 	private static final int KAIN_VAN_HALTER = 31639;
-	private static final int VAN_HALTER = 33999;
-	private static final int FERIN = 34001;
 	private static final int GRAIL = 33996;
 	private static final int MYSTERIOUS_WIZARD = 33980;
+	// Helper NPCs
+	private static final int HELPER_VAN_HALTER = 33999;
+	private static final int HELPER_FERIN = 34001;
 	// Misc
 	private static final int DOOR_2 = 17230102;
 	private static final int DOOR_3 = 17230103;
@@ -66,7 +68,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		addStartNpc(KAIN_VAN_HALTER);
 		addFirstTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
 		addTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
-		addCreatureSeeId(FERIN, VAN_HALTER);
+		addCreatureSeeId(HELPER_FERIN, HELPER_VAN_HALTER);
 	}
 	
 	@Override
@@ -145,12 +147,12 @@ public class ChamberOfProphecies extends AbstractInstance
 				{
 					return null;
 				}
-				final Npc valHalter = world.getNpc(VAN_HALTER);
-				if (valHalter != null)
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
+				if (vanHalter != null)
 				{
-					valHalter.deleteMe(); // probably needs another npc id for initial room
+					vanHalter.deleteMe(); // probably needs another npc id for initial room
 				}
-				final Npc ferin = world.getNpc(FERIN);
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
 				if (ferin != null)
 				{
 					ferin.deleteMe(); // probably needs another npc id for initial room
@@ -190,6 +192,8 @@ public class ChamberOfProphecies extends AbstractInstance
 			case "CHECK_STATUS":
 			{
 				final Instance world = player.getInstanceWorld();
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
 				if (!isInInstance(world))
 				{
 					return null;
@@ -200,8 +204,8 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
-							startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY2", 14000, ferin, player);
+							startQuestTimer("SEY_KAIN", 24000, vanHalter, player);
 							startQuestTimer("OPEN_DOOR1", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -221,7 +225,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY3", 8000, ferin, player);
 							startQuestTimer("OPEN_DOOR2", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -234,7 +238,7 @@ public class ChamberOfProphecies extends AbstractInstance
 							world.setStatus(4);
 							world.spawnGroup("wof_room3_2");
 							world.openCloseDoor(DOOR_3, false);
-							startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY_KAIN_1", 5000, vanHalter, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
 						break;
@@ -245,8 +249,8 @@ public class ChamberOfProphecies extends AbstractInstance
 						{
 							world.setStatus(5);
 							world.spawnGroup("wof_room4");
-							startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
-							startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY_KAIN_2", 3000, vanHalter, player);
+							startQuestTimer("SEY4", 7000, ferin, player);
 						}
 						else
 						{
@@ -304,7 +308,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					return null;
 				}
 				cancelQuestTimer("ATTACK1", npc, player);
-				startQuestTimer("ATTACK2", 200, world.getNpc(VAN_HALTER), player, true);
+				startQuestTimer("ATTACK2", 200, world.getNpc(HELPER_VAN_HALTER), player, true);
 				world.setStatus(3);
 				world.spawnGroup("wof_room3");
 				world.openCloseDoor(DOOR_3, true);
@@ -321,7 +325,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY2":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.YOU_CAN_T_DIE_HERE_I_DIDN_T_LEARN_RESURRECT_YET));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_4", 0, 0, 0, 0, 0));
@@ -330,7 +334,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GISELLE_WAS_SUCH_A_SWEET_CHILD));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_1", 0, 0, 0, 0, 0));
@@ -340,7 +344,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY3":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.DO_YOU_THINK_I_LL_GROW_TALLER_IF_I_EAT_LOTS_AND_LOTS));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_6", 0, 0, 0, 0, 0));
@@ -349,7 +353,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_1":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.SUCH_MONSTERS_IN_A_PLACE_LIKE_THIS_UNBELIEVABLE));
 				}
@@ -357,7 +361,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_2":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THAT_S_THE_MONSTER_THAT_ATTACKED_FAERON_YOU_RE_OUTMATCHED_HERE_GO_AHEAD_I_LL_CATCH_UP));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_6", 0, 0, 0, 0, 0));
@@ -367,7 +371,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY4":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GO_NOW_KAIN_CAN_HANDLE_THIS));
 					npc.setScriptValue(1);
@@ -377,7 +381,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_3":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.LEAVE_THIS_TO_ME_GO));
 					npc.setScriptValue(1);
@@ -387,7 +391,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "REST":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, player);
 				}
@@ -508,7 +512,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		{
 			switch (npc.getId())
 			{
-				case FERIN:
+				case HELPER_FERIN:
 				{
 					if (creature.isPlayer() && !creature.isDead() && npc.isScriptValue(0))
 					{
@@ -516,7 +520,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					}
 					break;
 				}
-				case VAN_HALTER:
+				case HELPER_VAN_HALTER:
 				{
 					if (creature.isPlayer() && !creature.isDead() && world.isStatus(0))
 					{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
index 57f651334c..da4e516f85 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
@@ -177,7 +177,14 @@ public class Q00933_TombRaiders extends Quest
 		final Party party = killer.getParty();
 		if (party != null)
 		{
-			party.getMembers().forEach(p -> processKill(npc, p));
+			for (Player member : party.getMembers())
+			{
+				final QuestState qs = getQuestState(member, false);
+				if (qs != null)
+				{
+					processKill(npc, member);
+				}
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-01.htm b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-01.htm
index 3314d03969..5094a407f3 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-01.htm
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-01.htm
@@ -1,4 +1,6 @@
 <html><body>Verdure Elder Elikia:<br>
-Have you brought me the message from Leona Blackbird?
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-03.html">"Yes, here it is."</Button>
+Greetings! I've been expecting you for a while.<br>
+Leona asked me to tell you something.<br>
+I hope you are ready to hear me out and help.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-02.htm">"What has Leona asked you to tell?"</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.htm b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.htm
new file mode 100644
index 0000000000..e7fc7b5818
--- /dev/null
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.htm
@@ -0,0 +1,6 @@
+<html><body>Verdure Elder Elikia:<br>
+I see you are ready. Now I'm going to tell you what Leona has told me.<br>
+In the last combat with Etis van Etina, Leona was badly wounded, so she had to train to recover her strength. Unfortunately, she had no time to complete the trainings because she received a message. It said about a dungeon of Atelia Fortress. Something connected to Etis van Etina was found there. That place was very odd and was called <font color="LEVEL">Atelia Refinery</font>.<br>
+Leona wanted to meet you personally, but there was an urgent business, so she asked me to see you and explain the situation. My mission is connected with that place.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-03.htm">Ask about Atelia Refinery</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.html b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.html
deleted file mode 100644
index 9d262558f5..0000000000
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Verdure Elder Elikia:<br>
-I don't see any message from Leona Blackbird, make sure you bring that to me.
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.htm b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.htm
new file mode 100644
index 0000000000..32f35f5524
--- /dev/null
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.htm
@@ -0,0 +1,6 @@
+<html><body>Verdure Elder Elikia:<br>
+We're assuming by the name that it's where Atelia is refined.<br>
+It's located at the underground of Atelia Fortress, so we didn't know about it until now.<br>
+I think Atelia refined from there is sent to the great temple where Etis van Etina is.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-04.html">"What has happened so far?"</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.html b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.html
deleted file mode 100644
index 5eeee527eb..0000000000
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Verdure Elder Elikia:<br>
-Great! You have brought it, now let me read it.<br>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.htm b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.htm
deleted file mode 100644
index 216047fa2e..0000000000
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Verdure Elder Elikia:<br>
-I've read the message from Leona Blackbird you should go see her to tell you what you have to do.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-05.html">"Ok, I'll go."</Button>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.html b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.html
new file mode 100644
index 0000000000..30f55b94dd
--- /dev/null
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.html
@@ -0,0 +1,6 @@
+<html><body>Verdure Elder Elikia:<br>
+Leona was lost in despair for some time but she finally rose again and started investigating the Atelia Refinery.<br>
+But our strength still isn't enough, so we're asking for your help once again.<br>
+Leona will be at the entrance of the Atelia Refinery. You'll find it if you leave camp and follow the passage of Dimensional Energy to the west.<br>
+Leona will fill you in with more details.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-05.html b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-05.html
deleted file mode 100644
index 59c38eaca9..0000000000
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-05.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Verdure Elder Elikia:<br>
-Leona Blackbird is waiting for you at Atelia Refinery entrance.
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Message.html b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Message.html
deleted file mode 100644
index 66e7889930..0000000000
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Message.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Message:<br>
-You received a message from Leona Blackbird, this means you can start Savior's Path quests.<br>
-To learn more, go to Blackbird Campsite and talk to Elikia.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery closeMessage">"Close message."</Button>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
index 1463675b0a..75d384ed5e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
@@ -16,6 +16,7 @@
  */
 package quests.Q10885_SaviorsPathDiscovery;
 
+import org.l2jmobius.gameserver.enums.Movie;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.Quest;
@@ -58,20 +59,27 @@ public class Q10885_SaviorsPathDiscovery extends Quest
 		String htmltext = null;
 		switch (event)
 		{
-			case "34057-03.html":
+			case "34057-02.htm":
+			{
+				qs.startQuest();
+				htmltext = event;
+				break;
+			}
+			case "34057-03.htm":
 			{
 				if (qs.isCond(1))
 				{
-					takeItems(player, -1, LEONA_BLACKBIRDS_MESSAGE);
 					qs.setCond(2);
 				}
 				htmltext = event;
 				break;
 			}
-			case "34057-05.html":
+			case "34057-04.html":
 			{
 				if (qs.isCond(2))
 				{
+					giveItems(player, LEONA_BLACKBIRDS_MESSAGE, 1, true);
+					playMovie(player, Movie.EP5_ASTATINE_QST_START);
 					qs.setCond(3);
 				}
 				htmltext = event;
@@ -83,6 +91,7 @@ public class Q10885_SaviorsPathDiscovery extends Quest
 				{
 					if ((player.getLevel() >= MIN_LEVEL))
 					{
+						takeItems(player, -1, LEONA_BLACKBIRDS_MESSAGE);
 						addExpAndSp(player, 906387492, 906387);
 						qs.exitQuest(false, true);
 						htmltext = event;
@@ -137,7 +146,11 @@ public class Q10885_SaviorsPathDiscovery extends Quest
 						}
 						else if (qs.isCond(2))
 						{
-							htmltext = "34057-04.htm";
+							htmltext = "34057-03.htm";
+						}
+						else if (qs.isCond(3))
+						{
+							htmltext = "34057-04.html";
 						}
 						break;
 					}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/34425-04.html b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/34425-04.html
index 37b0c2b30c..7d977a4778 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/34425-04.html
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/34425-04.html
@@ -1,4 +1,4 @@
 <html><body>Blackbird Clan Lord Leona Blackbird:<br>
-Yes. Go speak to <font color="LEVEL">Devianne</font>.
+Yes. Go speak to <font color="LEVEL">Devianne</font>.<br>
 Devianne will tell you how to get to the Atelia Refinery and what you must do there.<br>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
index f2fe21a819..0626200ce8 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
@@ -621,7 +621,7 @@ public class Q11025_PathOfDestinyProving extends Quest
 				holder.add(new NpcLogListHolder(NpcStringId.DEFEAT_SKELETONS_3.getId(), true, qs.getInt(KILL_COUNT_VAR)));
 				return holder;
 			}
-			else if (qs.isCond(11))
+			else if (qs.isCond(12))
 			{
 				final Set<NpcLogListHolder> holder = new HashSet<>();
 				holder.add(new NpcLogListHolder(NpcStringId.INVESTIGATE_THE_SURROUNDINGS.getId(), true, qs.getInt(KILL_COUNT_VAR2)));
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
index 37414acbff..9e42f6e195 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
@@ -315,7 +315,6 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT1);
 				}
-				htmltext = event;
 				break;
 			}
 			case "teleport2":
@@ -324,7 +323,6 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT2);
 				}
-				htmltext = event;
 				break;
 			}
 			case "teleport3":
@@ -333,7 +331,6 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT3);
 				}
-				htmltext = event;
 				break;
 			}
 			case "teleport4":
@@ -342,7 +339,6 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT4);
 				}
-				htmltext = event;
 				break;
 			}
 			case "teleport5":
@@ -351,10 +347,8 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT5);
 				}
-				htmltext = event;
 				break;
 			}
-			
 		}
 		return htmltext;
 	}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/33932-04.html b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/33932-04.html
index 34fcecd6d8..a0fbc4196d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/33932-04.html
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/33932-04.html
@@ -3,7 +3,7 @@
 <font color="LEVEL">When the god's voice will no longer be heard.</font><br>
 <font color="LEVEL">A red river flows...</font><br>
 <font color="LEVEL">Hard frost upon the earth... And one of half-noble blood, descending with the winds to become the prophesied one.</font><br>
-<font color="LEVEL">Your lonely, solitary journey has begun. A small child in the middle of a blocked road appears. When joined by one of nobility, the path will open to the Grail.</center><br>
+<font color="LEVEL">Your lonely, solitary journey has begun. A small child in the middle of a blocked road appears. When joined by one of nobility, the path will open to the Grail.</font></center><br>
 So it wasn't a coincidence that you left on your journey.<br>
 <Button ALIGN=LEFT ICON="Normal" action="bypass -h Quest Q11027_PathOfDestinyOvercome 33932-05.html">"What do you mean?"</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Rune/SwampOfScreamsMonsters.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Rune/SwampOfScreamsMonsters.xml
index 805daf70ba..7da3cdc129 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Rune/SwampOfScreamsMonsters.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Rune/SwampOfScreamsMonsters.xml
@@ -1,1183 +1,636 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_01" minZ="-2429" maxZ="-1929">
-				<node x="77747" y="-58718" />
-				<node x="77937" y="-58524" />
-				<node x="77937" y="-58267" />
-				<node x="77745" y="-58075" />
-				<node x="77489" y="-58076" />
-				<node x="77297" y="-58270" />
-				<node x="77299" y="-58525" />
-				<node x="77490" y="-58719" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_02" minZ="-2432" maxZ="-1932">
-				<node x="77606" y="-61735" />
-				<node x="77899" y="-61648" />
-				<node x="77827" y="-61312" />
-				<node x="77576" y="-61259" />
-				<node x="77312" y="-61312" />
-				<node x="76979" y="-61398" />
-				<node x="77056" y="-61827" />
-				<node x="77308" y="-61743" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_03" minZ="-2429" maxZ="-1929">
-				<node x="81568" y="-63672" />
-				<node x="81758" y="-63478" />
-				<node x="81758" y="-63221" />
-				<node x="81566" y="-63029" />
-				<node x="81310" y="-63030" />
-				<node x="81117" y="-63224" />
-				<node x="81120" y="-63479" />
-				<node x="81311" y="-63673" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_04" minZ="-2443" maxZ="-1943">
-				<node x="85107" y="-63157" />
-				<node x="85297" y="-62963" />
-				<node x="85298" y="-62707" />
-				<node x="85105" y="-62514" />
-				<node x="84849" y="-62515" />
-				<node x="84657" y="-62709" />
-				<node x="84660" y="-62964" />
-				<node x="84850" y="-63158" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_05" minZ="-2443" maxZ="-1943">
-				<node x="85647" y="-59758" />
-				<node x="85837" y="-59565" />
-				<node x="85838" y="-59308" />
-				<node x="85645" y="-59115" />
-				<node x="85389" y="-59116" />
-				<node x="85197" y="-59310" />
-				<node x="85200" y="-59566" />
-				<node x="85390" y="-59760" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_06" minZ="-2739" maxZ="-2239">
-				<node x="94136" y="-55178" />
-				<node x="94327" y="-54984" />
-				<node x="94327" y="-54727" />
-				<node x="94135" y="-54535" />
-				<node x="93878" y="-54536" />
-				<node x="93686" y="-54730" />
-				<node x="93689" y="-54985" />
-				<node x="93879" y="-55179" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_07" minZ="-2739" maxZ="-2239">
-				<node x="94756" y="-52845" />
-				<node x="94946" y="-52651" />
-				<node x="94946" y="-52395" />
-				<node x="94754" y="-52202" />
-				<node x="94497" y="-52203" />
-				<node x="94305" y="-52397" />
-				<node x="94308" y="-52652" />
-				<node x="94499" y="-52847" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_08" minZ="-2739" maxZ="-2239">
-				<node x="89550" y="-52293" />
-				<node x="89740" y="-52100" />
-				<node x="89741" y="-51843" />
-				<node x="89548" y="-51651" />
-				<node x="89292" y="-51652" />
-				<node x="89100" y="-51846" />
-				<node x="89103" y="-52101" />
-				<node x="89293" y="-52295" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_09" minZ="-2502" maxZ="-2002">
-				<node x="83172" y="-50881" />
-				<node x="83362" y="-50687" />
-				<node x="83362" y="-50431" />
-				<node x="83170" y="-50238" />
-				<node x="82913" y="-50239" />
-				<node x="82721" y="-50433" />
-				<node x="82724" y="-50688" />
-				<node x="82915" y="-50883" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_10" minZ="-2443" maxZ="-1943">
-				<node x="78978" y="-51399" />
-				<node x="79168" y="-51206" />
-				<node x="79169" y="-50949" />
-				<node x="78976" y="-50756" />
-				<node x="78720" y="-50757" />
-				<node x="78528" y="-50951" />
-				<node x="78531" y="-51207" />
-				<node x="78721" y="-51401" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_11" minZ="-3246" maxZ="-2746">
-				<node x="73884" y="-51613" />
-				<node x="74074" y="-51420" />
-				<node x="74074" y="-51163" />
-				<node x="73882" y="-50970" />
-				<node x="73626" y="-50971" />
-				<node x="73434" y="-51165" />
-				<node x="73436" y="-51421" />
-				<node x="73627" y="-51615" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_12" minZ="-3287" maxZ="-2787">
-				<node x="75808" y="-54864" />
-				<node x="75998" y="-54670" />
-				<node x="75999" y="-54414" />
-				<node x="75806" y="-54221" />
-				<node x="75550" y="-54222" />
-				<node x="75358" y="-54416" />
-				<node x="75361" y="-54671" />
-				<node x="75551" y="-54866" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_13" minZ="-2454" maxZ="-1954">
-				<node x="85479" y="-55083" />
-				<node x="85669" y="-54890" />
-				<node x="85669" y="-54633" />
-				<node x="85477" y="-54440" />
-				<node x="85221" y="-54442" />
-				<node x="85029" y="-54635" />
-				<node x="85031" y="-54891" />
-				<node x="85222" y="-55085" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_14" minZ="-2429" maxZ="-1929">
-				<node x="76441" y="-60418" />
-				<node x="76631" y="-60224" />
-				<node x="76631" y="-59967" />
-				<node x="76439" y="-59775" />
-				<node x="76183" y="-59776" />
-				<node x="75991" y="-59970" />
-				<node x="75993" y="-60225" />
-				<node x="76184" y="-60419" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_15" minZ="-2429" maxZ="-1929">
-				<node x="84161" y="-61281" />
-				<node x="84351" y="-61087" />
-				<node x="84351" y="-60830" />
-				<node x="84159" y="-60638" />
-				<node x="83903" y="-60639" />
-				<node x="83711" y="-60833" />
-				<node x="83713" y="-61088" />
-				<node x="83904" y="-61282" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_16" minZ="-2429" maxZ="-1929">
-				<node x="84299" y="-58492" />
-				<node x="84489" y="-58298" />
-				<node x="84489" y="-58041" />
-				<node x="84297" y="-57849" />
-				<node x="84041" y="-57850" />
-				<node x="83849" y="-58044" />
-				<node x="83851" y="-58299" />
-				<node x="84042" y="-58493" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_17" minZ="-2429" maxZ="-1929">
-				<node x="88437" y="-57690" />
-				<node x="88627" y="-57496" />
-				<node x="88627" y="-57239" />
-				<node x="88435" y="-57047" />
-				<node x="88179" y="-57048" />
-				<node x="87987" y="-57242" />
-				<node x="87989" y="-57497" />
-				<node x="88180" y="-57691" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_18" minZ="-2739" maxZ="-2239">
-				<node x="91401" y="-51521" />
-				<node x="91591" y="-51328" />
-				<node x="91592" y="-51071" />
-				<node x="91399" y="-50879" />
-				<node x="91143" y="-50880" />
-				<node x="90951" y="-51074" />
-				<node x="90954" y="-51329" />
-				<node x="91144" y="-51523" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_19" minZ="-3361" maxZ="-2861">
-				<node x="83708" y="-45975" />
-				<node x="83898" y="-45781" />
-				<node x="83898" y="-45524" />
-				<node x="83706" y="-45332" />
-				<node x="83450" y="-45333" />
-				<node x="83258" y="-45527" />
-				<node x="83260" y="-45782" />
-				<node x="83451" y="-45976" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_20" minZ="-3361" maxZ="-2861">
-				<node x="79937" y="-45735" />
-				<node x="80127" y="-45541" />
-				<node x="80127" y="-45284" />
-				<node x="79935" y="-45092" />
-				<node x="79679" y="-45093" />
-				<node x="79487" y="-45287" />
-				<node x="79489" y="-45542" />
-				<node x="79680" y="-45736" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_21" minZ="-3361" maxZ="-2861">
-				<node x="75126" y="-46888" />
-				<node x="75316" y="-46694" />
-				<node x="75316" y="-46437" />
-				<node x="75124" y="-46245" />
-				<node x="74868" y="-46246" />
-				<node x="74676" y="-46440" />
-				<node x="74678" y="-46695" />
-				<node x="74869" y="-46889" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_22" minZ="-3361" maxZ="-2861">
-				<node x="71139" y="-41611" />
-				<node x="71329" y="-41417" />
-				<node x="71329" y="-41160" />
-				<node x="71137" y="-40968" />
-				<node x="70881" y="-40969" />
-				<node x="70689" y="-41163" />
-				<node x="70691" y="-41418" />
-				<node x="70882" y="-41612" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_01" minZ="-3361" maxZ="-2861">
-				<node x="73183" y="-42690" />
-				<node x="73373" y="-42496" />
-				<node x="73374" y="-42240" />
-				<node x="73181" y="-42047" />
-				<node x="72925" y="-42048" />
-				<node x="72733" y="-42242" />
-				<node x="72736" y="-42497" />
-				<node x="72926" y="-42691" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_02" minZ="-3361" maxZ="-2861">
-				<node x="73707" y="-42673" />
-				<node x="73897" y="-42480" />
-				<node x="73897" y="-42223" />
-				<node x="73705" y="-42030" />
-				<node x="73449" y="-42031" />
-				<node x="73257" y="-42225" />
-				<node x="73259" y="-42481" />
-				<node x="73450" y="-42675" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_03" minZ="-3361" maxZ="-2861">
-				<node x="79440" y="-42583" />
-				<node x="79630" y="-42390" />
-				<node x="79630" y="-42133" />
-				<node x="79438" y="-41940" />
-				<node x="79181" y="-41942" />
-				<node x="78989" y="-42136" />
-				<node x="78992" y="-42391" />
-				<node x="79182" y="-42585" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_04" minZ="-3361" maxZ="-2861">
-				<node x="79860" y="-42263" />
-				<node x="80050" y="-42070" />
-				<node x="80051" y="-41813" />
-				<node x="79858" y="-41620" />
-				<node x="79602" y="-41621" />
-				<node x="79410" y="-41815" />
-				<node x="79413" y="-42071" />
-				<node x="79603" y="-42265" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_05" minZ="-3361" maxZ="-2861">
-				<node x="82408" y="-42131" />
-				<node x="82598" y="-41938" />
-				<node x="82599" y="-41681" />
-				<node x="82406" y="-41488" />
-				<node x="82150" y="-41489" />
-				<node x="81958" y="-41683" />
-				<node x="81961" y="-41939" />
-				<node x="82151" y="-42133" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_06" minZ="-3361" maxZ="-2861">
-				<node x="82466" y="-41657" />
-				<node x="82656" y="-41463" />
-				<node x="82656" y="-41207" />
-				<node x="82464" y="-41014" />
-				<node x="82207" y="-41015" />
-				<node x="82015" y="-41209" />
-				<node x="82018" y="-41464" />
-				<node x="82208" y="-41659" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_07" minZ="-3361" maxZ="-2861">
-				<node x="81585" y="-44731" />
-				<node x="81775" y="-44538" />
-				<node x="81775" y="-44281" />
-				<node x="81583" y="-44088" />
-				<node x="81327" y="-44090" />
-				<node x="81135" y="-44283" />
-				<node x="81137" y="-44539" />
-				<node x="81328" y="-44733" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_08" minZ="-3361" maxZ="-2861">
-				<node x="81779" y="-45175" />
-				<node x="81969" y="-44981" />
-				<node x="81969" y="-44724" />
-				<node x="81777" y="-44532" />
-				<node x="81521" y="-44533" />
-				<node x="81329" y="-44727" />
-				<node x="81331" y="-44982" />
-				<node x="81522" y="-45176" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_09" minZ="-2717" maxZ="-2217">
-				<node x="92140" y="-53133" />
-				<node x="92330" y="-52939" />
-				<node x="92330" y="-52682" />
-				<node x="92138" y="-52490" />
-				<node x="91882" y="-52491" />
-				<node x="91690" y="-52685" />
-				<node x="91692" y="-52940" />
-				<node x="91883" y="-53134" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_10" minZ="-2717" maxZ="-2217">
-				<node x="92422" y="-53473" />
-				<node x="92612" y="-53279" />
-				<node x="92613" y="-53022" />
-				<node x="92420" y="-52830" />
-				<node x="92164" y="-52831" />
-				<node x="91972" y="-53025" />
-				<node x="91975" y="-53280" />
-				<node x="92165" y="-53474" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_11" minZ="-2439" maxZ="-1939">
-				<node x="88687" y="-60732" />
-				<node x="88877" y="-60539" />
-				<node x="88877" y="-60282" />
-				<node x="88685" y="-60089" />
-				<node x="88429" y="-60090" />
-				<node x="88237" y="-60284" />
-				<node x="88239" y="-60539" />
-				<node x="88430" y="-60734" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_12" minZ="-2439" maxZ="-1939">
-				<node x="89026" y="-60332" />
-				<node x="89216" y="-60138" />
-				<node x="89216" y="-59881" />
-				<node x="89024" y="-59689" />
-				<node x="88768" y="-59690" />
-				<node x="88576" y="-59884" />
-				<node x="88578" y="-60139" />
-				<node x="88769" y="-60333" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_13" minZ="-2439" maxZ="-1939">
-				<node x="81670" y="-60519" />
-				<node x="81860" y="-60326" />
-				<node x="81860" y="-60069" />
-				<node x="81668" y="-59876" />
-				<node x="81411" y="-59877" />
-				<node x="81219" y="-60071" />
-				<node x="81222" y="-60327" />
-				<node x="81413" y="-60521" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_14" minZ="-2439" maxZ="-1939">
-				<node x="81200" y="-60287" />
-				<node x="81390" y="-60094" />
-				<node x="81390" y="-59837" />
-				<node x="81198" y="-59645" />
-				<node x="80942" y="-59646" />
-				<node x="80749" y="-59840" />
-				<node x="80752" y="-60095" />
-				<node x="80943" y="-60289" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_01" minZ="-3246" maxZ="-2746">
-				<node x="70882" y="-55719" />
-				<node x="71072" y="-55526" />
-				<node x="71072" y="-55269" />
-				<node x="70880" y="-55076" />
-				<node x="70624" y="-55077" />
-				<node x="70432" y="-55271" />
-				<node x="70434" y="-55526" />
-				<node x="70625" y="-55721" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_02" minZ="-3246" maxZ="-2746">
-				<node x="71413" y="-55723" />
-				<node x="71603" y="-55530" />
-				<node x="71603" y="-55273" />
-				<node x="71411" y="-55080" />
-				<node x="71155" y="-55081" />
-				<node x="70963" y="-55275" />
-				<node x="70965" y="-55531" />
-				<node x="71156" y="-55725" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_05" minZ="-3331" maxZ="-2831">
-				<node x="72249" y="-45372" />
-				<node x="72439" y="-45178" />
-				<node x="72439" y="-44922" />
-				<node x="72247" y="-44729" />
-				<node x="71990" y="-44730" />
-				<node x="71798" y="-44924" />
-				<node x="71801" y="-45179" />
-				<node x="71992" y="-45373" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_06" minZ="-3331" maxZ="-2831">
-				<node x="72490" y="-45872" />
-				<node x="72680" y="-45679" />
-				<node x="72681" y="-45422" />
-				<node x="72488" y="-45230" />
-				<node x="72232" y="-45231" />
-				<node x="72040" y="-45425" />
-				<node x="72043" y="-45680" />
-				<node x="72233" y="-45874" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_09" minZ="-3331" maxZ="-2831">
-				<node x="76533" y="-43664" />
-				<node x="76723" y="-43470" />
-				<node x="76724" y="-43214" />
-				<node x="76531" y="-43021" />
-				<node x="76275" y="-43022" />
-				<node x="76083" y="-43216" />
-				<node x="76086" y="-43471" />
-				<node x="76276" y="-43666" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_10" minZ="-3331" maxZ="-2831">
-				<node x="75923" y="-43666" />
-				<node x="76113" y="-43473" />
-				<node x="76114" y="-43216" />
-				<node x="75921" y="-43023" />
-				<node x="75665" y="-43024" />
-				<node x="75473" y="-43218" />
-				<node x="75476" y="-43474" />
-				<node x="75666" y="-43668" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_15" minZ="-2415" maxZ="-1915">
-				<node x="82373" y="-54914" />
-				<node x="82563" y="-54720" />
-				<node x="82563" y="-54464" />
-				<node x="82371" y="-54271" />
-				<node x="82115" y="-54272" />
-				<node x="81923" y="-54466" />
-				<node x="81925" y="-54721" />
-				<node x="82116" y="-54916" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_16" minZ="-2415" maxZ="-1915">
-				<node x="82174" y="-54464" />
-				<node x="82364" y="-54270" />
-				<node x="82364" y="-54014" />
-				<node x="82172" y="-53821" />
-				<node x="81916" y="-53822" />
-				<node x="81724" y="-54016" />
-				<node x="81726" y="-54271" />
-				<node x="81917" y="-54465" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_17" minZ="-2415" maxZ="-1915">
-				<node x="80147" y="-56452" />
-				<node x="80337" y="-56258" />
-				<node x="80337" y="-56002" />
-				<node x="80145" y="-55809" />
-				<node x="79889" y="-55810" />
-				<node x="79697" y="-56004" />
-				<node x="79699" y="-56259" />
-				<node x="79890" y="-56453" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_18" minZ="-2415" maxZ="-1915">
-				<node x="80616" y="-56636" />
-				<node x="80806" y="-56442" />
-				<node x="80806" y="-56186" />
-				<node x="80614" y="-55993" />
-				<node x="80358" y="-55994" />
-				<node x="80166" y="-56188" />
-				<node x="80168" y="-56443" />
-				<node x="80359" y="-56637" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_01" minZ="-3246" maxZ="-2746">
-				<node x="71204" y="-52062" />
-				<node x="71394" y="-51869" />
-				<node x="71394" y="-51612" />
-				<node x="71202" y="-51419" />
-				<node x="70946" y="-51420" />
-				<node x="70754" y="-51614" />
-				<node x="70756" y="-51870" />
-				<node x="70947" y="-52064" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_02" minZ="-3246" maxZ="-2746">
-				<node x="72483" y="-53428" />
-				<node x="72673" y="-53235" />
-				<node x="72673" y="-52978" />
-				<node x="72481" y="-52785" />
-				<node x="72225" y="-52786" />
-				<node x="72033" y="-52980" />
-				<node x="72035" y="-53236" />
-				<node x="72226" y="-53430" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_03" minZ="-2440" maxZ="-1940">
-				<node x="78929" y="-60301" />
-				<node x="79119" y="-60108" />
-				<node x="79119" y="-59851" />
-				<node x="78927" y="-59658" />
-				<node x="78671" y="-59659" />
-				<node x="78479" y="-59853" />
-				<node x="78481" y="-60109" />
-				<node x="78672" y="-60303" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_04" minZ="-2440" maxZ="-1940">
-				<node x="82123" y="-62242" />
-				<node x="82313" y="-62049" />
-				<node x="82313" y="-61792" />
-				<node x="82121" y="-61599" />
-				<node x="81865" y="-61600" />
-				<node x="81673" y="-61794" />
-				<node x="81675" y="-62050" />
-				<node x="81866" y="-62244" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_05" minZ="-2440" maxZ="-1940">
-				<node x="86121" y="-57915" />
-				<node x="86311" y="-57722" />
-				<node x="86311" y="-57465" />
-				<node x="86119" y="-57272" />
-				<node x="85863" y="-57273" />
-				<node x="85671" y="-57467" />
-				<node x="85673" y="-57723" />
-				<node x="85864" y="-57917" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_06" minZ="-2440" maxZ="-1940">
-				<node x="89958" y="-62046" />
-				<node x="90148" y="-61853" />
-				<node x="90148" y="-61596" />
-				<node x="89956" y="-61403" />
-				<node x="89700" y="-61404" />
-				<node x="89508" y="-61598" />
-				<node x="89510" y="-61854" />
-				<node x="89701" y="-62048" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_07" minZ="-2736" maxZ="-2236">
-				<node x="90140" y="-54352" />
-				<node x="90330" y="-54159" />
-				<node x="90330" y="-53902" />
-				<node x="90138" y="-53709" />
-				<node x="89882" y="-53710" />
-				<node x="89690" y="-53904" />
-				<node x="89692" y="-54160" />
-				<node x="89883" y="-54354" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_08" minZ="-2705" maxZ="-2205">
-				<node x="92683" y="-56045" />
-				<node x="92873" y="-55852" />
-				<node x="92873" y="-55595" />
-				<node x="92681" y="-55402" />
-				<node x="92425" y="-55403" />
-				<node x="92233" y="-55597" />
-				<node x="92235" y="-55853" />
-				<node x="92426" y="-56047" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_09" minZ="-2750" maxZ="-2250">
-				<node x="96012" y="-53727" />
-				<node x="96202" y="-53534" />
-				<node x="96202" y="-53277" />
-				<node x="96010" y="-53084" />
-				<node x="95754" y="-53085" />
-				<node x="95562" y="-53279" />
-				<node x="95564" y="-53535" />
-				<node x="95755" y="-53729" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_10" minZ="-2750" maxZ="-2250">
-				<node x="93282" y="-51573" />
-				<node x="93472" y="-51380" />
-				<node x="93472" y="-51123" />
-				<node x="93280" y="-50930" />
-				<node x="93024" y="-50931" />
-				<node x="92832" y="-51125" />
-				<node x="92834" y="-51381" />
-				<node x="93025" y="-51575" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_11" minZ="-3333" maxZ="-2833">
-				<node x="70688" y="-43454" />
-				<node x="70878" y="-43261" />
-				<node x="70878" y="-43004" />
-				<node x="70686" y="-42811" />
-				<node x="70430" y="-42812" />
-				<node x="70238" y="-43006" />
-				<node x="70240" y="-43262" />
-				<node x="70431" y="-43456" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_12" minZ="-3333" maxZ="-2833">
-				<node x="74411" y="-40685" />
-				<node x="74601" y="-40492" />
-				<node x="74601" y="-40235" />
-				<node x="74409" y="-40042" />
-				<node x="74153" y="-40043" />
-				<node x="73961" y="-40237" />
-				<node x="73963" y="-40493" />
-				<node x="74154" y="-40687" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_13" minZ="-3333" maxZ="-2833">
-				<node x="83421" y="-44199" />
-				<node x="83611" y="-44006" />
-				<node x="83611" y="-43749" />
-				<node x="83419" y="-43556" />
-				<node x="83163" y="-43557" />
-				<node x="82971" y="-43751" />
-				<node x="82973" y="-44007" />
-				<node x="83164" y="-44201" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_14" minZ="-3333" maxZ="-2833">
-				<node x="79555" y="-40295" />
-				<node x="79745" y="-40102" />
-				<node x="79745" y="-39845" />
-				<node x="79553" y="-39652" />
-				<node x="79297" y="-39653" />
-				<node x="79105" y="-39847" />
-				<node x="79107" y="-40103" />
-				<node x="79298" y="-40297" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_15" minZ="-3333" maxZ="-2833">
-				<node x="77294" y="-46771" />
-				<node x="77484" y="-46578" />
-				<node x="77484" y="-46321" />
-				<node x="77292" y="-46128" />
-				<node x="77036" y="-46129" />
-				<node x="76844" y="-46323" />
-				<node x="76846" y="-46579" />
-				<node x="77037" y="-46773" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_16" minZ="-3333" maxZ="-2833">
-				<node x="78371" y="-45107" />
-				<node x="78561" y="-44914" />
-				<node x="78561" y="-44657" />
-				<node x="78369" y="-44464" />
-				<node x="78113" y="-44465" />
-				<node x="77921" y="-44659" />
-				<node x="77923" y="-44915" />
-				<node x="78114" y="-45109" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_17" minZ="-3378" maxZ="-2878">
-				<node x="81874" y="-47352" />
-				<node x="82064" y="-47159" />
-				<node x="82064" y="-46902" />
-				<node x="81872" y="-46709" />
-				<node x="81616" y="-46710" />
-				<node x="81424" y="-46904" />
-				<node x="81426" y="-47160" />
-				<node x="81617" y="-47354" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_18" minZ="-2480" maxZ="-1980">
-				<node x="81508" y="-52237" />
-				<node x="81698" y="-52044" />
-				<node x="81698" y="-51787" />
-				<node x="81506" y="-51594" />
-				<node x="81250" y="-51595" />
-				<node x="81058" y="-51789" />
-				<node x="81060" y="-52045" />
-				<node x="81251" y="-52239" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_19" minZ="-2480" maxZ="-1980">
-				<node x="84405" y="-56499" />
-				<node x="84595" y="-56306" />
-				<node x="84595" y="-56049" />
-				<node x="84403" y="-55856" />
-				<node x="84147" y="-55857" />
-				<node x="83955" y="-56051" />
-				<node x="83957" y="-56307" />
-				<node x="84148" y="-56501" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_20" minZ="-3208" maxZ="-2708">
-				<node x="74731" y="-53288" />
-				<node x="74921" y="-53095" />
-				<node x="74921" y="-52838" />
-				<node x="74729" y="-52645" />
-				<node x="74473" y="-52646" />
-				<node x="74281" y="-52840" />
-				<node x="74283" y="-53096" />
-				<node x="74474" y="-53290" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_21" minZ="-2438" maxZ="-1938">
-				<node x="81685" y="-58517" />
-				<node x="81875" y="-58324" />
-				<node x="81875" y="-58067" />
-				<node x="81683" y="-57874" />
-				<node x="81427" y="-57875" />
-				<node x="81235" y="-58069" />
-				<node x="81237" y="-58325" />
-				<node x="81428" y="-58519" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_22" minZ="-3333" maxZ="-2833">
-				<node x="73225" y="-48582" />
-				<node x="73415" y="-48389" />
-				<node x="73415" y="-48132" />
-				<node x="73223" y="-47939" />
-				<node x="72967" y="-47940" />
-				<node x="72775" y="-48134" />
-				<node x="72777" y="-48390" />
-				<node x="72968" y="-48584" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+	<spawn name="SwampOfScreamsMonsters" spawnByDefault="false">
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="71230" y="-55358" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="73720" y="-51399" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="75748" y="-54618" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="74944" y="-46657" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="72152" y="-45067" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="72493" y="-45785" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="73107" y="-42346" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="73658" y="-42294" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="75769" y="-43267" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="76476" y="-43476" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="75190" y="-46502" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="79854" y="-45317" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="81260" y="-44377" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="81514" y="-44686" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="79750" y="-41915" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="79360" y="-42003" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="82186" y="-41268" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="82309" y="-41754" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="83692" y="-45626" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="85447" y="-59413" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="84015" y="-61074" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="85054" y="-62837" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="81603" y="-63297" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="81520" y="-60501" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="80915" y="-59934" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="84041" y="-58004" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="77671" y="-58313" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="76374" y="-59894" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="77383" y="-61554" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="80507" y="-56412" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="80002" y="-56009" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="82322" y="-54655" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="82048" y="-54271" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="78923" y="-51121" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="82975" y="-50598" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="85425" y="-54729" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="89321" y="-52011" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="91211" y="-51262" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="92122" y="-52894" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="93944" y="-54742" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="94636" y="-52583" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="71070" y="-51755" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="72408" y="-53084" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="74533" y="-52994" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="73291" y="-48206" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="77190" y="-46396" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="78206" y="-44800" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="81789" y="-47150" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="83180" y="-43975" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="79448" y="-40030" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3100" maxZ="-2900" rad="200">
+					<node x="74175" y="-40332" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="70651" y="-42916" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="81383" y="-51898" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="78704" y="-59856" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="82024" y="-62041" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="85912" y="-57582" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="89927" y="-61696" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+					<node x="93143" y="-51220" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+					<node x="95950" y="-53341" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+					<node x="92635" y="-55669" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="89976" y="-53911" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
 	</spawn>
 </list>
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/46200-46299.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/46200-46299.xml
index 34b37b3e5b..eb1cfdc9fd 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/46200-46299.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/46200-46299.xml
@@ -796,14 +796,19 @@
 	<item id="46254" name="Dandy's Golden Ball" type="EtcItem">
 		<!-- For 1 h., acquired XP/ SP +100%. Changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or Nevit's Hourglass. -->
 		<set name="icon" val="BranchIcon.icon.g_ev_goldenball" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_stackable" val="true" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="is_freightable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="18471" level="1" /> <!-- Dandy's Golden Ball -->
+		</skills>
 	</item>
 	<item id="46255" name="Automatic Appearance: Halloween Outfit" type="EtcItem">
 		<!-- Changes the appearance of upper armor into that of a Halloween Outfit. Works on one-pieces too. -->
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/80500-80599.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/80500-80599.xml
index ba5f8ccb0e..107f6a13dd 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/80500-80599.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/80500-80599.xml
@@ -382,6 +382,13 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="time" val="360" />
+		<skills>
+			<skill id="35363" level="1" /> <!-- Freya's Bloody Rune -->
+		</skills>
 	</item>
 	<item id="80544" name="Snow's Plea for Help - Altar of Evil" type="EtcItem">
 		<!-- A purifying mission requested by Snow for the 15th Anniversary. Snow wishes to celebrate the 15th Anniversary of Lineage by eradicating monsters in the Altar of Evil and Bloody Swampland. Characters of level 85-95 can receive the request by double-clicking the item. Can be played once a day. -->
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81000-81099.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81000-81099.xml
index 8afb5f81d6..6cd275ef26 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81000-81099.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81000-81099.xml
@@ -267,8 +267,15 @@
 		<!-- Changes the armor appearance to that of Red Archer Garment for 24 h. -->
 		<set name="icon" val="icon.dragon_dye_i01" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_stackable" val="true" />
+		<set name="is_sellable" val="false" />
+		<set name="handler" val="ItemSkills" />
+		<set name="etcitem_type" val="POTION" />
+		<skills>
+			<skill id="39580" level="1" /> <!-- Pink's Style Potion - Red Archer -->
+		</skills>
 	</item>
 	<item id="81017" name="Pink's Style Potion - Green Archer" type="EtcItem">
 		<!-- Changes the armor appearance to that of Green Archer Garment for 24 h. -->
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81600-81699.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81600-81699.xml
index 87371444a5..6daa7606e1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81600-81699.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81600-81699.xml
@@ -1037,6 +1037,28 @@
 		<set name="material" val="LEATHER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="is_commissionable" val="false" />
+		<set name="handler" val="ExtractableItems" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<capsuled_items>
+			<item id="29458" min="1" max="1" chance="6.25" /> <!-- Greater Cat's Eye Lv. 5 -->
+			<item id="29462" min="1" max="1" chance="6.25" /> <!-- Greater Amethyst Lv. 5 -->
+			<item id="48770" min="1" max="1" chance="6.25" /> <!-- Greater Topaz Lv. 5 -->
+			<item id="48774" min="1" max="1" chance="6.25" /> <!-- Greater Ruby Lv. 5 -->
+			<item id="48778" min="1" max="1" chance="6.25" /> <!-- Greater Sapphire Lv. 5 -->
+			<item id="48782" min="1" max="1" chance="6.25" /> <!-- Greater Obsidian Lv. 5 -->
+			<item id="48786" min="1" max="1" chance="6.25" /> <!-- Greater Opal Lv. 5 -->
+			<item id="48790" min="1" max="1" chance="6.25" /> <!-- Greater Emerald Lv. 5 -->
+			<item id="48794" min="1" max="1" chance="6.25" /> <!-- Greater Aquamarine Lv. 5 -->
+			<item id="48798" min="1" max="1" chance="6.25" /> <!-- Greater Diamond Lv. 5 -->
+			<item id="48802" min="1" max="1" chance="6.25" /> <!-- Greater Pearl Lv. 5 -->
+			<item id="48806" min="1" max="1" chance="6.25" /> <!-- Greater Vital Stone Lv. 5 -->
+			<item id="48810" min="1" max="1" chance="6.25" /> <!-- Greater Garnet Lv. 5 -->
+			<item id="48814" min="1" max="1" chance="6.25" /> <!-- Greater Tanzanite Lv. 5 -->
+			<item id="48818" min="1" max="1" chance="6.25" /> <!-- Greater Red Cat's Eye Lv. 5 -->
+			<item id="48822" min="1" max="1" chance="6.25" /> <!-- Greater Blue Cat's Eye Lv. 5 -->
+		</capsuled_items>
 	</item>
 	<item id="81673" name="Essence of Time" type="EtcItem">
 		<!-- Concentrated energy of time. When used, decreases time of homunculus creation for 1 h. -->
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/33900-33999.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/33900-33999.xml
index 6da0a6b277..ec4917c625 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/33900-33999.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/33900-33999.xml
@@ -3776,9 +3776,9 @@
 		<equipment rhand="36218" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234.06312688557" hpRegen="8.5" mp="1846.8" mpRegen="3" />
-			<attack physical="13000" magical="811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="430" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="1085.36442" magical="264.74086" />
+			<vitals hp="42340.06312688557" hpRegen="8.5" mp="18046.8" mpRegen="3" />
+			<attack physical="25000" magical="2811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="430" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="10085.36442" magical="2064.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
@@ -3789,7 +3789,7 @@
 			</attribute>
 			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" undying="true" />
+		<status attackable="false" talkable="false" undying="true" />
 		<skillList>
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/34000-34099.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/34000-34099.xml
index b6cbd2a1fb..8a76172e10 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/34000-34099.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/npcs/34000-34099.xml
@@ -39,7 +39,7 @@
 			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
 		</skillList>
 	</npc>
-	<npc id="34001" level="85" type="Folk" name="Ferin">
+	<npc id="34001" level="85" type="FriendlyNpc" name="Ferin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>FRIEND</race>
 		<sex>FEMALE</sex>
@@ -58,7 +58,7 @@
 			</attribute>
 			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" undying="true" />
+		<status attackable="false" talkable="false" undying="true" />
 		<collision>
 			<radius normal="8" />
 			<height normal="16" />
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/16300-16399.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/16300-16399.xml
index 5f455b6d57..4e89f9505b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/16300-16399.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/16300-16399.xml
@@ -801,6 +801,22 @@
 		<reuseDelay>5000</reuseDelay>
 		<effectPoint>-150</effectPoint>
 		<isDebuff>true</isDebuff>
+		<activateRate>80</activateRate>
+		<affectRange>900</affectRange>
+		<basicProperty>PHYSICAL</basicProperty>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<trait>PULL</trait>
+		<effects>
+			<effect name="AirBind" />
+			<effect name="Bluff">
+				<chance>100</chance>
+			</effect>
+			<effect name="PullBack">
+				<speed>600</speed>
+				<delay>600</delay>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="16388" toLevel="1" name="Kain's Wrath">
 		<!-- Consumed by vengeful fury toward all who harm Giselle. -->
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/18400-18499.xml
index 53f1dd5519..1adc33b4c3 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/18400-18499.xml
@@ -885,8 +885,30 @@
 		<!-- For 1 h., acquired XP/ SP +100%, recovers Vitality to the maximum. Changes the appearance of your armor into that of an NC Dinos Uniform. Cannot be stacked with the Fall of the Dragon or Nevit's Hourglass. -->
 		<icon>BranchIcon.icon.g_ev_goldenball</icon>
 		<operateType>A2</operateType>
+		<effectPoint>1</effectPoint>
+		<abnormalType>CHANGEBODY</abnormalType>
+		<abnormalVisualEffect>CHANGE_DINOS</abnormalVisualEffect>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>46254</itemConsumeId> <!-- Dandy's Home Run Ball -->
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>-3</magicLevel>
+		<abnormalLevel>2</abnormalLevel>
+		<abnormalTime>3600</abnormalTime>
 		<reuseDelay>15000</reuseDelay>
+		<irreplacableBuff>true</irreplacableBuff>
+		<stayAfterDeath>true</stayAfterDeath>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="ExpModify">
+				<amount>100</amount>
+			</effect>
+			<effect name="SpModify">
+				<amount>100</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18472" toLevel="6" name="Giveaway Number 1">
 		<icon>icon.skill0000</icon>
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/18500-18599.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/18500-18599.xml
index f3303a3a10..45b374c324 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/18500-18599.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/18500-18599.xml
@@ -819,10 +819,12 @@
 		<abnormalType>
 			<value level="1">SKILL_IGNORE</value>
 			<value level="2">ABNORMAL_INVINCIBILITY</value>
+			<value level="3">ABNORMAL_INVINCIBILITY</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalType>
 		<abnormalLevel>
 			<value level="1">2</value>
 			<value level="2">3</value>
+			<value level="3">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalLevel>
 		<abnormalTime>7</abnormalTime>
 		<hitTime>1000</hitTime>
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22500-22599.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22500-22599.xml
index 2a7708aba1..82a4b46e0d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22500-22599.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22500-22599.xml
@@ -1578,7 +1578,7 @@
 		<itemConsumeId>
 			<value level="1">22883</value>
 			<value level="2">22884</value>
-			<value level="2">22885</value>
+			<value level="3">22885</value>
 		</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<reuseDelay>3600000</reuseDelay>
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22700-22799.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22700-22799.xml
index 6a6db390ba..3cde5afbf8 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22700-22799.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22700-22799.xml
@@ -297,7 +297,7 @@
 		<itemConsumeId>
 			<value level="1">23338</value>
 			<value level="2">23339</value>
-			<value level="2">23340</value>
+			<value level="3">23340</value>
 		</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<reuseDelay>3600000</reuseDelay>
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30000-30099.xml
index 48e426673b..fb099b2e5f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30000-30099.xml
@@ -1978,8 +1978,8 @@
 		<operateType>P</operateType>
 		<magicLevel>85</magicLevel>
 		<effects>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>350</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/39400-39499.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/39400-39499.xml
index e0c8200815..dad3d4a5d5 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/39400-39499.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/39400-39499.xml
@@ -2087,6 +2087,7 @@
 		</effects>
 	</skill>
 	<skill id="39494" toLevel="1" name="Dye Powder">
+		<!-- Powder for replenishing the Dye Engraving scale. Restores 25% of the full scale. -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -2096,6 +2097,11 @@
 		<itemConsumeCount>1</itemConsumeCount>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="CanUseSymbolSealIncreaseItem">
+				<amount>25</amount> <!-- 25% from max symbol seal points -->
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="RestoreSymbolSeal">
 				<amount>25</amount>
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/39500-39599.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/39500-39599.xml
index c938b0779c..3c9fff1191 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/39500-39599.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/39500-39599.xml
@@ -1185,11 +1185,16 @@
 	<skill id="39580" toLevel="1" name="Pink's Style Potion - Red Archer">
 		<!-- Changes the armor appearance to that of Red Archer Garment. -->
 		<icon>icon.armor_t2000_b_i00</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalTime>86400</abnormalTime>
+		<abnormalVisualEffect>CGRADE_CHANGE</abnormalVisualEffect>
 		<isMagic>4</isMagic>
 		<hitTime>1500</hitTime>
 		<reuseDelay>5000</reuseDelay>
 		<effectPoint>780</effectPoint>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>81016</itemConsumeId>
+		<stayAfterDeath>true</stayAfterDeath>
 	</skill>
 	<skill id="39581" toLevel="1" name="Pink's Style Potion - Green Archer">
 		<!-- Changes the armor appearance to that of Green Archer Garment. -->
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/documentation.txt
index edd866e3e6..ec5ea13947 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/documentation.txt
@@ -12,6 +12,8 @@ AddHuntingTime: Add time for time limited hunting zones. (l2jmobius)
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -166,10 +168,11 @@ HpCpHealCritical: HpCp heal effects always trigger Magic Critical Hit.
 HpCpHeal: Increases current HP by a given amount. If the given amount exceeds maximum HP, it increases current CP with the rest value as well.
 HpDrain: Magical attack that absorbs given percentage of the damage inflicted as HP.
 Hp: Increases current HP by a static value.
-HpLimit: Increase a character's max hp limit (l2jmobius)
+HpLimit: Increase a character's max hp limit. (l2jmobius)
 HpRegen: HP Regeneration stat.
 HpToOwner: DOT effect that absorbs HP over time.
 IgnoreDeath: Become undying. Hp cannot decrease below 1.
+IgnoreReduceDamage: Ignore ReduceDamage effect implementation. (l2jmobius)
 ImmobileDamageBonus: Bonus damage to immobile targets. (l2jmobius)
 ImmobileDamageResist: Resist damage while immobile. (l2jmobius)
 ImmobilePetBuff: Causes your pet to become immobilized.
@@ -208,7 +211,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
@@ -273,6 +275,7 @@ RebalanceHP: Balances targets' current HP.
 RebalanceHPSummon: Balances targets' current HP for summons.
 RecoverVitalityInPeaceZone: Recover periodically vitality when player is in a peace zone. (l2jmobius)
 Recovery: Decreases death penalty level.
+ReduceDamage: Reduce damage effect implementation.
 ReduceCancel: Magic skill casting interruption stat.
 ReduceDropPenalty: Reduces EXP lost and death penalty chance.
 ReflectMagic: Deflects magical damage back to the attacker.
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/Config.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/Config.java
index 7dc56baeff..40bfcea596 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/Config.java
@@ -605,6 +605,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	
 	// --------------------------------------------------
 	// FloodProtector Settings
@@ -840,6 +841,7 @@ public class Config
 	public static int STARTING_VITALITY_POINTS;
 	public static boolean RAIDBOSS_USE_VITALITY;
 	public static float RATE_VITALITY_EXP_MULTIPLIER;
+	public static float RATE_VITALITY_EXP_PREMIUM_MULTIPLIER;
 	public static int VITALITY_MAX_ITEMS_ALLOWED;
 	public static float RATE_VITALITY_LOST;
 	public static float RATE_VITALITY_GAIN;
@@ -1346,6 +1348,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2217,6 +2220,7 @@ public class Config
 			ENABLE_AUTO_SKILL = generalConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = generalConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = generalConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = generalConfig.getBoolean("AssistLeader", false);
 			
 			// Load FloodProtector config file
 			final PropertiesParser floodProtectorConfig = new PropertiesParser(FLOOD_PROTECTOR_CONFIG_FILE);
@@ -2333,6 +2337,7 @@ public class Config
 			MONSTER_EXP_MAX_LEVEL_DIFFERENCE = ratesConfig.getInt("MonsterExpMaxLevelDifference", 11);
 			RATE_RAIDBOSS_POINTS = ratesConfig.getFloat("RateRaidbossPointsReward", 1);
 			RATE_VITALITY_EXP_MULTIPLIER = ratesConfig.getFloat("RateVitalityExpMultiplier", 2);
+			RATE_VITALITY_EXP_PREMIUM_MULTIPLIER = ratesConfig.getFloat("RateVitalityExpPremiumMultiplier", 3);
 			VITALITY_MAX_ITEMS_ALLOWED = ratesConfig.getInt("VitalityMaxItemsAllowed", 999);
 			RATE_VITALITY_LOST = ratesConfig.getFloat("RateVitalityLost", 1);
 			RATE_VITALITY_GAIN = ratesConfig.getFloat("RateVitalityGain", 1);
@@ -3391,6 +3396,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 6485e6c47d..2208f823ee 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index c5839831ba..deb0eec41a 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -546,9 +546,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index b277446b93..7bf956bdc5 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
index 40b4ea1c3d..ae43e8d744 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
@@ -25,4 +25,9 @@ import org.l2jmobius.gameserver.model.actor.Player;
 public interface IPlayerActionHandler
 {
 	void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed);
+	
+	default boolean isPetAction()
+	{
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 0c2f5d59de..0b7ad4e019 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -215,7 +215,7 @@ public class ShortCuts implements IRestorable
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
 				newsc.setAutoUse(sc.isAutoUse());
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 6e4cef898f..79a06cdc78 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1288,7 +1288,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2816,7 +2816,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2829,177 +2829,139 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						sendPacket(info);
+					}
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
index 196efaa0fe..9ac8bf98fc 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -319,6 +319,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoAbnormalVisualEf
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic;
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot;
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
+import org.l2jmobius.gameserver.network.serverpackets.ExVitalityEffectInfo;
 import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import org.l2jmobius.gameserver.network.serverpackets.HennaInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
@@ -4598,7 +4599,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8566,9 +8567,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
@@ -9876,6 +9881,7 @@ public class Player extends Playable
 				sendPacket(new ExUserBoostStat(this, BonusExpType.VITALITY));
 				sendPacket(new ExUserBoostStat(this, BonusExpType.BUFFS));
 				sendPacket(new ExUserBoostStat(this, BonusExpType.PASSIVE));
+				sendPacket(new ExVitalityEffectInfo(this));
 				_userBoostStatTask = null;
 			}, 300);
 		}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 196de38709..4213dec3ad 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -854,7 +855,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -875,7 +876,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -900,7 +908,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -908,7 +916,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -954,7 +969,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index ea61f72ae6..4d444a1fa3 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -883,15 +882,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -902,8 +899,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -912,7 +913,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -985,45 +986,26 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
 		
-		// Notify recalculation to child classes.
+		// Notify recalculation to child classes
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 33fd8aa870..ffcb16e4dc 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -482,7 +482,11 @@ public class PlayerStat extends PlayableStat
 	
 	public double getVitalityExpBonus()
 	{
-		return (getVitalityPoints() > 0) ? getMul(Stat.VITALITY_EXP_RATE, Config.RATE_VITALITY_EXP_MULTIPLIER) : 1.0;
+		if (getVitalityPoints() > 0)
+		{
+			return getMul(Stat.VITALITY_EXP_RATE, 1) * (getActiveChar().hasPremiumStatus() ? Config.RATE_VITALITY_EXP_PREMIUM_MULTIPLIER : Config.RATE_VITALITY_EXP_MULTIPLIER);
+		}
+		return 0;
 	}
 	
 	public void setVitalityPoints(int value)
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index ffdfcd5574..c56c35ad2d 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
index 97397f753f..9d5faa0c61 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
@@ -57,7 +57,10 @@ public enum CommissionItemType
 	NECKLACE(31),
 	BELT(32),
 	BRACELET(33),
+	AGATHION(62),
 	HAIR_ACCESSORY(34),
+	BROOCH_JEWEL(63),
+	ARTIFACT(64),
 	// Supplies
 	POTION(35),
 	SCROLL_ENCHANT_WEAPON(36),
@@ -65,6 +68,7 @@ public enum CommissionItemType
 	SCROLL_OTHER(38),
 	SOULSHOT(39),
 	SPIRITSHOT(40),
+	OTHER_SUPPLIES(41),
 	// Pet Goods
 	PET_EQUIPMENT(42),
 	PET_SUPPLIES(43),
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
index eb10918430..3a194d1660 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
@@ -47,8 +47,8 @@ public enum CommissionTreeType
 		CommissionItemType.SPEAR,
 		CommissionItemType.OTHER_WEAPON),
 	ARMOR(1, CommissionItemType.HELMET, CommissionItemType.ARMOR_TOP, CommissionItemType.ARMOR_PANTS, CommissionItemType.FULL_BODY, CommissionItemType.GLOVES, CommissionItemType.FEET, CommissionItemType.SHIELD, CommissionItemType.SIGIL, CommissionItemType.UNDERWEAR, CommissionItemType.CLOAK),
-	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.HAIR_ACCESSORY),
-	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT),
+	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.AGATHION, CommissionItemType.HAIR_ACCESSORY, CommissionItemType.BROOCH_JEWEL, CommissionItemType.ARTIFACT),
+	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT, CommissionItemType.OTHER_SUPPLIES),
 	PET_GOODS(4, CommissionItemType.PET_EQUIPMENT, CommissionItemType.PET_SUPPLIES),
 	MISC(
 		5,
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/effects/EffectType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/effects/EffectType.java
index 5a64922eb4..d0951ef585 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/effects/EffectType.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/effects/EffectType.java
@@ -63,5 +63,6 @@ public enum EffectType
 	TELEPORT,
 	TELEPORT_TO_TARGET,
 	ABNORMAL_SHIELD,
+	RESTORE_SYMBOL_SEAL,
 	VITALITY_POINT_UP
 }
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index e17d405a46..fba22cdb8c 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2242,6 +2242,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index ea22a67f17..d64a767c00 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -39,6 +39,7 @@ import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AgathionData;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -52,6 +53,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -74,12 +76,14 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemEnchantAdd;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemSoulCrystalAdd;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
 import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -94,6 +98,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1652,7 +1657,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2578,6 +2585,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2602,6 +2614,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2627,6 +2641,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 0adafe6811..9ecff3bd0c 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -754,7 +754,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -906,7 +907,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 61d7cb0485..6c17c2a05f 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -654,7 +654,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -677,7 +677,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -712,7 +712,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 550e8a579a..e8980bea33 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -95,6 +95,7 @@ public enum Stat
 	REAR_DAMAGE_RATE("rearDamage"),
 	DRAGON_WEAPON_DEFENCE("dragonWeaponDefence"),
 	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
+	IGNORE_REDUCE_DAMAGE("ignoreReduceDamage"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
@@ -135,7 +136,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index 8f916369b4..b7b0c4ef53 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index 265cef95f4..4211092a85 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -97,6 +97,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index c5f9cfd470..64b096aefd 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -117,6 +117,11 @@ public class RequestAcquireSkill implements ClientPacket
 		
 		final int skillId = player.getReplacementSkill(_id);
 		final Skill existingSkill = player.getKnownSkill(skillId); // Mobius: Keep existing sublevel.
+		if ((_level > 65536000) && (existingSkill != null) && (existingSkill.getSubLevel() > 1000))
+		{
+			_level -= existingSkill.getSubLevel() * 65536;
+		}
+		
 		final Skill skill = SkillData.getInstance().getSkill(skillId, _level, existingSkill == null ? 0 : existingSkill.getSubLevel());
 		if (skill == null)
 		{
@@ -681,7 +686,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList();
 		player.updateShortCuts(_id, skill.getLevel(), skill.getSubLevel());
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 14c84055da..63f5c4a527 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -87,7 +87,7 @@ public class RequestShortCutReg implements ClientPacket
 		else if (_page == 23)
 		{
 			final Item item = player.getInventory().getItemByObjectId(_id);
-			if ((item != null) && !item.isPotion())
+			if (((item != null) && !item.isPotion()) || (_type == ShortcutType.ACTION))
 			{
 				return;
 			}
@@ -148,7 +148,7 @@ public class RequestShortCutReg implements ClientPacket
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		sc.setAutoUse(_active);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 		player.sendPacket(new ExActivateAutoShortcut(sc, _active));
 		
 		// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index e04fde4707..07ed7641a9 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,129 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 38, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 49, 50, 51,
-		52, 53, 54, 55,
-		56, 57, 58, 59,
-		60, 61, 62, 63,
-		64, 65, 66, 67,
-		68, 69, 70, 71,
-		72, 73, 74, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 92, 93,
-		94, 96, 97,
-		1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index 21202af809..9c7e0eb8b0 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java
index 3263349360..38c94f8160 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.BonusExpType;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.stats.Stat;
@@ -45,31 +46,10 @@ public class ExUserBoostStat extends ServerPacket
 		{
 			case VITALITY:
 			{
-				final int currentVitalityPoints = _player.getStat().getVitalityPoints();
-				if (currentVitalityPoints > 105000)
+				if (_player.getStat().getVitalityPoints() > 0)
 				{
-					count = 1;
-					bonus = 300;
-				}
-				else if (currentVitalityPoints > 70000)
-				{
-					count = 1;
-					bonus = 250;
-				}
-				else if (currentVitalityPoints > 35000)
-				{
-					count = 1;
-					bonus = 200;
-				}
-				else if (currentVitalityPoints > 0)
-				{
-					count = 1;
-					bonus = 100;
-				}
-				if (bonus > 0)
-				{
-					count += (int) _player.getStat().getValue(Stat.VITALITY_SKILLS, 0);
-					bonus += (int) ((_player.getStat().getMul(Stat.VITALITY_EXP_RATE, 1) - 1) * 100);
+					count = (int) (_player.getStat().getValue(Stat.VITALITY_SKILLS, 0) + 1);
+					bonus = (int) (((_player.getStat().getMul(Stat.VITALITY_EXP_RATE, 1) - 1) + (_player.hasPremiumStatus() ? Config.RATE_VITALITY_EXP_PREMIUM_MULTIPLIER : Config.RATE_VITALITY_EXP_MULTIPLIER)) * 100d);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java
index ff6541ec6f..96e9690fe6 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.stats.Stat;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -26,13 +27,15 @@ import org.l2jmobius.gameserver.network.ServerPackets;
 public class ExVitalityEffectInfo extends ServerPacket
 {
 	private final int _vitalityBonus;
+	private final int _vitalityAddBonus;
 	private final int _vitalityItemsRemaining;
 	private final int _points;
 	
 	public ExVitalityEffectInfo(Player player)
 	{
 		_points = player.getVitalityPoints();
-		_vitalityBonus = (int) player.getStat().getVitalityExpBonus() * 100;
+		_vitalityBonus = (int) ((player.getStat().getMul(Stat.VITALITY_EXP_RATE, 1) - 1) + (player.hasPremiumStatus() ? Config.RATE_VITALITY_EXP_PREMIUM_MULTIPLIER : Config.RATE_VITALITY_EXP_MULTIPLIER)) * 100;
+		_vitalityAddBonus = (int) ((player.getStat().getMul(Stat.VITALITY_EXP_RATE, 1) - 1) * 100);
 		_vitalityItemsRemaining = Config.VITALITY_MAX_ITEMS_ALLOWED - player.getVitalityItemsUsed();
 	}
 	
@@ -42,7 +45,7 @@ public class ExVitalityEffectInfo extends ServerPacket
 		ServerPackets.EX_VITALITY_EFFECT_INFO.writeId(this);
 		writeInt(_points);
 		writeInt(_vitalityBonus); // Vitality Bonus
-		writeShort(0); // Vitality additional bonus in %
+		writeShort(_vitalityAddBonus); // Vitality additional bonus in %
 		writeShort(_vitalityItemsRemaining); // How much vitality items remaining for use
 		writeShort(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use
 	}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
index 8e396d93c9..a72d906550 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
@@ -167,7 +167,7 @@ public class FakePlayerInfo extends ServerPacket
 		writeByte(_npc.getTeam().getId());
 		writeInt(_clan != null ? _clan.getCrestLargeId() : 0);
 		writeByte(_fpcHolder.getNobleLevel());
-		writeByte(_fpcHolder.isHero());
+		writeByte(_fpcHolder.isHero() ? 2 : 0); // 152 - Value for enabled changed to 2
 		writeByte(_fpcHolder.isFishing());
 		writeInt(_fpcHolder.getBaitLocationX());
 		writeInt(_fpcHolder.getBaitLocationY());
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index e563e8e8f2..ee8bc21244 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
deleted file mode 100644
index c69a1e8cd0..0000000000
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeByte(0); // 286
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
new file mode 100644
index 0000000000..4a4fa97fcd
--- /dev/null
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -0,0 +1,182 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeShort(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 05aaedf2c5..46c9ccb5a9 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,20 +19,21 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
+		player.restoreAutoShortcutVisual();
 	}
 	
 	@Override
@@ -54,8 +55,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 9c1fbbcab8..851b53dc09 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -43,13 +49,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -60,8 +69,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 679c26e073..06711fb502 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1544a20c14..e9f977858a 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -42,6 +44,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	
@@ -96,6 +99,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking when in offline play.
+							if (player.isOfflinePlay() && player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -121,23 +135,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -145,6 +168,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -179,32 +205,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -310,6 +359,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 5899235fcb..66c93af753 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,7 +35,9 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.effects.EffectType;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemUse;
@@ -46,12 +48,12 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.EffectScope;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +383,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
@@ -394,7 +397,24 @@ public class AutoUseTaskManager
 							final IPlayerActionHandler actionHandler = PlayerActionHandler.getInstance().getHandler(actionHolder.getHandler());
 							if (actionHandler != null)
 							{
-								actionHandler.useAction(player, actionHolder, false, false);
+								if (!actionHandler.isPetAction())
+								{
+									actionHandler.useAction(player, actionHolder, false, false);
+								}
+								else
+								{
+									final Summon summon = player.getAnyServitor();
+									if ((summon != null) && !summon.isAlikeDead())
+									{
+										final Skill skill = summon.getKnownSkill(actionHolder.getOptionId());
+										if ((skill != null) && !canSummonCastSkill(player, summon, skill))
+										{
+											continue ACTIONS;
+										}
+										
+										actionHandler.useAction(player, actionHolder, false, false);
+									}
+								}
 							}
 						}
 					}
@@ -477,6 +497,59 @@ public class AutoUseTaskManager
 			
 			return !player.isSkillDisabled(skill) && skill.checkCondition(player, target, false);
 		}
+		
+		private boolean canSummonCastSkill(Player player, Summon summon, Skill skill)
+		{
+			if (skill.isBad() && (player.getTarget() == null))
+			{
+				return false;
+			}
+			
+			final int mpConsume = skill.getMpConsume() + skill.getMpInitialConsume();
+			if ((((mpConsume != 0) && (mpConsume > (int) Math.floor(summon.getCurrentMp()))) || ((skill.getHpConsume() != 0) && (skill.getHpConsume() > (int) Math.floor(summon.getCurrentHp())))))
+			{
+				return false;
+			}
+			
+			if (summon.isSkillDisabled(skill))
+			{
+				return false;
+			}
+			
+			if (((player.getTarget() != null) && !skill.checkCondition(summon, player.getTarget(), false)) || ((player.getTarget() == null) && !skill.checkCondition(summon, player, false)))
+			{
+				return false;
+			}
+			
+			if ((skill.getItemConsumeCount() > 0) && (summon.getInventory().getInventoryItemCount(skill.getItemConsumeId(), -1) < skill.getItemConsumeCount()))
+			{
+				return false;
+			}
+			
+			if (skill.getTargetType().equals(TargetType.SELF) || skill.getTargetType().equals(TargetType.SUMMON))
+			{
+				final BuffInfo summonInfo = summon.getEffectList().getBuffInfoBySkillId(skill.getId());
+				return (summonInfo != null) && (summonInfo.getTime() >= REUSE_MARGIN_TIME);
+			}
+			
+			if ((skill.getEffects(EffectScope.GENERAL) != null) && skill.getEffects(EffectScope.GENERAL).stream().anyMatch(a -> a.getEffectType().equals(EffectType.MANAHEAL_BY_LEVEL)) && (player.getCurrentMpPercent() > 80))
+			{
+				return false;
+			}
+			
+			final BuffInfo buffInfo = player.getEffectList().getBuffInfoBySkillId(skill.getId());
+			final BuffInfo abnormalBuffInfo = player.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
+			if (abnormalBuffInfo != null)
+			{
+				if (buffInfo != null)
+				{
+					return (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()));
+				}
+				return (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel()) || abnormalBuffInfo.isAbnormalType(AbnormalType.NONE);
+			}
+			
+			return true;
+		}
 	}
 	
 	public synchronized void startAutoUseTask(Player player)
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle.sql
index 7ffcebed6b..3445dea47a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_homunculus.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_homunculus.sql
index 24d6a4e5ff..d8beec306a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_homunculus.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_homunculus.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_homunculus` (
 	`skillLevel4` TINYINT UNSIGNED NOT NULL DEFAULT '0',
 	`skillLevel5` TINYINT UNSIGNED NOT NULL DEFAULT '0',
 	`active` TINYINT UNSIGNED NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_ranking_history.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_ranking_history.sql
index 3f938ba850..d2da345dec 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_ranking_history.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_ranking_history.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_ranking_history` (
   `ranking` int(20) NOT NULL,
   `exp` bigint(20) NOT NULL,
   PRIMARY KEY (`charId`,`day`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/characters.sql
index 4df7d3f88c..f39a66c2db 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/characters.sql
@@ -62,4 +62,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/collection_favorites.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/collection_favorites.sql
index 7571da448f..49758d7815 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/collection_favorites.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/collection_favorites.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `collection_favorites` (
   `accountName` VARCHAR(45) NOT NULL DEFAULT '',
   `collectionId` int(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`accountName`,`collectionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/collections.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/collections.sql
index 8c0fafc9fd..1ff9772ad3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/collections.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/collections.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `collections` (
   `collectionId` int(3) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`accountName`,`collectionId`,`index`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort.sql
index c1f09a3f79..c8e7f5458c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort_siege_guards.sql
index 4872d0110c..40ed7619dc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_siege_guards` VALUES
 -- Shanty Guards
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort_spawnlist.sql
index 0285fa6edd..d3caf9312e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,7 +11,7 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_spawnlist` VALUES
 (101,null,35658,-53273,156650,-1896,62000,0,0),
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/grandboss_data.sql
index 0fd9caf1d9..f92f39e3b8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29381, -6505, 183040, -3419, 0, 1342845023, 133301), -- Queen Ant
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/heroes.sql
index ae59eb8ba1..f2ee5692a8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/heroes.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/items.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/olympiad_fights.sql
index 15ffc8332b..1e88116dfc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/olympiad_fights.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(1) unsigned NOT NULL DEFAULT '0',
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/Character.ini b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/Character.ini
index 16d8c76ea1..92bec6794d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/Character.ini
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/Character.ini
@@ -299,6 +299,13 @@ HardinRemovedSkills = 148,10104,10065,10098,19558,10097,10042,19552;\
 181,11855,19212,11856,11854,11863,11859
 
 
+# ---------------------------------------------------------------------------
+# Eraton (Red Libra)
+# ---------------------------------------------------------------------------
+# Skill ids that will remain after Eraton class change.
+EratonRetainedSkills = 1370,1371,1372,11400,11401,11402,11403,11404,31048,31049,30930,30931
+
+
 # ---------------------------------------------------------------------------
 # Summons configuration
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/General.ini b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/General.ini
index 64580a7378..abe836fbf0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/General.ini
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/General.ini
@@ -430,8 +430,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
@@ -655,6 +655,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 
 # ---------------------------------------------------------------------------
 # Developer Settings
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/Rates.ini b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/Rates.ini
index d4f5606320..09b75dc15e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/Rates.ini
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/Rates.ini
@@ -159,11 +159,13 @@ EventItemMaxLevelDifference = 9
 # Vitality system rates. Works only if EnableVitality = True
 # ---------------------------------------------------------------------------
 
-# The following configures the XP multiplier of each vitality level. Basically, you have
-# Default: 2
+# The following configures the XP multiplier of each vitality level.
 # Take care setting these values according to your server rates, as the can lead to huge differences!
 # Example with a server rate 15x and vitality = 2. => final server rate = 30 (15x2)!
+# Retail: 2
 RateVitalityExpMultiplier = 2.
+# Retail: 3
+RateVitalityExpPremiumMultiplier = 3.
 
 # Maximum vitality items allowed to be used for a week by a player.
 # Default: 999
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/ActionData.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/ActionData.xml
index 965751da7b..d9637fa11c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/ActionData.xml
@@ -1,48 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
+	<action id="0" handler="SitStand" /> <!-- Sit/Stand -->
+	<action id="1" handler="RunWalk" /> <!-- Walk/Run -->
+	<action id="2" handler="None" /> <!-- Attack -->
+	<action id="3" handler="None" /> <!-- Trade -->
+	<action id="4" handler="None" /> <!-- Next Target (Melee) -->
+	<action id="5" handler="None" /> <!-- Pick Up -->
+	<action id="6" handler="None" /> <!-- Assist -->
+	<action id="7" handler="None" /> <!-- Invite -->
+	<action id="8" handler="None" /> <!-- Leave Party -->
+	<action id="9" handler="None" /> <!-- Dismiss Party Member -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store - Sell -->
+	<action id="11" handler="None" /> <!-- Party Matching -->
 	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
 	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
 	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
 	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
+	<action id="16" handler="PetAttack" /> <!-- Attackers -->
 	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
+	<action id="18" handler="None" /> <!-- Pick Up -->
+	<action id="19" handler="UnsummonPet" /> <!-- Recall a pet -->
+	<action id="20" handler="None" /> <!-- Special skill -->
 	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attackers -->
 	<action id="23" handler="ServitorStop" /> <!-- Stop -->
 	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
 	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
 	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
+	<action id="27" handler="None" /> <!-- Special skill -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store - Buy -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Confusion -->
 	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
 	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Switch Mode -->
 	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
 	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
 	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Toxic Smoke -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Workshop -->
 	<action id="38" handler="Ride" /> <!-- Mount/Dismount -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Parasite Burst -->
+	<action id="40" handler="None" /> <!-- Recommend -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Cannon -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Self Damage Shield -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Hydro Screw -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Boom Attack -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Master Recharge -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mega Storm Strike -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Steal Blood -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mech. Cannon -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Wild Temper -->
+	<action id="50" handler="None" /> <!-- Change Party Leader -->
+	<action id="51" handler="None" /> <!-- General Workshop -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Unsummon -->
+	<action id="53" handler="ServitorMove" /> <!-- Move -->
+	<action id="54" handler="PetMove" /> <!-- Move -->
+	<action id="55" handler="None" /> <!-- Start/End Recording Replay -->
+	<action id="56" handler="None" /> <!-- Command Channel Invite -->
+	<action id="57" handler="None" /> <!-- Find Store -->
+	<action id="58" handler="None" /> <!-- Duel -->
+	<action id="59" handler="None" /> <!-- Duel Withdrawal -->
+	<action id="60" handler="None" /> <!-- Party Duel -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store - Wholesale -->
 	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
+	<action id="63" handler="None" /> <!-- Mini-Game -->
+	<action id="64" handler="TeleportBookmark" /> <!-- My Teleport -->
 	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
 	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
 	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
@@ -51,169 +73,196 @@
 	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
 	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
 	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
+	<action id="74" handler="None" /> <!-- Turn On/Off the Status Information -->
+	<action id="76" handler="None" /> <!-- Invite Friends -->
+	<action id="77" handler="None" /> <!-- Start/End Recording -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Use of Token 1 -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Use of Token 2 -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Use of Token 3 -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Use of Token 4 -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Target by Token 1 -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Target by Token 2 -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Target by Token 3 -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Target by Token 4 -->
 	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
 	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Nightshade - Shade Sacrifice -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off -->
+	<action id="90" handler="InstanceZoneInfo" /> <!-- Instance Zone -->
+	<action id="92" handler="None" /> <!-- Previous Target (Melee) -->
+	<action id="93" handler="None" /> <!-- Next Target (Range) -->
+	<action id="94" handler="None" /> <!-- Previous Target (Range) -->
+	<action id="95" handler="WaitingAction" /> <!-- Waiting Action -->
+	<action id="96" handler="StrikeBack" /> <!-- Strike Back -->
+	<action id="97" handler="CombatMode" /> <!-- Combat Mode -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Hammer -->
+	<action id="1001" handler="None" /> <!-- Ultimate Bombastic Buster -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Hostile Feeling -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wild Stun -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wild Defense -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Bright Burst -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Bright Heal -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Blessing of Queen -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Gift of Queen -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cure of Queen -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Blessing of Seraphim -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Gift of Seraphim -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Cure of Seraphim -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Curse of Shade -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Mass Curse of Shade -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Shade Sacrifice -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Blow -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Strike -->
+	
+	<!-- TODO: Find skill ids. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Cursed Drain Energy -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Kat the Cat Skill 2 -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Mew the Cat's Skill 2 -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Kai the Cat's Skill 2 -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Boxer the Unicorn's Skill 2 -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Mirage the Unicorn Skill 2 -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Merrow the Unicorn Skill 2 -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Shadow Skill 1 -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Shadow Skill 2 -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Silhouette Skill 2 -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Reanimated Man Skill 1 -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Reanimated Man Skill 2 -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Corrupted Man Skill 2 -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Slash -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Spin Slash -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Grip of the Cat -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Whiplash -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Tidal Wave -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Corpse Burst -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Dicing Death -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Dark Curse -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Cannon Fodder -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Big Bang -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Bite Attack -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Maul -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Wolf Howl -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awakening -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Wolf Howl -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider Roar -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast Bite -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast Stun Attack -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast Fire Breath -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast Roar -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Blessed Body -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Blessed Soul -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Haste -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Acumen -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Clarity -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Empower -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Wild Magic -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Death Whisper -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Focus -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Guidance -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Death Blow -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Double Attack -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Spin Attack -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Meteor Shower -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakening -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Thunder Bolt -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Flash -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Lightning Wave -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Blaze -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Buff Control -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Power Striker -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Piercing Attack -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Whirlwind -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Lance Smash -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Battle Cry -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Power Smash -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Energy Burst -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Shock Wave -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Howl -->
 	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
 	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
 	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
 	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch Tactics -->
 	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
 	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
 	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Tail Strike -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Strider Bite -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Strider Fear -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Strider Dash -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen Strike -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen Wind Walk -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Maguen Power Strike -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen Wind Walk -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen Return -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Maguen Party Return -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attackers -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Unsummon -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Passive -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Key Security -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Bear Claw -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Bear Tumbling -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Cougar Bite -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Cougar Pounce -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Reaper Touch -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Reaper Power -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Lion Roar -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Lion Claw -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Lion Dash -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Lion Flame -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Flight -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Purity -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Feather -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Sharp Claw -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Blessing of Life -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Punch -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Feline Aggression -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Feline Stun -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Feline Bite -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Feline Pounce -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Feline Touch -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Feline Power -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Unicorn's Aggression -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Unicorn's Stun -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Unicorn's Bite -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Unicorn's Pounce -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Unicorn's Touch -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Unicorn's Power -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Phantom Aggression -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Phantom Stun -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Phantom Bite -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Phantom Pounce -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Phantom Touch -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Phantom Power -->
+	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Jumping Attack -->
+	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Double Slash -->
+	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Elemental Slam -->
+	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat Power -->
+	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Lancer Rush -->
+	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Power Stamp -->
+	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Multiple Icicles -->
+	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Cherub Power -->
+	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Phantom Sword Attack -->
+	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Phantom Blow -->
+	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Phantom Spike -->
+	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Phantom Crash -->
+	<action id="1156" handler="ServitorSkillUse" option="19406" /> <!-- Curse from the Deadland -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Hand of Warmth -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Rosy Seduction -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Art of Seduction -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Lightning Strike -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Flash -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Lightning Wave -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Buff Control -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Piercing Attack -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Spin Attack -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impale -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Battle Cry -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Power Smash -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Energy Burst -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Shock Wave -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Burst -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switch Tactics -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Cat the Ranger Boost -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/DoorData.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/DoorData.xml
index 28a76d706e..4cd7836a06 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/DoorData.xml
@@ -11645,6 +11645,176 @@
 		<openStatus default="open" />
 	</door>
 	
+	<!-- 21_16 FIXME: Rune clanhall doors cannot be found in client. -->
+	<door id="21160001" name="rune_castle_agit_002_001">
+		<nodes nodeZ="872">
+			<node x="37679" y="-50432" />
+			<node x="37726" y="-50433" />
+			<node x="37726" y="-50423" />
+			<node x="37678" y="-50424" />
+		</nodes>
+		<location x="37680" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160002" name="rune_castle_agit_002_002">
+		<nodes nodeZ="872">
+			<node x="37724" y="-50432" />
+			<node x="37771" y="-50432" />
+			<node x="37771" y="-50423" />
+			<node x="37723" y="-50424" />
+		</nodes>
+		<location x="37770" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160003" name="rune_castle_agit_003_001">
+		<nodes nodeZ="872">
+			<node x="38527" y="-50151" />
+			<node x="38570" y="-50131" />
+			<node x="38566" y="-50122" />
+			<node x="38524" y="-50144" />
+		</nodes>
+		<location x="38527" y="-50147" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160004" name="rune_castle_agit_003_002">
+		<nodes nodeZ="872">
+			<node x="38569" y="-50132" />
+			<node x="38610" y="-50111" />
+			<node x="38606" y="-50103" />
+			<node x="38564" y="-50124" />
+		</nodes>
+		<location x="38607" y="-50108" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160005" name="rune_castle_agit_004_001">
+		<nodes nodeZ="872">
+			<node x="39122" y="-49542" />
+			<node x="39145" y="-49501" />
+			<node x="39137" y="-49498" />
+			<node x="39115" y="-49539" />
+		</nodes>
+		<location x="39119" y="-49539" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160006" name="rune_castle_agit_004_002">
+		<nodes nodeZ="872">
+			<node x="39145" y="-49503" />
+			<node x="39167" y="-49462" />
+			<node x="39160" y="-49459" />
+			<node x="39136" y="-49498" />
+		</nodes>
+		<location x="39163" y="-49461" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160007" name="rune_castle_agit_001_001">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48291" />
+			<node x="39341" y="-48245" />
+			<node x="39335" y="-48245" />
+			<node x="39334" y="-48290" />
+		</nodes>
+		<location x="39338" y="-48290" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160008" name="rune_castle_agit_001_002">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48246" />
+			<node x="39342" y="-48199" />
+			<node x="39334" y="-48199" />
+			<node x="39334" y="-48246" />
+		</nodes>
+		<location x="39338" y="-48200" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160009" name="rune_castle_agit_005_001">
+		<nodes nodeZ="872">
+			<node x="39176" y="-47024" />
+			<node x="39155" y="-46982" />
+			<node x="39147" y="-46986" />
+			<node x="39169" y="-47026" />
+		</nodes>
+		<location x="39172" y="-47024" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160010" name="rune_castle_agit_005_002">
+		<nodes nodeZ="872">
+			<node x="39154" y="-46982" />
+			<node x="39133" y="-46942" />
+			<node x="39127" y="-46945" />
+			<node x="39148" y="-46986" />
+		</nodes>
+		<location x="39130" y="-46944" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160011" name="rune_castle_agit_006_001">
+		<nodes nodeZ="872">
+			<node x="38626" y="-46372" />
+			<node x="38586" y="-46350" />
+			<node x="38581" y="-46358" />
+			<node x="38623" y="-46379" />
+		</nodes>
+		<location x="38624" y="-46375" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160012" name="rune_castle_agit_006_002">
+		<nodes nodeZ="872">
+			<node x="38587" y="-46350" />
+			<node x="38545" y="-46330" />
+			<node x="38542" y="-46336" />
+			<node x="38583" y="-46358" />
+		</nodes>
+		<location x="38544" y="-46333" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160013" name="rune_castle_agit_007_001">
+		<nodes nodeZ="873">
+			<node x="37787" y="-46044" />
+			<node x="37741" y="-46044" />
+			<node x="37741" y="-46051" />
+			<node x="37787" y="-46050" />
+		</nodes>
+		<location x="37787" y="-46047" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160014" name="rune_castle_agit_007_002">
+		<nodes nodeZ="873">
+			<node x="37743" y="-46043" />
+			<node x="37697" y="-46045" />
+			<node x="37697" y="-46051" />
+			<node x="37742" y="-46051" />
+		</nodes>
+		<location x="37697" y="-46048" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	
 	<!-- 21_17 -->
 	<door id="21170001" name="Rune_bodeful_fortress_s.Rune_bf_azit_gate_door">
 		<nodes nodeZ="544">
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/34426.htm b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/34426.htm
new file mode 100644
index 0000000000..9d70e30f05
--- /dev/null
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/34426.htm
@@ -0,0 +1,6 @@
+<html><body>Blackbird Clan Lord Leona Blackbird:<br>
+This place is the Atelia Outlet, the most important place of Atelia Refinery.<br>
+Embryos might sense your presence, so please be very careful.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10889_SaviorsPathFallenEmperorsThrone teleport">Teleport to the inside of Atelia Refinery.</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/multisell/3160302.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/multisell/3160302.xml
index 649c3f4856..c9ee0fe75e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/multisell/3160302.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/multisell/3160302.xml
@@ -42,7 +42,7 @@
 		<production count="1" id="38568" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
@@ -50,7 +50,7 @@
 		<production count="1" id="38569" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/multisell/3368502.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/multisell/3368502.xml
index f280615e20..0e961b13f5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/multisell/3368502.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/multisell/3368502.xml
@@ -20,7 +20,7 @@
 	<item>
 		<ingredient count="10" id="45584" />
 		<ingredient count="500000" id="57" />
-		<production count="1" id="37894" /> <!-- Hero’s Recovery Potion -->
+		<production count="1" id="37894" /> <!-- Hero's Recovery Potion -->
 	</item>
 	<item>
 		<ingredient count="2" id="45584" />
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
index 1ec233eb7f..a62bbab9b4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
@@ -170,7 +170,6 @@ public class LionelHunter extends AbstractNpcAI
 					htmltext = "33907-not-completed.html";
 				}
 				break;
-				
 			}
 		}
 		return htmltext;
@@ -186,4 +185,4 @@ public class LionelHunter extends AbstractNpcAI
 	{
 		new LionelHunter();
 	}
-}
\ No newline at end of file
+}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
new file mode 100644
index 0000000000..5eacdf1f03
--- /dev/null
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
@@ -0,0 +1,181 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.Rune.SwampOfScreams;
+
+import java.util.Calendar;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.l2jmobius.commons.util.CommonUtil;
+import org.l2jmobius.gameserver.data.xml.SpawnData;
+import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.spawns.SpawnGroup;
+import org.l2jmobius.gameserver.model.spawns.SpawnTemplate;
+import org.l2jmobius.gameserver.network.NpcStringId;
+
+import ai.AbstractNpcAI;
+
+/**
+ * @author Tanatos
+ */
+public class SwampOfScreamsSiege extends AbstractNpcAI
+{
+	// NPCs
+	private static final int[] SWAMP_MONSTERS =
+	{
+		24570,
+		24571,
+		24572,
+		24573
+	};
+	private static final int SWAMP_PETRA = 24574;
+	private static final AtomicReference<SpawnTemplate> SPAWN_SWAMP_MONSTERS = new AtomicReference<>();
+	// Misc
+	private static final int[] DAYS_OF_WEEK =
+	{
+		Calendar.MONDAY,
+		Calendar.TUESDAY,
+		Calendar.WEDNESDAY,
+		Calendar.THURSDAY,
+		Calendar.FRIDAY,
+		Calendar.SATURDAY,
+		Calendar.SUNDAY
+	};
+	// Schedule: 13-15 & 22-24
+	private static final int[] DAY_TIME =
+	{
+		13,
+		00
+	};
+	private static final int[] NIGHT_TIME =
+	{
+		22,
+		00
+	};
+	private static final long DESPAWN_DELAY = 7200000;
+	private static boolean _daytime = false;
+	
+	private SwampOfScreamsSiege()
+	{
+		addKillId(SWAMP_MONSTERS);
+		scheduleDayTime();
+		scheduleNightTime();
+		LOGGER.info("Swamp of Screams siege starts from 13:00 to 15:00 and from 22:00 to 00:00.");
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "day_time_spawn":
+			{
+				World.getInstance().getPlayers().forEach(p -> showOnScreenMsg(p, NpcStringId.EVENT_ALARM_13_00_15_00_NKILL_THE_MONSTERS_APPEARED_IN_THE_SWAMP_OF_SCREAMS, 2, 10000, true));
+				SPAWN_SWAMP_MONSTERS.set(SpawnData.getInstance().getSpawnByName("SwampOfScreamsMonsters"));
+				SPAWN_SWAMP_MONSTERS.get().getGroups().forEach(SpawnGroup::spawnAll);
+				_daytime = true;
+				startQuestTimer("despawn", DESPAWN_DELAY, null, null);
+				break;
+			}
+			case "night_time_spawn":
+			{
+				World.getInstance().getPlayers().forEach(p -> showOnScreenMsg(p, NpcStringId.EVENT_ALARM_22_00_24_00_NKILL_THE_MONSTERS_APPEARED_IN_THE_SWAMP_OF_SCREAMS, 2, 10000, true));
+				SPAWN_SWAMP_MONSTERS.set(SpawnData.getInstance().getSpawnByName("SwampOfScreamsMonsters"));
+				SPAWN_SWAMP_MONSTERS.get().getGroups().forEach(SpawnGroup::spawnAll);
+				_daytime = false;
+				startQuestTimer("despawn", DESPAWN_DELAY, null, null);
+				break;
+			}
+			case "despawn":
+			{
+				if (_daytime)
+				{
+					World.getInstance().getPlayers().forEach(p -> showOnScreenMsg(p, NpcStringId.EVENT_ALARM_22_00_24_00_NMONSTERS_OF_THE_SWAMP_OF_SCREAMS_ARE_DEFEATED, 2, 10000, true));
+				}
+				else
+				{
+					World.getInstance().getPlayers().forEach(p -> showOnScreenMsg(p, NpcStringId.EVENT_ALARM_13_00_15_00_NMONSTERS_OF_THE_SWAMP_OF_SCREAMS_ARE_DEFEATED, 2, 10000, true));
+				}
+				SPAWN_SWAMP_MONSTERS.set(SpawnData.getInstance().getSpawnByName("SwampOfScreamsMonsters"));
+				SPAWN_SWAMP_MONSTERS.get().getGroups().forEach(SpawnGroup::despawnAll);
+				break;
+			}
+		}
+		return super.onAdvEvent(event, npc, player);
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player killer, boolean isSummon)
+	{
+		if ((CommonUtil.contains(SWAMP_MONSTERS, npc.getId())) && (getRandom(100) < 3))
+		{
+			addSpawn(SWAMP_PETRA, npc.getLocation(), false, 600000, false);
+		}
+		return super.onKill(npc, killer, isSummon);
+	}
+	
+	private void scheduleDayTime()
+	{
+		long time = Long.MAX_VALUE;
+		for (int day : DAYS_OF_WEEK)
+		{
+			final long nextDateMillis = getNextDateMilis(day, DAY_TIME[0], DAY_TIME[1]);
+			if (nextDateMillis < time)
+			{
+				time = nextDateMillis;
+			}
+		}
+		startQuestTimer("day_time_spawn", time - System.currentTimeMillis(), null, null);
+	}
+	
+	private void scheduleNightTime()
+	{
+		long time = Long.MAX_VALUE;
+		for (int day : DAYS_OF_WEEK)
+		{
+			final long nextDateMillis = getNextDateMilis(day, NIGHT_TIME[0], NIGHT_TIME[1]);
+			if (nextDateMillis < time)
+			{
+				time = nextDateMillis;
+			}
+		}
+		startQuestTimer("night_time_spawn", time - System.currentTimeMillis(), null, null);
+	}
+	
+	private long getNextDateMilis(int dayOfWeek, int hour, int minute)
+	{
+		final Calendar calendar = Calendar.getInstance();
+		calendar.set(Calendar.HOUR_OF_DAY, hour);
+		calendar.set(Calendar.MINUTE, minute);
+		calendar.set(Calendar.SECOND, 0);
+		for (int i = 0; i < 7; i++)
+		{
+			if ((calendar.get(Calendar.DAY_OF_WEEK) == dayOfWeek) && (calendar.getTimeInMillis() > System.currentTimeMillis()))
+			{
+				return calendar.getTimeInMillis();
+			}
+			calendar.add(Calendar.DAY_OF_WEEK, 1);
+		}
+		return calendar.getTimeInMillis();
+	}
+	
+	public static void main(String[] args)
+	{
+		new SwampOfScreamsSiege();
+	}
+}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GreedyTreasureChests.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GreedyTreasureChests.java
index 7bc5305338..c205e4d7e7 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GreedyTreasureChests.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GreedyTreasureChests.java
@@ -213,7 +213,7 @@ public class GreedyTreasureChests extends AbstractNpcAI
 					else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FM_2", 0))
 					{
 						addSpawn(CHEST_LV110, npc, true, 0, true);
-						GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET)));
+						GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_NZ_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET)));
 					}
 					else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_FM_3", 0))
 					{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index d3d1a6bbcf..6c678e8c19 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -235,6 +236,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
index a2c4da4b3f..080af57b40 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
@@ -297,7 +297,20 @@ public class Eraton extends AbstractNpcAI
 				takeItem(player, STONE_OF_DESTINY);
 				takeItem(player, getCloakItemId(player));
 				
-				player.removeAllSkills();
+				if (Config.ERATON_RETAINED_SKILLS.isEmpty())
+				{
+					player.removeAllSkills();
+				}
+				else
+				{
+					for (Skill skill : player.getAllSkills())
+					{
+						if (!Config.ERATON_RETAINED_SKILLS.contains(skill.getId()))
+						{
+							player.removeSkill(skill);
+						}
+					}
+				}
 				
 				// Stop auto use.
 				for (Shortcut shortcut : player.getAllShortCuts())
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 136f136a58..871b734c13 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -44,6 +44,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AgathionSlot", AgathionSlot::new);
@@ -199,6 +201,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("HpRegen", HpRegen::new);
 		EffectHandler.getInstance().registerHandler("HpToOwner", HpToOwner::new);
 		EffectHandler.getInstance().registerHandler("IgnoreDeath", IgnoreDeath::new);
+		EffectHandler.getInstance().registerHandler("IgnoreReduceDamage", IgnoreReduceDamage::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageBonus", ImmobileDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageResist", ImmobileDamageResist::new);
 		EffectHandler.getInstance().registerHandler("ImmobilePetBuff", ImmobilePetBuff::new);
@@ -238,7 +241,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java
index ffc903fd3f..bc95845925 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java
@@ -48,6 +48,7 @@ public class SkillConditionMasterHandler
 		SkillConditionHandler.getInstance().registerHandler("CanUseInDragonLair", CanUseInDragonLairSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CanUseSwoopCannon", CanUseSwoopCannonSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("HasVitalityPoints", HasVitalityPointsSkillCondition::new);
+		SkillConditionHandler.getInstance().registerHandler("CanUseSymbolSealIncreaseItem", CanUseSymbolSealIncreaseItemSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
new file mode 100644
index 0000000000..5405ccd4be
--- /dev/null
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class IgnoreReduceDamage extends AbstractStatEffect
+{
+	public IgnoreReduceDamage(StatSet params)
+	{
+		super(params, Stat.IGNORE_REDUCE_DAMAGE);
+	}
+}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
index 951002a2c2..35bfbcb6bc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.enums.StatModifierType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener;
 import org.l2jmobius.gameserver.model.events.returns.DamageReturn;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author Sdw
@@ -32,10 +34,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 public class ReduceDamage extends AbstractEffect
 {
 	private final double _amount;
+	private final StatModifierType _mode;
 	
 	public ReduceDamage(StatSet params)
 	{
 		_amount = params.getDouble("amount");
+		_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
 	}
 	
 	private DamageReturn onDamageReceivedEvent(OnCreatureDamageReceived event)
@@ -46,7 +50,15 @@ public class ReduceDamage extends AbstractEffect
 			return null;
 		}
 		
-		final double newDamage = event.getDamage() * (_amount / 100);
+		final double newDamage;
+		if (_mode == StatModifierType.PER)
+		{
+			newDamage = event.getDamage() - (event.getDamage() * (_amount / 100));
+		}
+		else // DIFF
+		{
+			newDamage = event.getDamage() - Math.max((_amount - event.getAttacker().getStat().getAdd(Stat.IGNORE_REDUCE_DAMAGE)), 0.0);
+		}
 		
 		return new DamageReturn(false, true, false, newDamage);
 	}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java
index 03d9e8638b..634ea96c64 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java
@@ -16,14 +16,21 @@
  */
 package handlers.effecthandlers;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import org.l2jmobius.Config;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.enums.StatModifierType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.effects.EffectType;
+import org.l2jmobius.gameserver.model.holders.ItemSkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author NviX
@@ -39,6 +46,12 @@ public class RestoreSymbolSeal extends AbstractEffect
 		_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.PER);
 	}
 	
+	@Override
+	public EffectType getEffectType()
+	{
+		return EffectType.RESTORE_SYMBOL_SEAL;
+	}
+	
 	@Override
 	public boolean isInstant()
 	{
@@ -77,6 +90,33 @@ public class RestoreSymbolSeal extends AbstractEffect
 			player.updateSymbolSealSkills();
 			player.sendSkillList();
 			player.broadcastUserInfo();
+			
+			// Send item list to update Dye Powder with red icon in inventory.
+			ThreadPool.schedule(() ->
+			{
+				final List<Item> items = new LinkedList<>();
+				ITEMS: for (Item i : effected.getActingPlayer().getInventory().getItems())
+				{
+					if (i.getTemplate().hasSkills())
+					{
+						for (ItemSkillHolder s : i.getTemplate().getAllSkills())
+						{
+							if (s.getSkill().hasEffectType(EffectType.RESTORE_SYMBOL_SEAL))
+							{
+								items.add(i);
+								continue ITEMS;
+							}
+						}
+					}
+				}
+				
+				if (!items.isEmpty())
+				{
+					final InventoryUpdate iu = new InventoryUpdate();
+					iu.addItems(items);
+					effected.getActingPlayer().sendInventoryUpdate(iu);
+				}
+			}, 1000);
 		}
 	}
 }
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index 7e02e79abc..bff5a1734b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -210,6 +210,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()) || _renewDuration)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
index 70789354f3..fd41f09a9a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
@@ -17,7 +17,13 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author Sero
@@ -28,4 +34,46 @@ public class WeaponBonusMAtk extends AbstractStatAddEffect
 	{
 		super(params, Stat.WEAPON_BONUS_MAGIC_ATTACK);
 	}
+	
+	@Override
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
 }
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
index df05ef8607..b36b10a92e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
@@ -17,7 +17,13 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author Sero
@@ -28,4 +34,46 @@ public class WeaponBonusPAtk extends AbstractStatAddEffect
 	{
 		super(params, Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
 	}
+	
+	@Override
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index b7434abd2e..854051b04c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,61 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetHold.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetHold.java
index 5e726bae7b..5688e59b8b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetHold.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetHold.java
@@ -52,4 +52,10 @@ public class PetHold implements IPlayerActionHandler
 			((SummonAI) pet.getAI()).notifyFollowStatusChange();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetMove.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetMove.java
index e5198fda6f..7b37a62148 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetMove.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetMove.java
@@ -53,4 +53,10 @@ public class PetMove implements IPlayerActionHandler
 			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, player.getTarget().getLocation());
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
index 80c073b1dc..f2044ed108 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
@@ -77,4 +77,10 @@ public class PetSkillUse implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetStop.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetStop.java
index 7ba96efec2..bcf54c7e96 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetStop.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetStop.java
@@ -51,4 +51,10 @@ public class PetStop implements IPlayerActionHandler
 			pet.cancelAction();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..b681353b73 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,52 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorHold.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
index 4bbeee8387..1931066222 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
@@ -48,4 +48,10 @@ public class ServitorHold implements IPlayerActionHandler
 			((SummonAI) s.getAI()).notifyFollowStatusChange();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorMode.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
index 456a2e042b..14159b2066 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
@@ -68,4 +68,10 @@ public class ServitorMode implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorMove.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
index 36528e0063..a5269a3d15 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
@@ -56,4 +56,10 @@ public class ServitorMove implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
index b67b13f2cc..133040fba4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
@@ -62,4 +62,10 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			}
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorStop.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
index 24db478dc7..3dda0b9c15 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
@@ -47,4 +47,10 @@ public class ServitorStop implements IPlayerActionHandler
 			s.cancelAction();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
index 390822a7b1..eaace592ee 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
@@ -62,4 +62,10 @@ public class UnsummonPet implements IPlayerActionHandler
 			pet.unSummon(player);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
index e4944df496..937dcaad1a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
@@ -69,4 +69,10 @@ public class UnsummonServitor implements IPlayerActionHandler
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSymbolSealIncreaseItemSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSymbolSealIncreaseItemSkillCondition.java
new file mode 100644
index 0000000000..3ab0d0bb69
--- /dev/null
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSymbolSealIncreaseItemSkillCondition.java
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.skillconditionhandlers;
+
+import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.skill.ISkillCondition;
+import org.l2jmobius.gameserver.model.skill.Skill;
+
+/**
+ * @author CostyKiller
+ */
+public class CanUseSymbolSealIncreaseItemSkillCondition implements ISkillCondition
+{
+	private final int _amount;
+	
+	public CanUseSymbolSealIncreaseItemSkillCondition(StatSet params)
+	{
+		_amount = params.getInt("amount", 0);
+	}
+	
+	@Override
+	public boolean canUse(Creature caster, Skill skill, WorldObject target)
+	{
+		return caster.isPlayer() && ((caster.getActingPlayer().getSymbolSealPoints() + ((Config.MAX_SYMBOL_SEAL_POINTS * _amount) / 100)) <= Config.MAX_SYMBOL_SEAL_POINTS);
+	}
+}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 89e06fc91d..7e94e156e6 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.quest.QuestState;
@@ -46,10 +47,11 @@ public class ChamberOfProphecies extends AbstractInstance
 {
 	// NPCs
 	private static final int KAIN_VAN_HALTER = 31639;
-	private static final int VAN_HALTER = 33999;
-	private static final int FERIN = 34001;
 	private static final int GRAIL = 33996;
 	private static final int MYSTERIOUS_WIZARD = 33980;
+	// Helper NPCs
+	private static final int HELPER_VAN_HALTER = 33999;
+	private static final int HELPER_FERIN = 34001;
 	// Misc
 	private static final int DOOR_2 = 17230102;
 	private static final int DOOR_3 = 17230103;
@@ -66,7 +68,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		addStartNpc(KAIN_VAN_HALTER);
 		addFirstTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
 		addTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
-		addCreatureSeeId(FERIN, VAN_HALTER);
+		addCreatureSeeId(HELPER_FERIN, HELPER_VAN_HALTER);
 	}
 	
 	@Override
@@ -145,12 +147,12 @@ public class ChamberOfProphecies extends AbstractInstance
 				{
 					return null;
 				}
-				final Npc valHalter = world.getNpc(VAN_HALTER);
-				if (valHalter != null)
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
+				if (vanHalter != null)
 				{
-					valHalter.deleteMe(); // probably needs another npc id for initial room
+					vanHalter.deleteMe(); // probably needs another npc id for initial room
 				}
-				final Npc ferin = world.getNpc(FERIN);
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
 				if (ferin != null)
 				{
 					ferin.deleteMe(); // probably needs another npc id for initial room
@@ -190,6 +192,8 @@ public class ChamberOfProphecies extends AbstractInstance
 			case "CHECK_STATUS":
 			{
 				final Instance world = player.getInstanceWorld();
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
 				if (!isInInstance(world))
 				{
 					return null;
@@ -200,8 +204,8 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
-							startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY2", 14000, ferin, player);
+							startQuestTimer("SEY_KAIN", 24000, vanHalter, player);
 							startQuestTimer("OPEN_DOOR1", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -221,7 +225,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY3", 8000, ferin, player);
 							startQuestTimer("OPEN_DOOR2", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -234,7 +238,7 @@ public class ChamberOfProphecies extends AbstractInstance
 							world.setStatus(4);
 							world.spawnGroup("wof_room3_2");
 							world.openCloseDoor(DOOR_3, false);
-							startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY_KAIN_1", 5000, vanHalter, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
 						break;
@@ -245,8 +249,8 @@ public class ChamberOfProphecies extends AbstractInstance
 						{
 							world.setStatus(5);
 							world.spawnGroup("wof_room4");
-							startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
-							startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY_KAIN_2", 3000, vanHalter, player);
+							startQuestTimer("SEY4", 7000, ferin, player);
 						}
 						else
 						{
@@ -304,7 +308,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					return null;
 				}
 				cancelQuestTimer("ATTACK1", npc, player);
-				startQuestTimer("ATTACK2", 200, world.getNpc(VAN_HALTER), player, true);
+				startQuestTimer("ATTACK2", 200, world.getNpc(HELPER_VAN_HALTER), player, true);
 				world.setStatus(3);
 				world.spawnGroup("wof_room3");
 				world.openCloseDoor(DOOR_3, true);
@@ -321,7 +325,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY2":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.YOU_CAN_T_DIE_HERE_I_DIDN_T_LEARN_RESURRECT_YET));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_4", 0, 0, 0, 0, 0));
@@ -330,7 +334,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GISELLE_WAS_SUCH_A_SWEET_CHILD));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_1", 0, 0, 0, 0, 0));
@@ -340,7 +344,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY3":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.DO_YOU_THINK_I_LL_GROW_TALLER_IF_I_EAT_LOTS_AND_LOTS));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_6", 0, 0, 0, 0, 0));
@@ -349,7 +353,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_1":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.SUCH_MONSTERS_IN_A_PLACE_LIKE_THIS_UNBELIEVABLE));
 				}
@@ -357,7 +361,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_2":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THAT_S_THE_MONSTER_THAT_ATTACKED_FAERON_YOU_RE_OUTMATCHED_HERE_GO_AHEAD_I_LL_CATCH_UP));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_6", 0, 0, 0, 0, 0));
@@ -367,7 +371,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY4":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GO_NOW_KAIN_CAN_HANDLE_THIS));
 					npc.setScriptValue(1);
@@ -377,7 +381,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_3":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.LEAVE_THIS_TO_ME_GO));
 					npc.setScriptValue(1);
@@ -387,7 +391,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "REST":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, player);
 				}
@@ -508,7 +512,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		{
 			switch (npc.getId())
 			{
-				case FERIN:
+				case HELPER_FERIN:
 				{
 					if (creature.isPlayer() && !creature.isDead() && npc.isScriptValue(0))
 					{
@@ -516,7 +520,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					}
 					break;
 				}
-				case VAN_HALTER:
+				case HELPER_VAN_HALTER:
 				{
 					if (creature.isPlayer() && !creature.isDead() && world.isStatus(0))
 					{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
index 57f651334c..da4e516f85 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
@@ -177,7 +177,14 @@ public class Q00933_TombRaiders extends Quest
 		final Party party = killer.getParty();
 		if (party != null)
 		{
-			party.getMembers().forEach(p -> processKill(npc, p));
+			for (Player member : party.getMembers())
+			{
+				final QuestState qs = getQuestState(member, false);
+				if (qs != null)
+				{
+					processKill(npc, member);
+				}
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-01.htm b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-01.htm
index 3314d03969..5094a407f3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-01.htm
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-01.htm
@@ -1,4 +1,6 @@
 <html><body>Verdure Elder Elikia:<br>
-Have you brought me the message from Leona Blackbird?
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-03.html">"Yes, here it is."</Button>
+Greetings! I've been expecting you for a while.<br>
+Leona asked me to tell you something.<br>
+I hope you are ready to hear me out and help.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-02.htm">"What has Leona asked you to tell?"</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.htm b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.htm
new file mode 100644
index 0000000000..e7fc7b5818
--- /dev/null
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.htm
@@ -0,0 +1,6 @@
+<html><body>Verdure Elder Elikia:<br>
+I see you are ready. Now I'm going to tell you what Leona has told me.<br>
+In the last combat with Etis van Etina, Leona was badly wounded, so she had to train to recover her strength. Unfortunately, she had no time to complete the trainings because she received a message. It said about a dungeon of Atelia Fortress. Something connected to Etis van Etina was found there. That place was very odd and was called <font color="LEVEL">Atelia Refinery</font>.<br>
+Leona wanted to meet you personally, but there was an urgent business, so she asked me to see you and explain the situation. My mission is connected with that place.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-03.htm">Ask about Atelia Refinery</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.html b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.html
deleted file mode 100644
index 9d262558f5..0000000000
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Verdure Elder Elikia:<br>
-I don't see any message from Leona Blackbird, make sure you bring that to me.
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.htm b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.htm
new file mode 100644
index 0000000000..32f35f5524
--- /dev/null
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.htm
@@ -0,0 +1,6 @@
+<html><body>Verdure Elder Elikia:<br>
+We're assuming by the name that it's where Atelia is refined.<br>
+It's located at the underground of Atelia Fortress, so we didn't know about it until now.<br>
+I think Atelia refined from there is sent to the great temple where Etis van Etina is.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-04.html">"What has happened so far?"</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.html b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.html
deleted file mode 100644
index 5eeee527eb..0000000000
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Verdure Elder Elikia:<br>
-Great! You have brought it, now let me read it.<br>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.htm b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.htm
deleted file mode 100644
index 216047fa2e..0000000000
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Verdure Elder Elikia:<br>
-I've read the message from Leona Blackbird you should go see her to tell you what you have to do.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-05.html">"Ok, I'll go."</Button>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.html b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.html
new file mode 100644
index 0000000000..30f55b94dd
--- /dev/null
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.html
@@ -0,0 +1,6 @@
+<html><body>Verdure Elder Elikia:<br>
+Leona was lost in despair for some time but she finally rose again and started investigating the Atelia Refinery.<br>
+But our strength still isn't enough, so we're asking for your help once again.<br>
+Leona will be at the entrance of the Atelia Refinery. You'll find it if you leave camp and follow the passage of Dimensional Energy to the west.<br>
+Leona will fill you in with more details.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-05.html b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-05.html
deleted file mode 100644
index 59c38eaca9..0000000000
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-05.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Verdure Elder Elikia:<br>
-Leona Blackbird is waiting for you at Atelia Refinery entrance.
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Message.html b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Message.html
deleted file mode 100644
index 66e7889930..0000000000
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Message.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Message:<br>
-You received a message from Leona Blackbird, this means you can start Savior's Path quests.<br>
-To learn more, go to Blackbird Campsite and talk to Elikia.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery closeMessage">"Close message."</Button>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
index 1463675b0a..75d384ed5e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
@@ -16,6 +16,7 @@
  */
 package quests.Q10885_SaviorsPathDiscovery;
 
+import org.l2jmobius.gameserver.enums.Movie;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.Quest;
@@ -58,20 +59,27 @@ public class Q10885_SaviorsPathDiscovery extends Quest
 		String htmltext = null;
 		switch (event)
 		{
-			case "34057-03.html":
+			case "34057-02.htm":
+			{
+				qs.startQuest();
+				htmltext = event;
+				break;
+			}
+			case "34057-03.htm":
 			{
 				if (qs.isCond(1))
 				{
-					takeItems(player, -1, LEONA_BLACKBIRDS_MESSAGE);
 					qs.setCond(2);
 				}
 				htmltext = event;
 				break;
 			}
-			case "34057-05.html":
+			case "34057-04.html":
 			{
 				if (qs.isCond(2))
 				{
+					giveItems(player, LEONA_BLACKBIRDS_MESSAGE, 1, true);
+					playMovie(player, Movie.EP5_ASTATINE_QST_START);
 					qs.setCond(3);
 				}
 				htmltext = event;
@@ -83,6 +91,7 @@ public class Q10885_SaviorsPathDiscovery extends Quest
 				{
 					if ((player.getLevel() >= MIN_LEVEL))
 					{
+						takeItems(player, -1, LEONA_BLACKBIRDS_MESSAGE);
 						addExpAndSp(player, 906387492, 906387);
 						qs.exitQuest(false, true);
 						htmltext = event;
@@ -137,7 +146,11 @@ public class Q10885_SaviorsPathDiscovery extends Quest
 						}
 						else if (qs.isCond(2))
 						{
-							htmltext = "34057-04.htm";
+							htmltext = "34057-03.htm";
+						}
+						else if (qs.isCond(3))
+						{
+							htmltext = "34057-04.html";
 						}
 						break;
 					}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/34425-04.html b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/34425-04.html
index 37b0c2b30c..7d977a4778 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/34425-04.html
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/34425-04.html
@@ -1,4 +1,4 @@
 <html><body>Blackbird Clan Lord Leona Blackbird:<br>
-Yes. Go speak to <font color="LEVEL">Devianne</font>.
+Yes. Go speak to <font color="LEVEL">Devianne</font>.<br>
 Devianne will tell you how to get to the Atelia Refinery and what you must do there.<br>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
index 5f08cbbf5c..3adf10d05f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
@@ -614,7 +614,7 @@ public class Q11025_PathOfDestinyProving extends Quest
 				holder.add(new NpcLogListHolder(NpcStringId.DEFEAT_SKELETONS_3.getId(), true, qs.getInt(KILL_COUNT_VAR)));
 				return holder;
 			}
-			else if (qs.isCond(11))
+			else if (qs.isCond(12))
 			{
 				final Set<NpcLogListHolder> holder = new HashSet<>();
 				holder.add(new NpcLogListHolder(NpcStringId.INVESTIGATE_THE_SURROUNDINGS.getId(), true, qs.getInt(KILL_COUNT_VAR2)));
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
index 64bd6eb6a7..cd880b6095 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
@@ -312,7 +312,6 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT1);
 				}
-				htmltext = event;
 				break;
 			}
 			case "teleport2":
@@ -321,7 +320,6 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT2);
 				}
-				htmltext = event;
 				break;
 			}
 			case "teleport3":
@@ -330,7 +328,6 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT3);
 				}
-				htmltext = event;
 				break;
 			}
 			case "teleport4":
@@ -339,7 +336,6 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT4);
 				}
-				htmltext = event;
 				break;
 			}
 			case "teleport5":
@@ -348,10 +344,8 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT5);
 				}
-				htmltext = event;
 				break;
 			}
-			
 		}
 		return htmltext;
 	}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/33932-04.html b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/33932-04.html
index 34fcecd6d8..a0fbc4196d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/33932-04.html
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/33932-04.html
@@ -3,7 +3,7 @@
 <font color="LEVEL">When the god's voice will no longer be heard.</font><br>
 <font color="LEVEL">A red river flows...</font><br>
 <font color="LEVEL">Hard frost upon the earth... And one of half-noble blood, descending with the winds to become the prophesied one.</font><br>
-<font color="LEVEL">Your lonely, solitary journey has begun. A small child in the middle of a blocked road appears. When joined by one of nobility, the path will open to the Grail.</center><br>
+<font color="LEVEL">Your lonely, solitary journey has begun. A small child in the middle of a blocked road appears. When joined by one of nobility, the path will open to the Grail.</font></center><br>
 So it wasn't a coincidence that you left on your journey.<br>
 <Button ALIGN=LEFT ICON="Normal" action="bypass -h Quest Q11027_PathOfDestinyOvercome 33932-05.html">"What do you mean?"</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Rune/SwampOfScreamsMonsters.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Rune/SwampOfScreamsMonsters.xml
index 805daf70ba..7da3cdc129 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Rune/SwampOfScreamsMonsters.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Rune/SwampOfScreamsMonsters.xml
@@ -1,1183 +1,636 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_01" minZ="-2429" maxZ="-1929">
-				<node x="77747" y="-58718" />
-				<node x="77937" y="-58524" />
-				<node x="77937" y="-58267" />
-				<node x="77745" y="-58075" />
-				<node x="77489" y="-58076" />
-				<node x="77297" y="-58270" />
-				<node x="77299" y="-58525" />
-				<node x="77490" y="-58719" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_02" minZ="-2432" maxZ="-1932">
-				<node x="77606" y="-61735" />
-				<node x="77899" y="-61648" />
-				<node x="77827" y="-61312" />
-				<node x="77576" y="-61259" />
-				<node x="77312" y="-61312" />
-				<node x="76979" y="-61398" />
-				<node x="77056" y="-61827" />
-				<node x="77308" y="-61743" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_03" minZ="-2429" maxZ="-1929">
-				<node x="81568" y="-63672" />
-				<node x="81758" y="-63478" />
-				<node x="81758" y="-63221" />
-				<node x="81566" y="-63029" />
-				<node x="81310" y="-63030" />
-				<node x="81117" y="-63224" />
-				<node x="81120" y="-63479" />
-				<node x="81311" y="-63673" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_04" minZ="-2443" maxZ="-1943">
-				<node x="85107" y="-63157" />
-				<node x="85297" y="-62963" />
-				<node x="85298" y="-62707" />
-				<node x="85105" y="-62514" />
-				<node x="84849" y="-62515" />
-				<node x="84657" y="-62709" />
-				<node x="84660" y="-62964" />
-				<node x="84850" y="-63158" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_05" minZ="-2443" maxZ="-1943">
-				<node x="85647" y="-59758" />
-				<node x="85837" y="-59565" />
-				<node x="85838" y="-59308" />
-				<node x="85645" y="-59115" />
-				<node x="85389" y="-59116" />
-				<node x="85197" y="-59310" />
-				<node x="85200" y="-59566" />
-				<node x="85390" y="-59760" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_06" minZ="-2739" maxZ="-2239">
-				<node x="94136" y="-55178" />
-				<node x="94327" y="-54984" />
-				<node x="94327" y="-54727" />
-				<node x="94135" y="-54535" />
-				<node x="93878" y="-54536" />
-				<node x="93686" y="-54730" />
-				<node x="93689" y="-54985" />
-				<node x="93879" y="-55179" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_07" minZ="-2739" maxZ="-2239">
-				<node x="94756" y="-52845" />
-				<node x="94946" y="-52651" />
-				<node x="94946" y="-52395" />
-				<node x="94754" y="-52202" />
-				<node x="94497" y="-52203" />
-				<node x="94305" y="-52397" />
-				<node x="94308" y="-52652" />
-				<node x="94499" y="-52847" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_08" minZ="-2739" maxZ="-2239">
-				<node x="89550" y="-52293" />
-				<node x="89740" y="-52100" />
-				<node x="89741" y="-51843" />
-				<node x="89548" y="-51651" />
-				<node x="89292" y="-51652" />
-				<node x="89100" y="-51846" />
-				<node x="89103" y="-52101" />
-				<node x="89293" y="-52295" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_09" minZ="-2502" maxZ="-2002">
-				<node x="83172" y="-50881" />
-				<node x="83362" y="-50687" />
-				<node x="83362" y="-50431" />
-				<node x="83170" y="-50238" />
-				<node x="82913" y="-50239" />
-				<node x="82721" y="-50433" />
-				<node x="82724" y="-50688" />
-				<node x="82915" y="-50883" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_10" minZ="-2443" maxZ="-1943">
-				<node x="78978" y="-51399" />
-				<node x="79168" y="-51206" />
-				<node x="79169" y="-50949" />
-				<node x="78976" y="-50756" />
-				<node x="78720" y="-50757" />
-				<node x="78528" y="-50951" />
-				<node x="78531" y="-51207" />
-				<node x="78721" y="-51401" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_11" minZ="-3246" maxZ="-2746">
-				<node x="73884" y="-51613" />
-				<node x="74074" y="-51420" />
-				<node x="74074" y="-51163" />
-				<node x="73882" y="-50970" />
-				<node x="73626" y="-50971" />
-				<node x="73434" y="-51165" />
-				<node x="73436" y="-51421" />
-				<node x="73627" y="-51615" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_12" minZ="-3287" maxZ="-2787">
-				<node x="75808" y="-54864" />
-				<node x="75998" y="-54670" />
-				<node x="75999" y="-54414" />
-				<node x="75806" y="-54221" />
-				<node x="75550" y="-54222" />
-				<node x="75358" y="-54416" />
-				<node x="75361" y="-54671" />
-				<node x="75551" y="-54866" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_13" minZ="-2454" maxZ="-1954">
-				<node x="85479" y="-55083" />
-				<node x="85669" y="-54890" />
-				<node x="85669" y="-54633" />
-				<node x="85477" y="-54440" />
-				<node x="85221" y="-54442" />
-				<node x="85029" y="-54635" />
-				<node x="85031" y="-54891" />
-				<node x="85222" y="-55085" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_14" minZ="-2429" maxZ="-1929">
-				<node x="76441" y="-60418" />
-				<node x="76631" y="-60224" />
-				<node x="76631" y="-59967" />
-				<node x="76439" y="-59775" />
-				<node x="76183" y="-59776" />
-				<node x="75991" y="-59970" />
-				<node x="75993" y="-60225" />
-				<node x="76184" y="-60419" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_15" minZ="-2429" maxZ="-1929">
-				<node x="84161" y="-61281" />
-				<node x="84351" y="-61087" />
-				<node x="84351" y="-60830" />
-				<node x="84159" y="-60638" />
-				<node x="83903" y="-60639" />
-				<node x="83711" y="-60833" />
-				<node x="83713" y="-61088" />
-				<node x="83904" y="-61282" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_16" minZ="-2429" maxZ="-1929">
-				<node x="84299" y="-58492" />
-				<node x="84489" y="-58298" />
-				<node x="84489" y="-58041" />
-				<node x="84297" y="-57849" />
-				<node x="84041" y="-57850" />
-				<node x="83849" y="-58044" />
-				<node x="83851" y="-58299" />
-				<node x="84042" y="-58493" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_17" minZ="-2429" maxZ="-1929">
-				<node x="88437" y="-57690" />
-				<node x="88627" y="-57496" />
-				<node x="88627" y="-57239" />
-				<node x="88435" y="-57047" />
-				<node x="88179" y="-57048" />
-				<node x="87987" y="-57242" />
-				<node x="87989" y="-57497" />
-				<node x="88180" y="-57691" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_18" minZ="-2739" maxZ="-2239">
-				<node x="91401" y="-51521" />
-				<node x="91591" y="-51328" />
-				<node x="91592" y="-51071" />
-				<node x="91399" y="-50879" />
-				<node x="91143" y="-50880" />
-				<node x="90951" y="-51074" />
-				<node x="90954" y="-51329" />
-				<node x="91144" y="-51523" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_19" minZ="-3361" maxZ="-2861">
-				<node x="83708" y="-45975" />
-				<node x="83898" y="-45781" />
-				<node x="83898" y="-45524" />
-				<node x="83706" y="-45332" />
-				<node x="83450" y="-45333" />
-				<node x="83258" y="-45527" />
-				<node x="83260" y="-45782" />
-				<node x="83451" y="-45976" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_20" minZ="-3361" maxZ="-2861">
-				<node x="79937" y="-45735" />
-				<node x="80127" y="-45541" />
-				<node x="80127" y="-45284" />
-				<node x="79935" y="-45092" />
-				<node x="79679" y="-45093" />
-				<node x="79487" y="-45287" />
-				<node x="79489" y="-45542" />
-				<node x="79680" y="-45736" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_21" minZ="-3361" maxZ="-2861">
-				<node x="75126" y="-46888" />
-				<node x="75316" y="-46694" />
-				<node x="75316" y="-46437" />
-				<node x="75124" y="-46245" />
-				<node x="74868" y="-46246" />
-				<node x="74676" y="-46440" />
-				<node x="74678" y="-46695" />
-				<node x="74869" y="-46889" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_22" minZ="-3361" maxZ="-2861">
-				<node x="71139" y="-41611" />
-				<node x="71329" y="-41417" />
-				<node x="71329" y="-41160" />
-				<node x="71137" y="-40968" />
-				<node x="70881" y="-40969" />
-				<node x="70689" y="-41163" />
-				<node x="70691" y="-41418" />
-				<node x="70882" y="-41612" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_01" minZ="-3361" maxZ="-2861">
-				<node x="73183" y="-42690" />
-				<node x="73373" y="-42496" />
-				<node x="73374" y="-42240" />
-				<node x="73181" y="-42047" />
-				<node x="72925" y="-42048" />
-				<node x="72733" y="-42242" />
-				<node x="72736" y="-42497" />
-				<node x="72926" y="-42691" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_02" minZ="-3361" maxZ="-2861">
-				<node x="73707" y="-42673" />
-				<node x="73897" y="-42480" />
-				<node x="73897" y="-42223" />
-				<node x="73705" y="-42030" />
-				<node x="73449" y="-42031" />
-				<node x="73257" y="-42225" />
-				<node x="73259" y="-42481" />
-				<node x="73450" y="-42675" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_03" minZ="-3361" maxZ="-2861">
-				<node x="79440" y="-42583" />
-				<node x="79630" y="-42390" />
-				<node x="79630" y="-42133" />
-				<node x="79438" y="-41940" />
-				<node x="79181" y="-41942" />
-				<node x="78989" y="-42136" />
-				<node x="78992" y="-42391" />
-				<node x="79182" y="-42585" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_04" minZ="-3361" maxZ="-2861">
-				<node x="79860" y="-42263" />
-				<node x="80050" y="-42070" />
-				<node x="80051" y="-41813" />
-				<node x="79858" y="-41620" />
-				<node x="79602" y="-41621" />
-				<node x="79410" y="-41815" />
-				<node x="79413" y="-42071" />
-				<node x="79603" y="-42265" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_05" minZ="-3361" maxZ="-2861">
-				<node x="82408" y="-42131" />
-				<node x="82598" y="-41938" />
-				<node x="82599" y="-41681" />
-				<node x="82406" y="-41488" />
-				<node x="82150" y="-41489" />
-				<node x="81958" y="-41683" />
-				<node x="81961" y="-41939" />
-				<node x="82151" y="-42133" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_06" minZ="-3361" maxZ="-2861">
-				<node x="82466" y="-41657" />
-				<node x="82656" y="-41463" />
-				<node x="82656" y="-41207" />
-				<node x="82464" y="-41014" />
-				<node x="82207" y="-41015" />
-				<node x="82015" y="-41209" />
-				<node x="82018" y="-41464" />
-				<node x="82208" y="-41659" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_07" minZ="-3361" maxZ="-2861">
-				<node x="81585" y="-44731" />
-				<node x="81775" y="-44538" />
-				<node x="81775" y="-44281" />
-				<node x="81583" y="-44088" />
-				<node x="81327" y="-44090" />
-				<node x="81135" y="-44283" />
-				<node x="81137" y="-44539" />
-				<node x="81328" y="-44733" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_08" minZ="-3361" maxZ="-2861">
-				<node x="81779" y="-45175" />
-				<node x="81969" y="-44981" />
-				<node x="81969" y="-44724" />
-				<node x="81777" y="-44532" />
-				<node x="81521" y="-44533" />
-				<node x="81329" y="-44727" />
-				<node x="81331" y="-44982" />
-				<node x="81522" y="-45176" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_09" minZ="-2717" maxZ="-2217">
-				<node x="92140" y="-53133" />
-				<node x="92330" y="-52939" />
-				<node x="92330" y="-52682" />
-				<node x="92138" y="-52490" />
-				<node x="91882" y="-52491" />
-				<node x="91690" y="-52685" />
-				<node x="91692" y="-52940" />
-				<node x="91883" y="-53134" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_10" minZ="-2717" maxZ="-2217">
-				<node x="92422" y="-53473" />
-				<node x="92612" y="-53279" />
-				<node x="92613" y="-53022" />
-				<node x="92420" y="-52830" />
-				<node x="92164" y="-52831" />
-				<node x="91972" y="-53025" />
-				<node x="91975" y="-53280" />
-				<node x="92165" y="-53474" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_11" minZ="-2439" maxZ="-1939">
-				<node x="88687" y="-60732" />
-				<node x="88877" y="-60539" />
-				<node x="88877" y="-60282" />
-				<node x="88685" y="-60089" />
-				<node x="88429" y="-60090" />
-				<node x="88237" y="-60284" />
-				<node x="88239" y="-60539" />
-				<node x="88430" y="-60734" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_12" minZ="-2439" maxZ="-1939">
-				<node x="89026" y="-60332" />
-				<node x="89216" y="-60138" />
-				<node x="89216" y="-59881" />
-				<node x="89024" y="-59689" />
-				<node x="88768" y="-59690" />
-				<node x="88576" y="-59884" />
-				<node x="88578" y="-60139" />
-				<node x="88769" y="-60333" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_13" minZ="-2439" maxZ="-1939">
-				<node x="81670" y="-60519" />
-				<node x="81860" y="-60326" />
-				<node x="81860" y="-60069" />
-				<node x="81668" y="-59876" />
-				<node x="81411" y="-59877" />
-				<node x="81219" y="-60071" />
-				<node x="81222" y="-60327" />
-				<node x="81413" y="-60521" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_14" minZ="-2439" maxZ="-1939">
-				<node x="81200" y="-60287" />
-				<node x="81390" y="-60094" />
-				<node x="81390" y="-59837" />
-				<node x="81198" y="-59645" />
-				<node x="80942" y="-59646" />
-				<node x="80749" y="-59840" />
-				<node x="80752" y="-60095" />
-				<node x="80943" y="-60289" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_01" minZ="-3246" maxZ="-2746">
-				<node x="70882" y="-55719" />
-				<node x="71072" y="-55526" />
-				<node x="71072" y="-55269" />
-				<node x="70880" y="-55076" />
-				<node x="70624" y="-55077" />
-				<node x="70432" y="-55271" />
-				<node x="70434" y="-55526" />
-				<node x="70625" y="-55721" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_02" minZ="-3246" maxZ="-2746">
-				<node x="71413" y="-55723" />
-				<node x="71603" y="-55530" />
-				<node x="71603" y="-55273" />
-				<node x="71411" y="-55080" />
-				<node x="71155" y="-55081" />
-				<node x="70963" y="-55275" />
-				<node x="70965" y="-55531" />
-				<node x="71156" y="-55725" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_05" minZ="-3331" maxZ="-2831">
-				<node x="72249" y="-45372" />
-				<node x="72439" y="-45178" />
-				<node x="72439" y="-44922" />
-				<node x="72247" y="-44729" />
-				<node x="71990" y="-44730" />
-				<node x="71798" y="-44924" />
-				<node x="71801" y="-45179" />
-				<node x="71992" y="-45373" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_06" minZ="-3331" maxZ="-2831">
-				<node x="72490" y="-45872" />
-				<node x="72680" y="-45679" />
-				<node x="72681" y="-45422" />
-				<node x="72488" y="-45230" />
-				<node x="72232" y="-45231" />
-				<node x="72040" y="-45425" />
-				<node x="72043" y="-45680" />
-				<node x="72233" y="-45874" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_09" minZ="-3331" maxZ="-2831">
-				<node x="76533" y="-43664" />
-				<node x="76723" y="-43470" />
-				<node x="76724" y="-43214" />
-				<node x="76531" y="-43021" />
-				<node x="76275" y="-43022" />
-				<node x="76083" y="-43216" />
-				<node x="76086" y="-43471" />
-				<node x="76276" y="-43666" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_10" minZ="-3331" maxZ="-2831">
-				<node x="75923" y="-43666" />
-				<node x="76113" y="-43473" />
-				<node x="76114" y="-43216" />
-				<node x="75921" y="-43023" />
-				<node x="75665" y="-43024" />
-				<node x="75473" y="-43218" />
-				<node x="75476" y="-43474" />
-				<node x="75666" y="-43668" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_15" minZ="-2415" maxZ="-1915">
-				<node x="82373" y="-54914" />
-				<node x="82563" y="-54720" />
-				<node x="82563" y="-54464" />
-				<node x="82371" y="-54271" />
-				<node x="82115" y="-54272" />
-				<node x="81923" y="-54466" />
-				<node x="81925" y="-54721" />
-				<node x="82116" y="-54916" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_16" minZ="-2415" maxZ="-1915">
-				<node x="82174" y="-54464" />
-				<node x="82364" y="-54270" />
-				<node x="82364" y="-54014" />
-				<node x="82172" y="-53821" />
-				<node x="81916" y="-53822" />
-				<node x="81724" y="-54016" />
-				<node x="81726" y="-54271" />
-				<node x="81917" y="-54465" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_17" minZ="-2415" maxZ="-1915">
-				<node x="80147" y="-56452" />
-				<node x="80337" y="-56258" />
-				<node x="80337" y="-56002" />
-				<node x="80145" y="-55809" />
-				<node x="79889" y="-55810" />
-				<node x="79697" y="-56004" />
-				<node x="79699" y="-56259" />
-				<node x="79890" y="-56453" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_18" minZ="-2415" maxZ="-1915">
-				<node x="80616" y="-56636" />
-				<node x="80806" y="-56442" />
-				<node x="80806" y="-56186" />
-				<node x="80614" y="-55993" />
-				<node x="80358" y="-55994" />
-				<node x="80166" y="-56188" />
-				<node x="80168" y="-56443" />
-				<node x="80359" y="-56637" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_01" minZ="-3246" maxZ="-2746">
-				<node x="71204" y="-52062" />
-				<node x="71394" y="-51869" />
-				<node x="71394" y="-51612" />
-				<node x="71202" y="-51419" />
-				<node x="70946" y="-51420" />
-				<node x="70754" y="-51614" />
-				<node x="70756" y="-51870" />
-				<node x="70947" y="-52064" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_02" minZ="-3246" maxZ="-2746">
-				<node x="72483" y="-53428" />
-				<node x="72673" y="-53235" />
-				<node x="72673" y="-52978" />
-				<node x="72481" y="-52785" />
-				<node x="72225" y="-52786" />
-				<node x="72033" y="-52980" />
-				<node x="72035" y="-53236" />
-				<node x="72226" y="-53430" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_03" minZ="-2440" maxZ="-1940">
-				<node x="78929" y="-60301" />
-				<node x="79119" y="-60108" />
-				<node x="79119" y="-59851" />
-				<node x="78927" y="-59658" />
-				<node x="78671" y="-59659" />
-				<node x="78479" y="-59853" />
-				<node x="78481" y="-60109" />
-				<node x="78672" y="-60303" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_04" minZ="-2440" maxZ="-1940">
-				<node x="82123" y="-62242" />
-				<node x="82313" y="-62049" />
-				<node x="82313" y="-61792" />
-				<node x="82121" y="-61599" />
-				<node x="81865" y="-61600" />
-				<node x="81673" y="-61794" />
-				<node x="81675" y="-62050" />
-				<node x="81866" y="-62244" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_05" minZ="-2440" maxZ="-1940">
-				<node x="86121" y="-57915" />
-				<node x="86311" y="-57722" />
-				<node x="86311" y="-57465" />
-				<node x="86119" y="-57272" />
-				<node x="85863" y="-57273" />
-				<node x="85671" y="-57467" />
-				<node x="85673" y="-57723" />
-				<node x="85864" y="-57917" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_06" minZ="-2440" maxZ="-1940">
-				<node x="89958" y="-62046" />
-				<node x="90148" y="-61853" />
-				<node x="90148" y="-61596" />
-				<node x="89956" y="-61403" />
-				<node x="89700" y="-61404" />
-				<node x="89508" y="-61598" />
-				<node x="89510" y="-61854" />
-				<node x="89701" y="-62048" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_07" minZ="-2736" maxZ="-2236">
-				<node x="90140" y="-54352" />
-				<node x="90330" y="-54159" />
-				<node x="90330" y="-53902" />
-				<node x="90138" y="-53709" />
-				<node x="89882" y="-53710" />
-				<node x="89690" y="-53904" />
-				<node x="89692" y="-54160" />
-				<node x="89883" y="-54354" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_08" minZ="-2705" maxZ="-2205">
-				<node x="92683" y="-56045" />
-				<node x="92873" y="-55852" />
-				<node x="92873" y="-55595" />
-				<node x="92681" y="-55402" />
-				<node x="92425" y="-55403" />
-				<node x="92233" y="-55597" />
-				<node x="92235" y="-55853" />
-				<node x="92426" y="-56047" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_09" minZ="-2750" maxZ="-2250">
-				<node x="96012" y="-53727" />
-				<node x="96202" y="-53534" />
-				<node x="96202" y="-53277" />
-				<node x="96010" y="-53084" />
-				<node x="95754" y="-53085" />
-				<node x="95562" y="-53279" />
-				<node x="95564" y="-53535" />
-				<node x="95755" y="-53729" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_10" minZ="-2750" maxZ="-2250">
-				<node x="93282" y="-51573" />
-				<node x="93472" y="-51380" />
-				<node x="93472" y="-51123" />
-				<node x="93280" y="-50930" />
-				<node x="93024" y="-50931" />
-				<node x="92832" y="-51125" />
-				<node x="92834" y="-51381" />
-				<node x="93025" y="-51575" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_11" minZ="-3333" maxZ="-2833">
-				<node x="70688" y="-43454" />
-				<node x="70878" y="-43261" />
-				<node x="70878" y="-43004" />
-				<node x="70686" y="-42811" />
-				<node x="70430" y="-42812" />
-				<node x="70238" y="-43006" />
-				<node x="70240" y="-43262" />
-				<node x="70431" y="-43456" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_12" minZ="-3333" maxZ="-2833">
-				<node x="74411" y="-40685" />
-				<node x="74601" y="-40492" />
-				<node x="74601" y="-40235" />
-				<node x="74409" y="-40042" />
-				<node x="74153" y="-40043" />
-				<node x="73961" y="-40237" />
-				<node x="73963" y="-40493" />
-				<node x="74154" y="-40687" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_13" minZ="-3333" maxZ="-2833">
-				<node x="83421" y="-44199" />
-				<node x="83611" y="-44006" />
-				<node x="83611" y="-43749" />
-				<node x="83419" y="-43556" />
-				<node x="83163" y="-43557" />
-				<node x="82971" y="-43751" />
-				<node x="82973" y="-44007" />
-				<node x="83164" y="-44201" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_14" minZ="-3333" maxZ="-2833">
-				<node x="79555" y="-40295" />
-				<node x="79745" y="-40102" />
-				<node x="79745" y="-39845" />
-				<node x="79553" y="-39652" />
-				<node x="79297" y="-39653" />
-				<node x="79105" y="-39847" />
-				<node x="79107" y="-40103" />
-				<node x="79298" y="-40297" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_15" minZ="-3333" maxZ="-2833">
-				<node x="77294" y="-46771" />
-				<node x="77484" y="-46578" />
-				<node x="77484" y="-46321" />
-				<node x="77292" y="-46128" />
-				<node x="77036" y="-46129" />
-				<node x="76844" y="-46323" />
-				<node x="76846" y="-46579" />
-				<node x="77037" y="-46773" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_16" minZ="-3333" maxZ="-2833">
-				<node x="78371" y="-45107" />
-				<node x="78561" y="-44914" />
-				<node x="78561" y="-44657" />
-				<node x="78369" y="-44464" />
-				<node x="78113" y="-44465" />
-				<node x="77921" y="-44659" />
-				<node x="77923" y="-44915" />
-				<node x="78114" y="-45109" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_17" minZ="-3378" maxZ="-2878">
-				<node x="81874" y="-47352" />
-				<node x="82064" y="-47159" />
-				<node x="82064" y="-46902" />
-				<node x="81872" y="-46709" />
-				<node x="81616" y="-46710" />
-				<node x="81424" y="-46904" />
-				<node x="81426" y="-47160" />
-				<node x="81617" y="-47354" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_18" minZ="-2480" maxZ="-1980">
-				<node x="81508" y="-52237" />
-				<node x="81698" y="-52044" />
-				<node x="81698" y="-51787" />
-				<node x="81506" y="-51594" />
-				<node x="81250" y="-51595" />
-				<node x="81058" y="-51789" />
-				<node x="81060" y="-52045" />
-				<node x="81251" y="-52239" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_19" minZ="-2480" maxZ="-1980">
-				<node x="84405" y="-56499" />
-				<node x="84595" y="-56306" />
-				<node x="84595" y="-56049" />
-				<node x="84403" y="-55856" />
-				<node x="84147" y="-55857" />
-				<node x="83955" y="-56051" />
-				<node x="83957" y="-56307" />
-				<node x="84148" y="-56501" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_20" minZ="-3208" maxZ="-2708">
-				<node x="74731" y="-53288" />
-				<node x="74921" y="-53095" />
-				<node x="74921" y="-52838" />
-				<node x="74729" y="-52645" />
-				<node x="74473" y="-52646" />
-				<node x="74281" y="-52840" />
-				<node x="74283" y="-53096" />
-				<node x="74474" y="-53290" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_21" minZ="-2438" maxZ="-1938">
-				<node x="81685" y="-58517" />
-				<node x="81875" y="-58324" />
-				<node x="81875" y="-58067" />
-				<node x="81683" y="-57874" />
-				<node x="81427" y="-57875" />
-				<node x="81235" y="-58069" />
-				<node x="81237" y="-58325" />
-				<node x="81428" y="-58519" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_22" minZ="-3333" maxZ="-2833">
-				<node x="73225" y="-48582" />
-				<node x="73415" y="-48389" />
-				<node x="73415" y="-48132" />
-				<node x="73223" y="-47939" />
-				<node x="72967" y="-47940" />
-				<node x="72775" y="-48134" />
-				<node x="72777" y="-48390" />
-				<node x="72968" y="-48584" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+	<spawn name="SwampOfScreamsMonsters" spawnByDefault="false">
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="71230" y="-55358" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="73720" y="-51399" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="75748" y="-54618" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="74944" y="-46657" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="72152" y="-45067" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="72493" y="-45785" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="73107" y="-42346" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="73658" y="-42294" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="75769" y="-43267" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="76476" y="-43476" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="75190" y="-46502" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="79854" y="-45317" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="81260" y="-44377" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="81514" y="-44686" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="79750" y="-41915" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="79360" y="-42003" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="82186" y="-41268" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="82309" y="-41754" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="83692" y="-45626" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="85447" y="-59413" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="84015" y="-61074" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="85054" y="-62837" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="81603" y="-63297" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="81520" y="-60501" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="80915" y="-59934" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="84041" y="-58004" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="77671" y="-58313" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="76374" y="-59894" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="77383" y="-61554" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="80507" y="-56412" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="80002" y="-56009" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="82322" y="-54655" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="82048" y="-54271" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="78923" y="-51121" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="82975" y="-50598" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="85425" y="-54729" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="89321" y="-52011" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="91211" y="-51262" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="92122" y="-52894" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="93944" y="-54742" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="94636" y="-52583" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="71070" y="-51755" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="72408" y="-53084" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="74533" y="-52994" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="73291" y="-48206" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="77190" y="-46396" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="78206" y="-44800" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="81789" y="-47150" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="83180" y="-43975" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="79448" y="-40030" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3100" maxZ="-2900" rad="200">
+					<node x="74175" y="-40332" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="70651" y="-42916" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="81383" y="-51898" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="78704" y="-59856" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="82024" y="-62041" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="85912" y="-57582" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="89927" y="-61696" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+					<node x="93143" y="-51220" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+					<node x="95950" y="-53341" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+					<node x="92635" y="-55669" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="89976" y="-53911" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
 	</spawn>
 </list>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/46200-46299.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/46200-46299.xml
index 7635f4ec8f..9fbfe71ec5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/46200-46299.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/46200-46299.xml
@@ -796,14 +796,19 @@
 	<item id="46254" name="Dandy's Golden Ball" type="EtcItem">
 		<!-- For 1 h., acquired XP/ SP +100%. Changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or Nevit's Hourglass. -->
 		<set name="icon" val="BranchIcon.icon.g_ev_goldenball" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_stackable" val="true" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="is_freightable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="18471" level="1" /> <!-- Dandy's Golden Ball -->
+		</skills>
 	</item>
 	<item id="46255" name="Halloween Outfit" type="EtcItem">
 		<!-- Changes the appearance of upper armor into that of a Halloween Outfit. Works on one-pieces too. -->
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/80500-80599.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/80500-80599.xml
index d2dd65d767..46f0303a1c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/80500-80599.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/80500-80599.xml
@@ -382,6 +382,13 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="time" val="360" />
+		<skills>
+			<skill id="35363" level="1" /> <!-- Freya's Bloody Rune -->
+		</skills>
 	</item>
 	<item id="80544" name="Snow's Plea for Help - Altar of Evil" type="EtcItem">
 		<!-- A purifying mission requested by Snow for the 15th Anniversary. Snow wishes to celebrate the 15th Anniversary of Lineage by eradicating monsters in the Altar of Evil and Bloody Swampland. Characters of level 85-95 can receive the request by double-clicking the item. Can be played once a day. -->
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81000-81099.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81000-81099.xml
index 869df6e88e..01e50b878a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81000-81099.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81000-81099.xml
@@ -267,8 +267,15 @@
 		<!-- Changes the armor appearance to that of Red Archer Garment for 24 h. -->
 		<set name="icon" val="icon.dragon_dye_i01" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_stackable" val="true" />
+		<set name="is_sellable" val="false" />
+		<set name="handler" val="ItemSkills" />
+		<set name="etcitem_type" val="POTION" />
+		<skills>
+			<skill id="39580" level="1" /> <!-- Pink's Style Potion - Red Archer -->
+		</skills>
 	</item>
 	<item id="81017" name="Pink's Style Potion - Green Archer" type="EtcItem">
 		<!-- Changes the armor appearance to that of Green Archer Garment for 24 h. -->
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81600-81699.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81600-81699.xml
index aa2af2bfe7..2a7885f576 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81600-81699.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81600-81699.xml
@@ -1037,6 +1037,28 @@
 		<set name="material" val="LEATHER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="is_commissionable" val="false" />
+		<set name="handler" val="ExtractableItems" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<capsuled_items>
+			<item id="29458" min="1" max="1" chance="6.25" /> <!-- Greater Cat's Eye Lv. 5 -->
+			<item id="29462" min="1" max="1" chance="6.25" /> <!-- Greater Amethyst Lv. 5 -->
+			<item id="48770" min="1" max="1" chance="6.25" /> <!-- Greater Topaz Lv. 5 -->
+			<item id="48774" min="1" max="1" chance="6.25" /> <!-- Greater Ruby Lv. 5 -->
+			<item id="48778" min="1" max="1" chance="6.25" /> <!-- Greater Sapphire Lv. 5 -->
+			<item id="48782" min="1" max="1" chance="6.25" /> <!-- Greater Obsidian Lv. 5 -->
+			<item id="48786" min="1" max="1" chance="6.25" /> <!-- Greater Opal Lv. 5 -->
+			<item id="48790" min="1" max="1" chance="6.25" /> <!-- Greater Emerald Lv. 5 -->
+			<item id="48794" min="1" max="1" chance="6.25" /> <!-- Greater Aquamarine Lv. 5 -->
+			<item id="48798" min="1" max="1" chance="6.25" /> <!-- Greater Diamond Lv. 5 -->
+			<item id="48802" min="1" max="1" chance="6.25" /> <!-- Greater Pearl Lv. 5 -->
+			<item id="48806" min="1" max="1" chance="6.25" /> <!-- Greater Vital Stone Lv. 5 -->
+			<item id="48810" min="1" max="1" chance="6.25" /> <!-- Greater Garnet Lv. 5 -->
+			<item id="48814" min="1" max="1" chance="6.25" /> <!-- Greater Tanzanite Lv. 5 -->
+			<item id="48818" min="1" max="1" chance="6.25" /> <!-- Greater Red Cat's Eye Lv. 5 -->
+			<item id="48822" min="1" max="1" chance="6.25" /> <!-- Greater Blue Cat's Eye Lv. 5 -->
+		</capsuled_items>
 	</item>
 	<item id="81673" name="Essence of Time" type="EtcItem">
 		<!-- Concentrated energy of time. When used, decreases time of homunculus creation for 1 h. -->
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/33900-33999.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/33900-33999.xml
index 74a4b0c13f..634dbd82cb 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/33900-33999.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/33900-33999.xml
@@ -3776,9 +3776,9 @@
 		<equipment rhand="36218" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234.06312688557" hpRegen="8.5" mp="1846.8" mpRegen="3" />
-			<attack physical="13000" magical="811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="430" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="1085.36442" magical="264.74086" />
+			<vitals hp="42340.06312688557" hpRegen="8.5" mp="18046.8" mpRegen="3" />
+			<attack physical="25000" magical="2811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="430" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="10085.36442" magical="2064.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
@@ -3789,7 +3789,7 @@
 			</attribute>
 			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" undying="true" />
+		<status attackable="false" talkable="false" undying="true" />
 		<skillList>
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/34000-34099.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/34000-34099.xml
index 7162e954ca..0e4ce7eed0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/34000-34099.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/34000-34099.xml
@@ -39,7 +39,7 @@
 			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
 		</skillList>
 	</npc>
-	<npc id="34001" level="85" type="Folk" name="Ferin">
+	<npc id="34001" level="85" type="FriendlyNpc" name="Ferin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>FRIEND</race>
 		<sex>FEMALE</sex>
@@ -58,7 +58,7 @@
 			</attribute>
 			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" undying="true" />
+		<status attackable="false" talkable="false" undying="true" />
 		<collision>
 			<radius normal="8" />
 			<height normal="16" />
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/16300-16399.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/16300-16399.xml
index 5e42554634..221c2945ed 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/16300-16399.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/16300-16399.xml
@@ -801,6 +801,22 @@
 		<reuseDelay>5000</reuseDelay>
 		<effectPoint>-150</effectPoint>
 		<isDebuff>true</isDebuff>
+		<activateRate>80</activateRate>
+		<affectRange>900</affectRange>
+		<basicProperty>PHYSICAL</basicProperty>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<trait>PULL</trait>
+		<effects>
+			<effect name="AirBind" />
+			<effect name="Bluff">
+				<chance>100</chance>
+			</effect>
+			<effect name="PullBack">
+				<speed>600</speed>
+				<delay>600</delay>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="16388" toLevel="1" name="Kain's Wrath">
 		<!-- Consumed by vengeful fury toward all who harm Giselle. -->
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/18400-18499.xml
index 5da87b23b6..11cf6bb101 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/18400-18499.xml
@@ -885,8 +885,30 @@
 		<!-- For 1 h., acquired XP/ SP +100%, recovers Vitality to the maximum. Changes the appearance of your armor into that of an NC Dinos Uniform. Cannot be stacked with the Fall of the Dragon or Nevit's Hourglass. -->
 		<icon>BranchIcon.icon.g_ev_goldenball</icon>
 		<operateType>A2</operateType>
+		<effectPoint>1</effectPoint>
+		<abnormalType>CHANGEBODY</abnormalType>
+		<abnormalVisualEffect>CHANGE_DINOS</abnormalVisualEffect>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>46254</itemConsumeId> <!-- Dandy's Home Run Ball -->
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>-3</magicLevel>
+		<abnormalLevel>2</abnormalLevel>
+		<abnormalTime>3600</abnormalTime>
 		<reuseDelay>15000</reuseDelay>
+		<irreplacableBuff>true</irreplacableBuff>
+		<stayAfterDeath>true</stayAfterDeath>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="ExpModify">
+				<amount>100</amount>
+			</effect>
+			<effect name="SpModify">
+				<amount>100</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18472" toLevel="6" name="Giveaway Number 1">
 		<icon>icon.skill0000</icon>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/18500-18599.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/18500-18599.xml
index 72a241be74..b3b6c1fdb7 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/18500-18599.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/18500-18599.xml
@@ -819,10 +819,12 @@
 		<abnormalType>
 			<value level="1">SKILL_IGNORE</value>
 			<value level="2">ABNORMAL_INVINCIBILITY</value>
+			<value level="3">ABNORMAL_INVINCIBILITY</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalType>
 		<abnormalLevel>
 			<value level="1">2</value>
 			<value level="2">3</value>
+			<value level="3">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalLevel>
 		<abnormalTime>7</abnormalTime>
 		<hitTime>1000</hitTime>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22500-22599.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22500-22599.xml
index 1c842e3486..b549546a09 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22500-22599.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22500-22599.xml
@@ -1578,7 +1578,7 @@
 		<itemConsumeId>
 			<value level="1">22883</value>
 			<value level="2">22884</value>
-			<value level="2">22885</value>
+			<value level="3">22885</value>
 		</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<reuseDelay>3600000</reuseDelay>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22700-22799.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22700-22799.xml
index 50ed7fa42c..1713eadda9 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22700-22799.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22700-22799.xml
@@ -297,7 +297,7 @@
 		<itemConsumeId>
 			<value level="1">23338</value>
 			<value level="2">23339</value>
-			<value level="2">23340</value>
+			<value level="3">23340</value>
 		</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<reuseDelay>3600000</reuseDelay>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30000-30099.xml
index 0ce433ca81..aa8b5c86b8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30000-30099.xml
@@ -1978,8 +1978,8 @@
 		<operateType>P</operateType>
 		<magicLevel>85</magicLevel>
 		<effects>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>350</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39100-39199.xml
index 95cdc78ccd..012962144b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39100-39199.xml
@@ -52,12 +52,14 @@
 			<value level="2">2</value>
 			<value level="3">3</value>
 			<value level="4">4</value>
+			<value level="5">5</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalLevel>
 		<abnormalTime>
 			<value level="1">3600</value>
 			<value level="2">7200</value>
 			<value level="3">21600</value>
 			<value level="4">28800</value>
+			<value level="5">28800</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalTime>
 		<abnormalType>CHANGEBODY</abnormalType>
 		<abnormalVisualEffect>CHANGESHAPE_TRANSFORM</abnormalVisualEffect>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39400-39499.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39400-39499.xml
index 70d4a163b6..9d43c48781 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39400-39499.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39400-39499.xml
@@ -2087,6 +2087,7 @@
 		</effects>
 	</skill>
 	<skill id="39494" toLevel="1" name="Dye Powder">
+		<!-- Powder for replenishing the Dye Engraving scale. Restores 25% of the full scale. -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -2096,6 +2097,11 @@
 		<itemConsumeCount>1</itemConsumeCount>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="CanUseSymbolSealIncreaseItem">
+				<amount>25</amount> <!-- 25% from max symbol seal points -->
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="RestoreSymbolSeal">
 				<amount>25</amount>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39500-39599.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39500-39599.xml
index 3327b34fd2..8034ab9075 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39500-39599.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39500-39599.xml
@@ -1166,11 +1166,16 @@
 	<skill id="39580" toLevel="1" name="Pink's Style Potion - Red Archer">
 		<!-- Changes the armor appearance to that of Red Archer Garment. -->
 		<icon>icon.armor_t2000_b_i00</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalTime>86400</abnormalTime>
+		<abnormalVisualEffect>CGRADE_CHANGE</abnormalVisualEffect>
 		<isMagic>4</isMagic>
 		<hitTime>1500</hitTime>
 		<reuseDelay>5000</reuseDelay>
 		<effectPoint>780</effectPoint>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>81016</itemConsumeId>
+		<stayAfterDeath>true</stayAfterDeath>
 	</skill>
 	<skill id="39581" toLevel="1" name="Pink's Style Potion - Green Archer">
 		<!-- Changes the armor appearance to that of Green Archer Garment. -->
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/documentation.txt
index c8b2310fd3..a010587846 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/documentation.txt
@@ -12,6 +12,8 @@ AddHuntingTime: Add time for time limited hunting zones. (l2jmobius)
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -166,10 +168,11 @@ HpCpHealCritical: HpCp heal effects always trigger Magic Critical Hit.
 HpCpHeal: Increases current HP by a given amount. If the given amount exceeds maximum HP, it increases current CP with the rest value as well.
 HpDrain: Magical attack that absorbs given percentage of the damage inflicted as HP.
 Hp: Increases current HP by a static value.
-HpLimit: Increase a character's max hp limit (l2jmobius)
+HpLimit: Increase a character's max hp limit. (l2jmobius)
 HpRegen: HP Regeneration stat.
 HpToOwner: DOT effect that absorbs HP over time.
 IgnoreDeath: Become undying. Hp cannot decrease below 1.
+IgnoreReduceDamage: Ignore ReduceDamage effect implementation. (l2jmobius)
 ImmobileDamageBonus: Bonus damage to immobile targets. (l2jmobius)
 ImmobileDamageResist: Resist damage while immobile. (l2jmobius)
 ImmobilePetBuff: Causes your pet to become immobilized.
@@ -208,7 +211,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
@@ -273,6 +275,7 @@ RebalanceHP: Balances targets' current HP.
 RebalanceHPSummon: Balances targets' current HP for summons.
 RecoverVitalityInPeaceZone: Recover periodically vitality when player is in a peace zone. (l2jmobius)
 Recovery: Decreases death penalty level.
+ReduceDamage: Reduce damage effect implementation.
 ReduceCancel: Magic skill casting interruption stat.
 ReduceDropPenalty: Reduces EXP lost and death penalty chance.
 ReflectMagic: Deflects magical damage back to the attacker.
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java
index 34f021b389..8a287a7d6a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java
@@ -606,6 +606,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	
 	// --------------------------------------------------
 	// FloodProtector Settings
@@ -834,6 +835,9 @@ public class Config
 	public static boolean HARDIN_ENABLE_ERTHEIAS;
 	public static Map<Integer, List<Integer>> HARDIN_REMOVED_SKILLS;
 	
+	// Eraton
+	public static Set<Integer> ERATON_RETAINED_SKILLS = new HashSet<>();
+	
 	// --------------------------------------------------
 	// Vitality Settings
 	// --------------------------------------------------
@@ -841,6 +845,7 @@ public class Config
 	public static int STARTING_VITALITY_POINTS;
 	public static boolean RAIDBOSS_USE_VITALITY;
 	public static float RATE_VITALITY_EXP_MULTIPLIER;
+	public static float RATE_VITALITY_EXP_PREMIUM_MULTIPLIER;
 	public static int VITALITY_MAX_ITEMS_ALLOWED;
 	public static float RATE_VITALITY_LOST;
 	public static float RATE_VITALITY_GAIN;
@@ -1360,6 +1365,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -1847,6 +1853,15 @@ public class Config
 					HARDIN_REMOVED_SKILLS.get(classId).add(Integer.parseInt(classInfo[i]));
 				}
 			}
+			ERATON_RETAINED_SKILLS.clear();
+			final String eratonRetainedSkills = characterConfig.getString("EratonRetainedSkills", "").trim();
+			if (!eratonRetainedSkills.isEmpty())
+			{
+				for (String id : eratonRetainedSkills.split(","))
+				{
+					ERATON_RETAINED_SKILLS.add(Integer.parseInt(id));
+				}
+			}
 			ENABLE_VITALITY = characterConfig.getBoolean("EnableVitality", true);
 			STARTING_VITALITY_POINTS = characterConfig.getInt("StartingVitalityPoints", 140000);
 			RAIDBOSS_USE_VITALITY = characterConfig.getBoolean("RaidbossUseVitality", true);
@@ -2225,6 +2240,7 @@ public class Config
 			ENABLE_AUTO_SKILL = generalConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = generalConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = generalConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = generalConfig.getBoolean("AssistLeader", false);
 			
 			// Load FloodProtector config file
 			final PropertiesParser floodProtectorConfig = new PropertiesParser(FLOOD_PROTECTOR_CONFIG_FILE);
@@ -2341,6 +2357,7 @@ public class Config
 			MONSTER_EXP_MAX_LEVEL_DIFFERENCE = ratesConfig.getInt("MonsterExpMaxLevelDifference", 11);
 			RATE_RAIDBOSS_POINTS = ratesConfig.getFloat("RateRaidbossPointsReward", 1);
 			RATE_VITALITY_EXP_MULTIPLIER = ratesConfig.getFloat("RateVitalityExpMultiplier", 2);
+			RATE_VITALITY_EXP_PREMIUM_MULTIPLIER = ratesConfig.getFloat("RateVitalityExpPremiumMultiplier", 3);
 			VITALITY_MAX_ITEMS_ALLOWED = ratesConfig.getInt("VitalityMaxItemsAllowed", 999);
 			RATE_VITALITY_LOST = ratesConfig.getFloat("RateVitalityLost", 1);
 			RATE_VITALITY_GAIN = ratesConfig.getFloat("RateVitalityGain", 1);
@@ -3399,6 +3416,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 6485e6c47d..2208f823ee 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index c5839831ba..deb0eec41a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -546,9 +546,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index b277446b93..7bf956bdc5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
index 40b4ea1c3d..ae43e8d744 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
@@ -25,4 +25,9 @@ import org.l2jmobius.gameserver.model.actor.Player;
 public interface IPlayerActionHandler
 {
 	void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed);
+	
+	default boolean isPetAction()
+	{
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 0c2f5d59de..0b7ad4e019 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -215,7 +215,7 @@ public class ShortCuts implements IRestorable
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
 				newsc.setAutoUse(sc.isAutoUse());
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 6e4cef898f..79a06cdc78 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1288,7 +1288,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2816,7 +2816,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2829,177 +2829,139 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						sendPacket(info);
+					}
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
index 90398174b7..8df0f2c6c5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -327,6 +327,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoAbnormalVisualEf
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic;
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot;
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
+import org.l2jmobius.gameserver.network.serverpackets.ExVitalityEffectInfo;
 import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import org.l2jmobius.gameserver.network.serverpackets.HennaInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
@@ -4617,7 +4618,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8594,9 +8595,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
@@ -9919,6 +9924,7 @@ public class Player extends Playable
 				sendPacket(new ExUserBoostStat(this, BonusExpType.VITALITY));
 				sendPacket(new ExUserBoostStat(this, BonusExpType.BUFFS));
 				sendPacket(new ExUserBoostStat(this, BonusExpType.PASSIVE));
+				sendPacket(new ExVitalityEffectInfo(this));
 				_userBoostStatTask = null;
 			}, 300);
 		}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 196de38709..4213dec3ad 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -854,7 +855,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -875,7 +876,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -900,7 +908,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -908,7 +916,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -954,7 +969,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index ea61f72ae6..4d444a1fa3 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -883,15 +882,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -902,8 +899,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -912,7 +913,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -985,45 +986,26 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
 		
-		// Notify recalculation to child classes.
+		// Notify recalculation to child classes
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 33fd8aa870..ffcb16e4dc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -482,7 +482,11 @@ public class PlayerStat extends PlayableStat
 	
 	public double getVitalityExpBonus()
 	{
-		return (getVitalityPoints() > 0) ? getMul(Stat.VITALITY_EXP_RATE, Config.RATE_VITALITY_EXP_MULTIPLIER) : 1.0;
+		if (getVitalityPoints() > 0)
+		{
+			return getMul(Stat.VITALITY_EXP_RATE, 1) * (getActiveChar().hasPremiumStatus() ? Config.RATE_VITALITY_EXP_PREMIUM_MULTIPLIER : Config.RATE_VITALITY_EXP_MULTIPLIER);
+		}
+		return 0;
 	}
 	
 	public void setVitalityPoints(int value)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index ffdfcd5574..c56c35ad2d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
index 97397f753f..9d5faa0c61 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
@@ -57,7 +57,10 @@ public enum CommissionItemType
 	NECKLACE(31),
 	BELT(32),
 	BRACELET(33),
+	AGATHION(62),
 	HAIR_ACCESSORY(34),
+	BROOCH_JEWEL(63),
+	ARTIFACT(64),
 	// Supplies
 	POTION(35),
 	SCROLL_ENCHANT_WEAPON(36),
@@ -65,6 +68,7 @@ public enum CommissionItemType
 	SCROLL_OTHER(38),
 	SOULSHOT(39),
 	SPIRITSHOT(40),
+	OTHER_SUPPLIES(41),
 	// Pet Goods
 	PET_EQUIPMENT(42),
 	PET_SUPPLIES(43),
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
index eb10918430..3a194d1660 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
@@ -47,8 +47,8 @@ public enum CommissionTreeType
 		CommissionItemType.SPEAR,
 		CommissionItemType.OTHER_WEAPON),
 	ARMOR(1, CommissionItemType.HELMET, CommissionItemType.ARMOR_TOP, CommissionItemType.ARMOR_PANTS, CommissionItemType.FULL_BODY, CommissionItemType.GLOVES, CommissionItemType.FEET, CommissionItemType.SHIELD, CommissionItemType.SIGIL, CommissionItemType.UNDERWEAR, CommissionItemType.CLOAK),
-	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.HAIR_ACCESSORY),
-	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT),
+	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.AGATHION, CommissionItemType.HAIR_ACCESSORY, CommissionItemType.BROOCH_JEWEL, CommissionItemType.ARTIFACT),
+	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT, CommissionItemType.OTHER_SUPPLIES),
 	PET_GOODS(4, CommissionItemType.PET_EQUIPMENT, CommissionItemType.PET_SUPPLIES),
 	MISC(
 		5,
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/effects/EffectType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/effects/EffectType.java
index 5f8f754d04..e8e874b856 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/effects/EffectType.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/effects/EffectType.java
@@ -64,5 +64,6 @@ public enum EffectType
 	TELEPORT_TO_TARGET,
 	ABNORMAL_SHIELD,
 	DUAL_RANGE,
+	RESTORE_SYMBOL_SEAL,
 	VITALITY_POINT_UP
 }
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index e17d405a46..fba22cdb8c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2242,6 +2242,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index ea22a67f17..d64a767c00 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -39,6 +39,7 @@ import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AgathionData;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -52,6 +53,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -74,12 +76,14 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemEnchantAdd;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemSoulCrystalAdd;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
 import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -94,6 +98,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1652,7 +1657,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2578,6 +2585,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2602,6 +2614,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2627,6 +2641,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 0adafe6811..9ecff3bd0c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -754,7 +754,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -906,7 +907,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index c691e9164c..51afd01651 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -686,7 +686,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -709,7 +709,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -744,7 +744,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 550e8a579a..e8980bea33 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -95,6 +95,7 @@ public enum Stat
 	REAR_DAMAGE_RATE("rearDamage"),
 	DRAGON_WEAPON_DEFENCE("dragonWeaponDefence"),
 	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
+	IGNORE_REDUCE_DAMAGE("ignoreReduceDamage"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
@@ -135,7 +136,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index 8f916369b4..b7b0c4ef53 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index 265cef95f4..4211092a85 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -97,6 +97,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index c5f9cfd470..64b096aefd 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -117,6 +117,11 @@ public class RequestAcquireSkill implements ClientPacket
 		
 		final int skillId = player.getReplacementSkill(_id);
 		final Skill existingSkill = player.getKnownSkill(skillId); // Mobius: Keep existing sublevel.
+		if ((_level > 65536000) && (existingSkill != null) && (existingSkill.getSubLevel() > 1000))
+		{
+			_level -= existingSkill.getSubLevel() * 65536;
+		}
+		
 		final Skill skill = SkillData.getInstance().getSkill(skillId, _level, existingSkill == null ? 0 : existingSkill.getSubLevel());
 		if (skill == null)
 		{
@@ -681,7 +686,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList();
 		player.updateShortCuts(_id, skill.getLevel(), skill.getSubLevel());
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 14c84055da..63f5c4a527 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -87,7 +87,7 @@ public class RequestShortCutReg implements ClientPacket
 		else if (_page == 23)
 		{
 			final Item item = player.getInventory().getItemByObjectId(_id);
-			if ((item != null) && !item.isPotion())
+			if (((item != null) && !item.isPotion()) || (_type == ShortcutType.ACTION))
 			{
 				return;
 			}
@@ -148,7 +148,7 @@ public class RequestShortCutReg implements ClientPacket
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		sc.setAutoUse(_active);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 		player.sendPacket(new ExActivateAutoShortcut(sc, _active));
 		
 		// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index e04fde4707..07ed7641a9 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,129 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 38, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 49, 50, 51,
-		52, 53, 54, 55,
-		56, 57, 58, 59,
-		60, 61, 62, 63,
-		64, 65, 66, 67,
-		68, 69, 70, 71,
-		72, 73, 74, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 92, 93,
-		94, 96, 97,
-		1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index 21202af809..9c7e0eb8b0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java
index 3263349360..38c94f8160 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.BonusExpType;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.stats.Stat;
@@ -45,31 +46,10 @@ public class ExUserBoostStat extends ServerPacket
 		{
 			case VITALITY:
 			{
-				final int currentVitalityPoints = _player.getStat().getVitalityPoints();
-				if (currentVitalityPoints > 105000)
+				if (_player.getStat().getVitalityPoints() > 0)
 				{
-					count = 1;
-					bonus = 300;
-				}
-				else if (currentVitalityPoints > 70000)
-				{
-					count = 1;
-					bonus = 250;
-				}
-				else if (currentVitalityPoints > 35000)
-				{
-					count = 1;
-					bonus = 200;
-				}
-				else if (currentVitalityPoints > 0)
-				{
-					count = 1;
-					bonus = 100;
-				}
-				if (bonus > 0)
-				{
-					count += (int) _player.getStat().getValue(Stat.VITALITY_SKILLS, 0);
-					bonus += (int) ((_player.getStat().getMul(Stat.VITALITY_EXP_RATE, 1) - 1) * 100);
+					count = (int) (_player.getStat().getValue(Stat.VITALITY_SKILLS, 0) + 1);
+					bonus = (int) (((_player.getStat().getMul(Stat.VITALITY_EXP_RATE, 1) - 1) + (_player.hasPremiumStatus() ? Config.RATE_VITALITY_EXP_PREMIUM_MULTIPLIER : Config.RATE_VITALITY_EXP_MULTIPLIER)) * 100d);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java
index ff6541ec6f..96e9690fe6 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.stats.Stat;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -26,13 +27,15 @@ import org.l2jmobius.gameserver.network.ServerPackets;
 public class ExVitalityEffectInfo extends ServerPacket
 {
 	private final int _vitalityBonus;
+	private final int _vitalityAddBonus;
 	private final int _vitalityItemsRemaining;
 	private final int _points;
 	
 	public ExVitalityEffectInfo(Player player)
 	{
 		_points = player.getVitalityPoints();
-		_vitalityBonus = (int) player.getStat().getVitalityExpBonus() * 100;
+		_vitalityBonus = (int) ((player.getStat().getMul(Stat.VITALITY_EXP_RATE, 1) - 1) + (player.hasPremiumStatus() ? Config.RATE_VITALITY_EXP_PREMIUM_MULTIPLIER : Config.RATE_VITALITY_EXP_MULTIPLIER)) * 100;
+		_vitalityAddBonus = (int) ((player.getStat().getMul(Stat.VITALITY_EXP_RATE, 1) - 1) * 100);
 		_vitalityItemsRemaining = Config.VITALITY_MAX_ITEMS_ALLOWED - player.getVitalityItemsUsed();
 	}
 	
@@ -42,7 +45,7 @@ public class ExVitalityEffectInfo extends ServerPacket
 		ServerPackets.EX_VITALITY_EFFECT_INFO.writeId(this);
 		writeInt(_points);
 		writeInt(_vitalityBonus); // Vitality Bonus
-		writeShort(0); // Vitality additional bonus in %
+		writeShort(_vitalityAddBonus); // Vitality additional bonus in %
 		writeShort(_vitalityItemsRemaining); // How much vitality items remaining for use
 		writeShort(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use
 	}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
index 8e396d93c9..a72d906550 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
@@ -167,7 +167,7 @@ public class FakePlayerInfo extends ServerPacket
 		writeByte(_npc.getTeam().getId());
 		writeInt(_clan != null ? _clan.getCrestLargeId() : 0);
 		writeByte(_fpcHolder.getNobleLevel());
-		writeByte(_fpcHolder.isHero());
+		writeByte(_fpcHolder.isHero() ? 2 : 0); // 152 - Value for enabled changed to 2
 		writeByte(_fpcHolder.isFishing());
 		writeInt(_fpcHolder.getBaitLocationX());
 		writeInt(_fpcHolder.getBaitLocationY());
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index e563e8e8f2..ee8bc21244 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
deleted file mode 100644
index c69a1e8cd0..0000000000
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeByte(0); // 286
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
new file mode 100644
index 0000000000..4a4fa97fcd
--- /dev/null
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -0,0 +1,182 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeShort(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 05aaedf2c5..46c9ccb5a9 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,20 +19,21 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
+		player.restoreAutoShortcutVisual();
 	}
 	
 	@Override
@@ -54,8 +55,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 9c1fbbcab8..851b53dc09 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -43,13 +49,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -60,8 +69,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 679c26e073..06711fb502 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1544a20c14..e9f977858a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -42,6 +44,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	
@@ -96,6 +99,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking when in offline play.
+							if (player.isOfflinePlay() && player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -121,23 +135,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -145,6 +168,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -179,32 +205,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -310,6 +359,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 5899235fcb..66c93af753 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,7 +35,9 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.effects.EffectType;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemUse;
@@ -46,12 +48,12 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.EffectScope;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +383,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
@@ -394,7 +397,24 @@ public class AutoUseTaskManager
 							final IPlayerActionHandler actionHandler = PlayerActionHandler.getInstance().getHandler(actionHolder.getHandler());
 							if (actionHandler != null)
 							{
-								actionHandler.useAction(player, actionHolder, false, false);
+								if (!actionHandler.isPetAction())
+								{
+									actionHandler.useAction(player, actionHolder, false, false);
+								}
+								else
+								{
+									final Summon summon = player.getAnyServitor();
+									if ((summon != null) && !summon.isAlikeDead())
+									{
+										final Skill skill = summon.getKnownSkill(actionHolder.getOptionId());
+										if ((skill != null) && !canSummonCastSkill(player, summon, skill))
+										{
+											continue ACTIONS;
+										}
+										
+										actionHandler.useAction(player, actionHolder, false, false);
+									}
+								}
 							}
 						}
 					}
@@ -477,6 +497,59 @@ public class AutoUseTaskManager
 			
 			return !player.isSkillDisabled(skill) && skill.checkCondition(player, target, false);
 		}
+		
+		private boolean canSummonCastSkill(Player player, Summon summon, Skill skill)
+		{
+			if (skill.isBad() && (player.getTarget() == null))
+			{
+				return false;
+			}
+			
+			final int mpConsume = skill.getMpConsume() + skill.getMpInitialConsume();
+			if ((((mpConsume != 0) && (mpConsume > (int) Math.floor(summon.getCurrentMp()))) || ((skill.getHpConsume() != 0) && (skill.getHpConsume() > (int) Math.floor(summon.getCurrentHp())))))
+			{
+				return false;
+			}
+			
+			if (summon.isSkillDisabled(skill))
+			{
+				return false;
+			}
+			
+			if (((player.getTarget() != null) && !skill.checkCondition(summon, player.getTarget(), false)) || ((player.getTarget() == null) && !skill.checkCondition(summon, player, false)))
+			{
+				return false;
+			}
+			
+			if ((skill.getItemConsumeCount() > 0) && (summon.getInventory().getInventoryItemCount(skill.getItemConsumeId(), -1) < skill.getItemConsumeCount()))
+			{
+				return false;
+			}
+			
+			if (skill.getTargetType().equals(TargetType.SELF) || skill.getTargetType().equals(TargetType.SUMMON))
+			{
+				final BuffInfo summonInfo = summon.getEffectList().getBuffInfoBySkillId(skill.getId());
+				return (summonInfo != null) && (summonInfo.getTime() >= REUSE_MARGIN_TIME);
+			}
+			
+			if ((skill.getEffects(EffectScope.GENERAL) != null) && skill.getEffects(EffectScope.GENERAL).stream().anyMatch(a -> a.getEffectType().equals(EffectType.MANAHEAL_BY_LEVEL)) && (player.getCurrentMpPercent() > 80))
+			{
+				return false;
+			}
+			
+			final BuffInfo buffInfo = player.getEffectList().getBuffInfoBySkillId(skill.getId());
+			final BuffInfo abnormalBuffInfo = player.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
+			if (abnormalBuffInfo != null)
+			{
+				if (buffInfo != null)
+				{
+					return (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()));
+				}
+				return (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel()) || abnormalBuffInfo.isAbnormalType(AbnormalType.NONE);
+			}
+			
+			return true;
+		}
 	}
 	
 	public synchronized void startAutoUseTask(Player player)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle.sql
index 7ffcebed6b..3445dea47a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_homunculus.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_homunculus.sql
index 24d6a4e5ff..d8beec306a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_homunculus.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_homunculus.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_homunculus` (
 	`skillLevel4` TINYINT UNSIGNED NOT NULL DEFAULT '0',
 	`skillLevel5` TINYINT UNSIGNED NOT NULL DEFAULT '0',
 	`active` TINYINT UNSIGNED NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_macroses.sql
index 7db9ed6b15..0a5f6b3390 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(1255) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_ranking_history.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_ranking_history.sql
index 3f938ba850..d2da345dec 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_ranking_history.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_ranking_history.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_ranking_history` (
   `ranking` int(20) NOT NULL,
   `exp` bigint(20) NOT NULL,
   PRIMARY KEY (`charId`,`day`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/characters.sql
index 4df7d3f88c..f39a66c2db 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/characters.sql
@@ -62,4 +62,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/collection_favorites.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/collection_favorites.sql
index 7571da448f..49758d7815 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/collection_favorites.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/collection_favorites.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `collection_favorites` (
   `accountName` VARCHAR(45) NOT NULL DEFAULT '',
   `collectionId` int(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`accountName`,`collectionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/collections.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/collections.sql
index 8c0fafc9fd..1ff9772ad3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/collections.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/collections.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `collections` (
   `collectionId` int(3) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`accountName`,`collectionId`,`index`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/conquest_data.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/conquest_data.sql
index 68eac09d4e..349cdcfbe8 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/conquest_data.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/conquest_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE `conquest_data` (
   `current_cycle` mediumint(8) unsigned NOT NULL DEFAULT 1,
   `conquest_season_end` bigint(13) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/conquest_prev_season_ranklist.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/conquest_prev_season_ranklist.sql
index 6451c94f86..374f506972 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/conquest_prev_season_ranklist.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/conquest_prev_season_ranklist.sql
@@ -4,4 +4,4 @@ CREATE TABLE `conquest_prev_season_ranklist` (
   `char_name` VARCHAR(45) DEFAULT NULL,
   `personal_points` bigint(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort.sql
index c1f09a3f79..c8e7f5458c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort_siege_guards.sql
index 4872d0110c..40ed7619dc 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_siege_guards` VALUES
 -- Shanty Guards
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort_spawnlist.sql
index 0285fa6edd..d3caf9312e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,7 +11,7 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_spawnlist` VALUES
 (101,null,35658,-53273,156650,-1896,62000,0,0),
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/grandboss_data.sql
index 0fd9caf1d9..f92f39e3b8 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29381, -6505, 183040, -3419, 0, 1342845023, 133301), -- Queen Ant
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/heroes.sql
index ae59eb8ba1..f2ee5692a8 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/heroes.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/huntpass.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/huntpass.sql
index 7108d1448a..69c5e19f44 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/huntpass.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/huntpass.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `huntpass` (
   `sayha_points_used` INT NOT NULL DEFAULT 0,
   `unclaimed_reward` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_transaction_history.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_transaction_history.sql
index f8ba353a1f..cd3be96e9a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_transaction_history.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_transaction_history.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_transaction_history` (
    `price` BIGINT UNSIGNED NOT NULL,
    `count` BIGINT UNSIGNED NOT NULL,
    PRIMARY KEY (`created_time`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/items.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/olympiad_fights.sql
index 15ffc8332b..1e88116dfc 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/olympiad_fights.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(1) unsigned NOT NULL DEFAULT '0',
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/world_exchange_items.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/world_exchange_items.sql
index 0db48c4d37..0c64236313 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/world_exchange_items.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/game/world_exchange_items.sql
@@ -9,4 +9,4 @@ CREATE TABLE `world_exchange_items`  (
   `start_time` bigint(13) unsigned NOT NULL DEFAULT '0',
   `end_time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`world_exchange_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_10.3_MasterClass/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/config/Character.ini b/L2J_Mobius_10.3_MasterClass/dist/game/config/Character.ini
index 65f412f0cc..04527febf7 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/config/Character.ini
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/config/Character.ini
@@ -299,6 +299,13 @@ HardinRemovedSkills = 148,10104,10065,10098,19558,10097,10042,19552;\
 181,11855,19212,11856,11854,11863,11859
 
 
+# ---------------------------------------------------------------------------
+# Eraton (Red Libra)
+# ---------------------------------------------------------------------------
+# Skill ids that will remain after Eraton class change.
+EratonRetainedSkills = 1370,1371,1372,11400,11401,11402,11403,11404,31048,31049,30930,30931
+
+
 # ---------------------------------------------------------------------------
 # Summons configuration
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/config/Conquest.ini b/L2J_Mobius_10.3_MasterClass/dist/game/config/Conquest.ini
index 2673ec6d22..dae8c8298e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/config/Conquest.ini
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/config/Conquest.ini
@@ -57,6 +57,10 @@ ConquestRateServerSoulOrbs = 1
 # Retail: 1
 ConquestRateZonePoints = 1
 
+# Bloody Coins multiplier
+# Retail: 1
+ConquestRateBloodyCoins = 1
+
 # Character Attack Points
 # Retail: 100
 ConquestCharacterAttackPoints = 100
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_10.3_MasterClass/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/config/General.ini b/L2J_Mobius_10.3_MasterClass/dist/game/config/General.ini
index 8f5ce649d7..d94b6e198f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/config/General.ini
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/config/General.ini
@@ -436,8 +436,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
@@ -660,6 +660,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 
 # ---------------------------------------------------------------------------
 # Blue-Red Team Abnormal Effect Settings
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/config/Rates.ini b/L2J_Mobius_10.3_MasterClass/dist/game/config/Rates.ini
index 76ff651b5a..b2164f33ad 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/config/Rates.ini
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/config/Rates.ini
@@ -159,11 +159,13 @@ EventItemMaxLevelDifference = 9
 # Vitality system rates. Works only if EnableVitality = True
 # ---------------------------------------------------------------------------
 
-# The following configures the XP multiplier of each vitality level. Basically, you have
-# Default: 2
+# The following configures the XP multiplier of each vitality level.
 # Take care setting these values according to your server rates, as the can lead to huge differences!
 # Example with a server rate 15x and vitality = 2. => final server rate = 30 (15x2)!
+# Retail: 2
 RateVitalityExpMultiplier = 2.
+# Retail: 3
+RateVitalityExpPremiumMultiplier = 3.
 
 # Maximum vitality items allowed to be used for a week by a player.
 # Default: 999
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/ActionData.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/ActionData.xml
index cce8ac65a7..d5decbe607 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/ActionData.xml
@@ -1,48 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
+	<action id="0" handler="SitStand" /> <!-- Sit / Stand -->
+	<action id="1" handler="RunWalk" /> <!-- Walk / Run -->
+	<action id="2" handler="None" /> <!-- Attack -->
+	<action id="3" handler="None" /> <!-- Trade -->
+	<action id="4" handler="None" /> <!-- Next Target (Melee) -->
+	<action id="5" handler="None" /> <!-- Pick Up -->
+	<action id="6" handler="None" /> <!-- Assist -->
+	<action id="7" handler="None" /> <!-- Invite -->
+	<action id="8" handler="None" /> <!-- Leave Party -->
+	<action id="9" handler="None" /> <!-- Dismiss Party Member -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store - Sell -->
+	<action id="11" handler="None" /> <!-- Party Matching -->
 	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
 	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
 	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
 	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
+	<action id="16" handler="PetAttack" /> <!-- Attackers -->
 	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
+	<action id="18" handler="None" /> <!-- Pick Up -->
+	<action id="19" handler="UnsummonPet" /> <!-- Recall Pet -->
+	<action id="20" handler="None" /> <!-- Special skill -->
 	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attackers -->
 	<action id="23" handler="ServitorStop" /> <!-- Stop -->
 	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
 	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
 	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
+	<action id="27" handler="None" /> <!-- Special skill -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store - Buy -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Confusion -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Standby -->
 	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Switch Mode -->
 	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
 	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
 	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Toxic Smoke -->
 	<action id="38" handler="Ride" /> <!-- Mount/Dismount -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Parasite Burst -->
+	<action id="40" handler="None" /> <!-- Recommend -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Cannon -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Self Damage Shield -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Water Pit -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Booming Attack -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Master Recharge -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Storm Strike -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Steal Blood -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanical Cannon -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Wild Temper -->
+	<action id="50" handler="None" /> <!-- Change Party Leader -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Unsummon -->
+	<action id="53" handler="ServitorMove" /> <!-- Move -->
+	<action id="54" handler="PetMove" /> <!-- Move -->
+	<action id="55" handler="None" /> <!-- Recording Replay On/Off -->
+	<action id="56" handler="None" /> <!-- Command Channel Invite -->
+	<action id="57" handler="None" /> <!-- Find Store -->
+	<action id="58" handler="None" /> <!-- Duel -->
+	<action id="59" handler="None" /> <!-- Cancel Duel -->
+	<action id="60" handler="None" /> <!-- Party Duel -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store - Wholesale -->
 	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
+	<action id="63" handler="None" /> <!-- Mini-Game -->
+	<action id="64" handler="TeleportBookmark" /> <!-- My Teleport -->
 	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
 	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
 	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
@@ -51,170 +71,196 @@
 	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
 	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
 	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
+	<action id="74" handler="None" /> <!-- Turn On/Off the Status Information -->
+	<action id="76" handler="None" /> <!-- Invite Friends -->
+	<action id="77" handler="None" /> <!-- Start/End Recording -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Use of Token 1 -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Use of Token 2 -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Use of Token 3 -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Use of Token 4 -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Target by Token 1 -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Target by Token 2 -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Target by Token 3 -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Target by Token 4 -->
 	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
 	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="95" handler="WaitingAction" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Nightshade - Shade Sacrifice -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off -->
+	<action id="90" handler="InstanceZoneInfo" /> <!-- Instance Zones -->
+	<action id="92" handler="None" /> <!-- Previous Target (Melee) -->
+	<action id="93" handler="None" /> <!-- Next Target (Range) -->
+	<action id="94" handler="None" /> <!-- Previous Target (Range) -->
+	<action id="95" handler="WaitingAction" /> <!-- Waiting Action -->
+	<action id="96" handler="StrikeBack" /> <!-- Strike Back -->
+	<action id="97" handler="CombatMode" /> <!-- Combat Mode -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Hammer -->
+	<action id="1001" handler="None" /> <!-- Ultimate Bombastic Buster -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Hostile Feeling -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wild Stun -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wild Defense -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Bright Burst -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Bright Heal -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Queen's Blessing -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Queen's Gift -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Queen's Cure -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Seraphim's Blessing -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Seraphim's Gift -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Seraphim's Cure -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Shadow's Curse -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Shadow's Mass Curse -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Shadow's Sacrifice -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Blow -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Strike -->
+	
+	<!-- TODO: Find skill ids. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Cursed HP Draining -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Kat the Cat's Skill 2 -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Mew the Cat's Skill 2 -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Kai the Cat's Skill 2 -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Boxer the Unicorn's Skill 2 -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Mirage the Unicorn's Skill 2 -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Merrow the Unicorn Skill 2 -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Shadow's Skill 1 -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Shadow's Skill 2 -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Silhouette's Skill -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Reanimated Man's Skill 1 -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Reanimated Man's Skill 2 -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Corrupted Man's Skill 2 -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Slash -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Spin Slash -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Cat's Grip -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Whiplash -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Tidal Wave -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Corpse Burst -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Dicing Death -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Dark Curse -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Cannon Fodder -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Big Bang -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Bite Attack -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Maul -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Wolf Cry -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awakening -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Wolf Howl -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider Roar -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast's Bite -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast's Stun Attack -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast's Fire Breath -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast's Roar -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Blessed Body -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Blessed Soul -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Haste -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Acumen -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Clarity -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Empower -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Wild Magic -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Death Whisper -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Focus -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Guidance -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Death Blow -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Double Attack -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Spin Attack -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Meteor Shower -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakening -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Thunder Bolt -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Blaze -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Lightning Wave -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Flare -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Buff Control -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Power Striker -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Piercing Attack -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Whirlwind -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Spear Strike -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Battle Cry -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Power Smash -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Energy Burst -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Shock Wave -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Howl -->
 	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
 	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
 	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
 	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch Tactics -->
 	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther's Dark Claw -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther's Fatal Claw -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Tail Strike -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Strider Bite -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Strider Fear -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Strider Dash -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen's Strike -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen Wind Walk -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Maguen's Power Strike -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen Wind Walk -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen Return -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Maguen Party Return -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attackers -->
+	<action id="1100" handler="ServitorMove" /> <!-- Teleport -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Unsummon -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Passive -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Defense -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Bear Claw -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Bear Tumbling -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Cougar Bite -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Cougar Pounce -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Reaper Touch -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Reaper Power -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Lion Roar -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Lion Claw -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Lion Dash -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Lion Flame -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Flight -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Purity -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Feather Blast -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Sharp Claw -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Blessing of Life -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Punch -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Feline Aggression -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Feline Stun -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Feline Bite -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Feline Pounce -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Feline Touch -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Feline Power -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Unicorn's Aggression -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Unicorn's Stun -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Unicorn's Bite -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Unicorn's Pounce -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Unicorn's Touch -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Unicorn's Power -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Phantom Aggression -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Phantom Stun -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Phantom Bite -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Phantom's Pounce -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Phantom Touch -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Phantom Power -->
+	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Jumping Attack -->
+	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Double Slash -->
+	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Elemental Slam -->
+	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat Power -->
+	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Lancer Rush -->
+	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Power Stamp -->
+	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Multiple Icicles -->
+	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Cherub Power -->
+	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Phantom Sword Attack -->
+	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Phantom Blow -->
+	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Phantom Spike -->
+	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Phantom Crash -->
+	<action id="1156" handler="ServitorSkillUse" option="19406" /> <!-- Curse of Deadlands -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Hand of Warmth -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Rosy Seduction -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Art of Seduction -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Thunder Bolt -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Flash -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Lightning Wave -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Buff Control -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Piercing Attack -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Spin Attack -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impale -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Battle Cry -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Power Smash -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Energy Burst -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Shock Wave -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Ignite -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switch Tactics -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Cat the Ranger Boost -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/DailyMission.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/DailyMission.xml
index 5459aa25ee..dab762af93 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/DailyMission.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/DailyMission.xml
@@ -177,9 +177,9 @@
 		</items>
 	</reward>
 	<reward id="2101" name="Field Boss I" requiredCompletion="3" isOneTime="false">
-		<!-- Defeat any of the field raid bosses 3 times: Baium Orfen Lilith Anakim Ishka -->
+		<!-- Defeat any of the field raid bosses 3 times: Orfen Lilith Anakim Lord Ishka Queen Ant Guillotine -->
 		<handler name="boss">
-			<param name="ids">29020,29325,29336,29348,29379</param>
+			<param name="ids">29325,29336,29348,29379,25888</param>
 		</handler>
 		<items>
 			<item id="-200" count="100" /> <!-- Clan Reputation -->
@@ -332,11 +332,11 @@
 		</items>
 	</reward>
 	<reward id="3031" name="World Boss Raid: First Steps" requiredCompletion="1">
-		<!-- Defeat 1 of the following once. Antharas Valakas Lindvior Fafurion Helios Etis van Etina -->
+		<!-- Defeat 1 of the following once. Antharas Valakas Lindvior Helios Etis van Etina -->
 		<handler name="boss">
 			<param name="minLevel">95</param>
 			<param name="maxLevel">255</param>
-			<param name="ids">29068,29028,29240,29361,29362,29363,29364,29365,29366,29367,29305,29320</param>
+			<param name="ids">29068,29028,29240,29305,29320</param>
 		</handler>
 		<items>
 			<item id="-200" count="200" /> <!-- Clan Reputation -->
@@ -344,11 +344,11 @@
 		</items>
 	</reward>
 	<reward id="3032" name="World Boss Raid: Seasoned" requiredMissionCompleteId="3031" requiredCompletion="10">
-		<!-- Defeat 1 of the following 10 times. Antharas Valakas Lindvior Fafurion Helios Etis van Etina -->
+		<!-- Defeat 1 of the following 10 times. Antharas Valakas Lindvior Helios Etis van Etina -->
 		<handler name="boss">
 			<param name="minLevel">95</param>
 			<param name="maxLevel">255</param>
-			<param name="ids">29068,29028,29240,29361,29362,29363,29364,29365,29366,29367,29305,29320</param>
+			<param name="ids">29068,29028,29240,29305,29320</param>
 		</handler>
 		<items>
 			<item id="-200" count="1000" /> <!-- Clan Reputation -->
@@ -356,11 +356,11 @@
 		</items>
 	</reward>
 	<reward id="3033" name="World Boss Raid: Expert" requiredMissionCompleteId="3032" requiredCompletion="30">
-		<!-- Defeat 1 of the following 30 times. Antharas Valakas Lindvior Fafurion Helios Etis van Etina -->
+		<!-- Defeat 1 of the following 30 times. Antharas Valakas Lindvior Helios Etis van Etina -->
 		<handler name="boss">
 			<param name="minLevel">95</param>
 			<param name="maxLevel">255</param>
-			<param name="ids">29068,29028,29240,29361,29362,29363,29364,29365,29366,29367,29305,29320</param>
+			<param name="ids">29068,29028,29240,29305,29320</param>
 		</handler>
 		<items>
 			<item id="-200" count="2000" /> <!-- Clan Reputation -->
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/DoorData.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/DoorData.xml
index ce8597f897..807d1dfa79 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/DoorData.xml
@@ -11659,6 +11659,176 @@
 		<openStatus default="open" />
 	</door>
 	
+	<!-- 21_16 FIXME: Rune clanhall doors cannot be found in client. -->
+	<door id="21160001" name="rune_castle_agit_002_001">
+		<nodes nodeZ="872">
+			<node x="37679" y="-50432" />
+			<node x="37726" y="-50433" />
+			<node x="37726" y="-50423" />
+			<node x="37678" y="-50424" />
+		</nodes>
+		<location x="37680" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160002" name="rune_castle_agit_002_002">
+		<nodes nodeZ="872">
+			<node x="37724" y="-50432" />
+			<node x="37771" y="-50432" />
+			<node x="37771" y="-50423" />
+			<node x="37723" y="-50424" />
+		</nodes>
+		<location x="37770" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160003" name="rune_castle_agit_003_001">
+		<nodes nodeZ="872">
+			<node x="38527" y="-50151" />
+			<node x="38570" y="-50131" />
+			<node x="38566" y="-50122" />
+			<node x="38524" y="-50144" />
+		</nodes>
+		<location x="38527" y="-50147" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160004" name="rune_castle_agit_003_002">
+		<nodes nodeZ="872">
+			<node x="38569" y="-50132" />
+			<node x="38610" y="-50111" />
+			<node x="38606" y="-50103" />
+			<node x="38564" y="-50124" />
+		</nodes>
+		<location x="38607" y="-50108" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160005" name="rune_castle_agit_004_001">
+		<nodes nodeZ="872">
+			<node x="39122" y="-49542" />
+			<node x="39145" y="-49501" />
+			<node x="39137" y="-49498" />
+			<node x="39115" y="-49539" />
+		</nodes>
+		<location x="39119" y="-49539" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160006" name="rune_castle_agit_004_002">
+		<nodes nodeZ="872">
+			<node x="39145" y="-49503" />
+			<node x="39167" y="-49462" />
+			<node x="39160" y="-49459" />
+			<node x="39136" y="-49498" />
+		</nodes>
+		<location x="39163" y="-49461" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160007" name="rune_castle_agit_001_001">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48291" />
+			<node x="39341" y="-48245" />
+			<node x="39335" y="-48245" />
+			<node x="39334" y="-48290" />
+		</nodes>
+		<location x="39338" y="-48290" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160008" name="rune_castle_agit_001_002">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48246" />
+			<node x="39342" y="-48199" />
+			<node x="39334" y="-48199" />
+			<node x="39334" y="-48246" />
+		</nodes>
+		<location x="39338" y="-48200" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160009" name="rune_castle_agit_005_001">
+		<nodes nodeZ="872">
+			<node x="39176" y="-47024" />
+			<node x="39155" y="-46982" />
+			<node x="39147" y="-46986" />
+			<node x="39169" y="-47026" />
+		</nodes>
+		<location x="39172" y="-47024" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160010" name="rune_castle_agit_005_002">
+		<nodes nodeZ="872">
+			<node x="39154" y="-46982" />
+			<node x="39133" y="-46942" />
+			<node x="39127" y="-46945" />
+			<node x="39148" y="-46986" />
+		</nodes>
+		<location x="39130" y="-46944" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160011" name="rune_castle_agit_006_001">
+		<nodes nodeZ="872">
+			<node x="38626" y="-46372" />
+			<node x="38586" y="-46350" />
+			<node x="38581" y="-46358" />
+			<node x="38623" y="-46379" />
+		</nodes>
+		<location x="38624" y="-46375" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160012" name="rune_castle_agit_006_002">
+		<nodes nodeZ="872">
+			<node x="38587" y="-46350" />
+			<node x="38545" y="-46330" />
+			<node x="38542" y="-46336" />
+			<node x="38583" y="-46358" />
+		</nodes>
+		<location x="38544" y="-46333" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160013" name="rune_castle_agit_007_001">
+		<nodes nodeZ="873">
+			<node x="37787" y="-46044" />
+			<node x="37741" y="-46044" />
+			<node x="37741" y="-46051" />
+			<node x="37787" y="-46050" />
+		</nodes>
+		<location x="37787" y="-46047" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160014" name="rune_castle_agit_007_002">
+		<nodes nodeZ="873">
+			<node x="37743" y="-46043" />
+			<node x="37697" y="-46045" />
+			<node x="37697" y="-46051" />
+			<node x="37742" y="-46051" />
+		</nodes>
+		<location x="37697" y="-46048" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	
 	<!-- 21_17 -->
 	<door id="21170001" name="Rune_bodeful_fortress_s.Rune_bf_azit_gate_door">
 		<nodes nodeZ="544">
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/html/default/34426.htm b/L2J_Mobius_10.3_MasterClass/dist/game/data/html/default/34426.htm
new file mode 100644
index 0000000000..9d70e30f05
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/html/default/34426.htm
@@ -0,0 +1,6 @@
+<html><body>Blackbird Clan Lord Leona Blackbird:<br>
+This place is the Atelia Outlet, the most important place of Atelia Refinery.<br>
+Embryos might sense your presence, so please be very careful.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10889_SaviorsPathFallenEmperorsThrone teleport">Teleport to the inside of Atelia Refinery.</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/multisell/3160302.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/multisell/3160302.xml
index 649c3f4856..c9ee0fe75e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/multisell/3160302.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/multisell/3160302.xml
@@ -42,7 +42,7 @@
 		<production count="1" id="38568" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
@@ -50,7 +50,7 @@
 		<production count="1" id="38569" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/multisell/3368502.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/multisell/3368502.xml
index f280615e20..0e961b13f5 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/multisell/3368502.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/multisell/3368502.xml
@@ -20,7 +20,7 @@
 	<item>
 		<ingredient count="10" id="45584" />
 		<ingredient count="500000" id="57" />
-		<production count="1" id="37894" /> <!-- Hero’s Recovery Potion -->
+		<production count="1" id="37894" /> <!-- Hero's Recovery Potion -->
 	</item>
 	<item>
 		<ingredient count="2" id="45584" />
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Conquest/ConquestEngine.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Conquest/ConquestEngine.java
index 66cf7595d5..57ce51da5f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Conquest/ConquestEngine.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Conquest/ConquestEngine.java
@@ -657,7 +657,7 @@ public class ConquestEngine extends AbstractNpcAI
 				updatePoints(attackerPlayer, CONQUEST_POINT_DATA.getPvpPersonalPointsAmount(targetPlayer.getLevel()), CONQUEST_POINT_DATA.getPvpServerPointsAmount(targetPlayer.getLevel()), 0, 0, true);
 				if ((getAttackPoints(attackerPlayer) >= 1) && (getLifePoints(targetPlayer) >= 1))
 				{
-					attackerPlayer.addItem("ConquestCoins", BLOODY_COIN, CONQUEST_POINT_DATA.getCoinsAmount(targetPlayer.getLevel()), attackerPlayer, true);
+					attackerPlayer.addItem("ConquestCoins", BLOODY_COIN, CONQUEST_POINT_DATA.getCoinsAmount(targetPlayer.getLevel()) * Config.CONQUEST_RATE_BLOODY_COINS, attackerPlayer, true);
 					setAttackPoints(attackerPlayer, -1);
 					setLifePoints(targetPlayer, -1);
 					
@@ -669,7 +669,7 @@ public class ConquestEngine extends AbstractNpcAI
 					// Winner Message
 					SystemMessage sm2 = new SystemMessage(SystemMessageId.YOU_HAVE_DEFEATED_C1_AND_GOT_BLOODY_COINS_X_S2_PERSONAL_CONQUEST_POINTS_X_S3_SERVER_CONQUEST_POINTS_X_S4_ATTACK_POINTS_1_TO_CHECK_THEIR_CURRENT_AMOUNT_ENTER_BLOODYCOIN_IN_YOUR_CHAT_WINDOW);
 					sm2.addString(targetPlayer.getName());
-					sm2.addString(Integer.toString(CONQUEST_POINT_DATA.getCoinsAmount(targetPlayer.getLevel())));
+					sm2.addString(Integer.toString(CONQUEST_POINT_DATA.getCoinsAmount(targetPlayer.getLevel()) * Config.CONQUEST_RATE_BLOODY_COINS));
 					sm2.addString(Long.toString(CONQUEST_POINT_DATA.getPvpPersonalPointsAmount(targetPlayer.getLevel())));
 					sm2.addString(Long.toString(CONQUEST_POINT_DATA.getPvpServerPointsAmount(targetPlayer.getLevel())));
 					attackerPlayer.sendPacket(sm2);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
index 1ec233eb7f..a62bbab9b4 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
@@ -170,7 +170,6 @@ public class LionelHunter extends AbstractNpcAI
 					htmltext = "33907-not-completed.html";
 				}
 				break;
-				
 			}
 		}
 		return htmltext;
@@ -186,4 +185,4 @@ public class LionelHunter extends AbstractNpcAI
 	{
 		new LionelHunter();
 	}
-}
\ No newline at end of file
+}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
new file mode 100644
index 0000000000..beaa3f26da
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
@@ -0,0 +1,181 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.Rune.SwampOfScreams;
+
+import java.util.Calendar;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.l2jmobius.commons.util.CommonUtil;
+import org.l2jmobius.gameserver.data.xml.SpawnData;
+import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.spawns.SpawnGroup;
+import org.l2jmobius.gameserver.model.spawns.SpawnTemplate;
+import org.l2jmobius.gameserver.network.NpcStringId;
+
+import ai.AbstractNpcAI;
+
+/**
+ * @author Tanatos
+ */
+public class SwampOfScreamsSiege extends AbstractNpcAI
+{
+	// NPCs
+	private static final int[] SWAMP_MONSTERS =
+	{
+		24570,
+		24571,
+		24572,
+		24573
+	};
+	private static final int SWAMP_PETRA = 24574;
+	private static final AtomicReference<SpawnTemplate> SPAWN_SWAMP_MONSTERS = new AtomicReference<>();
+	// Misc
+	private static final int[] DAYS_OF_WEEK =
+	{
+		Calendar.MONDAY,
+		Calendar.TUESDAY,
+		Calendar.WEDNESDAY,
+		Calendar.THURSDAY,
+		Calendar.FRIDAY,
+		Calendar.SATURDAY,
+		Calendar.SUNDAY
+	};
+	// Schedule: 10-11 & 22-23
+	private static final int[] DAY_TIME =
+	{
+		10,
+		00
+	};
+	private static final int[] NIGHT_TIME =
+	{
+		22,
+		00
+	};
+	private static final long DESPAWN_DELAY = 3600000;
+	private static boolean _daytime = false;
+	
+	private SwampOfScreamsSiege()
+	{
+		addKillId(SWAMP_MONSTERS);
+		scheduleDayTime();
+		scheduleNightTime();
+		LOGGER.info("Swamp of Screams siege starts from 10:00 to 11:00 and from 22:00 to 23:00.");
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "day_time_spawn":
+			{
+				World.getInstance().getPlayers().forEach(p -> showOnScreenMsg(p, NpcStringId.HERALD_S_ANNOUNCEMENT_10_00_11_00_MONSTERS_ARE_SPAWNING_IN_THE_SWAMP_OF_SCREAMS_KILL_THEM_ALL, 2, 10000, true));
+				SPAWN_SWAMP_MONSTERS.set(SpawnData.getInstance().getSpawnByName("SwampOfScreamsMonsters"));
+				SPAWN_SWAMP_MONSTERS.get().getGroups().forEach(SpawnGroup::spawnAll);
+				_daytime = true;
+				startQuestTimer("despawn", DESPAWN_DELAY, null, null);
+				break;
+			}
+			case "night_time_spawn":
+			{
+				World.getInstance().getPlayers().forEach(p -> showOnScreenMsg(p, NpcStringId.HERALD_S_ANNOUNCEMENT_10_00_P_M_11_00_P_M_MONSTERS_ARE_INVADING_THE_SWAMP_OF_SCREAMS_AT_NIGHT_TIME, 2, 10000, true));
+				SPAWN_SWAMP_MONSTERS.set(SpawnData.getInstance().getSpawnByName("SwampOfScreamsMonsters"));
+				SPAWN_SWAMP_MONSTERS.get().getGroups().forEach(SpawnGroup::spawnAll);
+				_daytime = false;
+				startQuestTimer("despawn", DESPAWN_DELAY, null, null);
+				break;
+			}
+			case "despawn":
+			{
+				if (_daytime)
+				{
+					World.getInstance().getPlayers().forEach(p -> showOnScreenMsg(p, NpcStringId.HERALD_S_ANNOUNCEMENT_10_P_M_11_00_P_M_MONSTERS_OF_THE_SWAMP_OF_SCREAMS_HAVE_FLED_AWAY, 2, 10000, true));
+				}
+				else
+				{
+					World.getInstance().getPlayers().forEach(p -> showOnScreenMsg(p, NpcStringId.HERALD_S_ANNOUNCEMENT_10_00_11_00_MONSTERS_OF_THE_SWAMP_OF_SCREAMS_ARE_DEFEATED, 2, 10000, true));
+				}
+				SPAWN_SWAMP_MONSTERS.set(SpawnData.getInstance().getSpawnByName("SwampOfScreamsMonsters"));
+				SPAWN_SWAMP_MONSTERS.get().getGroups().forEach(SpawnGroup::despawnAll);
+				break;
+			}
+		}
+		return super.onAdvEvent(event, npc, player);
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player killer, boolean isSummon)
+	{
+		if ((CommonUtil.contains(SWAMP_MONSTERS, npc.getId())) && (getRandom(100) < 3))
+		{
+			addSpawn(SWAMP_PETRA, npc.getLocation(), false, 600000, false);
+		}
+		return super.onKill(npc, killer, isSummon);
+	}
+	
+	private void scheduleDayTime()
+	{
+		long time = Long.MAX_VALUE;
+		for (int day : DAYS_OF_WEEK)
+		{
+			final long nextDateMillis = getNextDateMilis(day, DAY_TIME[0], DAY_TIME[1]);
+			if (nextDateMillis < time)
+			{
+				time = nextDateMillis;
+			}
+		}
+		startQuestTimer("day_time_spawn", time - System.currentTimeMillis(), null, null);
+	}
+	
+	private void scheduleNightTime()
+	{
+		long time = Long.MAX_VALUE;
+		for (int day : DAYS_OF_WEEK)
+		{
+			final long nextDateMillis = getNextDateMilis(day, NIGHT_TIME[0], NIGHT_TIME[1]);
+			if (nextDateMillis < time)
+			{
+				time = nextDateMillis;
+			}
+		}
+		startQuestTimer("night_time_spawn", time - System.currentTimeMillis(), null, null);
+	}
+	
+	private long getNextDateMilis(int dayOfWeek, int hour, int minute)
+	{
+		final Calendar calendar = Calendar.getInstance();
+		calendar.set(Calendar.HOUR_OF_DAY, hour);
+		calendar.set(Calendar.MINUTE, minute);
+		calendar.set(Calendar.SECOND, 0);
+		for (int i = 0; i < 7; i++)
+		{
+			if ((calendar.get(Calendar.DAY_OF_WEEK) == dayOfWeek) && (calendar.getTimeInMillis() > System.currentTimeMillis()))
+			{
+				return calendar.getTimeInMillis();
+			}
+			calendar.add(Calendar.DAY_OF_WEEK, 1);
+		}
+		return calendar.getTimeInMillis();
+	}
+	
+	public static void main(String[] args)
+	{
+		new SwampOfScreamsSiege();
+	}
+}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 7ef05d97dc..5944457dd2 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -42,10 +42,12 @@ import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.SkillLearn;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.ListenerRegisterType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterType;
+import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBecomeNoblesse;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin;
@@ -266,6 +268,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 				else
 				{
 					player.setNobleLevel(1);
+					checkNobleListener(player);
 					player.broadcastUserInfo();
 					// TODO: SetOneTimeQuestFlag(talker, 10385, 1);
 					htmltext = "test_server_helper025.html";
@@ -402,6 +405,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 						if (data.isRewardNoblesse())
 						{
 							player.setNobleLevel(1);
+							checkNobleListener(player);
 						}
 						// Give possible hero status reward.
 						if (data.isRewardHero())
@@ -859,6 +863,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 				if (data.isRewardNoblesse())
 				{
 					player.setNobleLevel(1);
+					checkNobleListener(player);
 				}
 				// Give possible hero status reward.
 				if (data.isRewardHero())
@@ -1170,6 +1175,15 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 		return null;
 	}
 	
+	private void checkNobleListener(Player player)
+	{
+		// Notify to scripts.
+		if (EventDispatcher.getInstance().hasListener(EventType.ON_PLAYER_BECOME_NOBLESSE))
+		{
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerBecomeNoblesse(player));
+		}
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClassMaster();
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/GreedyTreasureChests.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/GreedyTreasureChests.java
index 5c6bdecdab..26d3be6b29 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/GreedyTreasureChests.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/GreedyTreasureChests.java
@@ -600,7 +600,7 @@ public class GreedyTreasureChests extends AbstractNpcAI
 					else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_NZ_2", 0))
 					{
 						addSpawn(CHEST_LV110, npc, true, 0, true);
-						GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET)));
+						GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_NZ_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET)));
 					}
 					break;
 				}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/34641.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/34641.html
new file mode 100644
index 0000000000..a602ca161d
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/34641.html
@@ -0,0 +1,26 @@
+<html><body scroll="no">
+<font color="af9878">
+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">
+	<tr><td height=30></td></tr>
+	<tr>
+		<td align="center">
+			<table border=0 cellspacing=0 width=250 height=250>
+				<tr>
+					<td align="center">
+					"O Cantabile!<br1>
+					Your beautiful voice flows like a river!"
+					</td>
+				</tr>
+				<tr>
+					<td align=center>
+						Welcome, my friend! I am sure you will enjoy your stand in this wonderful place where exquisite music fills the air!<br>
+						The town is divided into 3 zones and each one of them has its own features.<br>
+						The first zone is overseen by Amoroso, the second by Delicato and the third by Comodo. Talk to them to learn more.
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+</font>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/34642.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/34642.html
new file mode 100644
index 0000000000..3df8e6e071
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/34642.html
@@ -0,0 +1,25 @@
+<html><body scroll="no">
+<font color="af9878">
+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">
+	<tr><td height=30></td></tr>
+	<tr>
+		<td align="center">
+			<table border=0 cellspacing=0 width=250 height=200>
+				<tr>
+					<td align="center">
+					"O Amoroso!<br1>
+					Sing us your song of love and beauty!"
+					</td>
+				</tr>
+				<tr>
+					<td align=center>
+						My name is Amoroso, I oversee Adagio (Zone 1)! I train dancers who have 10-34 on their PK counter.<br>
+						We are putting on an amazing, truly incredible concert! You must be dying of anticipation, right? Ha-ha!
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+</font>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/34643.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/34643.html
new file mode 100644
index 0000000000..9844339570
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/34643.html
@@ -0,0 +1,25 @@
+<html><body scroll="no">
+<font color="af9878">
+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">
+	<tr><td height=30></td></tr>
+	<tr>
+		<td align="center">
+			<table border=0 cellspacing=0 width=250 height=225>
+				<tr>
+					<td align="center">
+					"O Delicato!<br1>
+					Your intrincate songs move and inspire us!"
+					</td>
+				</tr>
+				<tr>
+					<td align=center>
+						My name is Delicato, I oversee Andante (Zone 2). Lord Narcissus has asked me to look after Pomposo and Dolce.<br>
+						Their petals are very valuable, but almost imposible to collect. Heroes who hace 35-39 on their PK counter can grow these flowers by bleeding over them.
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+</font>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/34644.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/34644.html
new file mode 100644
index 0000000000..da8fec9e47
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/34644.html
@@ -0,0 +1,26 @@
+<html><body scroll="no">
+<font color="af9878">
+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">
+	<tr><td height=30></td></tr>
+	<tr>
+		<td align="center">
+			<table border=0 cellspacing=0 width=250 height=275>
+				<tr>
+					<td align="center">
+					"O Comodo!<br1>
+					Your mellow melodies please our ears and soothe our souls!"
+					</td>
+				</tr>
+				<tr>
+					<td align=center>
+						My name is Comodo, I oversee Allegro (Zone 3).<br>
+						I've managed to find a Pure Crystal to offer as tribute to Narcissus, but then I learned that the poor Angel is possessed by evil spirits! Can you imagine?<br>
+						It is possible to exorcize the spirits, but only the heroes who have 40+ on their Pk counter can do it.
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+</font>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java
index 1dc6e07854..2634f960ad 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java
@@ -37,6 +37,16 @@ import ai.AbstractNpcAI;
  */
 public class PrisonManager extends AbstractNpcAI
 {
+	// NPC
+	private static final int MORENDO = 34637;
+	private static final int POMPOSO = 34638;
+	private static final int DOLLOROSO = 34639;
+	private static final int DOLCE = 34640;
+	private static final int CANTABILE = 34641;
+	private static final int AMOROSO = 34642;
+	private static final int DELICATO = 34643;
+	private static final int COMODO = 34644;
+	// Misc
 	private static final ScriptZone PRISON_ZONE_1 = ZoneManager.getInstance().getZoneById(26010, ScriptZone.class);
 	private static final ScriptZone PRISON_ZONE_2 = ZoneManager.getInstance().getZoneById(26011, ScriptZone.class);
 	private static final ScriptZone PRISON_ZONE_3 = ZoneManager.getInstance().getZoneById(26012, ScriptZone.class);
@@ -48,8 +58,8 @@ public class PrisonManager extends AbstractNpcAI
 	
 	public PrisonManager()
 	{
-		addFirstTalkId(34637, 34638, 34639, 34640);
-		addTalkId(34637, 34638, 34639, 34640);
+		addFirstTalkId(MORENDO, POMPOSO, DOLLOROSO, DOLCE, CANTABILE, AMOROSO, DELICATO, COMODO);
+		addTalkId(MORENDO, POMPOSO, DOLLOROSO, DOLCE, CANTABILE, AMOROSO, DELICATO, COMODO);
 		addEnterZoneId(PRISON_ZONE_1.getId(), PRISON_ZONE_2.getId(), PRISON_ZONE_3.getId(), PRISON_ENTER_ZONE.getId(), PRISON_ENTER_ZONE2.getId());
 		addExitZoneId(PRISON_ZONE_1.getId(), PRISON_ZONE_2.getId(), PRISON_ZONE_3.getId(), PRISON_ENTER_ZONE2.getId());
 	}
@@ -68,6 +78,10 @@ public class PrisonManager extends AbstractNpcAI
 			case "34639-no.html":
 			case "34640.html":
 			case "34640-no.html":
+			case "34641.html":
+			case "34642.html":
+			case "34643.html":
+			case "34644.html":
 			{
 				htmltext = event;
 				break;
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index d3d1a6bbcf..6c678e8c19 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -235,6 +236,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
index 4289e955d0..5d832a0a04 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
@@ -302,7 +302,20 @@ public class Eraton extends AbstractNpcAI
 				takeItem(player, STONE_OF_DESTINY);
 				takeItem(player, getCloakItemId(player));
 				
-				player.removeAllSkills();
+				if (Config.ERATON_RETAINED_SKILLS.isEmpty())
+				{
+					player.removeAllSkills();
+				}
+				else
+				{
+					for (Skill skill : player.getAllSkills())
+					{
+						if (!Config.ERATON_RETAINED_SKILLS.contains(skill.getId()))
+						{
+							player.removeSkill(skill);
+						}
+					}
+				}
 				
 				// Stop auto use.
 				for (Shortcut shortcut : player.getAllShortCuts())
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java
index e8c77fe7a0..4ebfe9eab4 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -44,6 +44,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AgathionSlot", AgathionSlot::new);
@@ -203,6 +205,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("HpToOwner", HpToOwner::new);
 		EffectHandler.getInstance().registerHandler("Ignition", Ignition::new);
 		EffectHandler.getInstance().registerHandler("IgnoreDeath", IgnoreDeath::new);
+		EffectHandler.getInstance().registerHandler("IgnoreReduceDamage", IgnoreReduceDamage::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageBonus", ImmobileDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageResist", ImmobileDamageResist::new);
 		EffectHandler.getInstance().registerHandler("ImmobilePetBuff", ImmobilePetBuff::new);
@@ -242,7 +245,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java
index ffc903fd3f..bc95845925 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java
@@ -48,6 +48,7 @@ public class SkillConditionMasterHandler
 		SkillConditionHandler.getInstance().registerHandler("CanUseInDragonLair", CanUseInDragonLairSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CanUseSwoopCannon", CanUseSwoopCannonSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("HasVitalityPoints", HasVitalityPointsSkillCondition::new);
+		SkillConditionHandler.getInstance().registerHandler("CanUseSymbolSealIncreaseItem", CanUseSymbolSealIncreaseItemSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new);
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index 816eb1b58b..98c4196ce6 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -49,6 +49,10 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.EventType;
+import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBecomeExalted;
+import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBecomeNoblesse;
 import org.l2jmobius.gameserver.model.html.PageBuilder;
 import org.l2jmobius.gameserver.model.html.PageResult;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -913,12 +917,22 @@ public class AdminEditChar implements IAdminCommandHandler
 					{
 						player.setNobleLevel(1);
 						player.sendMessage("A GM added you nobless status!");
+						// Notify to scripts.
+						if (EventDispatcher.getInstance().hasListener(EventType.ON_PLAYER_BECOME_NOBLESSE))
+						{
+							EventDispatcher.getInstance().notifyEventAsync(new OnPlayerBecomeNoblesse(player));
+						}
 						break;
 					}
 					case 1:
 					{
 						player.setNobleLevel(2);
 						player.sendMessage("A GM changed your nobless status to exalted!");
+						// Notify to scripts.
+						if (EventDispatcher.getInstance().hasListener(EventType.ON_PLAYER_BECOME_EXALTED))
+						{
+							EventDispatcher.getInstance().notifyEventAsync(new OnPlayerBecomeExalted(player));
+						}
 						break;
 					}
 					case 2:
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
new file mode 100644
index 0000000000..5405ccd4be
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class IgnoreReduceDamage extends AbstractStatEffect
+{
+	public IgnoreReduceDamage(StatSet params)
+	{
+		super(params, Stat.IGNORE_REDUCE_DAMAGE);
+	}
+}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
index 951002a2c2..35bfbcb6bc 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.enums.StatModifierType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener;
 import org.l2jmobius.gameserver.model.events.returns.DamageReturn;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author Sdw
@@ -32,10 +34,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 public class ReduceDamage extends AbstractEffect
 {
 	private final double _amount;
+	private final StatModifierType _mode;
 	
 	public ReduceDamage(StatSet params)
 	{
 		_amount = params.getDouble("amount");
+		_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
 	}
 	
 	private DamageReturn onDamageReceivedEvent(OnCreatureDamageReceived event)
@@ -46,7 +50,15 @@ public class ReduceDamage extends AbstractEffect
 			return null;
 		}
 		
-		final double newDamage = event.getDamage() * (_amount / 100);
+		final double newDamage;
+		if (_mode == StatModifierType.PER)
+		{
+			newDamage = event.getDamage() - (event.getDamage() * (_amount / 100));
+		}
+		else // DIFF
+		{
+			newDamage = event.getDamage() - Math.max((_amount - event.getAttacker().getStat().getAdd(Stat.IGNORE_REDUCE_DAMAGE)), 0.0);
+		}
 		
 		return new DamageReturn(false, true, false, newDamage);
 	}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java
index 03d9e8638b..634ea96c64 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java
@@ -16,14 +16,21 @@
  */
 package handlers.effecthandlers;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import org.l2jmobius.Config;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.enums.StatModifierType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.effects.EffectType;
+import org.l2jmobius.gameserver.model.holders.ItemSkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author NviX
@@ -39,6 +46,12 @@ public class RestoreSymbolSeal extends AbstractEffect
 		_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.PER);
 	}
 	
+	@Override
+	public EffectType getEffectType()
+	{
+		return EffectType.RESTORE_SYMBOL_SEAL;
+	}
+	
 	@Override
 	public boolean isInstant()
 	{
@@ -77,6 +90,33 @@ public class RestoreSymbolSeal extends AbstractEffect
 			player.updateSymbolSealSkills();
 			player.sendSkillList();
 			player.broadcastUserInfo();
+			
+			// Send item list to update Dye Powder with red icon in inventory.
+			ThreadPool.schedule(() ->
+			{
+				final List<Item> items = new LinkedList<>();
+				ITEMS: for (Item i : effected.getActingPlayer().getInventory().getItems())
+				{
+					if (i.getTemplate().hasSkills())
+					{
+						for (ItemSkillHolder s : i.getTemplate().getAllSkills())
+						{
+							if (s.getSkill().hasEffectType(EffectType.RESTORE_SYMBOL_SEAL))
+							{
+								items.add(i);
+								continue ITEMS;
+							}
+						}
+					}
+				}
+				
+				if (!items.isEmpty())
+				{
+					final InventoryUpdate iu = new InventoryUpdate();
+					iu.addItems(items);
+					effected.getActingPlayer().sendInventoryUpdate(iu);
+				}
+			}, 1000);
 		}
 	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index 7e02e79abc..bff5a1734b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -210,6 +210,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()) || _renewDuration)
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
index 70789354f3..fd41f09a9a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
@@ -17,7 +17,13 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author Sero
@@ -28,4 +34,46 @@ public class WeaponBonusMAtk extends AbstractStatAddEffect
 	{
 		super(params, Stat.WEAPON_BONUS_MAGIC_ATTACK);
 	}
+	
+	@Override
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
index df05ef8607..b36b10a92e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
@@ -17,7 +17,13 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author Sero
@@ -28,4 +34,46 @@ public class WeaponBonusPAtk extends AbstractStatAddEffect
 	{
 		super(params, Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
 	}
+	
+	@Override
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 78afa14171..460794e0f9 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,61 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_SATIETY_REACHES_0_YOU_CANNOT_CONTROL_IT);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetHold.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetHold.java
index 3cf51c6732..f5dbe68b37 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetHold.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetHold.java
@@ -52,4 +52,10 @@ public class PetHold implements IPlayerActionHandler
 			((SummonAI) pet.getAI()).notifyFollowStatusChange();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetMove.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetMove.java
index 9a029500f5..4a83d05bee 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetMove.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetMove.java
@@ -53,4 +53,10 @@ public class PetMove implements IPlayerActionHandler
 			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, player.getTarget().getLocation());
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
index aa2c460865..e1a6c3faa1 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
@@ -77,4 +77,10 @@ public class PetSkillUse implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetStop.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetStop.java
index 4acdbddc02..0de74af5e4 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetStop.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/PetStop.java
@@ -51,4 +51,10 @@ public class PetStop implements IPlayerActionHandler
 			pet.cancelAction();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 71d72e95b5..3e0acb89bd 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,52 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorHold.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
index fd0953d418..5bad03632b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
@@ -48,4 +48,10 @@ public class ServitorHold implements IPlayerActionHandler
 			((SummonAI) s.getAI()).notifyFollowStatusChange();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorMode.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
index eb824d4851..9d7e480224 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
@@ -68,4 +68,10 @@ public class ServitorMode implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorMove.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
index 919affb65d..44bed3a205 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
@@ -56,4 +56,10 @@ public class ServitorMove implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
index 7bd8e67c69..9386b57231 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
@@ -62,4 +62,10 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			}
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorStop.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
index 4c486d17d6..dca5d3231c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
@@ -47,4 +47,10 @@ public class ServitorStop implements IPlayerActionHandler
 			s.cancelAction();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
index 6a502a1f73..70384d677c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
@@ -62,4 +62,10 @@ public class UnsummonPet implements IPlayerActionHandler
 			pet.unSummon(player);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
index eb845aa177..46d56ed110 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
@@ -69,4 +69,10 @@ public class UnsummonServitor implements IPlayerActionHandler
 			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSymbolSealIncreaseItemSkillCondition.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSymbolSealIncreaseItemSkillCondition.java
new file mode 100644
index 0000000000..3ab0d0bb69
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSymbolSealIncreaseItemSkillCondition.java
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.skillconditionhandlers;
+
+import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.skill.ISkillCondition;
+import org.l2jmobius.gameserver.model.skill.Skill;
+
+/**
+ * @author CostyKiller
+ */
+public class CanUseSymbolSealIncreaseItemSkillCondition implements ISkillCondition
+{
+	private final int _amount;
+	
+	public CanUseSymbolSealIncreaseItemSkillCondition(StatSet params)
+	{
+		_amount = params.getInt("amount", 0);
+	}
+	
+	@Override
+	public boolean canUse(Creature caster, Skill skill, WorldObject target)
+	{
+		return caster.isPlayer() && ((caster.getActingPlayer().getSymbolSealPoints() + ((Config.MAX_SYMBOL_SEAL_POINTS * _amount) / 100)) <= Config.MAX_SYMBOL_SEAL_POINTS);
+	}
+}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 50b51c6455..16d1cae60c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.quest.QuestState;
@@ -46,10 +47,11 @@ public class ChamberOfProphecies extends AbstractInstance
 {
 	// NPCs
 	private static final int KAIN_VAN_HALTER = 31639;
-	private static final int VAN_HALTER = 33999;
-	private static final int FERIN = 34001;
 	private static final int GRAIL = 33996;
 	private static final int MYSTERIOUS_WIZARD = 33980;
+	// Helper NPCs
+	private static final int HELPER_VAN_HALTER = 33999;
+	private static final int HELPER_FERIN = 34001;
 	// Misc
 	private static final int DOOR_2 = 17230102;
 	private static final int DOOR_3 = 17230103;
@@ -66,7 +68,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		addStartNpc(KAIN_VAN_HALTER);
 		addFirstTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
 		addTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
-		addCreatureSeeId(FERIN, VAN_HALTER);
+		addCreatureSeeId(HELPER_FERIN, HELPER_VAN_HALTER);
 	}
 	
 	@Override
@@ -145,12 +147,12 @@ public class ChamberOfProphecies extends AbstractInstance
 				{
 					return null;
 				}
-				final Npc valHalter = world.getNpc(VAN_HALTER);
-				if (valHalter != null)
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
+				if (vanHalter != null)
 				{
-					valHalter.deleteMe(); // probably needs another npc id for initial room
+					vanHalter.deleteMe(); // probably needs another npc id for initial room
 				}
-				final Npc ferin = world.getNpc(FERIN);
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
 				if (ferin != null)
 				{
 					ferin.deleteMe(); // probably needs another npc id for initial room
@@ -190,6 +192,8 @@ public class ChamberOfProphecies extends AbstractInstance
 			case "CHECK_STATUS":
 			{
 				final Instance world = player.getInstanceWorld();
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
 				if (!isInInstance(world))
 				{
 					return null;
@@ -200,8 +204,8 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
-							startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY2", 14000, ferin, player);
+							startQuestTimer("SEY_KAIN", 24000, vanHalter, player);
 							startQuestTimer("OPEN_DOOR1", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -221,7 +225,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY3", 8000, ferin, player);
 							startQuestTimer("OPEN_DOOR2", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -234,7 +238,7 @@ public class ChamberOfProphecies extends AbstractInstance
 							world.setStatus(4);
 							world.spawnGroup("wof_room3_2");
 							world.openCloseDoor(DOOR_3, false);
-							startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY_KAIN_1", 5000, vanHalter, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
 						break;
@@ -245,8 +249,8 @@ public class ChamberOfProphecies extends AbstractInstance
 						{
 							world.setStatus(5);
 							world.spawnGroup("wof_room4");
-							startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
-							startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY_KAIN_2", 3000, vanHalter, player);
+							startQuestTimer("SEY4", 7000, ferin, player);
 						}
 						else
 						{
@@ -304,7 +308,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					return null;
 				}
 				cancelQuestTimer("ATTACK1", npc, player);
-				startQuestTimer("ATTACK2", 200, world.getNpc(VAN_HALTER), player, true);
+				startQuestTimer("ATTACK2", 200, world.getNpc(HELPER_VAN_HALTER), player, true);
 				world.setStatus(3);
 				world.spawnGroup("wof_room3");
 				world.openCloseDoor(DOOR_3, true);
@@ -321,7 +325,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY2":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.YOU_CAN_T_DIE_HERE_I_DIDN_T_LEARN_RESURRECT_YET));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_4", 0, 0, 0, 0, 0));
@@ -330,7 +334,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GISELLE_WAS_SUCH_A_SWEET_CHILD));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_1", 0, 0, 0, 0, 0));
@@ -340,7 +344,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY3":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.DO_YOU_THINK_I_LL_GROW_TALLER_IF_I_EAT_LOTS_AND_LOTS));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_6", 0, 0, 0, 0, 0));
@@ -349,7 +353,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_1":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.SUCH_MONSTERS_IN_A_PLACE_LIKE_THIS_UNBELIEVABLE));
 				}
@@ -357,7 +361,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_2":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THAT_S_THE_MONSTER_THAT_ATTACKED_FAERON_YOU_RE_OUTMATCHED_HERE_GO_AHEAD_I_LL_CATCH_UP));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_6", 0, 0, 0, 0, 0));
@@ -367,7 +371,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY4":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GO_NOW_KAIN_CAN_HANDLE_THIS));
 					npc.setScriptValue(1);
@@ -377,7 +381,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_3":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.LEAVE_THIS_TO_ME_GO));
 					npc.setScriptValue(1);
@@ -387,7 +391,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "REST":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, player);
 				}
@@ -508,7 +512,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		{
 			switch (npc.getId())
 			{
-				case FERIN:
+				case HELPER_FERIN:
 				{
 					if (creature.isPlayer() && !creature.isDead() && npc.isScriptValue(0))
 					{
@@ -516,7 +520,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					}
 					break;
 				}
-				case VAN_HALTER:
+				case HELPER_VAN_HALTER:
 				{
 					if (creature.isPlayer() && !creature.isDead() && world.isStatus(0))
 					{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/MissingQuests.txt b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/MissingQuests.txt
index 25d0ed1f72..22716774be 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/MissingQuests.txt
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/MissingQuests.txt
@@ -50,10 +50,6 @@
 1901 Storm Isle - Furtive Deal
 10595 The Dimensional Warp, Part 8
 10596 The Dimensional Warp, Part 9
-10904 Journey to the Conquest World
-10905 Hunting Time
-10906 Chasing the Light
-10907 Where Flowers Blossom
 11028 Wind of Destiny - Encounter
 11029 Wind of Destiny - Promise
 11030 Wind of Destiny - Choice
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
index 0d1d38c891..29426b05de 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
@@ -177,7 +177,14 @@ public class Q00933_TombRaiders extends Quest
 		final Party party = killer.getParty();
 		if (party != null)
 		{
-			party.getMembers().forEach(p -> processKill(npc, p));
+			for (Player member : party.getMembers())
+			{
+				final QuestState qs = getQuestState(member, false);
+				if (qs != null)
+				{
+					processKill(npc, member);
+				}
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
index 4d2155c8eb..b296c99fa4 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
@@ -25,6 +25,9 @@ import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.EventType;
+import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBecomeNoblesse;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.quest.Quest;
@@ -209,6 +212,7 @@ public class Q10591_NobleMaterial extends Quest
 					giveItems(player, WARRIOR_CICLET_BOX_LV5, 1);
 					basicRewards(player);
 					player.setNobleLevel(1);
+					checkNobleListener(player);
 					player.broadcastInfo();
 					showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_S1_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
 					player.doCast(NOBLESSE_PRESENTATION.getSkill());
@@ -225,6 +229,7 @@ public class Q10591_NobleMaterial extends Quest
 					giveItems(player, WIZARD_CICLET_BOX_LV5, 1);
 					basicRewards(player);
 					player.setNobleLevel(1);
+					checkNobleListener(player);
 					player.broadcastInfo();
 					showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_S1_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
 					player.doCast(NOBLESSE_PRESENTATION.getSkill());
@@ -241,6 +246,7 @@ public class Q10591_NobleMaterial extends Quest
 					giveItems(player, KNIGHT_CICLET_BOX_LV5, 1);
 					basicRewards(player);
 					player.setNobleLevel(1);
+					checkNobleListener(player);
 					player.broadcastInfo();
 					showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_S1_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
 					player.doCast(NOBLESSE_PRESENTATION.getSkill());
@@ -573,4 +579,13 @@ public class Q10591_NobleMaterial extends Quest
 			}
 		}
 	}
+	
+	private void checkNobleListener(Player player)
+	{
+		// Notify to scripts.
+		if (EventDispatcher.getInstance().hasListener(EventType.ON_PLAYER_BECOME_NOBLESSE))
+		{
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerBecomeNoblesse(player));
+		}
+	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-01.htm b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-01.htm
index 3314d03969..5094a407f3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-01.htm
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-01.htm
@@ -1,4 +1,6 @@
 <html><body>Verdure Elder Elikia:<br>
-Have you brought me the message from Leona Blackbird?
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-03.html">"Yes, here it is."</Button>
+Greetings! I've been expecting you for a while.<br>
+Leona asked me to tell you something.<br>
+I hope you are ready to hear me out and help.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-02.htm">"What has Leona asked you to tell?"</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.htm b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.htm
new file mode 100644
index 0000000000..e7fc7b5818
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.htm
@@ -0,0 +1,6 @@
+<html><body>Verdure Elder Elikia:<br>
+I see you are ready. Now I'm going to tell you what Leona has told me.<br>
+In the last combat with Etis van Etina, Leona was badly wounded, so she had to train to recover her strength. Unfortunately, she had no time to complete the trainings because she received a message. It said about a dungeon of Atelia Fortress. Something connected to Etis van Etina was found there. That place was very odd and was called <font color="LEVEL">Atelia Refinery</font>.<br>
+Leona wanted to meet you personally, but there was an urgent business, so she asked me to see you and explain the situation. My mission is connected with that place.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-03.htm">Ask about Atelia Refinery</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.html
deleted file mode 100644
index 9d262558f5..0000000000
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Verdure Elder Elikia:<br>
-I don't see any message from Leona Blackbird, make sure you bring that to me.
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.htm b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.htm
new file mode 100644
index 0000000000..32f35f5524
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.htm
@@ -0,0 +1,6 @@
+<html><body>Verdure Elder Elikia:<br>
+We're assuming by the name that it's where Atelia is refined.<br>
+It's located at the underground of Atelia Fortress, so we didn't know about it until now.<br>
+I think Atelia refined from there is sent to the great temple where Etis van Etina is.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-04.html">"What has happened so far?"</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.html
deleted file mode 100644
index 5eeee527eb..0000000000
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Verdure Elder Elikia:<br>
-Great! You have brought it, now let me read it.<br>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.htm b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.htm
deleted file mode 100644
index 216047fa2e..0000000000
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Verdure Elder Elikia:<br>
-I've read the message from Leona Blackbird you should go see her to tell you what you have to do.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-05.html">"Ok, I'll go."</Button>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.html
new file mode 100644
index 0000000000..30f55b94dd
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.html
@@ -0,0 +1,6 @@
+<html><body>Verdure Elder Elikia:<br>
+Leona was lost in despair for some time but she finally rose again and started investigating the Atelia Refinery.<br>
+But our strength still isn't enough, so we're asking for your help once again.<br>
+Leona will be at the entrance of the Atelia Refinery. You'll find it if you leave camp and follow the passage of Dimensional Energy to the west.<br>
+Leona will fill you in with more details.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-05.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-05.html
deleted file mode 100644
index 59c38eaca9..0000000000
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-05.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Verdure Elder Elikia:<br>
-Leona Blackbird is waiting for you at Atelia Refinery entrance.
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Message.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Message.html
deleted file mode 100644
index 66e7889930..0000000000
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Message.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Message:<br>
-You received a message from Leona Blackbird, this means you can start Savior's Path quests.<br>
-To learn more, go to Blackbird Campsite and talk to Elikia.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery closeMessage">"Close message."</Button>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
index e19b7a6488..9a054202bc 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
@@ -16,6 +16,7 @@
  */
 package quests.Q10885_SaviorsPathDiscovery;
 
+import org.l2jmobius.gameserver.enums.Movie;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.Quest;
@@ -58,20 +59,27 @@ public class Q10885_SaviorsPathDiscovery extends Quest
 		String htmltext = null;
 		switch (event)
 		{
-			case "34057-03.html":
+			case "34057-02.htm":
+			{
+				qs.startQuest();
+				htmltext = event;
+				break;
+			}
+			case "34057-03.htm":
 			{
 				if (qs.isCond(1))
 				{
-					takeItems(player, -1, LEONA_BLACKBIRDS_MESSAGE);
 					qs.setCond(2);
 				}
 				htmltext = event;
 				break;
 			}
-			case "34057-05.html":
+			case "34057-04.html":
 			{
 				if (qs.isCond(2))
 				{
+					giveItems(player, LEONA_BLACKBIRDS_MESSAGE, 1, true);
+					playMovie(player, Movie.EP5_ASTATINE_QST_START);
 					qs.setCond(3);
 				}
 				htmltext = event;
@@ -83,6 +91,7 @@ public class Q10885_SaviorsPathDiscovery extends Quest
 				{
 					if ((player.getLevel() >= MIN_LEVEL))
 					{
+						takeItems(player, -1, LEONA_BLACKBIRDS_MESSAGE);
 						addExpAndSp(player, 90638, 82);
 						qs.exitQuest(false, true);
 						htmltext = event;
@@ -137,7 +146,11 @@ public class Q10885_SaviorsPathDiscovery extends Quest
 						}
 						else if (qs.isCond(2))
 						{
-							htmltext = "34057-04.htm";
+							htmltext = "34057-03.htm";
+						}
+						else if (qs.isCond(3))
+						{
+							htmltext = "34057-04.html";
 						}
 						break;
 					}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/34425-04.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/34425-04.html
index 37b0c2b30c..7d977a4778 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/34425-04.html
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/34425-04.html
@@ -1,4 +1,4 @@
 <html><body>Blackbird Clan Lord Leona Blackbird:<br>
-Yes. Go speak to <font color="LEVEL">Devianne</font>.
+Yes. Go speak to <font color="LEVEL">Devianne</font>.<br>
 Devianne will tell you how to get to the Atelia Refinery and what you must do there.<br>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-00.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-00.html
new file mode 100644
index 0000000000..c9012038ad
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-00.html
@@ -0,0 +1,3 @@
+<html><body>Conquest Guide Entropy:<br>
+I don't see any invitation from Conquest Guide Chloe, make sure you bring that to me.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-01.htm b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-01.htm
new file mode 100644
index 0000000000..cb3365b298
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-01.htm
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Entropy:<br>
+Have you brought the invitation that Conquest Guide Chloe gave you?
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10904_JourneyToTheConquestWorld 34599-02.html">"Yes, here it is."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-02.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-02.html
new file mode 100644
index 0000000000..a079e26eae
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-02.html
@@ -0,0 +1,3 @@
+<html><body>Conquest Guide Entropy:<br>
+Oh! Let me see if it's genuine, come back later.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-03.htm b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-03.htm
new file mode 100644
index 0000000000..6fb447dcef
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-03.htm
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Entropy:<br>
+Checking the invitation...<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10904_JourneyToTheConquestWorld 34599-04.html">"How is it?"</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-04.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-04.html
new file mode 100644
index 0000000000..673c255fff
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-04.html
@@ -0,0 +1,3 @@
+<html><body>Conquest Guide Entropy:<br>
+Great! You have brought the right one, here is your reward.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34600-00.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34600-00.html
new file mode 100644
index 0000000000..27ec4acf46
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34600-00.html
@@ -0,0 +1,5 @@
+<html><body>Conquest Guide Chloe:<br>
+Hello, adventurer!<br>
+I have no news for you. There's nothing I can tell you.<br>
+(Available to characters of Lv. 110+.)<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34600-01.htm b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34600-01.htm
new file mode 100644
index 0000000000..e1ffb19ff5
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34600-01.htm
@@ -0,0 +1,6 @@
+<html><body>Conquest Guide Chloe:<br>
+Hello, adventurer!<br>
+The most upstanding warriors receive an invitation to visit a new world - the Conquest.<br>
+To learn more, go to Conquest Town and talk to Entropy.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10904_JourneyToTheConquestWorld 34600-02.html">Here, take this invitation.</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34600-02.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34600-02.html
new file mode 100644
index 0000000000..69730173ee
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34600-02.html
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Chloe:<br>
+You can go now,<br>
+you must give the invitation to Conquest Guide Entropy, in the Conquest Town.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/Q10904_JourneyToTheConquestWorld.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/Q10904_JourneyToTheConquestWorld.java
new file mode 100644
index 0000000000..a720ce3330
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/Q10904_JourneyToTheConquestWorld.java
@@ -0,0 +1,144 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q10904_JourneyToTheConquestWorld;
+
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.quest.Quest;
+import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
+
+/**
+ * @author CostyKiller
+ */
+public class Q10904_JourneyToTheConquestWorld extends Quest
+{
+	// NPCs
+	private static final int ENTROPY = 34599;
+	private static final int CHLOE = 34600;
+	// Items
+	private static final int CONQUEST_NAME_CHANGE_COUPON = 81979;
+	private static final int CHLOE_INVITATION = 82176;
+	// Misc
+	private static final int MIN_LEVEL = 110;
+	
+	public Q10904_JourneyToTheConquestWorld()
+	{
+		super(10904);
+		addStartNpc(CHLOE);
+		addTalkId(CHLOE, ENTROPY);
+		addCondMinLevel(MIN_LEVEL, "34600-00.html");
+		registerQuestItems(CHLOE_INVITATION);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if (qs == null)
+		{
+			return null;
+		}
+		
+		String htmltext = null;
+		switch (event)
+		{
+			case "34600-02.html":
+			{
+				if ((player.getLevel() >= MIN_LEVEL))
+				{
+					qs.startQuest();
+					giveItems(player, CHLOE_INVITATION, 1);
+					htmltext = event;
+				}
+				break;
+			}
+			case "34599-02.html":
+			{
+				if (qs.isCond(1) && (hasQuestItems(player, CHLOE_INVITATION)))
+				{
+					takeItems(player, -1, CHLOE_INVITATION);
+					qs.setCond(2);
+					htmltext = event;
+				}
+				break;
+			}
+			case "34599-04.html":
+			{
+				if (qs.isCond(2))
+				{
+					giveItems(player, CONQUEST_NAME_CHANGE_COUPON, 1);
+					qs.exitQuest(false, true);
+					htmltext = event;
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onTalk(Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, true);
+		String htmltext = getNoQuestMsg(player);
+		switch (qs.getState())
+		{
+			case State.CREATED:
+			{
+				if (npc.getId() == CHLOE)
+				{
+					htmltext = "34600-01.htm";
+				}
+				break;
+			}
+			case State.STARTED:
+			{
+				switch (npc.getId())
+				{
+					case CHLOE:
+					{
+						if (qs.isCond(1))
+						{
+							htmltext = "34600-02.html";
+						}
+						break;
+					}
+					case ENTROPY:
+					{
+						if (qs.isCond(1))
+						{
+							htmltext = "34599-01.htm";
+						}
+						else if (qs.isCond(2))
+						{
+							htmltext = "34599-03.htm";
+						}
+						break;
+					}
+				}
+				break;
+			}
+			case State.COMPLETED:
+			{
+				htmltext = getAlreadyCompletedMsg(player);
+				break;
+			}
+		}
+		return htmltext;
+	}
+}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-00.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-00.html
new file mode 100644
index 0000000000..975f1f53b9
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-00.html
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Entropy:<br>
+You are not ready for this yet.<br>
+(This quest is for characters Lv. 110 and higher who have completed the Journey to the Conquest World quest.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-01.htm b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-01.htm
new file mode 100644
index 0000000000..b5b1ebc72a
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-01.htm
@@ -0,0 +1,6 @@
+<html><body>Conquest Guide Entropy:<br>
+You must learn about Conquest World, there are three zones out there and you must hunt in each one of them.<br>
+Defeat the specified number of monsters in each of the following zones: <font color="LEVEL">600 in the Outer Lands, 600 in Zone 1 (Asa), 600 in Zone 2 (Anima) and 600 in Zone 3 (Nox).</font><br>
+Monsters to hunt: <font color="LEVEL">all monsters in water hunting zones of the Conquest world.</font><br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10905_HuntingTime 34599-02.html">"OK, let's do it."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-02.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-02.html
new file mode 100644
index 0000000000..1641d5e7f1
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-02.html
@@ -0,0 +1,5 @@
+<html><body>Conquest Guide Entropy:<br>
+Defeat the specified number of monsters in each of the following zones: <font color="LEVEL">600 in the Outer Lands, 600 in Zone 1 (Asa), 600 in Zone 2 (Anima) and 600 in Zone 3 (Nox).</font><br>
+Monsters to hunt: <font color="LEVEL">all monsters in water hunting zones of the Conquest world.</font><br>
+When you are done come back to me, to get your reward.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-03.htm b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-03.htm
new file mode 100644
index 0000000000..94fd846b39
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-03.htm
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Entropy:<br>
+Have you killed all the monsters?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10905_HuntingTime 34599-05.html">"Yes, sure."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-04.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-04.html
new file mode 100644
index 0000000000..fe78df4a7a
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-04.html
@@ -0,0 +1,6 @@
+<html><body>Conquest Guide Entropy:<br>
+Don't try to foul me...<br>
+Defeat the specified number of monsters in each of the following zones: <font color="LEVEL">600 in the Outer Lands, 600 in Zone 1 (Asa), 600 in Zone 2 (Anima) and 600 in Zone 3 (Nox).</font><br>
+Monsters to hunt: <font color="LEVEL">all monsters in water hunting zones of the Conquest world.</font><br>
+When you are done come back to me, to get your reward.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-05.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-05.html
new file mode 100644
index 0000000000..d3902cf585
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-05.html
@@ -0,0 +1,3 @@
+<html><body>Conquest Guide Entropy:<br>
+Congratulations. You have completed all the tasks.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/Q10905_HuntingTime.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/Q10905_HuntingTime.java
new file mode 100644
index 0000000000..dbaa7de9ce
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10905_HuntingTime/Q10905_HuntingTime.java
@@ -0,0 +1,345 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q10905_HuntingTime;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.l2jmobius.commons.util.CommonUtil;
+import org.l2jmobius.gameserver.enums.QuestSound;
+import org.l2jmobius.gameserver.model.Party;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
+import org.l2jmobius.gameserver.model.quest.Quest;
+import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
+import org.l2jmobius.gameserver.network.NpcStringId;
+
+import quests.Q10904_JourneyToTheConquestWorld.Q10904_JourneyToTheConquestWorld;
+
+/**
+ * @author CostyKiller
+ */
+public class Q10905_HuntingTime extends Quest
+{
+	// NPC
+	private static final int ENTROPY = 34599;
+	// Monsters
+	private static final int[] MONSTERS_OUTER_CASTLE =
+	{
+		// Daril's Water Source (Lv. 112)
+		27701, // Daril
+		27702, // Atron
+		27703, // Seo
+		27704, // Craigo
+		27705, // Kiku
+		27706, // Floato
+		// Daril Phran's Water Source (Lv. 116)
+		27707, // Daril Phran
+		27708, // Atron Phran
+		27709, // Seo Phran
+		27710, // Craigo Phran
+		27711, // Kiku Phran
+		27712, // Floato Phran
+	};
+	private static final int[] MONSTERS_ASA =
+	{
+		// Asa Area 1 (Lv. 116)
+		27713, // Daril Asa Ar
+		27714, // Seo Asa Ar
+		27715, // Floato Asa Ar
+		27716, // Asa Ar Hunter
+		27717, // Asa Ar Sorceress
+		27718, // Saida Asa Ar
+		19830, // Luminous Soul
+		// Asa Area 2 (Lv. 120)
+		27719, // Atron Asa Mide
+		27720, // Craigo Asa Mide
+		27721, // Kerberos Asa Mide
+		27722, // Asa Mide Hunter
+		27723, // Asa Mide Sorceress
+		27724, // Saida Asa Mide
+		27725, // Asa Mide Blader
+		// Asa Area 3 (Lv. 124)
+		27726, // Atron Asa Telro
+		27727, // Craigo Asa Telro
+		27728, // Beor Asa Telro
+		27729, // Asa Telro Hunter
+		27730, // Asa Telro Sorceress
+		27731, // Saida Asa Telro
+		27732, // Asa Telro Blader
+		27733, // Asa Telro Guard
+	};
+	private static final int[] MONSTERS_ANIMA =
+	{
+		// Anima Area 1 (Lv. 116)
+		27755, // Daril Anima Ar
+		27756, // Seo Anima Ar
+		27757, // Floato Anima Ar
+		27758, // Anima Ar Hunter
+		27759, // Anima Ar Sorceress
+		27760, // Saida Anima Ar
+		// Anima Area 2 (Lv. 120)
+		27761, // Atron Anima Mide
+		27762, // Craigo Anima Mide
+		27763, // Kerberos Anima Mide
+		27764, // Anima Mide Hunter
+		27765, // Anima Mide Sorceress
+		27766, // Saida Anima Mide
+		27767, // Anima Mide Blader
+		// Anima Area 3 (Lv. 124)
+		27768, // Atron Anima Telro
+		27769, // Craigo Anima Telro
+		27770, // Beor Anima Telro
+		27771, // Anima Telro Hunter
+		27772, // Anima Telro Sorceress
+		27773, // Saida Anima Telro
+		27774, // Anima Telro Blader
+		27775, // Anima Telro Guard
+	};
+	private static final int[] MONSTERS_NOX =
+	{
+		// Nox Area 1 (Lv. 116)
+		27734, // Daril Nox Ar
+		27735, // Seo Nox Ar
+		27736, // Floato Nox Ar
+		27737, // Nox Ar Hunter
+		27738, // Nox Ar Sorceress
+		27739, // Saida Nox Ar
+		// Nox Area 2 (Lv. 120)
+		27740, // Atron Nox Mide
+		27741, // Craigo Nox Mide
+		27742, // Kerberos Nox Mide
+		27743, // Nox Mide Hunter
+		27744, // Nox Mide Sorceress
+		27745, // Saida Nox Mide
+		27746, // Nox Mide Blader
+		// Nox Area 3 (Lv. 124)
+		27747, // Atron Nox Telro
+		27748, // Craigo Nox Telro
+		27749, // Beor Nox Telro
+		27750, // Nox Telro Hunter
+		27751, // Nox Telro Sorceress
+		27752, // Saida Nox Telro
+		27753, // Nox Telro Blader
+		27754, // Nox Telro Guard
+	};
+	// Misc
+	private static final int MIN_LEVEL = 110;
+	private static final String KILL_COUNT_VAR_OUTER_CASTLE = "KillCountOuterCastle";
+	private static final String KILL_COUNT_VAR_ASA = "KillCountAsa";
+	private static final String KILL_COUNT_VAR_ANIMA = "KillCountAnima";
+	private static final String KILL_COUNT_VAR_NOX = "KillCountNox";
+	// Monsters Kill Target
+	private static final int MAX_KILLED_MOBS_OUTER_CASTLE = 600;
+	private static final int MAX_KILLED_MOBS_ASA = 600;
+	private static final int MAX_KILLED_MOBS_ANIMA = 600;
+	private static final int MAX_KILLED_MOBS_NOX = 600;
+	
+	public Q10905_HuntingTime()
+	{
+		super(10905);
+		addStartNpc(ENTROPY);
+		addTalkId(ENTROPY);
+		addKillId(MONSTERS_OUTER_CASTLE);
+		addKillId(MONSTERS_ASA);
+		addKillId(MONSTERS_ANIMA);
+		addKillId(MONSTERS_NOX);
+		addCondCompletedQuest(Q10904_JourneyToTheConquestWorld.class.getSimpleName(), "34599-00.html");
+		addCondMinLevel(MIN_LEVEL, "34599-00.html");
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if (qs == null)
+		{
+			return null;
+		}
+		
+		String htmltext = null;
+		switch (event)
+		{
+			case "34599-02.html":
+			{
+				if ((player.getLevel() >= MIN_LEVEL))
+				{
+					qs.startQuest();
+					qs.setMemoState(1);
+					htmltext = event;
+				}
+				break;
+			}
+			case "34599-05.html":
+			{
+				if (qs.isCond(2))
+				{
+					addExpAndSp(player, 26617381116L, 23955643);
+					qs.exitQuest(false, true);
+					htmltext = event;
+				}
+				else
+				{
+					htmltext = "34599-04.html";
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onTalk(Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, true);
+		String htmltext = getNoQuestMsg(player);
+		switch (qs.getState())
+		{
+			case State.CREATED:
+			{
+				if (npc.getId() == ENTROPY)
+				{
+					htmltext = "34599-01.htm";
+				}
+				break;
+			}
+			case State.STARTED:
+			{
+				switch (npc.getId())
+				{
+					case ENTROPY:
+					{
+						if ((qs.isCond(1) & qs.isMemoState(1)) || qs.isCond(2))
+						{
+							htmltext = "34599-03.htm";
+						}
+						break;
+					}
+				}
+				break;
+			}
+			case State.COMPLETED:
+			{
+				htmltext = getAlreadyCompletedMsg(player);
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player killer, boolean isSummon)
+	{
+		final Party party = killer.getParty();
+		if (party != null)
+		{
+			for (Player member : party.getMembers())
+			{
+				final QuestState qs = getQuestState(member, false);
+				if (qs != null)
+				{
+					processKill(npc, member);
+				}
+			}
+		}
+		else
+		{
+			processKill(npc, killer);
+		}
+		return super.onKill(npc, killer, isSummon);
+	}
+	
+	private void processKill(Npc npc, Player killer)
+	{
+		final QuestState qs = getRandomPartyMemberState(killer, 1, 3, npc);
+		if (qs != null)
+		{
+			final Player player = qs.getPlayer();
+			final int killCountOuterCastle = qs.getInt(KILL_COUNT_VAR_OUTER_CASTLE);
+			final int killCountAsa = qs.getInt(KILL_COUNT_VAR_ASA);
+			final int killCountAnima = qs.getInt(KILL_COUNT_VAR_ANIMA);
+			final int killCountNox = qs.getInt(KILL_COUNT_VAR_NOX);
+			
+			if (CommonUtil.contains(MONSTERS_OUTER_CASTLE, npc.getId()))
+			{
+				if (killCountOuterCastle < MAX_KILLED_MOBS_OUTER_CASTLE)
+				{
+					qs.set(KILL_COUNT_VAR_OUTER_CASTLE, killCountOuterCastle + 1);
+					playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					checkKillProgress(killer);
+				}
+			}
+			if (CommonUtil.contains(MONSTERS_ASA, npc.getId()))
+			{
+				if (killCountAsa < MAX_KILLED_MOBS_ASA)
+				{
+					qs.set(KILL_COUNT_VAR_ASA, killCountAsa + 1);
+					playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					checkKillProgress(killer);
+				}
+			}
+			if (CommonUtil.contains(MONSTERS_ANIMA, npc.getId()))
+			{
+				if (killCountAnima < MAX_KILLED_MOBS_ANIMA)
+				{
+					qs.set(KILL_COUNT_VAR_ANIMA, killCountAnima + 1);
+					playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					checkKillProgress(killer);
+				}
+			}
+			if (CommonUtil.contains(MONSTERS_NOX, npc.getId()))
+			{
+				if (killCountNox < MAX_KILLED_MOBS_NOX)
+				{
+					qs.set(KILL_COUNT_VAR_NOX, killCountNox + 1);
+					playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					checkKillProgress(killer);
+				}
+			}
+			
+			sendNpcLogList(player);
+		}
+	}
+	
+	private void checkKillProgress(Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if ((qs.getInt(KILL_COUNT_VAR_OUTER_CASTLE) >= MAX_KILLED_MOBS_OUTER_CASTLE) && (qs.getInt(KILL_COUNT_VAR_ASA) >= MAX_KILLED_MOBS_ASA) && (qs.getInt(KILL_COUNT_VAR_ANIMA) >= MAX_KILLED_MOBS_ANIMA) && (qs.getInt(KILL_COUNT_VAR_NOX) >= MAX_KILLED_MOBS_NOX))
+		{
+			qs.setCond(2, true);
+			playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+		}
+	}
+	
+	@Override
+	public Set<NpcLogListHolder> getNpcLogList(Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if ((qs != null) && qs.isCond(1))
+		{
+			final Set<NpcLogListHolder> holder = new HashSet<>();
+			holder.add(new NpcLogListHolder(NpcStringId.MONSTERS_IN_THE_OUTER_CASTLE.getId(), true, qs.getInt(KILL_COUNT_VAR_OUTER_CASTLE)));
+			holder.add(new NpcLogListHolder(NpcStringId.MONSTERS_IN_THE_ASA_ZONE.getId(), true, qs.getInt(KILL_COUNT_VAR_ASA)));
+			holder.add(new NpcLogListHolder(NpcStringId.MONSTERS_IN_THE_ANIMA_ZONE.getId(), true, qs.getInt(KILL_COUNT_VAR_ANIMA)));
+			holder.add(new NpcLogListHolder(NpcStringId.MONSTERS_IN_THE_NOX_ZONE.getId(), true, qs.getInt(KILL_COUNT_VAR_NOX)));
+			return holder;
+		}
+		return super.getNpcLogList(player);
+	}
+}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-00.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-00.html
new file mode 100644
index 0000000000..975f1f53b9
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-00.html
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Entropy:<br>
+You are not ready for this yet.<br>
+(This quest is for characters Lv. 110 and higher who have completed the Journey to the Conquest World quest.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-01.htm b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-01.htm
new file mode 100644
index 0000000000..18c376a9c8
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-01.htm
@@ -0,0 +1,6 @@
+<html><body>Conquest Guide Entropy:<br>
+You must learn about a new way to succeed in conquering the Conquest world.<br>
+Defeat <font color="LEVEL">30 Luminous Souls</font> that can be encountered in certain zones of the Conquest world, and collect their fragments.<br>
+Monster to hunt: <font color="LEVEL">Luminous Soul.</font><br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10906_ChasingTheLight 34599-02.html">"OK, let's start."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-02.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-02.html
new file mode 100644
index 0000000000..714d176159
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-02.html
@@ -0,0 +1,5 @@
+<html><body>Conquest Guide Entropy:<br>
+Defeat <font color="LEVEL">30 Luminous Souls</font> that can be encountered in certain zones of the Conquest world, and collect their fragments.<br>
+Monster to hunt: <font color="LEVEL">Luminous Soul.</font><br>
+When you are done come back to me, to get your reward.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-03.htm b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-03.htm
new file mode 100644
index 0000000000..375c0e8783
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-03.htm
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Entropy:<br>
+Have you collected all the required luminous soul fragments?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10906_ChasingTheLight 34599-05.html">"Yes, sure."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-04.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-04.html
new file mode 100644
index 0000000000..52892111fa
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-04.html
@@ -0,0 +1,6 @@
+<html><body>Conquest Guide Entropy:<br>
+Don't try to foul me...<br>
+Defeat <font color="LEVEL">30 Luminous Souls</font> that can be encountered in certain zones of the Conquest world, and collect their fragments.<br>
+Monster to hunt: <font color="LEVEL">Luminous Soul.</font><br>
+When you are done come back to me, to get your reward.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-05.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-05.html
new file mode 100644
index 0000000000..d3902cf585
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-05.html
@@ -0,0 +1,3 @@
+<html><body>Conquest Guide Entropy:<br>
+Congratulations. You have completed all the tasks.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/Q10906_ChasingTheLight.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/Q10906_ChasingTheLight.java
new file mode 100644
index 0000000000..8fa1226328
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10906_ChasingTheLight/Q10906_ChasingTheLight.java
@@ -0,0 +1,164 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q10906_ChasingTheLight;
+
+import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.enums.QuestSound;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.quest.Quest;
+import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
+
+import quests.Q10904_JourneyToTheConquestWorld.Q10904_JourneyToTheConquestWorld;
+
+/**
+ * @author CostyKiller
+ */
+public class Q10906_ChasingTheLight extends Quest
+{
+	// NPC
+	private static final int ENTROPY = 34599;
+	// Monsters
+	private static final int[] MONSTERS =
+	{
+		19830, // Luminous Soul - Asa Area 1 (Lv. 116)
+		19832, // Luminous Soul - Anima Area 1 (Lv. 116)
+		19831, // Luminous Soul - Nox Area 1 (Lv. 116)
+	};
+	// Item
+	private static final int LUMINOUS_SOUL_FRAGMENT = 82177;
+	// Misc
+	private static final int MIN_LEVEL = 110;
+	private static final int LUMINOUS_SOUL_FRAGMENT_NEEDED = 30;
+	
+	public Q10906_ChasingTheLight()
+	{
+		super(10906);
+		addStartNpc(ENTROPY);
+		addTalkId(ENTROPY);
+		addKillId(MONSTERS);
+		addCondCompletedQuest(Q10904_JourneyToTheConquestWorld.class.getSimpleName(), "34599-00.html");
+		addCondMinLevel(MIN_LEVEL, "34599-00.html");
+		registerQuestItems(LUMINOUS_SOUL_FRAGMENT);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if (qs == null)
+		{
+			return null;
+		}
+		
+		String htmltext = null;
+		switch (event)
+		{
+			case "34599-02.html":
+			{
+				if ((player.getLevel() >= MIN_LEVEL))
+				{
+					qs.startQuest();
+					qs.setMemoState(1);
+					htmltext = event;
+				}
+				break;
+			}
+			case "34599-05.html":
+			{
+				if (qs.isCond(2))
+				{
+					takeItems(player, LUMINOUS_SOUL_FRAGMENT, 30);
+					addExpAndSp(player, 8872460372L, 7985214);
+					qs.exitQuest(false, true);
+					htmltext = event;
+				}
+				else
+				{
+					htmltext = "34599-04.html";
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onTalk(Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, true);
+		String htmltext = getNoQuestMsg(player);
+		switch (qs.getState())
+		{
+			case State.CREATED:
+			{
+				if (npc.getId() == ENTROPY)
+				{
+					htmltext = "34599-01.htm";
+				}
+				break;
+			}
+			case State.STARTED:
+			{
+				switch (npc.getId())
+				{
+					case ENTROPY:
+					{
+						if ((qs.isCond(1) & qs.isMemoState(1)) || qs.isCond(2))
+						{
+							htmltext = "34599-03.htm";
+						}
+						break;
+					}
+				}
+				break;
+			}
+			case State.COMPLETED:
+			{
+				htmltext = getAlreadyCompletedMsg(player);
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player player, boolean isSummon)
+	{
+		executeForEachPlayer(player, npc, isSummon, true, false);
+		return super.onKill(npc, player, isSummon);
+	}
+	
+	@Override
+	public void actionForEachPlayer(Player player, Npc npc, boolean isSummon)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if ((qs != null) && qs.isCond(1) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
+		{
+			if (getQuestItemsCount(player, LUMINOUS_SOUL_FRAGMENT) < LUMINOUS_SOUL_FRAGMENT_NEEDED)
+			{
+				giveItems(player, LUMINOUS_SOUL_FRAGMENT, 1);
+				playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			}
+			if (getQuestItemsCount(player, LUMINOUS_SOUL_FRAGMENT) >= LUMINOUS_SOUL_FRAGMENT_NEEDED)
+			{
+				qs.setCond(2, true);
+			}
+		}
+	}
+}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-00.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-00.html
new file mode 100644
index 0000000000..975f1f53b9
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-00.html
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Entropy:<br>
+You are not ready for this yet.<br>
+(This quest is for characters Lv. 110 and higher who have completed the Journey to the Conquest World quest.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-01.htm b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-01.htm
new file mode 100644
index 0000000000..0b29b2dda9
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-01.htm
@@ -0,0 +1,6 @@
+<html><body>Conquest Guide Entropy:<br>
+I need you to bring me petals of the special flowers that grow only in the Conquest world.<br>
+Defeat <font color="LEVEL">120 Soul Flowers</font> that sometimes appear while hunting monsters in the Conquest world, and gather their petals.<br>
+Monster to hunt: <font color="LEVEL">Soul Flower.</font><br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10907_WhereFlowersBlossom 34599-02.html">"OK, let's start."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-02.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-02.html
new file mode 100644
index 0000000000..c715627758
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-02.html
@@ -0,0 +1,5 @@
+<html><body>Conquest Guide Entropy:<br>
+Defeat <font color="LEVEL">120 Soul Flowers</font> that sometimes appear while hunting monsters in the Conquest world, and gather their petals.<br>
+Monster to hunt: <font color="LEVEL">Soul Flower.</font><br>
+When you are done come back to me, to get your reward.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-03.htm b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-03.htm
new file mode 100644
index 0000000000..800061b434
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-03.htm
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Entropy:<br>
+Have you gathered all the required flower petals?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10907_WhereFlowersBlossom 34599-05.html">"Yes, sure."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-04.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-04.html
new file mode 100644
index 0000000000..376cf18f5e
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-04.html
@@ -0,0 +1,6 @@
+<html><body>Conquest Guide Entropy:<br>
+Don't try to foul me...<br>
+Defeat <font color="LEVEL">120 Soul Flowers</font> that sometimes appear while hunting monsters in the Conquest world, and gather their petals.<br>
+Monster to hunt: <font color="LEVEL">Soul Flower.</font><br>
+When you are done come back to me, to get your reward.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-05.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-05.html
new file mode 100644
index 0000000000..d3902cf585
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-05.html
@@ -0,0 +1,3 @@
+<html><body>Conquest Guide Entropy:<br>
+Congratulations. You have completed all the tasks.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/Q10907_WhereFlowersBlossom.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/Q10907_WhereFlowersBlossom.java
new file mode 100644
index 0000000000..bf7448011d
--- /dev/null
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/Q10907_WhereFlowersBlossom.java
@@ -0,0 +1,172 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q10907_WhereFlowersBlossom;
+
+import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.enums.QuestSound;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.quest.Quest;
+import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
+
+import quests.Q10904_JourneyToTheConquestWorld.Q10904_JourneyToTheConquestWorld;
+
+/**
+ * @author CostyKiller
+ */
+public class Q10907_WhereFlowersBlossom extends Quest
+{
+	// NPC
+	private static final int ENTROPY = 34599;
+	// Monsters
+	private static final int[] MONSTERS =
+	{
+		19818, // Soul Flower - Asa Area 1 (Lv. 116)
+		19819, // Soul Flower - Asa Area 2 (Lv. 120)
+		19820, // Soul Flower - Asa Area 3 (Lv. 124)
+		19824, // Soul Flower - Anima Area 1 (Lv. 116)
+		19825, // Soul Flower - Anima Area 2 (Lv. 120)
+		19826, // Soul Flower - Anima Area 3 (Lv. 124)
+		19821, // Soul Flower - Nox Area 1 (Lv. 116)
+		19822, // Soul Flower - Nox Area 2 (Lv. 120)
+		19823, // Soul Flower - Nox Area 3 (Lv. 124)
+		19840, // Soul Flower - Vita (Lv. 124)
+		19841, // Soul Flower - Ignis (Lv. 128)
+	};
+	// Item
+	private static final int SOUL_FLOWER_PETAL = 82178;
+	// Misc
+	private static final int MIN_LEVEL = 110;
+	private static final int SOUL_FLOWER_PETAL_NEEDED = 120;
+	
+	public Q10907_WhereFlowersBlossom()
+	{
+		super(10907);
+		addStartNpc(ENTROPY);
+		addTalkId(ENTROPY);
+		addKillId(MONSTERS);
+		addCondCompletedQuest(Q10904_JourneyToTheConquestWorld.class.getSimpleName(), "34599-00.html");
+		addCondMinLevel(MIN_LEVEL, "34599-00.html");
+		registerQuestItems(SOUL_FLOWER_PETAL);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if (qs == null)
+		{
+			return null;
+		}
+		
+		String htmltext = null;
+		switch (event)
+		{
+			case "34599-02.html":
+			{
+				if ((player.getLevel() >= MIN_LEVEL))
+				{
+					qs.startQuest();
+					qs.setMemoState(1);
+					htmltext = event;
+				}
+				break;
+			}
+			case "34599-05.html":
+			{
+				if (qs.isCond(2))
+				{
+					takeItems(player, SOUL_FLOWER_PETAL, 120);
+					addExpAndSp(player, 8872460372L, 7985214);
+					qs.exitQuest(false, true);
+					htmltext = event;
+				}
+				else
+				{
+					htmltext = "34599-04.html";
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onTalk(Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, true);
+		String htmltext = getNoQuestMsg(player);
+		switch (qs.getState())
+		{
+			case State.CREATED:
+			{
+				if (npc.getId() == ENTROPY)
+				{
+					htmltext = "34599-01.htm";
+				}
+				break;
+			}
+			case State.STARTED:
+			{
+				switch (npc.getId())
+				{
+					case ENTROPY:
+					{
+						if ((qs.isCond(1) & qs.isMemoState(1)) || qs.isCond(2))
+						{
+							htmltext = "34599-03.htm";
+						}
+						break;
+					}
+				}
+				break;
+			}
+			case State.COMPLETED:
+			{
+				htmltext = getAlreadyCompletedMsg(player);
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player player, boolean isSummon)
+	{
+		executeForEachPlayer(player, npc, isSummon, true, false);
+		return super.onKill(npc, player, isSummon);
+	}
+	
+	@Override
+	public void actionForEachPlayer(Player player, Npc npc, boolean isSummon)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if ((qs != null) && qs.isCond(1) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
+		{
+			if (getQuestItemsCount(player, SOUL_FLOWER_PETAL) < SOUL_FLOWER_PETAL_NEEDED)
+			{
+				giveItems(player, SOUL_FLOWER_PETAL, 1);
+				playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			}
+			if (getQuestItemsCount(player, SOUL_FLOWER_PETAL) >= SOUL_FLOWER_PETAL_NEEDED)
+			{
+				qs.setCond(2, true);
+			}
+		}
+	}
+}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
index 5d9caef35d..d5d956a12f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
@@ -614,7 +614,7 @@ public class Q11025_PathOfDestinyProving extends Quest
 				holder.add(new NpcLogListHolder(NpcStringId.KILL_SKELETONS_3.getId(), true, qs.getInt(KILL_COUNT_VAR)));
 				return holder;
 			}
-			else if (qs.isCond(11))
+			else if (qs.isCond(12))
 			{
 				final Set<NpcLogListHolder> holder = new HashSet<>();
 				holder.add(new NpcLogListHolder(NpcStringId.INVESTIGATE_THE_SURROUNDINGS.getId(), true, qs.getInt(KILL_COUNT_VAR2)));
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
index 4a31dde5c2..1154f7ab9a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
@@ -312,7 +312,6 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT1);
 				}
-				htmltext = event;
 				break;
 			}
 			case "teleport2":
@@ -321,7 +320,6 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT2);
 				}
-				htmltext = event;
 				break;
 			}
 			case "teleport3":
@@ -330,7 +328,6 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT3);
 				}
-				htmltext = event;
 				break;
 			}
 			case "teleport4":
@@ -339,7 +336,6 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT4);
 				}
-				htmltext = event;
 				break;
 			}
 			case "teleport5":
@@ -348,10 +344,8 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT5);
 				}
-				htmltext = event;
 				break;
 			}
-			
 		}
 		return htmltext;
 	}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/33932-04.html b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/33932-04.html
index 34fcecd6d8..a0fbc4196d 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/33932-04.html
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/33932-04.html
@@ -3,7 +3,7 @@
 <font color="LEVEL">When the god's voice will no longer be heard.</font><br>
 <font color="LEVEL">A red river flows...</font><br>
 <font color="LEVEL">Hard frost upon the earth... And one of half-noble blood, descending with the winds to become the prophesied one.</font><br>
-<font color="LEVEL">Your lonely, solitary journey has begun. A small child in the middle of a blocked road appears. When joined by one of nobility, the path will open to the Grail.</center><br>
+<font color="LEVEL">Your lonely, solitary journey has begun. A small child in the middle of a blocked road appears. When joined by one of nobility, the path will open to the Grail.</font></center><br>
 So it wasn't a coincidence that you left on your journey.<br>
 <Button ALIGN=LEFT ICON="Normal" action="bypass -h Quest Q11027_PathOfDestinyOvercome 33932-05.html">"What do you mean?"</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/QuestMasterHandler.java
index bb0b01e84b..d78eee9929 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -60,6 +60,10 @@ import quests.Q10887_SaviorsPathDemonsAndAtelia.Q10887_SaviorsPathDemonsAndAteli
 import quests.Q10888_SaviorsPathDefeatTheEmbryo.Q10888_SaviorsPathDefeatTheEmbryo;
 import quests.Q10889_SaviorsPathFallenEmperorsThrone.Q10889_SaviorsPathFallenEmperorsThrone;
 import quests.Q10890_SaviorsPathHallOfEtina.Q10890_SaviorsPathHallOfEtina;
+import quests.Q10904_JourneyToTheConquestWorld.Q10904_JourneyToTheConquestWorld;
+import quests.Q10905_HuntingTime.Q10905_HuntingTime;
+import quests.Q10906_ChasingTheLight.Q10906_ChasingTheLight;
+import quests.Q10907_WhereFlowersBlossom.Q10907_WhereFlowersBlossom;
 import quests.Q11024_PathOfDestinyBeginning.Q11024_PathOfDestinyBeginning;
 import quests.Q11025_PathOfDestinyProving.Q11025_PathOfDestinyProving;
 import quests.Q11026_PathOfDestinyConviction.Q11026_PathOfDestinyConviction;
@@ -75,10 +79,6 @@ import quests.not_done.Q01900_StormIsleSecretSpot;
 import quests.not_done.Q01901_StormIsleFurtiveDeal;
 import quests.not_done.Q10595_TheDimensionalWarpPart8;
 import quests.not_done.Q10596_TheDimensionalWarpPart9;
-import quests.not_done.Q10904_JourneyToTheConquestWorld;
-import quests.not_done.Q10905_HuntingTime;
-import quests.not_done.Q10906_ChasingTheLight;
-import quests.not_done.Q10907_WhereFlowersBlossom;
 import quests.not_done.Q11028_WindOfDestinyEncounter;
 import quests.not_done.Q11029_WindOfDestinyPromise;
 import quests.not_done.Q11030_WindOfDestinyChoice;
@@ -144,10 +144,10 @@ public class QuestMasterHandler
 		Q10888_SaviorsPathDefeatTheEmbryo.class,
 		Q10889_SaviorsPathFallenEmperorsThrone.class,
 		Q10890_SaviorsPathHallOfEtina.class,
-		Q10904_JourneyToTheConquestWorld.class, // TODO: Not done.
-		Q10905_HuntingTime.class, // TODO: Not done.
-		Q10906_ChasingTheLight.class, // TODO: Not done.
-		Q10907_WhereFlowersBlossom.class, // TODO: Not done.
+		Q10904_JourneyToTheConquestWorld.class,
+		Q10905_HuntingTime.class,
+		Q10906_ChasingTheLight.class,
+		Q10907_WhereFlowersBlossom.class,
 		Q11028_WindOfDestinyEncounter.class, // TODO: Not done.
 		Q11029_WindOfDestinyPromise.class, // TODO: Not done.
 		Q11030_WindOfDestinyChoice.class, // TODO: Not done.
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/spawns/Rune/ForestOfTheDeadMonsters.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/spawns/Rune/ForestOfTheDeadMonsters.xml
index 32f1b84456..404b7b2566 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/spawns/Rune/ForestOfTheDeadMonsters.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/spawns/Rune/ForestOfTheDeadMonsters.xml
@@ -425,33 +425,6 @@
 			<npc id="21599" count="1" respawnTime="90sec" /> <!-- Requiem Priest -->
 		</group>
 	</spawn>
-	<spawn name="rune09_2116_15_DayNight" ai="DayNightSpawns">
-		<territories>
-			<territory name="rune09_2116_15" minZ="-3247" maxZ="-2347">
-				<node x="61271" y="-48011" />
-				<node x="62135" y="-44855" />
-				<node x="61207" y="-44065" />
-				<node x="58383" y="-47642" />
-				<node x="59055" y="-49908" />
-			</territory>
-		</territories>
-		<group name="dayTime" spawnByDefault="false">
-			<npc id="21570" count="1" respawnTime="30sec" /> <!-- Ghost of Betrayer -->
-			<npc id="21575" count="1" respawnTime="30sec" /> <!-- Bone Grinder -->
-			<npc id="21578" count="1" respawnTime="30sec" /> <!-- Behemoth Zombie -->
-			<npc id="21580" count="1" respawnTime="30sec" /> <!-- Bone Caster -->
-			<npc id="21581" count="1" respawnTime="30sec" /> <!-- Bone Puppeteer -->
-		</group>
-		<group name="nightTime" spawnByDefault="false">
-			<npc id="21573" count="1" respawnTime="30sec" /> <!-- Atrox -->
-			<npc id="21571" count="1" respawnTime="30sec" /> <!-- Ghost of Rebel Soldier -->
-			<npc id="21576" count="1" respawnTime="30sec" /> <!-- Ghost of Guillotine -->
-			<npc id="21577" count="1" respawnTime="30sec" /> <!-- Ghost of Guillotine -->
-			<npc id="21579" count="1" respawnTime="30sec" /> <!-- Ghost of Rebel Leader -->
-			<npc id="21582" count="1" respawnTime="30sec" /> <!-- Vampire Soldier -->
-			<npc id="21599" count="1" respawnTime="90sec" /> <!-- Requiem Priest -->
-		</group>
-	</spawn>
 	<spawn name="rune09_2116_16_DayNight" ai="DayNightSpawns">
 		<territories>
 			<territory name="rune09_2116_16" minZ="-3465" maxZ="-2165">
@@ -698,24 +671,4 @@
 			<npc id="21588" count="1" respawnTime="30sec" /> <!-- Vampire Wizard -->
 		</group>
 	</spawn>
-	<spawn name="rune09_2116_26_Night" ai="DayNightSpawns">
-		<territories>
-			<territory name="rune09_2116_26" minZ="-3216" maxZ="-2616">
-				<node x="61742" y="-43011" />
-				<node x="61991" y="-41266" />
-				<node x="58288" y="-40739" />
-				<node x="55959" y="-41439" />
-				<node x="58733" y="-43587" />
-				<node x="60332" y="-43914" />
-			</territory>
-		</territories>
-		<group name="nightTime" spawnByDefault="false">
-			<npc id="21586" count="1" respawnTime="30sec" /> <!-- Vampire Adept -->
-			<npc id="21585" count="1" respawnTime="30sec" /> <!-- Vampire Magician -->
-			<npc id="21592" count="1" respawnTime="30sec" /> <!-- Vampire Magister -->
-			<npc id="21595" count="1" respawnTime="30sec" /> <!-- Vampire Warlord -->
-			<npc id="21588" count="1" respawnTime="30sec" /> <!-- Vampire Wizard -->
-			<npc id="21589" count="1" respawnTime="30sec" /> <!-- Vampire Wizard -->
-		</group>
-	</spawn>
 </list>
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/spawns/Rune/SwampOfScreamsMonsters.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/spawns/Rune/SwampOfScreamsMonsters.xml
index 805daf70ba..7da3cdc129 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/spawns/Rune/SwampOfScreamsMonsters.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/spawns/Rune/SwampOfScreamsMonsters.xml
@@ -1,1183 +1,636 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_01" minZ="-2429" maxZ="-1929">
-				<node x="77747" y="-58718" />
-				<node x="77937" y="-58524" />
-				<node x="77937" y="-58267" />
-				<node x="77745" y="-58075" />
-				<node x="77489" y="-58076" />
-				<node x="77297" y="-58270" />
-				<node x="77299" y="-58525" />
-				<node x="77490" y="-58719" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_02" minZ="-2432" maxZ="-1932">
-				<node x="77606" y="-61735" />
-				<node x="77899" y="-61648" />
-				<node x="77827" y="-61312" />
-				<node x="77576" y="-61259" />
-				<node x="77312" y="-61312" />
-				<node x="76979" y="-61398" />
-				<node x="77056" y="-61827" />
-				<node x="77308" y="-61743" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_03" minZ="-2429" maxZ="-1929">
-				<node x="81568" y="-63672" />
-				<node x="81758" y="-63478" />
-				<node x="81758" y="-63221" />
-				<node x="81566" y="-63029" />
-				<node x="81310" y="-63030" />
-				<node x="81117" y="-63224" />
-				<node x="81120" y="-63479" />
-				<node x="81311" y="-63673" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_04" minZ="-2443" maxZ="-1943">
-				<node x="85107" y="-63157" />
-				<node x="85297" y="-62963" />
-				<node x="85298" y="-62707" />
-				<node x="85105" y="-62514" />
-				<node x="84849" y="-62515" />
-				<node x="84657" y="-62709" />
-				<node x="84660" y="-62964" />
-				<node x="84850" y="-63158" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_05" minZ="-2443" maxZ="-1943">
-				<node x="85647" y="-59758" />
-				<node x="85837" y="-59565" />
-				<node x="85838" y="-59308" />
-				<node x="85645" y="-59115" />
-				<node x="85389" y="-59116" />
-				<node x="85197" y="-59310" />
-				<node x="85200" y="-59566" />
-				<node x="85390" y="-59760" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_06" minZ="-2739" maxZ="-2239">
-				<node x="94136" y="-55178" />
-				<node x="94327" y="-54984" />
-				<node x="94327" y="-54727" />
-				<node x="94135" y="-54535" />
-				<node x="93878" y="-54536" />
-				<node x="93686" y="-54730" />
-				<node x="93689" y="-54985" />
-				<node x="93879" y="-55179" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_07" minZ="-2739" maxZ="-2239">
-				<node x="94756" y="-52845" />
-				<node x="94946" y="-52651" />
-				<node x="94946" y="-52395" />
-				<node x="94754" y="-52202" />
-				<node x="94497" y="-52203" />
-				<node x="94305" y="-52397" />
-				<node x="94308" y="-52652" />
-				<node x="94499" y="-52847" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_08" minZ="-2739" maxZ="-2239">
-				<node x="89550" y="-52293" />
-				<node x="89740" y="-52100" />
-				<node x="89741" y="-51843" />
-				<node x="89548" y="-51651" />
-				<node x="89292" y="-51652" />
-				<node x="89100" y="-51846" />
-				<node x="89103" y="-52101" />
-				<node x="89293" y="-52295" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_09" minZ="-2502" maxZ="-2002">
-				<node x="83172" y="-50881" />
-				<node x="83362" y="-50687" />
-				<node x="83362" y="-50431" />
-				<node x="83170" y="-50238" />
-				<node x="82913" y="-50239" />
-				<node x="82721" y="-50433" />
-				<node x="82724" y="-50688" />
-				<node x="82915" y="-50883" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_10" minZ="-2443" maxZ="-1943">
-				<node x="78978" y="-51399" />
-				<node x="79168" y="-51206" />
-				<node x="79169" y="-50949" />
-				<node x="78976" y="-50756" />
-				<node x="78720" y="-50757" />
-				<node x="78528" y="-50951" />
-				<node x="78531" y="-51207" />
-				<node x="78721" y="-51401" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_11" minZ="-3246" maxZ="-2746">
-				<node x="73884" y="-51613" />
-				<node x="74074" y="-51420" />
-				<node x="74074" y="-51163" />
-				<node x="73882" y="-50970" />
-				<node x="73626" y="-50971" />
-				<node x="73434" y="-51165" />
-				<node x="73436" y="-51421" />
-				<node x="73627" y="-51615" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_12" minZ="-3287" maxZ="-2787">
-				<node x="75808" y="-54864" />
-				<node x="75998" y="-54670" />
-				<node x="75999" y="-54414" />
-				<node x="75806" y="-54221" />
-				<node x="75550" y="-54222" />
-				<node x="75358" y="-54416" />
-				<node x="75361" y="-54671" />
-				<node x="75551" y="-54866" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_13" minZ="-2454" maxZ="-1954">
-				<node x="85479" y="-55083" />
-				<node x="85669" y="-54890" />
-				<node x="85669" y="-54633" />
-				<node x="85477" y="-54440" />
-				<node x="85221" y="-54442" />
-				<node x="85029" y="-54635" />
-				<node x="85031" y="-54891" />
-				<node x="85222" y="-55085" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_14" minZ="-2429" maxZ="-1929">
-				<node x="76441" y="-60418" />
-				<node x="76631" y="-60224" />
-				<node x="76631" y="-59967" />
-				<node x="76439" y="-59775" />
-				<node x="76183" y="-59776" />
-				<node x="75991" y="-59970" />
-				<node x="75993" y="-60225" />
-				<node x="76184" y="-60419" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_15" minZ="-2429" maxZ="-1929">
-				<node x="84161" y="-61281" />
-				<node x="84351" y="-61087" />
-				<node x="84351" y="-60830" />
-				<node x="84159" y="-60638" />
-				<node x="83903" y="-60639" />
-				<node x="83711" y="-60833" />
-				<node x="83713" y="-61088" />
-				<node x="83904" y="-61282" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_16" minZ="-2429" maxZ="-1929">
-				<node x="84299" y="-58492" />
-				<node x="84489" y="-58298" />
-				<node x="84489" y="-58041" />
-				<node x="84297" y="-57849" />
-				<node x="84041" y="-57850" />
-				<node x="83849" y="-58044" />
-				<node x="83851" y="-58299" />
-				<node x="84042" y="-58493" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_17" minZ="-2429" maxZ="-1929">
-				<node x="88437" y="-57690" />
-				<node x="88627" y="-57496" />
-				<node x="88627" y="-57239" />
-				<node x="88435" y="-57047" />
-				<node x="88179" y="-57048" />
-				<node x="87987" y="-57242" />
-				<node x="87989" y="-57497" />
-				<node x="88180" y="-57691" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_18" minZ="-2739" maxZ="-2239">
-				<node x="91401" y="-51521" />
-				<node x="91591" y="-51328" />
-				<node x="91592" y="-51071" />
-				<node x="91399" y="-50879" />
-				<node x="91143" y="-50880" />
-				<node x="90951" y="-51074" />
-				<node x="90954" y="-51329" />
-				<node x="91144" y="-51523" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_19" minZ="-3361" maxZ="-2861">
-				<node x="83708" y="-45975" />
-				<node x="83898" y="-45781" />
-				<node x="83898" y="-45524" />
-				<node x="83706" y="-45332" />
-				<node x="83450" y="-45333" />
-				<node x="83258" y="-45527" />
-				<node x="83260" y="-45782" />
-				<node x="83451" y="-45976" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_20" minZ="-3361" maxZ="-2861">
-				<node x="79937" y="-45735" />
-				<node x="80127" y="-45541" />
-				<node x="80127" y="-45284" />
-				<node x="79935" y="-45092" />
-				<node x="79679" y="-45093" />
-				<node x="79487" y="-45287" />
-				<node x="79489" y="-45542" />
-				<node x="79680" y="-45736" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_21" minZ="-3361" maxZ="-2861">
-				<node x="75126" y="-46888" />
-				<node x="75316" y="-46694" />
-				<node x="75316" y="-46437" />
-				<node x="75124" y="-46245" />
-				<node x="74868" y="-46246" />
-				<node x="74676" y="-46440" />
-				<node x="74678" y="-46695" />
-				<node x="74869" y="-46889" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_22" minZ="-3361" maxZ="-2861">
-				<node x="71139" y="-41611" />
-				<node x="71329" y="-41417" />
-				<node x="71329" y="-41160" />
-				<node x="71137" y="-40968" />
-				<node x="70881" y="-40969" />
-				<node x="70689" y="-41163" />
-				<node x="70691" y="-41418" />
-				<node x="70882" y="-41612" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_01" minZ="-3361" maxZ="-2861">
-				<node x="73183" y="-42690" />
-				<node x="73373" y="-42496" />
-				<node x="73374" y="-42240" />
-				<node x="73181" y="-42047" />
-				<node x="72925" y="-42048" />
-				<node x="72733" y="-42242" />
-				<node x="72736" y="-42497" />
-				<node x="72926" y="-42691" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_02" minZ="-3361" maxZ="-2861">
-				<node x="73707" y="-42673" />
-				<node x="73897" y="-42480" />
-				<node x="73897" y="-42223" />
-				<node x="73705" y="-42030" />
-				<node x="73449" y="-42031" />
-				<node x="73257" y="-42225" />
-				<node x="73259" y="-42481" />
-				<node x="73450" y="-42675" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_03" minZ="-3361" maxZ="-2861">
-				<node x="79440" y="-42583" />
-				<node x="79630" y="-42390" />
-				<node x="79630" y="-42133" />
-				<node x="79438" y="-41940" />
-				<node x="79181" y="-41942" />
-				<node x="78989" y="-42136" />
-				<node x="78992" y="-42391" />
-				<node x="79182" y="-42585" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_04" minZ="-3361" maxZ="-2861">
-				<node x="79860" y="-42263" />
-				<node x="80050" y="-42070" />
-				<node x="80051" y="-41813" />
-				<node x="79858" y="-41620" />
-				<node x="79602" y="-41621" />
-				<node x="79410" y="-41815" />
-				<node x="79413" y="-42071" />
-				<node x="79603" y="-42265" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_05" minZ="-3361" maxZ="-2861">
-				<node x="82408" y="-42131" />
-				<node x="82598" y="-41938" />
-				<node x="82599" y="-41681" />
-				<node x="82406" y="-41488" />
-				<node x="82150" y="-41489" />
-				<node x="81958" y="-41683" />
-				<node x="81961" y="-41939" />
-				<node x="82151" y="-42133" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_06" minZ="-3361" maxZ="-2861">
-				<node x="82466" y="-41657" />
-				<node x="82656" y="-41463" />
-				<node x="82656" y="-41207" />
-				<node x="82464" y="-41014" />
-				<node x="82207" y="-41015" />
-				<node x="82015" y="-41209" />
-				<node x="82018" y="-41464" />
-				<node x="82208" y="-41659" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_07" minZ="-3361" maxZ="-2861">
-				<node x="81585" y="-44731" />
-				<node x="81775" y="-44538" />
-				<node x="81775" y="-44281" />
-				<node x="81583" y="-44088" />
-				<node x="81327" y="-44090" />
-				<node x="81135" y="-44283" />
-				<node x="81137" y="-44539" />
-				<node x="81328" y="-44733" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_08" minZ="-3361" maxZ="-2861">
-				<node x="81779" y="-45175" />
-				<node x="81969" y="-44981" />
-				<node x="81969" y="-44724" />
-				<node x="81777" y="-44532" />
-				<node x="81521" y="-44533" />
-				<node x="81329" y="-44727" />
-				<node x="81331" y="-44982" />
-				<node x="81522" y="-45176" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_09" minZ="-2717" maxZ="-2217">
-				<node x="92140" y="-53133" />
-				<node x="92330" y="-52939" />
-				<node x="92330" y="-52682" />
-				<node x="92138" y="-52490" />
-				<node x="91882" y="-52491" />
-				<node x="91690" y="-52685" />
-				<node x="91692" y="-52940" />
-				<node x="91883" y="-53134" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_10" minZ="-2717" maxZ="-2217">
-				<node x="92422" y="-53473" />
-				<node x="92612" y="-53279" />
-				<node x="92613" y="-53022" />
-				<node x="92420" y="-52830" />
-				<node x="92164" y="-52831" />
-				<node x="91972" y="-53025" />
-				<node x="91975" y="-53280" />
-				<node x="92165" y="-53474" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_11" minZ="-2439" maxZ="-1939">
-				<node x="88687" y="-60732" />
-				<node x="88877" y="-60539" />
-				<node x="88877" y="-60282" />
-				<node x="88685" y="-60089" />
-				<node x="88429" y="-60090" />
-				<node x="88237" y="-60284" />
-				<node x="88239" y="-60539" />
-				<node x="88430" y="-60734" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_12" minZ="-2439" maxZ="-1939">
-				<node x="89026" y="-60332" />
-				<node x="89216" y="-60138" />
-				<node x="89216" y="-59881" />
-				<node x="89024" y="-59689" />
-				<node x="88768" y="-59690" />
-				<node x="88576" y="-59884" />
-				<node x="88578" y="-60139" />
-				<node x="88769" y="-60333" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_13" minZ="-2439" maxZ="-1939">
-				<node x="81670" y="-60519" />
-				<node x="81860" y="-60326" />
-				<node x="81860" y="-60069" />
-				<node x="81668" y="-59876" />
-				<node x="81411" y="-59877" />
-				<node x="81219" y="-60071" />
-				<node x="81222" y="-60327" />
-				<node x="81413" y="-60521" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_14" minZ="-2439" maxZ="-1939">
-				<node x="81200" y="-60287" />
-				<node x="81390" y="-60094" />
-				<node x="81390" y="-59837" />
-				<node x="81198" y="-59645" />
-				<node x="80942" y="-59646" />
-				<node x="80749" y="-59840" />
-				<node x="80752" y="-60095" />
-				<node x="80943" y="-60289" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_01" minZ="-3246" maxZ="-2746">
-				<node x="70882" y="-55719" />
-				<node x="71072" y="-55526" />
-				<node x="71072" y="-55269" />
-				<node x="70880" y="-55076" />
-				<node x="70624" y="-55077" />
-				<node x="70432" y="-55271" />
-				<node x="70434" y="-55526" />
-				<node x="70625" y="-55721" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_02" minZ="-3246" maxZ="-2746">
-				<node x="71413" y="-55723" />
-				<node x="71603" y="-55530" />
-				<node x="71603" y="-55273" />
-				<node x="71411" y="-55080" />
-				<node x="71155" y="-55081" />
-				<node x="70963" y="-55275" />
-				<node x="70965" y="-55531" />
-				<node x="71156" y="-55725" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_05" minZ="-3331" maxZ="-2831">
-				<node x="72249" y="-45372" />
-				<node x="72439" y="-45178" />
-				<node x="72439" y="-44922" />
-				<node x="72247" y="-44729" />
-				<node x="71990" y="-44730" />
-				<node x="71798" y="-44924" />
-				<node x="71801" y="-45179" />
-				<node x="71992" y="-45373" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_06" minZ="-3331" maxZ="-2831">
-				<node x="72490" y="-45872" />
-				<node x="72680" y="-45679" />
-				<node x="72681" y="-45422" />
-				<node x="72488" y="-45230" />
-				<node x="72232" y="-45231" />
-				<node x="72040" y="-45425" />
-				<node x="72043" y="-45680" />
-				<node x="72233" y="-45874" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_09" minZ="-3331" maxZ="-2831">
-				<node x="76533" y="-43664" />
-				<node x="76723" y="-43470" />
-				<node x="76724" y="-43214" />
-				<node x="76531" y="-43021" />
-				<node x="76275" y="-43022" />
-				<node x="76083" y="-43216" />
-				<node x="76086" y="-43471" />
-				<node x="76276" y="-43666" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_10" minZ="-3331" maxZ="-2831">
-				<node x="75923" y="-43666" />
-				<node x="76113" y="-43473" />
-				<node x="76114" y="-43216" />
-				<node x="75921" y="-43023" />
-				<node x="75665" y="-43024" />
-				<node x="75473" y="-43218" />
-				<node x="75476" y="-43474" />
-				<node x="75666" y="-43668" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_15" minZ="-2415" maxZ="-1915">
-				<node x="82373" y="-54914" />
-				<node x="82563" y="-54720" />
-				<node x="82563" y="-54464" />
-				<node x="82371" y="-54271" />
-				<node x="82115" y="-54272" />
-				<node x="81923" y="-54466" />
-				<node x="81925" y="-54721" />
-				<node x="82116" y="-54916" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_16" minZ="-2415" maxZ="-1915">
-				<node x="82174" y="-54464" />
-				<node x="82364" y="-54270" />
-				<node x="82364" y="-54014" />
-				<node x="82172" y="-53821" />
-				<node x="81916" y="-53822" />
-				<node x="81724" y="-54016" />
-				<node x="81726" y="-54271" />
-				<node x="81917" y="-54465" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_17" minZ="-2415" maxZ="-1915">
-				<node x="80147" y="-56452" />
-				<node x="80337" y="-56258" />
-				<node x="80337" y="-56002" />
-				<node x="80145" y="-55809" />
-				<node x="79889" y="-55810" />
-				<node x="79697" y="-56004" />
-				<node x="79699" y="-56259" />
-				<node x="79890" y="-56453" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_18" minZ="-2415" maxZ="-1915">
-				<node x="80616" y="-56636" />
-				<node x="80806" y="-56442" />
-				<node x="80806" y="-56186" />
-				<node x="80614" y="-55993" />
-				<node x="80358" y="-55994" />
-				<node x="80166" y="-56188" />
-				<node x="80168" y="-56443" />
-				<node x="80359" y="-56637" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_01" minZ="-3246" maxZ="-2746">
-				<node x="71204" y="-52062" />
-				<node x="71394" y="-51869" />
-				<node x="71394" y="-51612" />
-				<node x="71202" y="-51419" />
-				<node x="70946" y="-51420" />
-				<node x="70754" y="-51614" />
-				<node x="70756" y="-51870" />
-				<node x="70947" y="-52064" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_02" minZ="-3246" maxZ="-2746">
-				<node x="72483" y="-53428" />
-				<node x="72673" y="-53235" />
-				<node x="72673" y="-52978" />
-				<node x="72481" y="-52785" />
-				<node x="72225" y="-52786" />
-				<node x="72033" y="-52980" />
-				<node x="72035" y="-53236" />
-				<node x="72226" y="-53430" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_03" minZ="-2440" maxZ="-1940">
-				<node x="78929" y="-60301" />
-				<node x="79119" y="-60108" />
-				<node x="79119" y="-59851" />
-				<node x="78927" y="-59658" />
-				<node x="78671" y="-59659" />
-				<node x="78479" y="-59853" />
-				<node x="78481" y="-60109" />
-				<node x="78672" y="-60303" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_04" minZ="-2440" maxZ="-1940">
-				<node x="82123" y="-62242" />
-				<node x="82313" y="-62049" />
-				<node x="82313" y="-61792" />
-				<node x="82121" y="-61599" />
-				<node x="81865" y="-61600" />
-				<node x="81673" y="-61794" />
-				<node x="81675" y="-62050" />
-				<node x="81866" y="-62244" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_05" minZ="-2440" maxZ="-1940">
-				<node x="86121" y="-57915" />
-				<node x="86311" y="-57722" />
-				<node x="86311" y="-57465" />
-				<node x="86119" y="-57272" />
-				<node x="85863" y="-57273" />
-				<node x="85671" y="-57467" />
-				<node x="85673" y="-57723" />
-				<node x="85864" y="-57917" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_06" minZ="-2440" maxZ="-1940">
-				<node x="89958" y="-62046" />
-				<node x="90148" y="-61853" />
-				<node x="90148" y="-61596" />
-				<node x="89956" y="-61403" />
-				<node x="89700" y="-61404" />
-				<node x="89508" y="-61598" />
-				<node x="89510" y="-61854" />
-				<node x="89701" y="-62048" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_07" minZ="-2736" maxZ="-2236">
-				<node x="90140" y="-54352" />
-				<node x="90330" y="-54159" />
-				<node x="90330" y="-53902" />
-				<node x="90138" y="-53709" />
-				<node x="89882" y="-53710" />
-				<node x="89690" y="-53904" />
-				<node x="89692" y="-54160" />
-				<node x="89883" y="-54354" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_08" minZ="-2705" maxZ="-2205">
-				<node x="92683" y="-56045" />
-				<node x="92873" y="-55852" />
-				<node x="92873" y="-55595" />
-				<node x="92681" y="-55402" />
-				<node x="92425" y="-55403" />
-				<node x="92233" y="-55597" />
-				<node x="92235" y="-55853" />
-				<node x="92426" y="-56047" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_09" minZ="-2750" maxZ="-2250">
-				<node x="96012" y="-53727" />
-				<node x="96202" y="-53534" />
-				<node x="96202" y="-53277" />
-				<node x="96010" y="-53084" />
-				<node x="95754" y="-53085" />
-				<node x="95562" y="-53279" />
-				<node x="95564" y="-53535" />
-				<node x="95755" y="-53729" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_10" minZ="-2750" maxZ="-2250">
-				<node x="93282" y="-51573" />
-				<node x="93472" y="-51380" />
-				<node x="93472" y="-51123" />
-				<node x="93280" y="-50930" />
-				<node x="93024" y="-50931" />
-				<node x="92832" y="-51125" />
-				<node x="92834" y="-51381" />
-				<node x="93025" y="-51575" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_11" minZ="-3333" maxZ="-2833">
-				<node x="70688" y="-43454" />
-				<node x="70878" y="-43261" />
-				<node x="70878" y="-43004" />
-				<node x="70686" y="-42811" />
-				<node x="70430" y="-42812" />
-				<node x="70238" y="-43006" />
-				<node x="70240" y="-43262" />
-				<node x="70431" y="-43456" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_12" minZ="-3333" maxZ="-2833">
-				<node x="74411" y="-40685" />
-				<node x="74601" y="-40492" />
-				<node x="74601" y="-40235" />
-				<node x="74409" y="-40042" />
-				<node x="74153" y="-40043" />
-				<node x="73961" y="-40237" />
-				<node x="73963" y="-40493" />
-				<node x="74154" y="-40687" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_13" minZ="-3333" maxZ="-2833">
-				<node x="83421" y="-44199" />
-				<node x="83611" y="-44006" />
-				<node x="83611" y="-43749" />
-				<node x="83419" y="-43556" />
-				<node x="83163" y="-43557" />
-				<node x="82971" y="-43751" />
-				<node x="82973" y="-44007" />
-				<node x="83164" y="-44201" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_14" minZ="-3333" maxZ="-2833">
-				<node x="79555" y="-40295" />
-				<node x="79745" y="-40102" />
-				<node x="79745" y="-39845" />
-				<node x="79553" y="-39652" />
-				<node x="79297" y="-39653" />
-				<node x="79105" y="-39847" />
-				<node x="79107" y="-40103" />
-				<node x="79298" y="-40297" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_15" minZ="-3333" maxZ="-2833">
-				<node x="77294" y="-46771" />
-				<node x="77484" y="-46578" />
-				<node x="77484" y="-46321" />
-				<node x="77292" y="-46128" />
-				<node x="77036" y="-46129" />
-				<node x="76844" y="-46323" />
-				<node x="76846" y="-46579" />
-				<node x="77037" y="-46773" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_16" minZ="-3333" maxZ="-2833">
-				<node x="78371" y="-45107" />
-				<node x="78561" y="-44914" />
-				<node x="78561" y="-44657" />
-				<node x="78369" y="-44464" />
-				<node x="78113" y="-44465" />
-				<node x="77921" y="-44659" />
-				<node x="77923" y="-44915" />
-				<node x="78114" y="-45109" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_17" minZ="-3378" maxZ="-2878">
-				<node x="81874" y="-47352" />
-				<node x="82064" y="-47159" />
-				<node x="82064" y="-46902" />
-				<node x="81872" y="-46709" />
-				<node x="81616" y="-46710" />
-				<node x="81424" y="-46904" />
-				<node x="81426" y="-47160" />
-				<node x="81617" y="-47354" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_18" minZ="-2480" maxZ="-1980">
-				<node x="81508" y="-52237" />
-				<node x="81698" y="-52044" />
-				<node x="81698" y="-51787" />
-				<node x="81506" y="-51594" />
-				<node x="81250" y="-51595" />
-				<node x="81058" y="-51789" />
-				<node x="81060" y="-52045" />
-				<node x="81251" y="-52239" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_19" minZ="-2480" maxZ="-1980">
-				<node x="84405" y="-56499" />
-				<node x="84595" y="-56306" />
-				<node x="84595" y="-56049" />
-				<node x="84403" y="-55856" />
-				<node x="84147" y="-55857" />
-				<node x="83955" y="-56051" />
-				<node x="83957" y="-56307" />
-				<node x="84148" y="-56501" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_20" minZ="-3208" maxZ="-2708">
-				<node x="74731" y="-53288" />
-				<node x="74921" y="-53095" />
-				<node x="74921" y="-52838" />
-				<node x="74729" y="-52645" />
-				<node x="74473" y="-52646" />
-				<node x="74281" y="-52840" />
-				<node x="74283" y="-53096" />
-				<node x="74474" y="-53290" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_21" minZ="-2438" maxZ="-1938">
-				<node x="81685" y="-58517" />
-				<node x="81875" y="-58324" />
-				<node x="81875" y="-58067" />
-				<node x="81683" y="-57874" />
-				<node x="81427" y="-57875" />
-				<node x="81235" y="-58069" />
-				<node x="81237" y="-58325" />
-				<node x="81428" y="-58519" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_22" minZ="-3333" maxZ="-2833">
-				<node x="73225" y="-48582" />
-				<node x="73415" y="-48389" />
-				<node x="73415" y="-48132" />
-				<node x="73223" y="-47939" />
-				<node x="72967" y="-47940" />
-				<node x="72775" y="-48134" />
-				<node x="72777" y="-48390" />
-				<node x="72968" y="-48584" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+	<spawn name="SwampOfScreamsMonsters" spawnByDefault="false">
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="71230" y="-55358" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="73720" y="-51399" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="75748" y="-54618" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="74944" y="-46657" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="72152" y="-45067" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="72493" y="-45785" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="73107" y="-42346" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="73658" y="-42294" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="75769" y="-43267" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="76476" y="-43476" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="75190" y="-46502" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="79854" y="-45317" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="81260" y="-44377" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="81514" y="-44686" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="79750" y="-41915" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="79360" y="-42003" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="82186" y="-41268" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="82309" y="-41754" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="83692" y="-45626" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="85447" y="-59413" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="84015" y="-61074" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="85054" y="-62837" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="81603" y="-63297" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="81520" y="-60501" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="80915" y="-59934" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="84041" y="-58004" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="77671" y="-58313" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="76374" y="-59894" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="77383" y="-61554" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="80507" y="-56412" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="80002" y="-56009" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="82322" y="-54655" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="82048" y="-54271" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="78923" y="-51121" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="82975" y="-50598" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="85425" y="-54729" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="89321" y="-52011" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="91211" y="-51262" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="92122" y="-52894" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="93944" y="-54742" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="94636" y="-52583" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="71070" y="-51755" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="72408" y="-53084" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="74533" y="-52994" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="73291" y="-48206" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="77190" y="-46396" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="78206" y="-44800" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="81789" y="-47150" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="83180" y="-43975" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="79448" y="-40030" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3100" maxZ="-2900" rad="200">
+					<node x="74175" y="-40332" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="70651" y="-42916" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="81383" y="-51898" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="78704" y="-59856" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="82024" y="-62041" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="85912" y="-57582" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="89927" y="-61696" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+					<node x="93143" y="-51220" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+					<node x="95950" y="-53341" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+					<node x="92635" y="-55669" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="89976" y="-53911" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
 	</spawn>
 </list>
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/initialEquipment.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/initialEquipment.xml
index 026e3ef986..0f8028ab8f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/initialEquipment.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/initialEquipment.xml
@@ -170,8 +170,5 @@
 		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
-		<item id="80683" count="1" /> <!-- Sword Breaker - For Apprentice Adventurer -->
-		<item id="80687" count="1" /> <!-- Compound Bow - For Apprentice Adventurer -->
-		<item id="17" count="1500" /> <!-- Wooden Arrow -->
 	</equipment>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/initialEquipmentEvent.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/initialEquipmentEvent.xml
index 1a47100d7f..1c8435d4d3 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/initialEquipmentEvent.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/initialEquipmentEvent.xml
@@ -2,9 +2,12 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/initialEquipment.xsd">
 	<!-- Human Fighter -->
 	<equipment classId="0">
-		<item id="2369" count="1" equipped="true" /> <!-- Squire's Sword -->
-		<item id="1146" count="1" equipped="true" /> <!-- Squire's Shirt -->
-		<item id="1147" count="1" equipped="true" /> <!-- Squire's Pants -->
+		<item id="80684" count="1" equipped="true" /> <!-- Falchion - For Apprentice Adventurer -->
+		<item id="80690" count="1" equipped="true" /> <!-- Durable Leather Helmet - Apprentice Adventurer -->
+		<item id="80691" count="1" equipped="true" /> <!-- Bronze Breastplate - Apprentice Adventurer -->
+		<item id="80692" count="1" equipped="true" /> <!-- Bronze Gaiters - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
@@ -12,183 +15,218 @@
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
 		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
-		<item id="10" count="1" /> <!-- Dagger -->
+		<item id="80683" count="1" /> <!-- Sword Breaker - For Apprentice Adventurer -->
+		<item id="80687" count="1" /> <!-- Compound Bow - For Apprentice Adventurer -->
+		<item id="17" count="1500" /> <!-- Wooden Arrow -->
 	</equipment>
 	<!-- Human Mystic -->
 	<equipment classId="10">
-		<item id="6" count="1" equipped="true" /> <!-- Apprentice's Wand -->
-		<item id="425" count="1" equipped="true" /> <!-- Apprentice's Tunic -->
-		<item id="461" count="1" equipped="true" /> <!-- Apprentice's Stockings -->
+		<item id="80686" count="1" equipped="true" /> <!-- Mage Staff - For Apprentice Adventurer -->
+		<item id="80695" count="1" equipped="true" /> <!-- Leather Helmet - Apprentice Adventurer -->
+		<item id="80696" count="1" equipped="true" /> <!-- Tunic of Devotion - Apprentice Adventurer -->
+		<item id="80697" count="1" equipped="true" /> <!-- Stockings of Devotion - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
+		<item id="80689" count="1" /> <!-- Flanged Mace - For Apprentice Adventurer -->
 	</equipment>
 	<!-- Elven Fighter -->
 	<equipment classId="18">
-		<item id="2369" count="1" equipped="true" /> <!-- Squire's Sword -->
-		<item id="1146" count="1" equipped="true" /> <!-- Squire's Shirt -->
-		<item id="1147" count="1" equipped="true" /> <!-- Squire's Pants -->
+		<item id="80684" count="1" equipped="true" /> <!-- Falchion - For Apprentice Adventurer -->
+		<item id="80690" count="1" equipped="true" /> <!-- Durable Leather Helmet - Apprentice Adventurer -->
+		<item id="80691" count="1" equipped="true" /> <!-- Bronze Breastplate - Apprentice Adventurer -->
+		<item id="80692" count="1" equipped="true" /> <!-- Bronze Gaiters - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
-		<item id="10" count="1" /> <!-- Dagger -->
+		<item id="80683" count="1" /> <!-- Sword Breaker - For Apprentice Adventurer -->
+		<item id="80687" count="1" /> <!-- Compound Bow - For Apprentice Adventurer -->
+		<item id="17" count="1500" /> <!-- Wooden Arrow -->
 	</equipment>
 	<!-- Elven Mystic -->
 	<equipment classId="25">
-		<item id="6" count="1" equipped="true" /> <!-- Apprentice's Wand -->
-		<item id="425" count="1" equipped="true" /> <!-- Apprentice's Tunic -->
-		<item id="461" count="1" equipped="true" /> <!-- Apprentice's Stockings -->
+		<item id="80686" count="1" equipped="true" /> <!-- Mage Staff - For Apprentice Adventurer -->
+		<item id="80695" count="1" equipped="true" /> <!-- Leather Helmet - Apprentice Adventurer -->
+		<item id="80696" count="1" equipped="true" /> <!-- Tunic of Devotion - Apprentice Adventurer -->
+		<item id="80697" count="1" equipped="true" /> <!-- Stockings of Devotion - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
+		<item id="80689" count="1" /> <!-- Flanged Mace - For Apprentice Adventurer -->
 	</equipment>
 	<!-- Dark Fighter -->
 	<equipment classId="31">
-		<item id="2369" count="1" equipped="true" /> <!-- Squire's Sword -->
-		<item id="1146" count="1" equipped="true" /> <!-- Squire's Shirt -->
-		<item id="1147" count="1" equipped="true" /> <!-- Squire's Pants -->
+		<item id="80684" count="1" equipped="true" /> <!-- Falchion - For Apprentice Adventurer -->
+		<item id="80690" count="1" equipped="true" /> <!-- Durable Leather Helmet - Apprentice Adventurer -->
+		<item id="80691" count="1" equipped="true" /> <!-- Bronze Breastplate - Apprentice Adventurer -->
+		<item id="80692" count="1" equipped="true" /> <!-- Bronze Gaiters - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
-		<item id="10" count="1" /> <!-- Dagger -->
+		<item id="80683" count="1" /> <!-- Sword Breaker - For Apprentice Adventurer -->
+		<item id="80687" count="1" /> <!-- Compound Bow - For Apprentice Adventurer -->
+		<item id="17" count="1500" /> <!-- Wooden Arrow -->
 	</equipment>
 	<!-- Dark Mystic -->
 	<equipment classId="38">
-		<item id="6" count="1" equipped="true" /> <!-- Apprentice's Wand -->
-		<item id="425" count="1" equipped="true" /> <!-- Apprentice's Tunic -->
-		<item id="461" count="1" equipped="true" /> <!-- Apprentice's Stockings -->
+		<item id="80686" count="1" equipped="true" /> <!-- Mage Staff - For Apprentice Adventurer -->
+		<item id="80695" count="1" equipped="true" /> <!-- Leather Helmet - Apprentice Adventurer -->
+		<item id="80696" count="1" equipped="true" /> <!-- Tunic of Devotion - Apprentice Adventurer -->
+		<item id="80697" count="1" equipped="true" /> <!-- Stockings of Devotion - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
+		<item id="80689" count="1" /> <!-- Flanged Mace - For Apprentice Adventurer -->
 	</equipment>
 	<!-- Orc Fighter -->
 	<equipment classId="44">
-		<item id="2369" count="1" equipped="true" /> <!-- Squire's Sword -->
-		<item id="1146" count="1" equipped="true" /> <!-- Squire's Shirt -->
-		<item id="1147" count="1" equipped="true" /> <!-- Squire's Pants -->
+		<item id="80685" count="1" equipped="true" /> <!-- Zweihander - For Apprentice Adventurer -->
+		<item id="80690" count="1" equipped="true" /> <!-- Durable Leather Helmet - Apprentice Adventurer -->
+		<item id="80691" count="1" equipped="true" /> <!-- Bronze Breastplate - Apprentice Adventurer -->
+		<item id="80692" count="1" equipped="true" /> <!-- Bronze Gaiters - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
-		<item id="2368" count="1" /> <!-- Training Gloves -->
+		<item id="80688" count="1" /> <!-- Viper Fang - Apprentice Adventurer -->
 	</equipment>
 	<!-- Orc Mystic -->
 	<!-- NOTE: This is orc_mage (orc_shaman is retail typo) -->
 	<equipment classId="49">
-		<item id="2368" count="1" equipped="true" /> <!-- Training Gloves -->
-		<item id="425" count="1" equipped="true" /> <!-- Apprentice's Tunic -->
-		<item id="461" count="1" equipped="true" /> <!-- Apprentice's Stockings -->
+		<item id="80686" count="1" equipped="true" /> <!-- Mage Staff - For Apprentice Adventurer -->
+		<item id="80695" count="1" equipped="true" /> <!-- Leather Helmet - Apprentice Adventurer -->
+		<item id="80696" count="1" equipped="true" /> <!-- Tunic of Devotion - Apprentice Adventurer -->
+		<item id="80697" count="1" equipped="true" /> <!-- Stockings of Devotion - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
+		<item id="80689" count="1" /> <!-- Flanged Mace - For Apprentice Adventurer -->
 	</equipment>
 	<!-- Dwarf Fighter -->
 	<equipment classId="53">
-		<item id="2370" count="1" equipped="true" /> <!-- Guild Member's Club -->
-		<item id="10" count="1" /> <!-- Dagger -->
-		<item id="1146" count="1" equipped="true" /> <!-- Squire's Shirt -->
-		<item id="1147" count="1" equipped="true" /> <!-- Squire's Pants -->
+		<item id="80689" count="1" equipped="true" /> <!-- Flanged Mace - Apprentice Adventurer -->
+		<item id="80690" count="1" equipped="true" /> <!-- Durable Leather Helmet - Apprentice Adventurer -->
+		<item id="80691" count="1" equipped="true" /> <!-- Bronze Breastplate - Apprentice Adventurer -->
+		<item id="80692" count="1" equipped="true" /> <!-- Bronze Gaiters - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
+		<item id="80683" count="1" /> <!-- Sword Breaker - For Apprentice Adventurer -->
 	</equipment>
 	<!-- Male Kamael Soldier -->
 	<equipment classId="123">
-		<item id="2369" count="1" equipped="true" /> <!-- Squire's Sword -->
-		<item id="1146" count="1" equipped="true" /> <!-- Squire's Shirt -->
-		<item id="1147" count="1" equipped="true" /> <!-- Squire's Pants -->
+		<item id="80684" count="1" equipped="true" /> <!-- Falchion - For Apprentice Adventurer -->
+		<item id="80690" count="1" equipped="true" /> <!-- Durable Leather Helmet - Apprentice Adventurer -->
+		<item id="80691" count="1" equipped="true" /> <!-- Bronze Breastplate - Apprentice Adventurer -->
+		<item id="80692" count="1" equipped="true" /> <!-- Bronze Gaiters - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
-		<item id="10" count="1" /> <!-- Dagger -->
+		<item id="80683" count="1" /> <!-- Sword Breaker - For Apprentice Adventurer -->
 	</equipment>
 	<!-- Female Kamael Soldier -->
 	<equipment classId="124">
-		<item id="2369" count="1" equipped="true" /> <!-- Squire's Sword -->
-		<item id="1146" count="1" equipped="true" /> <!-- Squire's Shirt -->
-		<item id="1147" count="1" equipped="true" /> <!-- Squire's Pants -->
+		<item id="80684" count="1" equipped="true" /> <!-- Falchion - For Apprentice Adventurer -->
+		<item id="80690" count="1" equipped="true" /> <!-- Durable Leather Helmet - Apprentice Adventurer -->
+		<item id="80691" count="1" equipped="true" /> <!-- Bronze Breastplate - Apprentice Adventurer -->
+		<item id="80692" count="1" equipped="true" /> <!-- Bronze Gaiters - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
-		<item id="10" count="1" /> <!-- Dagger -->
+		<item id="80686" count="1" /> <!-- Mage Staff - For Apprentice Adventurer -->
 	</equipment>
 	<!-- Ertheia Fighter -->
 	<equipment classId="182">
-		<item id="2368" count="1" equipped="true" /> <!-- Training Gloves -->
-		<item id="1146" count="1" equipped="true" /> <!-- Squire's Shirt -->
-		<item id="1147" count="1" equipped="true" /> <!-- Squire's Pants -->
+		<item id="80688" count="1" equipped="true" /> <!-- Viper Fang - Apprentice Adventurer -->
+		<item id="80690" count="1" equipped="true" /> <!-- Durable Leather Helmet - Apprentice Adventurer -->
+		<item id="80691" count="1" equipped="true" /> <!-- Bronze Breastplate - Apprentice Adventurer -->
+		<item id="80692" count="1" equipped="true" /> <!-- Bronze Gaiters - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="40195" count="10" /> <!-- Scroll of Escape: Faeron Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
 	</equipment>
 	<!-- Ertheia Wizard -->
 	<equipment classId="183">
-		<item id="40061" count="1" equipped="true" /> <!-- Apprentice's Staff -->
-		<item id="425" count="1" equipped="true" /> <!-- Apprentice's Tunic -->
-		<item id="461" count="1" equipped="true" /> <!-- Apprentice's Stockings -->
+		<item id="80686" count="1" equipped="true" /> <!-- Mage Staff - For Apprentice Adventurer -->
+		<item id="80695" count="1" equipped="true" /> <!-- Leather Helmet - Apprentice Adventurer -->
+		<item id="80696" count="1" equipped="true" /> <!-- Tunic of Devotion - Apprentice Adventurer -->
+		<item id="80697" count="1" equipped="true" /> <!-- Stockings of Devotion - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="40195" count="10" /> <!-- Scroll of Escape: Faeron Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
 	</equipment>
 	<!-- Death Soldier -->
 	<equipment classId="212">
-		<item id="2369" count="1" equipped="true" /> <!-- Squire's Sword -->
-		<item id="1146" count="1" equipped="true" /> <!-- Squire's Shirt -->
-		<item id="1147" count="1" equipped="true" /> <!-- Squire's Pants -->
+		<item id="80684" count="1" equipped="true" /> <!-- Falchion - For Apprentice Adventurer -->
+		<item id="80690" count="1" equipped="true" /> <!-- Durable Leather Helmet - Apprentice Adventurer -->
+		<item id="80691" count="1" equipped="true" /> <!-- Bronze Breastplate - Apprentice Adventurer -->
+		<item id="80692" count="1" equipped="true" /> <!-- Bronze Gaiters - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
-		<item id="10" count="1" /> <!-- Dagger -->
 	</equipment>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/46200-46299.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/46200-46299.xml
index ff5d3488b8..8e79aebdbe 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/46200-46299.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/46200-46299.xml
@@ -796,14 +796,19 @@
 	<item id="46254" name="Dandy's Golden Ball" type="EtcItem">
 		<!-- For 1 h., acquired XP/ SP +100%. Changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or Nevit's Hourglass. -->
 		<set name="icon" val="BranchIcon.icon.g_ev_goldenball" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_stackable" val="true" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="is_freightable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="18471" level="1" /> <!-- Dandy's Golden Ball -->
+		</skills>
 	</item>
 	<item id="46255" name="Halloween Outfit" type="EtcItem">
 		<!-- Changes the appearance of upper armor into that of a Halloween Outfit. Works on one-pieces too. -->
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/60300-60399.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/60300-60399.xml
index dcf100a62e..e1efbbf377 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/60300-60399.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/60300-60399.xml
@@ -333,6 +333,7 @@
 		<set name="material" val="LIQUID" />
 		<set name="weight" val="10" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60320" name="Forgotten Lord's Shining Crystal of Dyes" type="EtcItem">
 		<!-- Required for creating Forgotten Lord's dyes. Can be compounded with a dye of Lv. 7+. In case of failure, the dye does not disappear, but its level drops to 7. -->
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/60400-60499.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/60400-60499.xml
index 53be6d57ac..2d8a8f2b1a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/60400-60499.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/60400-60499.xml
@@ -1141,9 +1141,18 @@
 		<set name="icon" val="icon.bm_dragon_posion_special" />
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="material" val="LIQUID" />
 		<set name="weight" val="1" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="is_event_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="reuse_delay" val="300000" />
+		<skills>
+			<skill id="39205" level="2" /> <!-- Glowing Dragon's Attribute Potion -->
+		</skills>
 	</item>
 	<item id="60460" name="Shining Royal Nevit's Gold Hourglass" type="EtcItem">
 		<!-- During hunting, for 30 min., acquired XP/ SP +120%, damage +5%, received damage -7%. Cannot stack with the Shining Nevit's Gold Hourglass, Fall of the Dragon, or Dandy's Home Run Ball. The effect is removed after entering the Olympiad or the Ceremony of Chaos. Cooldown: 10 sec. -->
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/80500-80599.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/80500-80599.xml
index 2b8268c102..6110fbbb40 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/80500-80599.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/80500-80599.xml
@@ -382,6 +382,13 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="time" val="360" />
+		<skills>
+			<skill id="35363" level="1" /> <!-- Freya's Bloody Rune -->
+		</skills>
 	</item>
 	<item id="80544" name="Snow's Plea for Help - Altar of Evil" type="EtcItem">
 		<!-- A purifying mission requested by Snow for the 15th Anniversary. Snow wishes to celebrate the 15th Anniversary of Lineage by eradicating monsters in the Altar of Evil and Bloody Swampland. Characters of level 85-95 can receive the request by double-clicking the item. Can be played once a day. -->
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/80800-80899.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/80800-80899.xml
index 3068db50e9..e95e5baf00 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/80800-80899.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/80800-80899.xml
@@ -242,6 +242,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<skills>
+			<skill id="39520" level="1" /> <!-- Emperor's Special Cocktail -->
 			<skill id="39766" level="1" /> <!-- Musician's Melody - Emperor's Special Cocktail -->
 			<skill id="39771" level="1" /> <!-- Drum Concert - Emperor's Special Cocktail -->
 			<skill id="39772" level="1" /> <!-- United Resistance - Emperor's Special Cocktail -->
@@ -263,6 +264,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<skills>
+			<skill id="39520" level="2" /> <!-- Emperor's Special Cocktail -->
 			<skill id="39766" level="2" /> <!-- Musician's Melody - Emperor's Special Cocktail -->
 			<skill id="39771" level="2" /> <!-- Drum Concert - Emperor's Special Cocktail -->
 			<skill id="39772" level="2" /> <!-- United Resistance - Emperor's Special Cocktail -->
@@ -284,6 +286,7 @@
 		<set name="is_freightable" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<skills>
+			<skill id="39520" level="3" /> <!-- Emperor's Special Cocktail -->
 			<skill id="39766" level="3" /> <!-- Musician's Melody - Emperor's Special Cocktail -->
 			<skill id="39771" level="3" /> <!-- Drum Concert - Emperor's Special Cocktail -->
 			<skill id="39772" level="3" /> <!-- United Resistance - Emperor's Special Cocktail -->
@@ -299,6 +302,7 @@
 		<set name="reuse_delay" val="300000" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
@@ -307,6 +311,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<skills>
+			<skill id="39521" level="1" /> <!-- PA Emperor's Special Cocktail -->
 			<skill id="39766" level="1" /> <!-- Musician's Melody - Emperor's Special Cocktail -->
 			<skill id="39771" level="1" /> <!-- Drum Concert - Emperor's Special Cocktail -->
 			<skill id="39772" level="1" /> <!-- United Resistance - Emperor's Special Cocktail -->
@@ -323,7 +328,24 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="reuse_delay" val="1000" />
+		<set name="shared_reuse_group" val="7" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ELIXIR" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<cond addName="1" msgId="113">
+			<player instanceId="224,225,226,227" />
+		</cond>
+		<skills>
+			<skill id="9545" level="1" /> <!-- Horn Melody - Chaos Arena -->
+			<skill id="9546" level="1" /> <!-- Drum Melody - Chaos Arena -->
+			<skill id="9547" level="1" /> <!-- Pipe Organ Melody - Chaos Arena -->
+			<skill id="9548" level="1" /> <!-- Guitar Melody - Chaos Arena -->
+			<skill id="39515" level="1" /> <!-- Fantasia Harmony - Chaos Arena -->
+		</skills>
 	</item>
 	<item id="80822" name="Elixir of Harmony" type="EtcItem">
 		<!-- For 30 minutes, provides the effect of Fantasia Harmony. Can be used only by characters above level 85. Cooldown is 2 min. -->
@@ -439,25 +461,21 @@
 		<set name="reuse_delay" val="300000" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="reuse_delay" val="300000" />
 		<set name="is_oly_restricted" val="true" />
 		<set name="is_event_restricted" val="true" />
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<skills>
-			<skill id="39407" level="1" /> <!-- Horn Melody - Emperor's Special Cocktail -->
-			<skill id="39408" level="1" /> <!-- Drum Melody - Emperor's Special Cocktail -->
-			<skill id="39409" level="1" /> <!-- Pipe Organ Melody - Emperor's Special Cocktail -->
-			<skill id="39410" level="1" /> <!-- Guitar Melody - Emperor's Special Cocktail -->
-			<skill id="39414" level="1" /> <!-- War Drum - Emperor's Special Cocktail -->
-			<skill id="39415" level="1" /> <!-- Marching Drum - Emperor's Special Cocktail -->
-			<skill id="39416" level="1" /> <!-- Soothing Drum - Emperor's Special Cocktail -->
-			<skill id="39413" level="1" /> <!-- Mental Attack Resistance - Emperor's Special Cocktail -->
-			<skill id="39412" level="1" /> <!-- Resistance Debuff - Emperor's Special Cocktail -->
-			<skill id="39411" level="1" /> <!-- Elemental Resistance - Emperor's Special Cocktail -->
+			<skill id="39520" level="1" /> <!-- Emperor's Special Cocktail -->
 			<skill id="39514" level="1" /> <!-- Fantasia Harmony - Emperor's Special Cocktail -->
 			<skill id="39517" level="1" /> <!-- Fantasia Melody - Emperor's Special Cocktail -->
+			<skill id="39766" level="1" /> <!-- Musician's Melody - Emperor's Special Cocktail -->
+			<skill id="39771" level="1" /> <!-- Drum Concert - Emperor's Special Cocktail -->
+			<skill id="39772" level="1" /> <!-- United Resistance - Emperor's Special Cocktail -->
 		</skills>
 	</item>
 	<item id="80833" name="Golden Pig's Medium Vitality Tonic" type="EtcItem">
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/81000-81099.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/81000-81099.xml
index 28915b98b4..e9c419601f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/81000-81099.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/81000-81099.xml
@@ -260,8 +260,15 @@
 		<!-- Changes the armor appearance to that of Red Archer Garment for 24 h. -->
 		<set name="icon" val="icon.dragon_dye_i01" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_stackable" val="true" />
+		<set name="is_sellable" val="false" />
+		<set name="handler" val="ItemSkills" />
+		<set name="etcitem_type" val="POTION" />
+		<skills>
+			<skill id="39580" level="1" /> <!-- Pink's Style Potion - Red Archer -->
+		</skills>
 	</item>
 	<item id="81017" name="Pink's Style Potion - Green Archer" type="EtcItem">
 		<!-- Changes the armor appearance to that of Green Archer Garment for 24 h. -->
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/81600-81699.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/81600-81699.xml
index 3ba6915fd6..abf2b89c3e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/81600-81699.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/81600-81699.xml
@@ -1080,6 +1080,28 @@
 		<set name="material" val="LEATHER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="is_commissionable" val="false" />
+		<set name="handler" val="ExtractableItems" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<capsuled_items>
+			<item id="29458" min="1" max="1" chance="6.25" /> <!-- Greater Cat's Eye Lv. 5 -->
+			<item id="29462" min="1" max="1" chance="6.25" /> <!-- Greater Amethyst Lv. 5 -->
+			<item id="48770" min="1" max="1" chance="6.25" /> <!-- Greater Topaz Lv. 5 -->
+			<item id="48774" min="1" max="1" chance="6.25" /> <!-- Greater Ruby Lv. 5 -->
+			<item id="48778" min="1" max="1" chance="6.25" /> <!-- Greater Sapphire Lv. 5 -->
+			<item id="48782" min="1" max="1" chance="6.25" /> <!-- Greater Obsidian Lv. 5 -->
+			<item id="48786" min="1" max="1" chance="6.25" /> <!-- Greater Opal Lv. 5 -->
+			<item id="48790" min="1" max="1" chance="6.25" /> <!-- Greater Emerald Lv. 5 -->
+			<item id="48794" min="1" max="1" chance="6.25" /> <!-- Greater Aquamarine Lv. 5 -->
+			<item id="48798" min="1" max="1" chance="6.25" /> <!-- Greater Diamond Lv. 5 -->
+			<item id="48802" min="1" max="1" chance="6.25" /> <!-- Greater Pearl Lv. 5 -->
+			<item id="48806" min="1" max="1" chance="6.25" /> <!-- Greater Vital Stone Lv. 5 -->
+			<item id="48810" min="1" max="1" chance="6.25" /> <!-- Greater Garnet Lv. 5 -->
+			<item id="48814" min="1" max="1" chance="6.25" /> <!-- Greater Tanzanite Lv. 5 -->
+			<item id="48818" min="1" max="1" chance="6.25" /> <!-- Greater Red Cat's Eye Lv. 5 -->
+			<item id="48822" min="1" max="1" chance="6.25" /> <!-- Greater Blue Cat's Eye Lv. 5 -->
+		</capsuled_items>
 	</item>
 	<item id="81673" name="Essence of Time" type="EtcItem">
 		<!-- Concentrated energy of time. When used, decreases time of homunculus creation for 1 h. -->
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/82100-82199.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/82100-82199.xml
index 23da2a68c5..e9b6b73bbd 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/82100-82199.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/82100-82199.xml
@@ -827,34 +827,63 @@
 	<item id="82164" name="Collection Item Box - All as One" additionalName="Event" type="EtcItem">
 		<!-- Double-click to obtain Orb of Abyss Lv. 1, Orb of Abyss Lv. 3, Orb of Abyss Lv. 7 (1 of each). -->
 		<set name="icon" val="icon.event_six_party_box_i00" />
-		<set name="default_action" val="PEEL" />
+		<set name="default_action" val="CAPSULE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="81848" min="1" max="1" chance="100" /> <!-- Orb of Abyss Lv. 1 -->
+			<item id="81850" min="1" max="1" chance="100" /> <!-- Orb of Abyss Lv. 3 -->
+			<item id="81854" min="1" max="1" chance="100" /> <!-- Orb of Abyss Lv. 7 -->
+		</capsuled_items>
 	</item>
 	<item id="82165" name="Collection Item Box - Last Chance!" additionalName="Event" type="EtcItem">
 		<!-- Double-click to obtain Orb of Darkness Lv. 2, Orb of Darkness Lv. 3, Orb of Darkness Lv. 6, Orb of Darkness Lv. 7 (1 of each). -->
 		<set name="icon" val="icon.event_six_party_box_i00" />
-		<set name="default_action" val="PEEL" />
+		<set name="default_action" val="CAPSULE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="81860" min="1" max="1" chance="100" /> <!-- Orb of Darkness Lv. 2 -->
+			<item id="81861" min="1" max="1" chance="100" /> <!-- Orb of Darkness Lv. 3 -->
+			<item id="81864" min="1" max="1" chance="100" /> <!-- Orb of Darkness Lv. 6 -->
+			<item id="81865" min="1" max="1" chance="100" /> <!-- Orb of Darkness Lv. 7 -->
+		</capsuled_items>
 	</item>
 	<item id="82166" name="Collection Item Box - Adventurer" additionalName="Event" type="EtcItem">
 		<!-- Double-click to obtain Orb of Bloody Soul Lv. 3, Orb of Bloody Soul Lv. 5, Orb of Bloody Soul Lv. 8, Orb of Bloody Soul Lv. 10 (1 of each). -->
 		<set name="icon" val="icon.event_six_party_box_i00" />
-		<set name="default_action" val="PEEL" />
+		<set name="default_action" val="CAPSULE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="81839" min="1" max="1" chance="100" /> <!-- Orb of Bloody Soul Lv. 3 -->
+			<item id="81841" min="1" max="1" chance="100" /> <!-- Orb of Bloody Soul Lv. 5 -->
+			<item id="81844" min="1" max="1" chance="100" /> <!-- Orb of Bloody Soul Lv. 8 -->
+			<item id="81846" min="1" max="1" chance="100" /> <!-- Orb of Bloody Soul Lv. 10 -->
+		</capsuled_items>
 	</item>
 	<item id="82167" name="Collection Item Box - Empiric" additionalName="Event" type="EtcItem">
 		<!-- Double-click to obtain Orb of Bloody Soul Lv. 8, Orb of Bloody Soul Lv. 9 (1 of each). -->
 		<set name="icon" val="icon.event_six_party_box_i00" />
-		<set name="default_action" val="PEEL" />
+		<set name="default_action" val="CAPSULE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="81844" min="1" max="1" chance="100" /> <!-- Orb of Bloody Soul Lv. 8 -->
+			<item id="81845" min="1" max="1" chance="100" /> <!-- Orb of Bloody Soul Lv. 9 -->
+		</capsuled_items>
 	</item>
 	<item id="82168" name="Sayha's Blessing Potion" type="EtcItem">
 		<!-- For 30 min., Attribute Attack/ Resistance +70, acquired XP/ SP +30%. Cooldown: 5 min. The effect remains after death. Cannot be used in the Olympiad. -->
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/82200-82299.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/82200-82299.xml
index 5216370340..31394d9ec0 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/82200-82299.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/items/82200-82299.xml
@@ -1443,7 +1443,7 @@
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ExtractableItems" />
 		<capsuled_items>
-			<item id="82288" min="1" max="1" chance="100" /> <!-- Tersi's Soul Crystal Pack -->
+			<item id="82288" min="100" max="100" chance="100" /> <!-- Tersi's Soul Crystal Pack -->
 			<item id="82289" min="1" max="1" chance="100" /> <!-- Tersi's Seal -->
 		</capsuled_items>
 	</item>
@@ -1458,7 +1458,7 @@
 		<set name="handler" val="ExtractableItems" />
 		<capsuled_items>
 			<item id="82265" min="1" max="1" chance="100" /> <!-- Tersi's Soul Crystal Lv. 1 - Armor -->
-			<item id="82275" min="1" max="1" chance="100" /> <!-- Tersi's Soul -->
+			<item id="82275" min="10" max="10" chance="100" /> <!-- Tersi's Soul -->
 		</capsuled_items>
 	</item>
 	<item id="82289" name="Tersi's Seal" type="EtcItem">
@@ -1638,8 +1638,15 @@
 		<set name="icon" val="icon.bless_scroll" />
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="reuse_delay" val="300000" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39794" level="1" /> <!-- Freya's Scroll of Blessing -->
+		</skills>
 	</item>
 	<item id="82296" name="Artifact - Received Damage" additionalName="Balance" type="Armor">
 		<!-- An artifact that decreases received damage. Can be equipped in a balance artifact slot. Received damage -11%, when in the slot. Cannot be upgraded. -->
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/npcs/33900-33999.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/npcs/33900-33999.xml
index 93b9b554c6..1b1267553b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/npcs/33900-33999.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/npcs/33900-33999.xml
@@ -3776,9 +3776,9 @@
 		<equipment rhand="36218" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234.06312688557" hpRegen="8.5" mp="1846.8" mpRegen="3" />
-			<attack physical="13000" magical="811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="430" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="1085.36442" magical="264.74086" />
+			<vitals hp="42340.06312688557" hpRegen="8.5" mp="18046.8" mpRegen="3" />
+			<attack physical="25000" magical="2811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="430" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="10085.36442" magical="2064.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
@@ -3789,7 +3789,7 @@
 			</attribute>
 			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" undying="true" />
+		<status attackable="false" talkable="false" undying="true" />
 		<skillList>
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/npcs/34000-34099.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/npcs/34000-34099.xml
index b1a1c0cad9..1b5ff21899 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/npcs/34000-34099.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/npcs/34000-34099.xml
@@ -39,7 +39,7 @@
 			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
 		</skillList>
 	</npc>
-	<npc id="34001" level="85" type="Folk" name="Ferin">
+	<npc id="34001" level="85" type="FriendlyNpc" name="Ferin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>FRIEND</race>
 		<sex>FEMALE</sex>
@@ -58,7 +58,7 @@
 			</attribute>
 			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" undying="true" />
+		<status attackable="false" talkable="false" undying="true" />
 		<collision>
 			<radius normal="8" />
 			<height normal="16" />
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/10500-10599.xml
index 15d33a8d90..97666cb586 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/10500-10599.xml
@@ -848,6 +848,8 @@
 					<value level="11">9832</value>
 					<value level="12">10268</value>
 					<value level="13">10704</value>
+					<value level="14">10704</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="15">10704</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 				</abnormalPower>
 				<chanceBoost>365</chanceBoost>
 				<overHit>true</overHit>
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/16300-16399.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/16300-16399.xml
index b5851bf6f4..895cd4a965 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/16300-16399.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/16300-16399.xml
@@ -801,6 +801,22 @@
 		<reuseDelay>5000</reuseDelay>
 		<effectPoint>-150</effectPoint>
 		<isDebuff>true</isDebuff>
+		<activateRate>80</activateRate>
+		<affectRange>900</affectRange>
+		<basicProperty>PHYSICAL</basicProperty>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<trait>PULL</trait>
+		<effects>
+			<effect name="AirBind" />
+			<effect name="Bluff">
+				<chance>100</chance>
+			</effect>
+			<effect name="PullBack">
+				<speed>600</speed>
+				<delay>600</delay>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="16388" toLevel="1" name="Kain's Wrath">
 		<!-- Consumed by vengeful fury toward all who harm Giselle. -->
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/18400-18499.xml
index af1f979d70..fa7edfd0a5 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/18400-18499.xml
@@ -885,8 +885,30 @@
 		<!-- For 1 h., acquired XP/ SP +100%, recovers Vitality to the maximum. Changes the appearance of your armor into that of an NC Dinos Uniform. Cannot be stacked with the Fall of the Dragon or Nevit's Hourglass. -->
 		<icon>BranchIcon.icon.g_ev_goldenball</icon>
 		<operateType>A2</operateType>
+		<effectPoint>1</effectPoint>
+		<abnormalType>CHANGEBODY</abnormalType>
+		<abnormalVisualEffect>CHANGE_DINOS</abnormalVisualEffect>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>46254</itemConsumeId> <!-- Dandy's Home Run Ball -->
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>-3</magicLevel>
+		<abnormalLevel>2</abnormalLevel>
+		<abnormalTime>3600</abnormalTime>
 		<reuseDelay>15000</reuseDelay>
+		<irreplacableBuff>true</irreplacableBuff>
+		<stayAfterDeath>true</stayAfterDeath>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="ExpModify">
+				<amount>100</amount>
+			</effect>
+			<effect name="SpModify">
+				<amount>100</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18472" toLevel="6" name="Giveaway Number 1">
 		<icon>icon.skill0000</icon>
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/18500-18599.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/18500-18599.xml
index 14625d6c75..5b4e7c35a5 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/18500-18599.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/18500-18599.xml
@@ -803,10 +803,12 @@
 		<abnormalType>
 			<value level="1">SKILL_IGNORE</value>
 			<value level="2">ABNORMAL_INVINCIBILITY</value>
+			<value level="3">ABNORMAL_INVINCIBILITY</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalType>
 		<abnormalLevel>
 			<value level="1">2</value>
 			<value level="2">3</value>
+			<value level="3">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalLevel>
 		<abnormalTime>7</abnormalTime>
 		<hitTime>1000</hitTime>
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/22500-22599.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/22500-22599.xml
index 139da35b33..feaa2c9ed4 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/22500-22599.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/22500-22599.xml
@@ -1578,7 +1578,7 @@
 		<itemConsumeId>
 			<value level="1">22883</value>
 			<value level="2">22884</value>
-			<value level="2">22885</value>
+			<value level="3">22885</value>
 		</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<reuseDelay>3600000</reuseDelay>
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/22700-22799.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/22700-22799.xml
index b219397603..e40e6c3a34 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/22700-22799.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/22700-22799.xml
@@ -297,7 +297,7 @@
 		<itemConsumeId>
 			<value level="1">23338</value>
 			<value level="2">23339</value>
-			<value level="2">23340</value>
+			<value level="3">23340</value>
 		</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<reuseDelay>3600000</reuseDelay>
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/27500-27599.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/27500-27599.xml
index 72ef52b94f..ebd44c864c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/27500-27599.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/27500-27599.xml
@@ -2735,10 +2735,12 @@
 		<abnormalType>
 			<value level="1">SKILL_IGNORE</value>
 			<value level="2">ABNORMAL_INVINCIBILITY</value>
+			<value level="3">ABNORMAL_INVINCIBILITY</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalType>
 		<abnormalLevel>
 			<value level="1">2</value>
 			<value level="2">3</value>
+			<value level="3">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalLevel>
 		<abnormalTime>7</abnormalTime>
 		<hitTime>1000</hitTime>
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/30000-30099.xml
index 02f17315cd..843cab2df2 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/30000-30099.xml
@@ -2036,8 +2036,8 @@
 		<operateType>P</operateType>
 		<magicLevel>85</magicLevel>
 		<effects>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>350</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/30700-30799.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/30700-30799.xml
index 13dc5353c3..9717166a85 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/30700-30799.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/30700-30799.xml
@@ -3207,6 +3207,7 @@
 			<value level="2">90</value>
 			<value level="3">95</value>
 			<value level="4">110</value>
+			<value level="5">110</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</magicLevel>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/30800-30899.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/30800-30899.xml
index 2ec2f4ab16..ba718db119 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/30800-30899.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/30800-30899.xml
@@ -2269,7 +2269,7 @@
 		<abnormalVisualEffect>H_DEBUFF_SELF_B_AVE</abnormalVisualEffect>
 		<magicLevel>
 			<value level="1">110</value>
-			<value level="1">115</value>
+			<value level="2">115</value>
 		</magicLevel>
 		<magicCriticalRate>5</magicCriticalRate>
 		<operateType>AU</operateType>
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39100-39199.xml
index 285eebd5e9..18fc22ef68 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39100-39199.xml
@@ -52,12 +52,14 @@
 			<value level="2">2</value>
 			<value level="3">3</value>
 			<value level="4">4</value>
+			<value level="5">5</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalLevel>
 		<abnormalTime>
 			<value level="1">3600</value>
 			<value level="2">7200</value>
 			<value level="3">21600</value>
 			<value level="4">28800</value>
+			<value level="5">28800</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalTime>
 		<abnormalType>CHANGEBODY</abnormalType>
 		<abnormalVisualEffect>CHANGESHAPE_TRANSFORM</abnormalVisualEffect>
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39200-39299.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39200-39299.xml
index a11be52fb3..18a206f7a2 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39200-39299.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39200-39299.xml
@@ -46,6 +46,7 @@
 		<icon>icon.bm_dragon_posion_special</icon>
 		<operateType>A2</operateType>
 		<isMagic>2</isMagic>
+		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>300000</reuseDelay>
 		<abnormalType>GLOWING_DRAGON_POTION</abnormalType>
@@ -115,8 +116,10 @@
 				</amount>
 			</effect>
 			<effect name="SpModify">
-				<value level="1">30</value>
-				<value level="2">50</value>
+				<amount>
+					<value level="1">30</value>
+					<value level="2">50</value>
+				</amount>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39400-39499.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39400-39499.xml
index 36f6cb53b1..3903492b0b 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39400-39499.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39400-39499.xml
@@ -2091,6 +2091,7 @@
 		</effects>
 	</skill>
 	<skill id="39494" toLevel="1" name="Dye Powder">
+		<!-- Powder for replenishing the Dye Engraving scale. Restores 25% of the full scale. -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -2100,6 +2101,11 @@
 		<itemConsumeCount>1</itemConsumeCount>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="CanUseSymbolSealIncreaseItem">
+				<amount>25</amount> <!-- 25% from max symbol seal points -->
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="RestoreSymbolSeal">
 				<amount>25</amount>
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39500-39599.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39500-39599.xml
index f7c6007df1..0906121380 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39500-39599.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39500-39599.xml
@@ -170,6 +170,8 @@
 		<stayAfterDeath>true</stayAfterDeath>
 		<irreplacableBuff>true</irreplacableBuff>
 		<blockedInOlympiad>true</blockedInOlympiad>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<canDoubleCast>false</canDoubleCast>
 		<effects>
 			<effect name="PAtk">
 				<amount>25</amount>
@@ -232,6 +234,26 @@
 				<mode>PER</mode>
 				<magicType>1</magicType>
 			</effect>
+			<effect name="MagicMpCost">
+				<amount>-15</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-15</amount>
+				<mode>PER</mode>
+				<magicType>3</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-15</amount>
+				<mode>PER</mode>
+				<magicType>2</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-15</amount>
+				<mode>PER</mode>
+				<magicType>22</magicType>
+			</effect>
 			<effect name="AttackAttributeAdd">
 				<amount>100</amount>
 				<mode>DIFF</mode>
@@ -252,7 +274,7 @@
 				<magicType>22</magicType>
 			</effect>
 			<effect name="DispelBySlotProbability">
-				<dispel>MULTI_BUFF;DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;INSTINCT;BERSERKER;PA_PD_UP;IMPROVE_SHIELD_RATE_DEFENCE_UP;SHIELD_PROB_UP;SHIELD_DEFENCE_UP;CANCEL_PROB_DOWN;MA_UP_SPECIAL</dispel>
+				<dispel>MULTI_BUFF;DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;INSTINCT;BERSERKER;PA_PD_UP;IMPROVE_SHIELD_RATE_DEFENCE_UP;SHIELD_PROB_UP;SHIELD_DEFENCE_UP;CANCEL_PROB_DOWN;MA_UP_SPECIAL;BUFF_SPECIAL_CLASS</dispel>
 				<rate>100</rate>
 			</effect>
 			<effect name="BlockAbnormalSlot">
@@ -265,8 +287,113 @@
 		<icon>icon.soul_spirit1</icon>
 		<operateType>A2</operateType>
 		<hitTime>100</hitTime>
-		<reuseDelay>2000</reuseDelay>
 		<effectPoint>100</effectPoint>
+		<abnormalType>BUFF_SPECIAL_CLASS</abnormalType>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>85</magicLevel>
+		<abnormalLevel>1</abnormalLevel>
+		<abnormalTime>420</abnormalTime>
+		<isMagic>2</isMagic>
+		<reuseDelay>2000</reuseDelay>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PAtk">
+				<amount>22</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>40</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>45</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>15</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="CriticalRate">
+				<amount>100</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicCriticalRate">
+				<amount>100</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="CriticalDamage">
+				<amount>70</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalAttackSpeed">
+				<amount>15</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="ShieldDefence">
+				<amount>50</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="ShieldDefenceRate">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-15</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-15</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-15</amount>
+				<mode>PER</mode>
+				<magicType>3</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-15</amount>
+				<mode>PER</mode>
+				<magicType>2</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-15</amount>
+				<mode>PER</mode>
+				<magicType>22</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-20</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-20</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-20</amount>
+				<mode>PER</mode>
+				<magicType>22</magicType>
+			</effect>
+			<effect name="DisableSkill">
+				<disable>30833</disable>
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<dispel>MULTI_BUFF;DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;INSTINCT;BERSERKER;PA_PD_UP;IMPROVE_SHIELD_RATE_DEFENCE_UP;SHIELD_PROB_UP;SHIELD_DEFENCE_UP;CANCEL_PROB_DOWN;MA_UP_SPECIAL;BUFF_SPECIAL_CLASS</dispel>
+				<rate>100</rate>
+			</effect>
+			<effect name="BlockAbnormalSlot">
+				<slot>MULTI_BUFF;DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;INSTINCT;BERSERKER;PA_PD_UP;IMPROVE_SHIELD_RATE_DEFENCE_UP;SHIELD_PROB_UP;SHIELD_DEFENCE_UP;CANCEL_PROB_DOWN;MA_UP_SPECIAL;BUFF_SPECIAL_CLASS</slot>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39516" toLevel="1" name="Elixir of Harmony">
 		<!-- For 30 min., P. Atk. +22%, M. Atk. +40%, P. Def. +45%, M. Def. +15%, P./ M. Critical Rate +100%, Critical Damage for basic attacks +70%, Atk. Spd. +10%, Casting Spd. +15%, Shield Defense Rate +30 min.0, Shield Defense +30 min.1, Skill Cooldown -30 min.2, Skill MP Consumption -30 min.3. PA only. -->
@@ -298,6 +425,8 @@
 		<stayAfterDeath>true</stayAfterDeath>
 		<irreplacableBuff>true</irreplacableBuff>
 		<blockedInOlympiad>true</blockedInOlympiad>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<canDoubleCast>false</canDoubleCast>
 		<effects>
 			<effect name="AttackAttributeAdd">
 				<amount>10</amount>
@@ -357,19 +486,81 @@
 	<skill id="39520" toLevel="3" name="Emperor's Special Cocktail">
 		<!-- For 60 min., applies the following effects: Musician's Melody Lv. 5, Fantasia Harmony Lv. 2, Drum Concert, Fantasia Melody, United Resistance. To remove the effect, press Alt + Mouse Left Click. -->
 		<icon>icon.bm_special_cocktail_of_king_p</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalTime>
+			<value level="1">3600</value>
+			<value level="2">14400</value>
+			<value level="3">28800</value>
+		</abnormalTime>
+		<effectPoint>1</effectPoint>
+		<basicProperty>NONE</basicProperty>
+		<abnormalLevel>7</abnormalLevel>
+		<specialLevel>-2</specialLevel>
+		<magicLevel>-2</magicLevel>
+		<isMagic>2</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<stayAfterDeath>true</stayAfterDeath>
+		<irreplacableBuff>true</irreplacableBuff>
+		<blockedInOlympiad>true</blockedInOlympiad>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<canDoubleCast>false</canDoubleCast>
 		<reuseDelay>5000</reuseDelay>
+		<effects>
+			<effect name="DispelBySlotProbability">
+				<dispel>BUFF_SPECIAL_CLASS;DITTY;BUFF_SPECIAL_ATTACK;BUFF_SPECIAL_AURA;ARMOR_ELEMENT_ALL</dispel>
+				<rate>100</rate>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39514</skillId> <!-- Fantasia Harmony - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39517</skillId> <!-- Fantasia Melody - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39766</skillId> <!-- Musician's Melody - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39771</skillId> <!-- Drum Concert - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39772</skillId> <!-- United Resistance - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</effects>
+		<endEffects>
+			<effect name="DispelBySlotProbability">
+				<dispel>BUFF_SPECIAL_CLASS;DITTY;BUFF_SPECIAL_ATTACK;BUFF_SPECIAL_AURA;ARMOR_ELEMENT_ALL</dispel>
+				<rate>100</rate>
+			</effect>
+		</endEffects>
 	</skill>
 	<skill id="39521" toLevel="1" name="PA Emperor's Special Cocktail">
 		<!-- For 60 min., applies the following effects: Musician's Melody Lv. 5, Fantasia Harmony Lv. 2, Drum Concert, Fantasia Melody, United Resistance. To remove the effect, press Alt + Mouse Left Click. -->
 		<icon>icon.bm_special_cocktail_of_king_p</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalTime>3600</abnormalTime>
+		<effectPoint>1</effectPoint>
+		<basicProperty>NONE</basicProperty>
+		<abnormalLevel>7</abnormalLevel>
+		<specialLevel>-2</specialLevel>
+		<magicLevel>-2</magicLevel>
+		<isMagic>22</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<stayAfterDeath>true</stayAfterDeath>
+		<irreplacableBuff>true</irreplacableBuff>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<reuseDelay>5000</reuseDelay>
 	</skill>
 	<skill id="39522" toLevel="1" name="Emperor's Special Cocktail">
 		<!-- For 60 min., applies the following effects: Musician's Melody Lv. 5, Fantasia Harmony Lv. 2, Drum Concert, Fantasia Melody, United Resistance. To remove the effect, press Alt + Mouse Left Click. -->
 		<icon>icon.bm_special_cocktail_of_king_p</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
 		<reuseDelay>5000</reuseDelay>
 	</skill>
 	<skill id="39523" toLevel="1" name="Golden Pig's Medium Vitality Tonic">
@@ -1189,11 +1380,16 @@
 	<skill id="39580" toLevel="1" name="Pink's Style Potion - Red Archer">
 		<!-- Changes the armor appearance to that of Red Archer Garment. -->
 		<icon>icon.armor_t2000_b_i00</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalTime>86400</abnormalTime>
+		<abnormalVisualEffect>CGRADE_CHANGE</abnormalVisualEffect>
 		<isMagic>4</isMagic>
 		<hitTime>1500</hitTime>
 		<reuseDelay>5000</reuseDelay>
 		<effectPoint>780</effectPoint>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>81016</itemConsumeId>
+		<stayAfterDeath>true</stayAfterDeath>
 	</skill>
 	<skill id="39581" toLevel="1" name="Pink's Style Potion - Green Archer">
 		<!-- Changes the armor appearance to that of Green Archer Garment. -->
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39700-39799.xml b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39700-39799.xml
index 70e95b11ca..db7f6b4b6c 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39700-39799.xml
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/39700-39799.xml
@@ -1067,6 +1067,11 @@
 				<mode>PER</mode>
 				<magicType>3</magicType>
 			</effect>
+			<effect name="MagicMpCost">
+				<amount>-10</amount>
+				<mode>PER</mode>
+				<magicType>22</magicType>
+			</effect>
 			<effect name="VampiricAttack">
 				<amount>9</amount>
 				<chance>30</chance>
@@ -1193,6 +1198,16 @@
 				<mode>PER</mode>
 				<magicType>0</magicType>
 			</effect>
+			<effect name="MagicMpCost">
+				<amount>-22</amount>
+				<mode>PER</mode>
+				<magicType>2</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-22</amount>
+				<mode>PER</mode>
+				<magicType>22</magicType>
+			</effect>
 			<effect name="VampiricAttack">
 				<amount>8</amount>
 				<chance>30</chance>
@@ -1515,7 +1530,33 @@
 	<skill id="39794" toLevel="1" name="Freya's Scroll of Blessing">
 		<!-- For 30 min., sustains Vitality, acquired XP/ SP +150%, Vitality bonus +100%. Doesn't stack with effects from Freya's Frozen Scroll, Freya's Scroll of Storm, and Maphr's Scroll of Storm. Cooldown: 5 min. The effect remains after death. -->
 		<icon>icon.bless_scroll</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalLevel>1</abnormalLevel>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>FREYA_SCROLL_VIT</abnormalType>
+		<itemConsumeId>82295</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<stayAfterDeath>true</stayAfterDeath>
+		<effects>
+			<effect name="VitalityExpRate">
+				<amount>100</amount>
+			</effect>
+			<effect name="ExpModify">
+				<amount>150</amount>
+			</effect>
+			<effect name="SpModify">
+				<amount>150</amount>
+			</effect>
+			<effect name="VitalityPointsRate">
+				<amount>-100</amount>
+			</effect>
+			<effect name="DispelBySlot">
+				<dispel>EXP_SPECIAL,-1;DANDY_CHALLENGE,-1;SANTIAGO_SCROLL,-1</dispel>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39795" toLevel="1" name="Tavern Special Drink">
 		<!-- For 30 min., damage +15%, Attribute Attack/ Resistance +100, received damage -15%. Doesn't stack with effects from Freya's Charisma Potion, Einhasad's Charisma Potion, and Freya's Luck Potion. Cooldown: 5 min. The effect remains after death. -->
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/documentation.txt
index 9082ef31f6..f7159c901e 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/stats/skills/documentation.txt
@@ -12,6 +12,8 @@ AddHuntingTime: Add time for time limited hunting zones. (l2jmobius)
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -169,11 +171,12 @@ HpCpHealCritical: HpCp heal effects always trigger Magic Critical Hit.
 HpCpHeal: Increases current HP by a given amount. If the given amount exceeds maximum HP, it increases current CP with the rest value as well.
 HpDrain: Magical attack that absorbs given percentage of the damage inflicted as HP.
 Hp: Increases current HP by a static value.
-HpLimit: Increase a character's max hp limit (l2jmobius)
+HpLimit: Increase a character's max hp limit. (l2jmobius)
 HpRegen: HP Regeneration stat.
 HpToOwner: DOT effect that absorbs HP over time.
 Ignition: Transforms sword to Death Knight's Flame Sword. (l2jmobius)
 IgnoreDeath: Become undying. Hp cannot decrease below 1.
+IgnoreReduceDamage: Ignore ReduceDamage effect implementation. (l2jmobius)
 ImmobileDamageBonus: Bonus damage to immobile targets. (l2jmobius)
 ImmobileDamageResist: Resist damage while immobile. (l2jmobius)
 ImmobilePetBuff: Causes your pet to become immobilized.
@@ -212,7 +215,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
@@ -277,6 +279,7 @@ RebalanceHP: Balances targets' current HP.
 RebalanceHPSummon: Balances targets' current HP for summons.
 RecoverVitalityInPeaceZone: Recover periodically vitality when player is in a peace zone. (l2jmobius)
 Recovery: Decreases death penalty level.
+ReduceDamage: Reduce damage effect implementation.
 ReduceCancel: Magic skill casting interruption stat.
 ReduceDropPenalty: Reduces EXP lost and death penalty chance.
 ReflectMagic: Deflects magical damage back to the attacker.
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/xsd/LimitShop.xsd b/L2J_Mobius_10.3_MasterClass/dist/game/data/xsd/LimitShop.xsd
index 02d5bc1963..56b8adce72 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/xsd/LimitShop.xsd
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/xsd/LimitShop.xsd
@@ -24,6 +24,7 @@
 											<xs:attribute type="xs:long" name="count" use="optional"/>
 											<xs:attribute type="xs:float" name="chance" use="optional"/>
 											<xs:attribute type="xs:boolean" name="announce" use="optional"/>
+											<xs:attribute type="xs:int" name="enchant" use="optional"/>
 											<xs:attribute type="xs:int" name="id2" use="optional"/>
 											<xs:attribute type="xs:long" name="count2" use="optional"/>
 											<xs:attribute type="xs:float" name="chance2" use="optional"/>
@@ -40,6 +41,7 @@
 											<xs:attribute type="xs:long" name="count5" use="optional"/>
 											<xs:attribute type="xs:boolean" name="announce5" use="optional"/>
 											<xs:attribute type="xs:int" name="accountDailyLimit" use="optional"/>
+											<xs:attribute type="xs:int" name="accountMontlyLimit" use="optional"/>
 											<xs:attribute type="xs:int" name="accountBuyLimit" use="optional"/>
 										</xs:extension>
 									</xs:simpleContent>
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/xsd/skills.xsd b/L2J_Mobius_10.3_MasterClass/dist/game/data/xsd/skills.xsd
index 846e558dd4..c4a4a7605a 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/xsd/skills.xsd
@@ -2722,6 +2722,9 @@
 															</xs:complexType>
 														</xs:element>
 														<xs:element minOccurs="0" name="skillLevelScaleTo" type="xs:unsignedByte" />
+														<xs:element minOccurs="0" name="slot" type="xs:string" />
+														<xs:element minOccurs="0" name="dispel" type="xs:string" />
+														<xs:element minOccurs="0" name="rate" type="xs:unsignedByte" />
 													</xs:sequence>
 													<xs:attribute name="name" type="xs:string" use="required" />
 													<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/Config.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/Config.java
index a6055301b3..0a0d90a72e 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/Config.java
@@ -611,6 +611,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static AbnormalVisualEffect BLUE_TEAM_ABNORMAL_EFFECT;
 	public static AbnormalVisualEffect RED_TEAM_ABNORMAL_EFFECT;
 	
@@ -841,6 +842,9 @@ public class Config
 	public static boolean HARDIN_ENABLE_ERTHEIAS;
 	public static Map<Integer, List<Integer>> HARDIN_REMOVED_SKILLS;
 	
+	// Eraton
+	public static Set<Integer> ERATON_RETAINED_SKILLS = new HashSet<>();
+	
 	// --------------------------------------------------
 	// Vitality Settings
 	// --------------------------------------------------
@@ -848,6 +852,7 @@ public class Config
 	public static int STARTING_VITALITY_POINTS;
 	public static boolean RAIDBOSS_USE_VITALITY;
 	public static float RATE_VITALITY_EXP_MULTIPLIER;
+	public static float RATE_VITALITY_EXP_PREMIUM_MULTIPLIER;
 	public static int VITALITY_MAX_ITEMS_ALLOWED;
 	public static float RATE_VITALITY_LOST;
 	public static float RATE_VITALITY_GAIN;
@@ -1153,6 +1158,7 @@ public class Config
 	public static int CONQUEST_RATE_SERVER_POINTS;
 	public static int CONQUEST_RATE_SERVER_SOUL_ORBS;
 	public static int CONQUEST_RATE_ZONE_POINTS;
+	public static int CONQUEST_RATE_BLOODY_COINS;
 	public static int CONQUEST_ATTACK_POINTS;
 	public static int CONQUEST_LIFE_POINTS;
 	public static boolean CONQUEST_PVP_ZONE;
@@ -1425,6 +1431,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -1912,6 +1919,15 @@ public class Config
 					HARDIN_REMOVED_SKILLS.get(classId).add(Integer.parseInt(classInfo[i]));
 				}
 			}
+			ERATON_RETAINED_SKILLS.clear();
+			final String eratonRetainedSkills = characterConfig.getString("EratonRetainedSkills", "").trim();
+			if (!eratonRetainedSkills.isEmpty())
+			{
+				for (String id : eratonRetainedSkills.split(","))
+				{
+					ERATON_RETAINED_SKILLS.add(Integer.parseInt(id));
+				}
+			}
 			ENABLE_VITALITY = characterConfig.getBoolean("EnableVitality", true);
 			STARTING_VITALITY_POINTS = characterConfig.getInt("StartingVitalityPoints", 140000);
 			RAIDBOSS_USE_VITALITY = characterConfig.getBoolean("RaidbossUseVitality", true);
@@ -2134,6 +2150,7 @@ public class Config
 			CONQUEST_RATE_SERVER_POINTS = conquestConfig.getInt("ConquestRateServerPoints", 1);
 			CONQUEST_RATE_SERVER_SOUL_ORBS = conquestConfig.getInt("ConquestRateServerSoulOrbs", 100);
 			CONQUEST_RATE_ZONE_POINTS = conquestConfig.getInt("ConquestRateZonePoints", 1);
+			CONQUEST_RATE_BLOODY_COINS = conquestConfig.getInt("ConquestRateBloodyCoins", 1);
 			CONQUEST_ATTACK_POINTS = conquestConfig.getInt("ConquestCharacterAttackPoints", 100);
 			CONQUEST_LIFE_POINTS = conquestConfig.getInt("ConquestCharacterLifePoints", 20);
 			CONQUEST_PVP_ZONE = conquestConfig.getBoolean("ConquestIsPvpZone", false);
@@ -2452,6 +2469,7 @@ public class Config
 			ENABLE_AUTO_SKILL = generalConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = generalConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = generalConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = generalConfig.getBoolean("AssistLeader", false);
 			BLUE_TEAM_ABNORMAL_EFFECT = null;
 			final String blueTeamAve = generalConfig.getString("BlueTeamAbnormalEffect", "").trim();
 			if (!blueTeamAve.isEmpty())
@@ -2580,6 +2598,7 @@ public class Config
 			MONSTER_EXP_MAX_LEVEL_DIFFERENCE = ratesConfig.getInt("MonsterExpMaxLevelDifference", 11);
 			RATE_RAIDBOSS_POINTS = ratesConfig.getFloat("RateRaidbossPointsReward", 1);
 			RATE_VITALITY_EXP_MULTIPLIER = ratesConfig.getFloat("RateVitalityExpMultiplier", 2);
+			RATE_VITALITY_EXP_PREMIUM_MULTIPLIER = ratesConfig.getFloat("RateVitalityExpPremiumMultiplier", 3);
 			VITALITY_MAX_ITEMS_ALLOWED = ratesConfig.getInt("VitalityMaxItemsAllowed", 999);
 			RATE_VITALITY_LOST = ratesConfig.getFloat("RateVitalityLost", 1);
 			RATE_VITALITY_GAIN = ratesConfig.getFloat("RateVitalityGain", 1);
@@ -3647,6 +3666,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index eab3156866..9b9cbc1cc8 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java
index 60350c6209..48e31e400e 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java
@@ -126,7 +126,9 @@ public class LimitShopCraftData implements IXmlReader
 							boolean announce3 = false;
 							boolean announce4 = false;
 							boolean announce5 = false;
+							int enchant = 0;
 							int accountDailyLimit = 0;
+							int accountMontlyLimit = 0;
 							int accountBuyLimit = 0;
 							for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling())
 							{
@@ -217,6 +219,7 @@ public class LimitShopCraftData implements IXmlReader
 									count = parseLong(attrs, "count", 1L);
 									chance = parseFloat(attrs, "chance", 100f);
 									announce = parseBoolean(attrs, "announce", false);
+									enchant = parseInteger(attrs, "enchant", 0);
 									productionId2 = parseInteger(attrs, "id2", 0);
 									count2 = parseLong(attrs, "count2", 1L);
 									chance2 = parseFloat(attrs, "chance2", 100f);
@@ -233,6 +236,7 @@ public class LimitShopCraftData implements IXmlReader
 									count5 = parseLong(attrs, "count5", 1L);
 									announce5 = parseBoolean(attrs, "announce5", false);
 									accountDailyLimit = parseInteger(attrs, "accountDailyLimit", 0);
+									accountMontlyLimit = parseInteger(attrs, "accountMontlyLimit", 0);
 									accountBuyLimit = parseInteger(attrs, "accountBuyLimit", 0);
 									
 									final ItemTemplate item = ItemTable.getInstance().getTemplate(productionId);
@@ -244,7 +248,7 @@ public class LimitShopCraftData implements IXmlReader
 								}
 							}
 							
-							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, count, chance, announce, productionId2, count2, chance2, announce2, productionId3, count3, chance3, announce3, productionId4, count4, chance4, announce4, productionId5, count5, announce5, accountDailyLimit, accountBuyLimit));
+							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, count, chance, announce, enchant, productionId2, count2, chance2, announce2, productionId3, count3, chance3, announce3, productionId4, count4, chance4, announce4, productionId5, count5, announce5, accountDailyLimit, accountMontlyLimit, accountBuyLimit));
 						}
 					}
 				}
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
index 0bdd0c2ba5..49a8e17546 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
@@ -109,6 +109,7 @@ public class LimitShopData implements IXmlReader
 							ingredientEnchants[4] = 0;
 							int productionId = 0;
 							int accountDailyLimit = 0;
+							int accountMontlyLimit = 0;
 							int accountBuyLimit = 0;
 							for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling())
 							{
@@ -197,6 +198,7 @@ public class LimitShopData implements IXmlReader
 								{
 									productionId = parseInteger(attrs, "id");
 									accountDailyLimit = parseInteger(attrs, "accountDailyLimit", 0);
+									accountMontlyLimit = parseInteger(attrs, "accountMontlyLimit", 0);
 									accountBuyLimit = parseInteger(attrs, "accountBuyLimit", 0);
 									
 									final ItemTemplate item = ItemTable.getInstance().getTemplate(productionId);
@@ -208,7 +210,7 @@ public class LimitShopData implements IXmlReader
 								}
 							}
 							
-							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, 1, 100, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, false, accountDailyLimit, accountBuyLimit));
+							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, 1, 100, false, 0, 0, 0, 0, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, false, accountDailyLimit, accountMontlyLimit, accountBuyLimit));
 						}
 					}
 				}
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index c5839831ba..deb0eec41a 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -546,9 +546,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index b277446b93..7bf956bdc5 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
index 40b4ea1c3d..ae43e8d744 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
@@ -25,4 +25,9 @@ import org.l2jmobius.gameserver.model.actor.Player;
 public interface IPlayerActionHandler
 {
 	void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed);
+	
+	default boolean isPetAction()
+	{
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index d0fd7fa44a..ac6af33bb4 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -139,6 +139,11 @@ public class DailyTaskManager
 			resetHuntPass();
 		}
 		
+		if (calendar.get(Calendar.DAY_OF_MONTH) == 1)
+		{
+			resetMontlyLimitShopData();
+		}
+		
 		// Daily tasks.
 		resetAttendanceRewards();
 		resetDailySkills();
@@ -779,6 +784,31 @@ public class DailyTaskManager
 		LOGGER.info("LimitShopData has been reset.");
 	}
 	
+	private void resetMontlyLimitShopData()
+	{
+		for (LimitShopProductHolder holder : LimitShopData.getInstance().getProducts())
+		{
+			// Update data for offline players.
+			try (Connection con = DatabaseFactory.getConnection();
+				PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?"))
+			{
+				ps.setString(1, AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + holder.getProductionId());
+				ps.executeUpdate();
+			}
+			catch (Exception e)
+			{
+				LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset LimitShopData: " + e);
+			}
+			// Update data for online players.
+			for (Player player : World.getInstance().getPlayers())
+			{
+				player.getAccountVariables().remove(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + holder.getProductionId());
+				player.getAccountVariables().storeMe();
+			}
+		}
+		LOGGER.info("LimitShopData has been resetted.");
+	}
+	
 	private void resetHuntPass()
 	{
 		// Update data for offline players.
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 0c2f5d59de..0b7ad4e019 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -215,7 +215,7 @@ public class ShortCuts implements IRestorable
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
 				newsc.setAutoUse(sc.isAutoUse());
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 198f9e4c20..cfba05b152 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1298,7 +1298,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2826,7 +2826,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2839,177 +2839,139 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						sendPacket(info);
+					}
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
index 1b67db5072..f98187de75 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -331,6 +331,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoAbnormalVisualEf
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic;
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot;
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
+import org.l2jmobius.gameserver.network.serverpackets.ExVitalityEffectInfo;
 import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import org.l2jmobius.gameserver.network.serverpackets.HennaInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
@@ -4690,7 +4691,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8706,9 +8707,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
@@ -10048,6 +10053,7 @@ public class Player extends Playable
 				sendPacket(new ExUserBoostStat(this, BonusExpType.VITALITY));
 				sendPacket(new ExUserBoostStat(this, BonusExpType.BUFFS));
 				sendPacket(new ExUserBoostStat(this, BonusExpType.PASSIVE));
+				sendPacket(new ExVitalityEffectInfo(this));
 				_userBoostStatTask = null;
 			}, 300);
 		}
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 033c7ddb2a..0439961149 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -854,7 +855,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -875,7 +876,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -900,7 +908,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -908,7 +916,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -954,7 +969,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index ea61f72ae6..4d444a1fa3 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -883,15 +882,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -902,8 +899,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -912,7 +913,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -985,45 +986,26 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
 		
-		// Notify recalculation to child classes.
+		// Notify recalculation to child classes
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 629fdce45e..9bf6e1f9b4 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -482,7 +482,11 @@ public class PlayerStat extends PlayableStat
 	
 	public double getVitalityExpBonus()
 	{
-		return (getVitalityPoints() > 0) ? getMul(Stat.VITALITY_EXP_RATE, Config.RATE_VITALITY_EXP_MULTIPLIER) : 1.0;
+		if (getVitalityPoints() > 0)
+		{
+			return getMul(Stat.VITALITY_EXP_RATE, 1) * (getActiveChar().hasPremiumStatus() ? Config.RATE_VITALITY_EXP_PREMIUM_MULTIPLIER : Config.RATE_VITALITY_EXP_MULTIPLIER);
+		}
+		return 0;
 	}
 	
 	public void setVitalityPoints(int value)
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 2a33946a42..da10434743 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
index 97397f753f..9d5faa0c61 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
@@ -57,7 +57,10 @@ public enum CommissionItemType
 	NECKLACE(31),
 	BELT(32),
 	BRACELET(33),
+	AGATHION(62),
 	HAIR_ACCESSORY(34),
+	BROOCH_JEWEL(63),
+	ARTIFACT(64),
 	// Supplies
 	POTION(35),
 	SCROLL_ENCHANT_WEAPON(36),
@@ -65,6 +68,7 @@ public enum CommissionItemType
 	SCROLL_OTHER(38),
 	SOULSHOT(39),
 	SPIRITSHOT(40),
+	OTHER_SUPPLIES(41),
 	// Pet Goods
 	PET_EQUIPMENT(42),
 	PET_SUPPLIES(43),
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
index eb10918430..3a194d1660 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
@@ -47,8 +47,8 @@ public enum CommissionTreeType
 		CommissionItemType.SPEAR,
 		CommissionItemType.OTHER_WEAPON),
 	ARMOR(1, CommissionItemType.HELMET, CommissionItemType.ARMOR_TOP, CommissionItemType.ARMOR_PANTS, CommissionItemType.FULL_BODY, CommissionItemType.GLOVES, CommissionItemType.FEET, CommissionItemType.SHIELD, CommissionItemType.SIGIL, CommissionItemType.UNDERWEAR, CommissionItemType.CLOAK),
-	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.HAIR_ACCESSORY),
-	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT),
+	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.AGATHION, CommissionItemType.HAIR_ACCESSORY, CommissionItemType.BROOCH_JEWEL, CommissionItemType.ARTIFACT),
+	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT, CommissionItemType.OTHER_SUPPLIES),
 	PET_GOODS(4, CommissionItemType.PET_EQUIPMENT, CommissionItemType.PET_SUPPLIES),
 	MISC(
 		5,
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/effects/EffectType.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/effects/EffectType.java
index 5f8f754d04..e8e874b856 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/effects/EffectType.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/effects/EffectType.java
@@ -64,5 +64,6 @@ public enum EffectType
 	TELEPORT_TO_TARGET,
 	ABNORMAL_SHIELD,
 	DUAL_RANGE,
+	RESTORE_SYMBOL_SEAL,
 	VITALITY_POINT_UP
 }
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 3a9363e12c..deeb505370 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2242,6 +2242,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java
index f72c9ddc4d..ac357b3fa1 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java
@@ -32,6 +32,7 @@ public class LimitShopProductHolder
 	private final long _count;
 	private final float _chance;
 	private final boolean _announce;
+	private final int _enchant;
 	private final int _productionId2;
 	private final long _count2;
 	private final float _chance2;
@@ -48,9 +49,10 @@ public class LimitShopProductHolder
 	private final long _count5;
 	private final boolean _announce5;
 	private final int _accountDailyLimit;
+	private final int _accountMontlyLimit;
 	private final int _accountBuyLimit;
 	
-	public LimitShopProductHolder(int id, int category, int minLevel, int maxLevel, int[] ingredientIds, long[] ingredientQuantities, int[] ingredientEnchants, int productionId, long count, float chance, boolean announce, int productionId2, long count2, float chance2, boolean announce2, int productionId3, long count3, float chance3, boolean announce3, int productionId4, long count4, float chance4, boolean announce4, int productionId5, long count5, boolean announce5, int accountDailyLimit, int accountBuyLimit)
+	public LimitShopProductHolder(int id, int category, int minLevel, int maxLevel, int[] ingredientIds, long[] ingredientQuantities, int[] ingredientEnchants, int productionId, long count, float chance, boolean announce, int enchant, int productionId2, long count2, float chance2, boolean announce2, int productionId3, long count3, float chance3, boolean announce3, int productionId4, long count4, float chance4, boolean announce4, int productionId5, long count5, boolean announce5, int accountDailyLimit, int accountMontlyLimit, int accountBuyLimit)
 	{
 		_id = id;
 		_category = category;
@@ -63,6 +65,7 @@ public class LimitShopProductHolder
 		_count = count;
 		_chance = chance;
 		_announce = announce;
+		_enchant = enchant;
 		_productionId2 = productionId2;
 		_count2 = count2;
 		_chance2 = chance2;
@@ -79,6 +82,7 @@ public class LimitShopProductHolder
 		_count5 = count5;
 		_announce5 = announce5;
 		_accountDailyLimit = accountDailyLimit;
+		_accountMontlyLimit = accountMontlyLimit;
 		_accountBuyLimit = accountBuyLimit;
 	}
 	
@@ -137,6 +141,11 @@ public class LimitShopProductHolder
 		return _announce;
 	}
 	
+	public int getEnchant()
+	{
+		return _enchant;
+	}
+	
 	public int getProductionId2()
 	{
 		return _productionId2;
@@ -217,6 +226,11 @@ public class LimitShopProductHolder
 		return _accountDailyLimit;
 	}
 	
+	public int getAccountMontlyLimit()
+	{
+		return _accountMontlyLimit;
+	}
+	
 	public int getAccountBuyLimit()
 	{
 		return _accountBuyLimit;
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index b581899d76..bb16241da0 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -39,6 +39,7 @@ import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AgathionData;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -52,6 +53,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -74,12 +76,14 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemEnchantAdd;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
 import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -94,6 +98,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1652,7 +1657,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2581,6 +2588,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2605,6 +2617,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2630,6 +2644,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index ba76b7093f..b87ba44056 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -755,7 +755,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -907,7 +908,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index b23146d9b8..7df91e96bd 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -686,7 +686,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -709,7 +709,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -744,7 +744,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/Stat.java
index e34184f49c..cd0461e173 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -97,6 +97,7 @@ public enum Stat
 	REAR_DAMAGE_RATE("rearDamage"),
 	DRAGON_WEAPON_DEFENCE("dragonWeaponDefence"),
 	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
+	IGNORE_REDUCE_DAMAGE("ignoreReduceDamage"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
@@ -137,7 +138,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	DEFENCE_CRITICAL_RATE("defCritRate"),
 	DEFENCE_CRITICAL_RATE_ADD("defCritRateAdd"),
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index 8f916369b4..b7b0c4ef53 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index 265cef95f4..4211092a85 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -97,6 +97,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java
index ffdee6263a..3717fcfbb6 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java
@@ -45,6 +45,7 @@ public class AccountVariables extends AbstractVariables
 	public static final String PRIME_SHOP_PRODUCT_DAILY_COUNT = "PSPDailyCount";
 	public static final String LCOIN_SHOP_PRODUCT_COUNT = "LCSCount";
 	public static final String LCOIN_SHOP_PRODUCT_DAILY_COUNT = "LCSDailyCount";
+	public static final String LCOIN_SHOP_PRODUCT_MONTLY_COUNT = "LCSMontlyCount";
 	
 	private final String _accountName;
 	
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
index ae0b7f5853..736f4f70d6 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
@@ -36,6 +36,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureZoneEnter;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureZoneExit;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.interfaces.ILocational;
+import org.l2jmobius.gameserver.network.SystemMessageId;
+import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 
 /**
@@ -215,6 +217,10 @@ public abstract class ZoneType extends ListenersContainer
 		// Check level
 		if ((creature.getLevel() < _minLevel) || (creature.getLevel() > _maxLevel))
 		{
+			if (creature.isPlayer())
+			{
+				creature.getActingPlayer().sendPacket(new ExShowScreenMessage(SystemMessageId.YOU_CANNOT_ENTER_AS_YOUR_LEVEL_DOESN_T_MEED_THE_REQUIREMENTS, ExShowScreenMessage.TOP_CENTER, 10000));
+			}
 			return false;
 		}
 		
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 535aabfa2d..1b32a7b69f 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.zone.type;
 
+import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.zone.ZoneType;
@@ -32,6 +33,7 @@ public class TeleportZone extends ZoneType
 	public TeleportZone(int id)
 	{
 		super(id);
+		setTargetType(InstanceType.Player); // Default only player.
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 455795ea8d..cdc919eb71 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -117,6 +117,11 @@ public class RequestAcquireSkill implements ClientPacket
 		
 		final int skillId = player.getReplacementSkill(_id);
 		final Skill existingSkill = player.getKnownSkill(skillId); // Mobius: Keep existing sublevel.
+		if ((_level > 65536000) && (existingSkill != null) && (existingSkill.getSubLevel() > 1000))
+		{
+			_level -= existingSkill.getSubLevel() * 65536;
+		}
+		
 		final Skill skill = SkillData.getInstance().getSkill(skillId, _level, existingSkill == null ? 0 : existingSkill.getSubLevel());
 		if (skill == null)
 		{
@@ -681,7 +686,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList();
 		player.updateShortCuts(_id, skill.getLevel(), skill.getSubLevel());
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 14c84055da..63f5c4a527 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -87,7 +87,7 @@ public class RequestShortCutReg implements ClientPacket
 		else if (_page == 23)
 		{
 			final Item item = player.getInventory().getItemByObjectId(_id);
-			if ((item != null) && !item.isPotion())
+			if (((item != null) && !item.isPotion()) || (_type == ShortcutType.ACTION))
 			{
 				return;
 			}
@@ -148,7 +148,7 @@ public class RequestShortCutReg implements ClientPacket
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		sc.setAutoUse(_active);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 		player.sendPacket(new ExActivateAutoShortcut(sc, _active));
 		
 		// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 366671eff4..ba7ac22ef4 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -225,21 +225,21 @@ public class UseItem implements ClientPacket
 			
 			if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, player.getClassId().getId()))
 			{
-				// Death Knight class unequip shields.
+				// Unequip shields.
 				if ((player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND) != null) && (player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND).getItemType() == ArmorType.SHIELD))
 				{
 					player.disarmShield();
 				}
 				
-				// Prevent Death Knight class to equip shields.
+				// Prevent equipping shields.
 				if (item.getItemType() == ArmorType.SHIELD)
 				{
 					player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
 					return;
 				}
 				
-				// Prevent Death Knight class to equip other weapons.
-				if (item.isWeapon() && ((item.getWeaponItem().getItemType() != WeaponType.SWORD) || ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND))))
+				// Prevent equipping other weapons.
+				if (item.isWeapon() && (item.getWeaponItem().getItemType() != WeaponType.FISHINGROD) && ((item.getWeaponItem().getItemType() != WeaponType.SWORD) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND)))
 				{
 					player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
 					return;
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
index e7d165919c..2948334971 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
@@ -99,10 +99,6 @@ public class RequestEnchantItem implements ClientPacket
 			player.removeRequest(request.getClass());
 			return;
 		}
-		if (item.getEnchantLevel() != request.getEnchantLevel())
-		{
-			item.setEnchantLevel(request.getEnchantLevel());
-		}
 		
 		// Template for scroll.
 		final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/herobook/RequestHeroBookEnchant.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/herobook/RequestHeroBookEnchant.java
index 2cabb297d1..3fe6d2f033 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/herobook/RequestHeroBookEnchant.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/herobook/RequestHeroBookEnchant.java
@@ -29,7 +29,7 @@ public class RequestHeroBookEnchant implements ClientPacket
 	@Override
 	public void run(GameClient client)
 	{
-		Player player = client.getPlayer();
+		final Player player = client.getPlayer();
 		if (player == null)
 		{
 			return;
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java
index deba2be826..875c3fda08 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java
@@ -112,26 +112,9 @@ public class RequestHuntPassReward implements ClientPacket
 			return;
 		}
 		
-		// Normal reward.
-		if (!huntPass.isPremium() && (rewardIndex <= HuntPassData.getInstance().getRewardsCount()))
-		{
-			rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
-			huntPass.setRewardStep(rewardIndex + 1);
-		}
-		// Premium reward.
-		else if (huntPass.isPremium())
-		{
-			if ((rewardIndex < HuntPassData.getInstance().getRewardsCount()) && (rewardIndex <= premiumRewardIndex))
-			{
-				rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
-				huntPass.setRewardStep(rewardIndex + 1);
-			}
-			else if ((premiumRewardIndex < rewardIndex) && (premiumRewardIndex <= HuntPassData.getInstance().getPremiumRewardsCount()))
-			{
-				rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex));
-				huntPass.setPremiumRewardStep(premiumRewardIndex + 1);
-			}
-		}
+		normalReward(player);
+		premiumReward(player);
+		huntPass.setRewardStep(rewardIndex + 1);
 		huntPass.setRewardAlert(false);
 		
 		player.sendPacket(new HuntPassInfo(player, _huntPassType));
@@ -157,4 +140,39 @@ public class RequestHuntPassReward implements ClientPacket
 			player.addItem("HuntPassReward", reward, player, true);
 		}
 	}
+	
+	private void premiumReward(Player player)
+	{
+		final HuntPass huntPass = player.getHuntPass();
+		final int premiumRewardIndex = huntPass.getPremiumRewardStep();
+		if (premiumRewardIndex >= HuntPassData.getInstance().getPremiumRewardsCount())
+		{
+			return;
+		}
+		
+		if (!huntPass.isPremium())
+		{
+			return;
+		}
+		
+		rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex));
+		huntPass.setPremiumRewardStep(premiumRewardIndex + 1);
+	}
+	
+	private void normalReward(Player player)
+	{
+		final HuntPass huntPass = player.getHuntPass();
+		final int rewardIndex = huntPass.getRewardStep();
+		if (rewardIndex >= HuntPassData.getInstance().getRewardsCount())
+		{
+			return;
+		}
+		
+		if (huntPass.isPremium() && ((huntPass.getPremiumRewardStep() < rewardIndex) || (huntPass.getPremiumRewardStep() >= HuntPassData.getInstance().getPremiumRewardsCount())))
+		{
+			return;
+		}
+		
+		rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
+	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassRewardAll.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassRewardAll.java
index acc67daf3b..b878bf9e6d 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassRewardAll.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassRewardAll.java
@@ -115,26 +115,9 @@ public class RequestHuntPassRewardAll implements ClientPacket
 				break REWARD_LOOP;
 			}
 			
-			// Normal reward.
-			if (!huntPass.isPremium() && (rewardIndex <= HuntPassData.getInstance().getRewardsCount()))
-			{
-				rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
-				huntPass.setRewardStep(rewardIndex + 1);
-			}
-			// Premium reward.
-			else if (huntPass.isPremium())
-			{
-				if ((rewardIndex < HuntPassData.getInstance().getRewardsCount()) && (rewardIndex <= premiumRewardIndex))
-				{
-					rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
-					huntPass.setRewardStep(rewardIndex + 1);
-				}
-				else if ((premiumRewardIndex < rewardIndex) && (premiumRewardIndex <= HuntPassData.getInstance().getPremiumRewardsCount()))
-				{
-					rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex));
-					huntPass.setPremiumRewardStep(premiumRewardIndex + 1);
-				}
-			}
+			normalReward(player);
+			premiumReward(player);
+			huntPass.setRewardStep(rewardIndex + 1);
 		}
 		
 		if (!inventoryLimitReached)
@@ -165,4 +148,39 @@ public class RequestHuntPassRewardAll implements ClientPacket
 			player.addItem("HuntPassReward", reward, player, true);
 		}
 	}
+	
+	private void premiumReward(Player player)
+	{
+		final HuntPass huntPass = player.getHuntPass();
+		final int premiumRewardIndex = huntPass.getPremiumRewardStep();
+		if (premiumRewardIndex >= HuntPassData.getInstance().getPremiumRewardsCount())
+		{
+			return;
+		}
+		
+		if (!huntPass.isPremium())
+		{
+			return;
+		}
+		
+		rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex));
+		huntPass.setPremiumRewardStep(premiumRewardIndex + 1);
+	}
+	
+	private void normalReward(Player player)
+	{
+		final HuntPass huntPass = player.getHuntPass();
+		final int rewardIndex = huntPass.getRewardStep();
+		if (rewardIndex >= HuntPassData.getInstance().getRewardsCount())
+		{
+			return;
+		}
+		
+		if (huntPass.isPremium() && ((huntPass.getPremiumRewardStep() < rewardIndex) || (huntPass.getPremiumRewardStep() >= HuntPassData.getInstance().getPremiumRewardsCount())))
+		{
+			return;
+		}
+		
+		rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
+	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
index f9625ca242..22b92dba08 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
@@ -147,6 +147,25 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 				return;
 			}
 		}
+		else if (_product.getAccountMontlyLimit() > 0)
+		{
+			final long amount = _product.getAccountMontlyLimit() * _amount;
+			if (amount < 1)
+			{
+				player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+				player.removeRequest(PrimeShopRequest.class);
+				player.sendPacket(new ExPurchaseLimitShopItemResult(false, _shopIndex, _productId, 0, Collections.emptyList()));
+				return;
+			}
+			if (player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + _product.getProductionId(), 0) >= amount)
+			{
+				player.sendMessage("You have reached your montly limit.");
+				player.removeRequest(PrimeShopRequest.class);
+				player.sendPacket(new ExPurchaseLimitShopItemResult(false, _shopIndex, _productId, 0, Collections.emptyList()));
+				return;
+			}
+			
+		}
 		else if (_product.getAccountBuyLimit() > 0) // Count limit.
 		{
 			final long amount = _product.getAccountBuyLimit() * _amount;
@@ -168,7 +187,7 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 		}
 		
 		// Check existing items.
-		final int remainingInfo = Math.max(0, Math.max(_product.getAccountBuyLimit(), _product.getAccountDailyLimit()));
+		final int remainingInfo = Math.max(0, Math.max(_product.getAccountBuyLimit(), Math.max(_product.getAccountDailyLimit(), _product.getAccountMontlyLimit())));
 		for (int i = 0; i < _product.getIngredientIds().length; i++)
 		{
 			if (_product.getIngredientIds()[i] == 0)
@@ -315,7 +334,7 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 				if (Rnd.get(100) < _product.getChance())
 				{
 					rewards.computeIfAbsent(0, k -> new LimitShopRandomCraftReward(_product.getProductionId(), 0, 0)).getCount().addAndGet((int) _product.getCount());
-					final Item item = player.addItem("LCoinShop", _product.getProductionId(), _product.getCount(), player, true);
+					final Item item = player.addItem("LCoinShop", _product.getProductionId(), _product.getCount(), _product.getEnchant(), player, true);
 					if (_product.isAnnounce())
 					{
 						Broadcast.toAllOnlinePlayers(new ExItemAnnounce(player, item, ExItemAnnounce.SPECIAL_CREATION));
@@ -362,7 +381,7 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 		else if (Rnd.get(100) < _product.getChance())
 		{
 			rewards.put(0, new LimitShopRandomCraftReward(_product.getProductionId(), (int) (_product.getCount() * _amount), 0));
-			final Item item = player.addItem("LCoinShop", _product.getProductionId(), _product.getCount() * _amount, player, true);
+			final Item item = player.addItem("LCoinShop", _product.getProductionId(), _product.getCount() * _amount, _product.getEnchant(), player, true);
 			if (_product.isAnnounce())
 			{
 				Broadcast.toAllOnlinePlayers(new ExItemAnnounce(player, item, ExItemAnnounce.SPECIAL_CREATION));
@@ -374,6 +393,10 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 		{
 			player.getAccountVariables().set(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + _product.getProductionId(), player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + _product.getProductionId(), 0) + _amount);
 		}
+		if (_product.getAccountMontlyLimit() > 0)
+		{
+			player.getAccountVariables().set(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + _product.getProductionId(), player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + _product.getProductionId(), 0) + _amount);
+		}
 		else if (_product.getAccountBuyLimit() > 0)
 		{
 			player.getAccountVariables().set(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + _product.getProductionId(), player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + _product.getProductionId(), 0) + _amount);
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index 3acca7c8e2..07ed7641a9 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,129 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 38, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 49, 50, 51,
-		52, 53, 54, 55,
-		56, 57, 58, 59,
-		60, 61, 62, 63,
-		64, 65, 66, 67,
-		68, 69, 70, 71,
-		72, 73, 74, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 92, 93,
-		94, 95, 96, 97,
-		1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index c956600198..d33663880b 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java
index 3263349360..38c94f8160 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.BonusExpType;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.stats.Stat;
@@ -45,31 +46,10 @@ public class ExUserBoostStat extends ServerPacket
 		{
 			case VITALITY:
 			{
-				final int currentVitalityPoints = _player.getStat().getVitalityPoints();
-				if (currentVitalityPoints > 105000)
+				if (_player.getStat().getVitalityPoints() > 0)
 				{
-					count = 1;
-					bonus = 300;
-				}
-				else if (currentVitalityPoints > 70000)
-				{
-					count = 1;
-					bonus = 250;
-				}
-				else if (currentVitalityPoints > 35000)
-				{
-					count = 1;
-					bonus = 200;
-				}
-				else if (currentVitalityPoints > 0)
-				{
-					count = 1;
-					bonus = 100;
-				}
-				if (bonus > 0)
-				{
-					count += (int) _player.getStat().getValue(Stat.VITALITY_SKILLS, 0);
-					bonus += (int) ((_player.getStat().getMul(Stat.VITALITY_EXP_RATE, 1) - 1) * 100);
+					count = (int) (_player.getStat().getValue(Stat.VITALITY_SKILLS, 0) + 1);
+					bonus = (int) (((_player.getStat().getMul(Stat.VITALITY_EXP_RATE, 1) - 1) + (_player.hasPremiumStatus() ? Config.RATE_VITALITY_EXP_PREMIUM_MULTIPLIER : Config.RATE_VITALITY_EXP_MULTIPLIER)) * 100d);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java
index ff6541ec6f..96e9690fe6 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.stats.Stat;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -26,13 +27,15 @@ import org.l2jmobius.gameserver.network.ServerPackets;
 public class ExVitalityEffectInfo extends ServerPacket
 {
 	private final int _vitalityBonus;
+	private final int _vitalityAddBonus;
 	private final int _vitalityItemsRemaining;
 	private final int _points;
 	
 	public ExVitalityEffectInfo(Player player)
 	{
 		_points = player.getVitalityPoints();
-		_vitalityBonus = (int) player.getStat().getVitalityExpBonus() * 100;
+		_vitalityBonus = (int) ((player.getStat().getMul(Stat.VITALITY_EXP_RATE, 1) - 1) + (player.hasPremiumStatus() ? Config.RATE_VITALITY_EXP_PREMIUM_MULTIPLIER : Config.RATE_VITALITY_EXP_MULTIPLIER)) * 100;
+		_vitalityAddBonus = (int) ((player.getStat().getMul(Stat.VITALITY_EXP_RATE, 1) - 1) * 100);
 		_vitalityItemsRemaining = Config.VITALITY_MAX_ITEMS_ALLOWED - player.getVitalityItemsUsed();
 	}
 	
@@ -42,7 +45,7 @@ public class ExVitalityEffectInfo extends ServerPacket
 		ServerPackets.EX_VITALITY_EFFECT_INFO.writeId(this);
 		writeInt(_points);
 		writeInt(_vitalityBonus); // Vitality Bonus
-		writeShort(0); // Vitality additional bonus in %
+		writeShort(_vitalityAddBonus); // Vitality additional bonus in %
 		writeShort(_vitalityItemsRemaining); // How much vitality items remaining for use
 		writeShort(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use
 	}
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
index a49f41ca7f..2e12fcbc85 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
@@ -167,7 +167,7 @@ public class FakePlayerInfo extends ServerPacket
 		writeByte(_npc.getTeam().getId());
 		writeInt(_clan != null ? _clan.getCrestLargeId() : 0);
 		writeByte(_fpcHolder.getNobleLevel());
-		writeByte(_fpcHolder.isHero());
+		writeByte(_fpcHolder.isHero() ? 2 : 0); // 152 - Value for enabled changed to 2
 		writeByte(_fpcHolder.isFishing());
 		writeInt(_fpcHolder.getBaitLocationX());
 		writeInt(_fpcHolder.getBaitLocationY());
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
index 936b64a402..4a9ed2717f 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
@@ -118,7 +118,7 @@ public class MultiSellList extends AbstractItemPacket
 				}
 				writeLong(_list.getProductCount(product));
 				writeShort(product.getEnchantmentLevel() > 0 ? product.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
-				writeInt((int) product.getChance() * 1000000); // chance
+				writeInt((int) (product.getChance() * 1000000)); // chance
 				writeItemAugment(displayItemEnchantment);
 				writeItemElemental(displayItemEnchantment);
 				writeItemEnsoulOptions(displayItemEnchantment);
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index 4677b2aa13..0d62a7df88 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -170,7 +170,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -330,9 +330,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -350,11 +350,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -378,9 +378,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -410,7 +410,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
similarity index 97%
rename from L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
rename to L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
index f0b55b330c..a5cc36da6f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
 import org.l2jmobius.gameserver.network.ServerPackets;
 import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
 
-public class PetInfo extends ServerPacket
+public class PetSummonInfo extends ServerPacket
 {
 	private final Summon _summon;
 	private final int _value;
@@ -44,7 +44,7 @@ public class PetInfo extends ServerPacket
 	private int _curFed;
 	private int _statusMask = 0;
 	
-	public PetInfo(Summon summon, int value)
+	public PetSummonInfo(Summon summon, int value)
 	{
 		_summon = summon;
 		_moveMultiplier = summon.getMovementSpeedMultiplier();
@@ -139,7 +139,7 @@ public class PetInfo extends ServerPacket
 		writeInt((int) _summon.getCurrentMp()); // current mp
 		writeInt(_summon.getMaxMp()); // max mp
 		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
+		writeShort(_summon.getLevel()); // level
 		writeLong(_summon.getStat().getExp());
 		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
 		{
@@ -150,7 +150,6 @@ public class PetInfo extends ServerPacket
 			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
 		}
 		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeByte(0); // 286
 		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
 		writeInt(_summon.getMaxLoad()); // max weight it can carry
 		writeInt(_summon.getPAtk()); // patk
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 05aaedf2c5..46c9ccb5a9 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,20 +19,21 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
+		player.restoreAutoShortcutVisual();
 	}
 	
 	@Override
@@ -54,8 +55,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 944e376e63..851b53dc09 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -43,14 +49,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // item augment id
-				writeInt(0); // visual id
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 3a3a1545a5..dfbdb8b182 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -68,7 +68,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -149,7 +149,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -249,9 +249,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -269,11 +269,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -297,9 +297,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -330,7 +329,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
index 8e5c5f7765..22eb4ac7d4 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
@@ -83,6 +83,17 @@ public class ExPurchaseLimitShopItemListNew extends ServerPacket
 					writeInt(product.getAccountDailyLimit() - _player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + product.getProductionId(), 0));
 				}
 			}
+			else if (product.getAccountMontlyLimit() > 0)
+			{
+				if (_player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + product.getProductionId(), 0) >= product.getAccountMontlyLimit())
+				{
+					writeInt(0);
+				}
+				else
+				{
+					writeInt(product.getAccountMontlyLimit() - _player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + product.getProductionId(), 0));
+				}
+			}
 			else if (product.getAccountBuyLimit() > 0) // Count limit.
 			{
 				if (_player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + product.getProductionId(), 0) >= product.getAccountBuyLimit())
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1544a20c14..e9f977858a 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -42,6 +44,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	
@@ -96,6 +99,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking when in offline play.
+							if (player.isOfflinePlay() && player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -121,23 +135,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -145,6 +168,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -179,32 +205,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -310,6 +359,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 5899235fcb..66c93af753 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,7 +35,9 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.effects.EffectType;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemUse;
@@ -46,12 +48,12 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.EffectScope;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +383,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
@@ -394,7 +397,24 @@ public class AutoUseTaskManager
 							final IPlayerActionHandler actionHandler = PlayerActionHandler.getInstance().getHandler(actionHolder.getHandler());
 							if (actionHandler != null)
 							{
-								actionHandler.useAction(player, actionHolder, false, false);
+								if (!actionHandler.isPetAction())
+								{
+									actionHandler.useAction(player, actionHolder, false, false);
+								}
+								else
+								{
+									final Summon summon = player.getAnyServitor();
+									if ((summon != null) && !summon.isAlikeDead())
+									{
+										final Skill skill = summon.getKnownSkill(actionHolder.getOptionId());
+										if ((skill != null) && !canSummonCastSkill(player, summon, skill))
+										{
+											continue ACTIONS;
+										}
+										
+										actionHandler.useAction(player, actionHolder, false, false);
+									}
+								}
 							}
 						}
 					}
@@ -477,6 +497,59 @@ public class AutoUseTaskManager
 			
 			return !player.isSkillDisabled(skill) && skill.checkCondition(player, target, false);
 		}
+		
+		private boolean canSummonCastSkill(Player player, Summon summon, Skill skill)
+		{
+			if (skill.isBad() && (player.getTarget() == null))
+			{
+				return false;
+			}
+			
+			final int mpConsume = skill.getMpConsume() + skill.getMpInitialConsume();
+			if ((((mpConsume != 0) && (mpConsume > (int) Math.floor(summon.getCurrentMp()))) || ((skill.getHpConsume() != 0) && (skill.getHpConsume() > (int) Math.floor(summon.getCurrentHp())))))
+			{
+				return false;
+			}
+			
+			if (summon.isSkillDisabled(skill))
+			{
+				return false;
+			}
+			
+			if (((player.getTarget() != null) && !skill.checkCondition(summon, player.getTarget(), false)) || ((player.getTarget() == null) && !skill.checkCondition(summon, player, false)))
+			{
+				return false;
+			}
+			
+			if ((skill.getItemConsumeCount() > 0) && (summon.getInventory().getInventoryItemCount(skill.getItemConsumeId(), -1) < skill.getItemConsumeCount()))
+			{
+				return false;
+			}
+			
+			if (skill.getTargetType().equals(TargetType.SELF) || skill.getTargetType().equals(TargetType.SUMMON))
+			{
+				final BuffInfo summonInfo = summon.getEffectList().getBuffInfoBySkillId(skill.getId());
+				return (summonInfo != null) && (summonInfo.getTime() >= REUSE_MARGIN_TIME);
+			}
+			
+			if ((skill.getEffects(EffectScope.GENERAL) != null) && skill.getEffects(EffectScope.GENERAL).stream().anyMatch(a -> a.getEffectType().equals(EffectType.MANAHEAL_BY_LEVEL)) && (player.getCurrentMpPercent() > 80))
+			{
+				return false;
+			}
+			
+			final BuffInfo buffInfo = player.getEffectList().getBuffInfoBySkillId(skill.getId());
+			final BuffInfo abnormalBuffInfo = player.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
+			if (abnormalBuffInfo != null)
+			{
+				if (buffInfo != null)
+				{
+					return (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()));
+				}
+				return (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel()) || abnormalBuffInfo.isAbnormalType(AbnormalType.NONE);
+			}
+			
+			return true;
+		}
 	}
 	
 	public synchronized void startAutoUseTask(Player player)
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/account_gsdata.sql
index b70d2eea0d..576cc18356 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/account_premium.sql
index b52e46ebca..3125e00443 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/airships.sql
index e4f74d138a..28cc8a9610 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/announcements.sql
index eb86953965..1ff1b9ddd3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/auction_bid.sql
index 1afcf3ba88..bd42d75b3a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/bbs_favorites.sql
index d46500c1bb..9cb97e6682 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/bot_reported_char_data.sql
index 452d310e16..ddbda95b17 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle.sql
index d4f4cbe28e..5a5caef186 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_doorupgrade.sql
index c66e5d0991..dc92b68a2f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_functions.sql
index 14a51b2630..be7ac8630d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_manor_procure.sql
index eae8164dbd..dff0affeec 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_manor_production.sql
index ca51a24e35..7f09f6c1b0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_siege_guards.sql
index 5352cfb249..ad7acac0a5 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_trapupgrade.sql
index 63406a22f3..22f6071cb6 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_contacts.sql
index 5e7c88bd1a..350ec43a14 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_hennas.sql
index 5225720259..806d3eb0ae 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_homunculus.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_homunculus.sql
index 6676b04635..87dc86c085 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_homunculus.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_homunculus.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_homunculus` (
 	`skillLevel4` TINYINT UNSIGNED NOT NULL DEFAULT '0',
 	`skillLevel5` TINYINT UNSIGNED NOT NULL DEFAULT '0',
 	`active` TINYINT UNSIGNED NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_instance_time.sql
index 412aecd168..f9307271bf 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_item_reuse_save.sql
index 90481cbf90..bdfc7d2385 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_macroses.sql
index 4647752208..d140fc9630 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(1255) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_mentees.sql
index 0ff6f45e08..48c7b48b41 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_offline_trade.sql
index 232f6ad468..2019801a3b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_offline_trade_items.sql
index e0c31f77e5..456b9c2231 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_premium_items.sql
index 0034ae985b..adcbc4e3f1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_quests.sql
index 26f87fcefc..75a036b290 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_ranking_history.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_ranking_history.sql
index 3f938ba850..d2da345dec 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_ranking_history.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_ranking_history.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_ranking_history` (
   `ranking` int(20) NOT NULL,
   `exp` bigint(20) NOT NULL,
   PRIMARY KEY (`charId`,`day`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_recipebook.sql
index 259046c922..c4f1ff9e42 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_recipeshoplist.sql
index 384d5d2dec..97209515a1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_reco_bonus.sql
index d49289a9ef..d9f0fedb2d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_summons.sql
index b57b1cce1c..d7128f1c29 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_tpbookmark.sql
index 05678e5513..cde9ff3db3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_variables.sql
index 2b33040680..81530a3da5 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/characters.sql
index 4df7d3f88c..f39a66c2db 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/characters.sql
@@ -62,4 +62,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_data.sql
index 4180467c9f..de5b5d95b2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_notices.sql
index b8062eea96..61425ca510 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_privs.sql
index cc35c5862f..baca0444a8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_skills.sql
index 298f710835..ddc8b0f819 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_subpledges.sql
index b1ca14bf1a..5ede8982a6 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/collection_favorites.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/collection_favorites.sql
index b08c0c4fd2..07c749c815 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/collection_favorites.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/collection_favorites.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `collection_favorites` (
   `accountName` VARCHAR(45) NOT NULL DEFAULT '',
   `collectionId` int(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`accountName`,`collectionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/collections.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/collections.sql
index 5814dfa284..8ff04209a6 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/collections.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/collections.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `collections` (
   `collectionId` int(3) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`accountName`,`collectionId`,`index`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/conquest_data.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/conquest_data.sql
index 68eac09d4e..349cdcfbe8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/conquest_data.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/conquest_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE `conquest_data` (
   `current_cycle` mediumint(8) unsigned NOT NULL DEFAULT 1,
   `conquest_season_end` bigint(13) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/conquest_prev_season_ranklist.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/conquest_prev_season_ranklist.sql
index 6451c94f86..374f506972 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/conquest_prev_season_ranklist.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/conquest_prev_season_ranklist.sql
@@ -4,4 +4,4 @@ CREATE TABLE `conquest_prev_season_ranklist` (
   `char_name` VARCHAR(45) DEFAULT NULL,
   `personal_points` bigint(10) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/custom_mail.sql
index c05ac99727..312a5ae524 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/custom_teleport.sql
index 14f8570536..d7f658b250 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort.sql
index ff4bd472a5..1662a5aa35 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8b40b5ffe8..db6f1a278a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort_functions.sql
index 76f3fa99a2..7feb890a15 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort_siege_guards.sql
index eec3c42b3b..628ee4d910 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_siege_guards` VALUES
 -- Shanty Guards
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort_spawnlist.sql
index f4257ac49f..8315eb3a23 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,7 +11,7 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_spawnlist` VALUES
 (101,null,35658,-53273,156650,-1896,62000,0,0),
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fortsiege_clans.sql
index b091192446..0c9ab1ba84 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/forums.sql
index 0b82c19b72..bd2eeda97a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/global_tasks.sql
index 8cd87cb650..51cab5ed2f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/global_variables.sql
index 1721657eb2..e3e5348a1a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/grandboss_data.sql
index 0fd9caf1d9..f92f39e3b8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29381, -6505, 183040, -3419, 0, 1342845023, 133301), -- Queen Ant
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/heroes.sql
index 7691debf5f..6dd502dc65 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/heroes.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/heroes_diary.sql
index db45dce351..bb15483356 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/huntpass.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/huntpass.sql
index f3ff3061ec..b45d73a32b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/huntpass.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/huntpass.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `huntpass` (
   `sayha_points_used` INT NOT NULL DEFAULT 0,
   `unclaimed_reward` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_auction.sql
index 3b7402da4c..0c5514d192 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_auction_bid.sql
index a2fd42f3a1..984709481f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_elementals.sql
index 0c432dd172..8ff8322446 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_transaction_history.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_transaction_history.sql
index 7ec1d192f0..a08fe3b8fd 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_transaction_history.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_transaction_history.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_transaction_history` (
    `price` BIGINT UNSIGNED NOT NULL,
    `count` BIGINT UNSIGNED NOT NULL,
    PRIMARY KEY (`created_time`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/items.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/items.sql
index 380faa715b..26f64fc7aa 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/itemsonground.sql
index 5725d56625..1891903f34 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/merchant_lease.sql
index 4c7e52d5e1..d8c5488c67 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/olympiad_data.sql
index fb3c7e28fa..d86b0a4e06 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/olympiad_fights.sql
index b39c209178..cae8bee430 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/olympiad_fights.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(1) unsigned NOT NULL DEFAULT '0',
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/olympiad_nobles.sql
index a084f69e22..bbe3bc9bf5 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index 5f4ea7bc47..82578d73a8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/petition_feedback.sql
index 55a1c41c22..a77f5730f2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/pets.sql
index 07128fda6f..64c80e61f7 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/posts.sql
index dbc8234412..3025ed14ac 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/siege_clans.sql
index 3aa070529c..d88f155d0f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/topic.sql
index 55fc74d214..b0af891b12 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/world_exchange_items.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/world_exchange_items.sql
index c994e04006..442405f40b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/world_exchange_items.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/game/world_exchange_items.sql
@@ -9,4 +9,4 @@ CREATE TABLE `world_exchange_items`  (
   `start_time` bigint(13) unsigned NOT NULL DEFAULT '0',
   `end_time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`world_exchange_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/login/account_data.sql
index d5e81eb0c9..b09fbca191 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/login/accounts.sql
index 790c39919c..a724eb54c6 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/login/accounts_ipauth.sql
index ea37ca029b..5c79e268f9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/login/gameservers.sql
index f9f75ef9fe..f2c43f0d90 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/Character.ini b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/Character.ini
index b15b5ba311..89be148d0f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/Character.ini
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/Character.ini
@@ -299,6 +299,13 @@ HardinRemovedSkills = 148,10104,10065,10098,19558,10097,10042,19552;\
 181,11855,19212,11856,11854,11863,11859
 
 
+# ---------------------------------------------------------------------------
+# Eraton (Red Libra)
+# ---------------------------------------------------------------------------
+# Skill ids that will remain after Eraton class change.
+EratonRetainedSkills = 1370,1371,1372,11400,11401,11402,11403,11404,31048,31049,30930,30931
+
+
 # ---------------------------------------------------------------------------
 # Summons configuration
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/Conquest.ini b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/Conquest.ini
index 2e6d7b5dd1..d534ffba2e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/Conquest.ini
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/Conquest.ini
@@ -64,6 +64,10 @@ ConquestRateServerSoulOrbs = 1
 # Retail: 1
 ConquestRateZonePoints = 1
 
+# Bloody Coins multiplier
+# Retail: 1
+ConquestRateBloodyCoins = 1
+
 # Character Attack Points
 # Retail: 100
 ConquestCharacterAttackPoints = 100
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/Custom/FakePlayers.ini
index 314e1793b8..8de34755bb 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/General.ini b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/General.ini
index 212f363d80..8b588f8d9c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/General.ini
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/General.ini
@@ -436,8 +436,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
@@ -660,6 +660,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 
 # ---------------------------------------------------------------------------
 # Blue-Red Team Abnormal Effect Settings
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/Rates.ini b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/Rates.ini
index 76ff651b5a..b2164f33ad 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/Rates.ini
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/config/Rates.ini
@@ -159,11 +159,13 @@ EventItemMaxLevelDifference = 9
 # Vitality system rates. Works only if EnableVitality = True
 # ---------------------------------------------------------------------------
 
-# The following configures the XP multiplier of each vitality level. Basically, you have
-# Default: 2
+# The following configures the XP multiplier of each vitality level.
 # Take care setting these values according to your server rates, as the can lead to huge differences!
 # Example with a server rate 15x and vitality = 2. => final server rate = 30 (15x2)!
+# Retail: 2
 RateVitalityExpMultiplier = 2.
+# Retail: 3
+RateVitalityExpPremiumMultiplier = 3.
 
 # Maximum vitality items allowed to be used for a week by a player.
 # Default: 999
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/ActionData.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/ActionData.xml
index 3f66ed148f..7de2a1ca25 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/ActionData.xml
@@ -2,33 +2,33 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
 	<action id="0" handler="SitStand" /> <!-- Sit / Stand -->
 	<action id="1" handler="RunWalk" /> <!-- Walk / Run -->
-	<!-- Attack -->
-	<!-- Exchange -->
-	<!-- Next Target (Melee) -->
-	<!-- Pick Up -->
-	<!-- Help -->
-	<!-- Invite -->
-	<!-- Leave Party -->
-	<!-- Dismiss Party Member -->
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<!-- Party Matching -->
+	<action id="2" handler="None" /> <!-- Attack -->
+	<action id="3" handler="None" /> <!-- Exchange -->
+	<action id="4" handler="None" /> <!-- Next Target (Melee) -->
+	<action id="5" handler="None" /> <!-- Pick Up -->
+	<action id="6" handler="None" /> <!-- Help -->
+	<action id="7" handler="None" /> <!-- Invite -->
+	<action id="8" handler="None" /> <!-- Leave Party -->
+	<action id="9" handler="None" /> <!-- Dismiss Party Member -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store - Sell -->
+	<action id="11" handler="None" /> <!-- Party Matching -->
 	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
 	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
 	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
 	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
 	<action id="16" handler="PetAttack" /> <!-- Attack -->
 	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<!-- Pick Up -->
+	<action id="18" handler="None" /> <!-- Pick Up -->
 	<action id="19" handler="UnsummonPet" /> <!-- Recall Pet -->
-	<!-- Special skill -->
+	<action id="20" handler="None" /> <!-- Special skill -->
 	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
 	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
 	<action id="23" handler="ServitorStop" /> <!-- Stop -->
 	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
 	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
 	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<!-- Special skill -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
+	<action id="27" handler="None" /> <!-- Special skill -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store - Buy -->
 	<action id="29" handler="SocialAction" option="8" /> <!-- Confusion -->
 	<action id="30" handler="SocialAction" option="9" /> <!-- Standby -->
 	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
@@ -37,10 +37,9 @@
 	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
 	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
 	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
 	<action id="38" handler="Ride" /> <!-- Mount/Dismount -->
 	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Parasite Burst -->
-	<!-- Recommend -->
+	<action id="40" handler="None" /> <!-- Recommend -->
 	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Cannon -->
 	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Self Damage Shield -->
 	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Water Pit -->
@@ -50,21 +49,20 @@
 	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Steal Blood -->
 	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanical Cannon -->
 	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Wild Temper -->
-	<!-- Change Party Leader -->
+	<action id="50" handler="None" /> <!-- Change Party Leader -->
 	<action id="52" handler="UnsummonServitor" /> <!-- Unsummon -->
 	<action id="53" handler="ServitorMove" /> <!-- Move -->
 	<action id="54" handler="PetMove" /> <!-- Move -->
-	<!-- Recording Replay On/Off -->
-	<!-- Command Channel Invite -->
-	<!-- Find Store -->
-	<!-- Duel -->
-	<!-- Cancel Duel -->
-	<!-- Party Duel -->
+	<action id="55" handler="None" /> <!-- Recording Replay On/Off -->
+	<action id="56" handler="None" /> <!-- Command Channel Invite -->
+	<action id="57" handler="None" /> <!-- Find Store -->
+	<action id="58" handler="None" /> <!-- Duel -->
+	<action id="59" handler="None" /> <!-- Cancel Duel -->
+	<action id="60" handler="None" /> <!-- Party Duel -->
 	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store - Wholesale -->
 	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<!-- Minigame -->
+	<action id="63" handler="None" /> <!-- Minigame -->
 	<action id="64" handler="TeleportBookmark" /> <!-- My Teleport -->
-	<action id="65" handler="BotReport" />
 	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
 	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
 	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
@@ -73,9 +71,9 @@
 	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
 	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
 	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<!-- Turn On/Off the Status Information -->
-	<!-- Invite Friends -->
-	<!-- Start/End Recording -->
+	<action id="74" handler="None" /> <!-- Turn On/Off the Status Information -->
+	<action id="76" handler="None" /> <!-- Invite Friends -->
+	<action id="77" handler="None" /> <!-- Start/End Recording -->
 	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Use of Token 1 -->
 	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Use of Token 2 -->
 	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Use of Token 3 -->
@@ -88,15 +86,15 @@
 	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
 	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off -->
 	<action id="90" handler="InstanceZoneInfo" /> <!-- Instance Zones -->
-	<!-- Previous Target (Melee) -->
-	<!-- Next Target (Range) -->
-	<!-- Previous Target (Range) -->
+	<action id="92" handler="None" /> <!-- Previous Target (Melee) -->
+	<action id="93" handler="None" /> <!-- Next Target (Range) -->
+	<action id="94" handler="None" /> <!-- Previous Target (Range) -->
 	<action id="95" handler="WaitingAction" /> <!-- Waiting Action -->
 	<action id="96" handler="StrikeBack" /> <!-- Strike Back -->
 	<action id="97" handler="CombatMode" /> <!-- Combat Mode -->
 	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Hammer -->
-	<!-- Ultimate Bombastic Buster -->
-	<!-- Hostile Feeling -->
+	<action id="1001" handler="None" /> <!-- Ultimate Bombastic Buster -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Hostile Feeling -->
 	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wild Stun -->
 	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wild Defense -->
 	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Bright Burst -->
@@ -235,8 +233,6 @@
 	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Phantom's Pounce -->
 	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Phantom Touch -->
 	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Panther Rush -->
 	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Jumping Attack -->
 	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Double Slash -->
 	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Elemental Slam -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/AppearanceStones.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/AppearanceStones.xml
index 3c35d41411..6e758d33e8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/AppearanceStones.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/AppearanceStones.xml
@@ -4550,4 +4550,34 @@
 		<bodyPart>chest</bodyPart>
 		<bodyPart>fullarmor</bodyPart>
 	</appearance_stone>
+	
+	<!-- Appearance Stone: Sigil of Light Lv. 1 -->
+	<appearance_stone id="60585" targetType="ARMOR" type="FIXED" visualId="60575" armorType="SIGIL" /> <!-- Sigil of Light Lv. 1 -->
+	
+	<!-- Appearance Stone: Sigil of Light Lv. 2 -->
+	<appearance_stone id="60586" targetType="ARMOR" type="FIXED" visualId="60576" armorType="SIGIL" /> <!-- Sigil of Light Lv. 2 -->
+	
+	<!-- Appearance Stone: Sigil of Light Lv. 3 -->
+	<appearance_stone id="60587" targetType="ARMOR" type="FIXED" visualId="60577" armorType="SIGIL" /> <!-- Sigil of Light Lv. 3 -->
+	
+	<!-- Appearance Stone: Sigil of Light Lv. 4 -->
+	<appearance_stone id="60588" targetType="ARMOR" type="FIXED" visualId="60578" armorType="SIGIL" /> <!-- Sigil of Light Lv. 4 -->
+	
+	<!-- Appearance Stone: Sigil of Light Lv. 5 -->
+	<appearance_stone id="60589" targetType="ARMOR" type="FIXED" visualId="60579" armorType="SIGIL" /> <!-- Sigil of Light Lv. 5 -->
+	
+	<!-- Appearance Stone: Sigil of Light Lv. 6 -->
+	<appearance_stone id="60590" targetType="ARMOR" type="FIXED" visualId="60580" armorType="SIGIL" /> <!-- Sigil of Light Lv. 6 -->
+	
+	<!-- Appearance Stone: Sigil of Light Lv. 7 -->
+	<appearance_stone id="60591" targetType="ARMOR" type="FIXED" visualId="60581" armorType="SIGIL" /> <!-- Sigil of Light Lv. 7 -->
+	
+	<!-- Appearance Stone: Sigil of Light Lv. 8 -->
+	<appearance_stone id="60592" targetType="ARMOR" type="FIXED" visualId="60582" armorType="SIGIL" /> <!-- Sigil of Light Lv. 8 -->
+	
+	<!-- Appearance Stone: Sigil of Light Lv. 9 -->
+	<appearance_stone id="60593" targetType="ARMOR" type="FIXED" visualId="60583" armorType="SIGIL" /> <!-- Sigil of Light Lv. 9 -->
+	
+	<!-- Appearance Stone: Sigil of Light Lv. 10 -->
+	<appearance_stone id="60594" targetType="ARMOR" type="FIXED" visualId="60584" armorType="SIGIL" /> <!-- Sigil of Light Lv. 10 -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/DailyMission.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/DailyMission.xml
index 5459aa25ee..dab762af93 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/DailyMission.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/DailyMission.xml
@@ -177,9 +177,9 @@
 		</items>
 	</reward>
 	<reward id="2101" name="Field Boss I" requiredCompletion="3" isOneTime="false">
-		<!-- Defeat any of the field raid bosses 3 times: Baium Orfen Lilith Anakim Ishka -->
+		<!-- Defeat any of the field raid bosses 3 times: Orfen Lilith Anakim Lord Ishka Queen Ant Guillotine -->
 		<handler name="boss">
-			<param name="ids">29020,29325,29336,29348,29379</param>
+			<param name="ids">29325,29336,29348,29379,25888</param>
 		</handler>
 		<items>
 			<item id="-200" count="100" /> <!-- Clan Reputation -->
@@ -332,11 +332,11 @@
 		</items>
 	</reward>
 	<reward id="3031" name="World Boss Raid: First Steps" requiredCompletion="1">
-		<!-- Defeat 1 of the following once. Antharas Valakas Lindvior Fafurion Helios Etis van Etina -->
+		<!-- Defeat 1 of the following once. Antharas Valakas Lindvior Helios Etis van Etina -->
 		<handler name="boss">
 			<param name="minLevel">95</param>
 			<param name="maxLevel">255</param>
-			<param name="ids">29068,29028,29240,29361,29362,29363,29364,29365,29366,29367,29305,29320</param>
+			<param name="ids">29068,29028,29240,29305,29320</param>
 		</handler>
 		<items>
 			<item id="-200" count="200" /> <!-- Clan Reputation -->
@@ -344,11 +344,11 @@
 		</items>
 	</reward>
 	<reward id="3032" name="World Boss Raid: Seasoned" requiredMissionCompleteId="3031" requiredCompletion="10">
-		<!-- Defeat 1 of the following 10 times. Antharas Valakas Lindvior Fafurion Helios Etis van Etina -->
+		<!-- Defeat 1 of the following 10 times. Antharas Valakas Lindvior Helios Etis van Etina -->
 		<handler name="boss">
 			<param name="minLevel">95</param>
 			<param name="maxLevel">255</param>
-			<param name="ids">29068,29028,29240,29361,29362,29363,29364,29365,29366,29367,29305,29320</param>
+			<param name="ids">29068,29028,29240,29305,29320</param>
 		</handler>
 		<items>
 			<item id="-200" count="1000" /> <!-- Clan Reputation -->
@@ -356,11 +356,11 @@
 		</items>
 	</reward>
 	<reward id="3033" name="World Boss Raid: Expert" requiredMissionCompleteId="3032" requiredCompletion="30">
-		<!-- Defeat 1 of the following 30 times. Antharas Valakas Lindvior Fafurion Helios Etis van Etina -->
+		<!-- Defeat 1 of the following 30 times. Antharas Valakas Lindvior Helios Etis van Etina -->
 		<handler name="boss">
 			<param name="minLevel">95</param>
 			<param name="maxLevel">255</param>
-			<param name="ids">29068,29028,29240,29361,29362,29363,29364,29365,29366,29367,29305,29320</param>
+			<param name="ids">29068,29028,29240,29305,29320</param>
 		</handler>
 		<items>
 			<item id="-200" count="2000" /> <!-- Clan Reputation -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/DailyMissionConquest.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/DailyMissionConquest.xml
index b6cc0ff5aa..747d096c97 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/DailyMissionConquest.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/DailyMissionConquest.xml
@@ -4,7 +4,7 @@
 		<!-- Kill 300 monsters. (A monster kill counts only when XP is gained from it.) -->
 		<!-- dethronedailymission_begin name=[Monster Hunting] id=1 npc_kill_max_count=300 reward_personal_dethrone_point=250 reward_server_dethrone_point=500 dethronedailymission_end -->
 		<handler name="monster">
-			<param name="ids">27701,27702,27703,27704,27705,27706,27707,27708,27709,27710,27711,27712,27713,27714,27715,27716,27717,27718,27719,27720,27721,27722,27723,27724,27725,27726,27727,27728,27729,27730,27731,27732,27733,27734,27735,27736,27737,27738,27739,27740,27741,27742,27743,27744,27745,27746,27747,27748,27749,27750,27751,27752,27753,27754</param>
+			<param name="ids">27701,27702,27703,27704,27705,27706,27707,27708,27709,27710,27711,27712,27713,27714,27715,27716,27717,27718,27719,27720,27721,27722,27723,27724,27725,27726,27727,27728,27729,27730,27731,27732,27733,27734,27735,27736,27737,27738,27739,27740,27741,27742,27743,27744,27745,27746,27747,27748,27749,27750,27751,27752,27753,27754,27801,27802,27803,27804,27805,27806,27794,27795,27796,27797,27798,27799,27808,27810,27811,27812,27813,27814,27815,27816,27817,27819,27820,27821,27822,27823,27824,27825</param>
 			<param name="minLevel">101</param>
 			<param name="maxLevel">255</param>
 		</handler>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/DoorData.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/DoorData.xml
index 2c635df7dc..858465d9b8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/DoorData.xml
@@ -11947,6 +11947,176 @@
 		<openStatus default="open" />
 	</door>
 	
+	<!-- 21_16 FIXME: Rune clanhall doors cannot be found in client. -->
+	<door id="21160001" name="rune_castle_agit_002_001">
+		<nodes nodeZ="872">
+			<node x="37679" y="-50432" />
+			<node x="37726" y="-50433" />
+			<node x="37726" y="-50423" />
+			<node x="37678" y="-50424" />
+		</nodes>
+		<location x="37680" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160002" name="rune_castle_agit_002_002">
+		<nodes nodeZ="872">
+			<node x="37724" y="-50432" />
+			<node x="37771" y="-50432" />
+			<node x="37771" y="-50423" />
+			<node x="37723" y="-50424" />
+		</nodes>
+		<location x="37770" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160003" name="rune_castle_agit_003_001">
+		<nodes nodeZ="872">
+			<node x="38527" y="-50151" />
+			<node x="38570" y="-50131" />
+			<node x="38566" y="-50122" />
+			<node x="38524" y="-50144" />
+		</nodes>
+		<location x="38527" y="-50147" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160004" name="rune_castle_agit_003_002">
+		<nodes nodeZ="872">
+			<node x="38569" y="-50132" />
+			<node x="38610" y="-50111" />
+			<node x="38606" y="-50103" />
+			<node x="38564" y="-50124" />
+		</nodes>
+		<location x="38607" y="-50108" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160005" name="rune_castle_agit_004_001">
+		<nodes nodeZ="872">
+			<node x="39122" y="-49542" />
+			<node x="39145" y="-49501" />
+			<node x="39137" y="-49498" />
+			<node x="39115" y="-49539" />
+		</nodes>
+		<location x="39119" y="-49539" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160006" name="rune_castle_agit_004_002">
+		<nodes nodeZ="872">
+			<node x="39145" y="-49503" />
+			<node x="39167" y="-49462" />
+			<node x="39160" y="-49459" />
+			<node x="39136" y="-49498" />
+		</nodes>
+		<location x="39163" y="-49461" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160007" name="rune_castle_agit_001_001">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48291" />
+			<node x="39341" y="-48245" />
+			<node x="39335" y="-48245" />
+			<node x="39334" y="-48290" />
+		</nodes>
+		<location x="39338" y="-48290" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160008" name="rune_castle_agit_001_002">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48246" />
+			<node x="39342" y="-48199" />
+			<node x="39334" y="-48199" />
+			<node x="39334" y="-48246" />
+		</nodes>
+		<location x="39338" y="-48200" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160009" name="rune_castle_agit_005_001">
+		<nodes nodeZ="872">
+			<node x="39176" y="-47024" />
+			<node x="39155" y="-46982" />
+			<node x="39147" y="-46986" />
+			<node x="39169" y="-47026" />
+		</nodes>
+		<location x="39172" y="-47024" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160010" name="rune_castle_agit_005_002">
+		<nodes nodeZ="872">
+			<node x="39154" y="-46982" />
+			<node x="39133" y="-46942" />
+			<node x="39127" y="-46945" />
+			<node x="39148" y="-46986" />
+		</nodes>
+		<location x="39130" y="-46944" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160011" name="rune_castle_agit_006_001">
+		<nodes nodeZ="872">
+			<node x="38626" y="-46372" />
+			<node x="38586" y="-46350" />
+			<node x="38581" y="-46358" />
+			<node x="38623" y="-46379" />
+		</nodes>
+		<location x="38624" y="-46375" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160012" name="rune_castle_agit_006_002">
+		<nodes nodeZ="872">
+			<node x="38587" y="-46350" />
+			<node x="38545" y="-46330" />
+			<node x="38542" y="-46336" />
+			<node x="38583" y="-46358" />
+		</nodes>
+		<location x="38544" y="-46333" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160013" name="rune_castle_agit_007_001">
+		<nodes nodeZ="873">
+			<node x="37787" y="-46044" />
+			<node x="37741" y="-46044" />
+			<node x="37741" y="-46051" />
+			<node x="37787" y="-46050" />
+		</nodes>
+		<location x="37787" y="-46047" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160014" name="rune_castle_agit_007_002">
+		<nodes nodeZ="873">
+			<node x="37743" y="-46043" />
+			<node x="37697" y="-46045" />
+			<node x="37697" y="-46051" />
+			<node x="37742" y="-46051" />
+		</nodes>
+		<location x="37697" y="-46048" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	
 	<!-- 21_17 -->
 	<door id="21170001" name="Rune_bodeful_fortress_s.Rune_bf_azit_gate_door">
 		<nodes nodeZ="544">
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/HuntPass.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/HuntPass.xml
index 44b2386585..1f3321a75d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/HuntPass.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/HuntPass.xml
@@ -4,110 +4,110 @@
 	<item id="60368" count="2" premiumId="60386" premiumCount="1"/> <!-- Season Pass Bonus / Hunter's Coin -->
 	<item id="48848" count="5" premiumId="60368" premiumCount="10" /> <!-- Freya's Ice Rose / Season Pass Bonus -->
 	<item id="60368" count="2" premiumId="80960" premiumCount="1" /> <!-- Season Pass Bonus / Pantheon's Museum's Time Stone -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="40" /> <!-- Season Pass Bonus / Freya's Ice Rose -->
+	<item id="81011" count="5" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
+	<item id="60368" count="2" premiumId="48848" premiumCount="40" /> <!-- Season Pass Bonus / Freya's Ice Rose -->
 	<item id="48857" count="5" premiumId="60368" premiumCount="20" /> <!-- Glowing Dragon's Attribute Potion (XP) / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Shining Nevit's Gold Hourglass -->
+	<item id="60368" count="2" premiumId="81013" premiumCount="20" /> <!-- Season Pass Bonus / Shining Nevit's Gold Hourglass -->
 	<item id="81815" count="1" premiumId="60368" premiumCount="10" /> <!-- Homunculus' Hourglass / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Emperor's Special Cocktail Event -->
+	<item id="60368" count="2" premiumId="81012" premiumCount="20" /> <!-- Season Pass Bonus / Emperor's Special Cocktail Event -->
 	<item id="60306" count="10" premiumId="60306" premiumCount="650" /> <!-- Vitality Sustention Points / Vitality Sustention Points -->
 	<!-- Page 2 -->
 	<item id="60368" count="2" premiumId="81815" premiumCount="4"/> <!-- Season Pass Bonus / Homunculus' Hourglass -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
 	<item id="60368" count="2" premiumId="80906" premiumCount="1" /> <!-- Season Pass Bonus / Jamoa's Camp's Time Stone -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="40" /> <!-- Season Pass Bonus / Honey Dark Beer -->
+	<item id="60368" count="2" premiumId="81011" premiumCount="40" /> <!-- Season Pass Bonus / Honey Dark Beer -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="40" /> <!-- Season Pass Bonus / Glowing Dragon's Attribute Potion (XP) -->
+	<item id="60368" count="2" premiumId="48857" premiumCount="40" /> <!-- Season Pass Bonus / Glowing Dragon's Attribute Potion (XP) -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Freya's Scroll of Storm Event -->
+	<item id="60368" count="2" premiumId="81054" premiumCount="20" /> <!-- Season Pass Bonus / Freya's Scroll of Storm Event -->
 	<item id="60306" count="10" premiumId="82394" premiumCount="5" /> <!-- Vitality Sustention Points / Augmenting Stone: Accesories -->
 	<!-- Page 3 -->
 	<item id="60368" count="2" premiumId="81815" premiumCount="2"/> <!-- Season Pass Bonus / Homunculus' Hourglass -->
 	<item id="48848" count="5" premiumId="60368" premiumCount="10" /> <!-- Freya's Ice Rose / Season Pass Bonus -->
 	<item id="60368" count="2" premiumId="80960" premiumCount="1" /> <!-- Season Pass Bonus / Pantheon's Museum's Time Stone -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="40" /> <!-- Season Pass Bonus / Freya's Ice Rose -->
+	<item id="81011" count="5" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
+	<item id="60368" count="2" premiumId="48848" premiumCount="20" /> <!-- Season Pass Bonus / Freya's Ice Rose -->
 	<item id="48857" count="5" premiumId="60368" premiumCount="20" /> <!-- Glowing Dragon's Attribute Potion (XP) / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Shining Nevit's Gold Hourglass -->
+	<item id="60368" count="2" premiumId="81013" premiumCount="10" /> <!-- Season Pass Bonus / Shining Nevit's Gold Hourglass -->
 	<item id="81815" count="1" premiumId="60368" premiumCount="10" /> <!-- Homunculus' Hourglass / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Emperor's Special Cocktail Event -->
+	<item id="60368" count="2" premiumId="81012" premiumCount="10" /> <!-- Season Pass Bonus / Emperor's Special Cocktail Event -->
 	<item id="60306" count="10" premiumId="60306" premiumCount="650" /> <!-- Vitality Sustention Points / Vitality Sustention Points -->
 	<!-- Page 4 -->
 	<item id="60368" count="2" premiumId="81815" premiumCount="4"/> <!-- Season Pass Bonus / Homunculus' Hourglass -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
 	<item id="60368" count="2" premiumId="80906" premiumCount="1" /> <!-- Season Pass Bonus / Jamoa's Camp's Time Stone -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="40" /> <!-- Season Pass Bonus / Honey Dark Beer -->
+	<item id="60368" count="2" premiumId="81011" premiumCount="20" /> <!-- Season Pass Bonus / Honey Dark Beer -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="40" /> <!-- Season Pass Bonus / Glowing Dragon's Attribute Potion (XP) -->
+	<item id="60368" count="2" premiumId="48857" premiumCount="20" /> <!-- Season Pass Bonus / Glowing Dragon's Attribute Potion (XP) -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Freya's Scroll of Storm Event -->
-	<item id="60306" count="40" premiumId="80393" premiumCount="5" /> <!-- Vitality Sustention Points / Augmenting Stone: Circlet -->
+	<item id="60368" count="2" premiumId="81054" premiumCount="10" /> <!-- Season Pass Bonus / Freya's Scroll of Storm Event -->
+	<item id="60306" count="10" premiumId="82393" premiumCount="5" /> <!-- Vitality Sustention Points / Augmenting Stone: Circlet -->
 	<!-- Page 5 -->
 	<item id="60368" count="2" premiumId="81815" premiumCount="2"/> <!-- Season Pass Bonus / Homunculus' Hourglass -->
 	<item id="48848" count="5" premiumId="60368" premiumCount="10" /> <!-- Freya's Ice Rose / Season Pass Bonus -->
 	<item id="60368" count="2" premiumId="80960" premiumCount="1" /> <!-- Season Pass Bonus / Pantheon's Museum's Time Stone -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="40" /> <!-- Season Pass Bonus / Freya's Ice Rose -->
+	<item id="81011" count="5" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
+	<item id="60368" count="2" premiumId="48848" premiumCount="20" /> <!-- Season Pass Bonus / Freya's Ice Rose -->
 	<item id="48857" count="5" premiumId="60368" premiumCount="20" /> <!-- Glowing Dragon's Attribute Potion (XP) / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Shining Nevit's Gold Hourglass -->
+	<item id="60368" count="2" premiumId="81013" premiumCount="10" /> <!-- Season Pass Bonus / Shining Nevit's Gold Hourglass -->
 	<item id="81815" count="1" premiumId="60368" premiumCount="10" /> <!-- Homunculus' Hourglass / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Emperor's Special Cocktail Event -->
+	<item id="60368" count="2" premiumId="81012" premiumCount="10" /> <!-- Season Pass Bonus / Emperor's Special Cocktail Event -->
 	<item id="60306" count="10" premiumId="60306" premiumCount="650" /> <!-- Vitality Sustention Points / Vitality Sustention Points -->
 	<!-- Page 6 -->
 	<item id="60368" count="2" premiumId="81815" premiumCount="4"/> <!-- Season Pass Bonus / Homunculus' Hourglass -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
 	<item id="60368" count="2" premiumId="80906" premiumCount="1" /> <!-- Season Pass Bonus / Jamoa's Camp's Time Stone -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="40" /> <!-- Season Pass Bonus / Honey Dark Beer -->
+	<item id="60368" count="2" premiumId="81011" premiumCount="20" /> <!-- Season Pass Bonus / Honey Dark Beer -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="40" /> <!-- Season Pass Bonus / Glowing Dragon's Attribute Potion (XP) -->
+	<item id="60368" count="2" premiumId="48857" premiumCount="20" /> <!-- Season Pass Bonus / Glowing Dragon's Attribute Potion (XP) -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Freya's Scroll of Storm Event -->
-	<item id="60306" count="40" premiumId="80396" premiumCount="5" /> <!-- Vitality Sustention Points / Augmenting Stone: Kaliel's Bracelet -->
+	<item id="60368" count="2" premiumId="81054" premiumCount="10" /> <!-- Season Pass Bonus / Freya's Scroll of Storm Event -->
+	<item id="60306" count="10" premiumId="80396" premiumCount="5" /> <!-- Vitality Sustention Points / Augmenting Stone: Kaliel's Bracelet -->
 	<!-- Page 7 -->
 	<item id="60368" count="2" premiumId="81815" premiumCount="2"/> <!-- Season Pass Bonus / Homunculus' Hourglass -->
 	<item id="48848" count="5" premiumId="60368" premiumCount="10" /> <!-- Freya's Ice Rose / Season Pass Bonus -->
 	<item id="60368" count="2" premiumId="80960" premiumCount="1" /> <!-- Season Pass Bonus / Pantheon's Museum's Time Stone -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="40" /> <!-- Season Pass Bonus / Freya's Ice Rose -->
+	<item id="81011" count="5" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
+	<item id="60368" count="2" premiumId="48848" premiumCount="20" /> <!-- Season Pass Bonus / Freya's Ice Rose -->
 	<item id="48857" count="5" premiumId="60368" premiumCount="20" /> <!-- Glowing Dragon's Attribute Potion (XP) / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Shining Nevit's Gold Hourglass -->
+	<item id="60368" count="2" premiumId="81013" premiumCount="10" /> <!-- Season Pass Bonus / Shining Nevit's Gold Hourglass -->
 	<item id="81815" count="1" premiumId="60368" premiumCount="10" /> <!-- Homunculus' Hourglass / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Emperor's Special Cocktail Event -->
+	<item id="60368" count="2" premiumId="81012" premiumCount="10" /> <!-- Season Pass Bonus / Emperor's Special Cocktail Event -->
 	<item id="60306" count="10" premiumId="60306" premiumCount="650" /> <!-- Vitality Sustention Points / Vitality Sustention Points -->
 	<!-- Page 8 -->
 	<item id="60368" count="2" premiumId="81815" premiumCount="4"/> <!-- Season Pass Bonus / Homunculus' Hourglass -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
 	<item id="60368" count="2" premiumId="80906" premiumCount="1" /> <!-- Season Pass Bonus / Jamoa's Camp's Time Stone -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="40" /> <!-- Season Pass Bonus / Honey Dark Beer -->
+	<item id="60368" count="2" premiumId="81011" premiumCount="20" /> <!-- Season Pass Bonus / Honey Dark Beer -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="40" /> <!-- Season Pass Bonus / Glowing Dragon's Attribute Potion (XP) -->
+	<item id="60368" count="2" premiumId="48857" premiumCount="20" /> <!-- Season Pass Bonus / Glowing Dragon's Attribute Potion (XP) -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Freya's Scroll of Storm Event -->
-	<item id="60306" count="40" premiumId="80398" premiumCount="5" /> <!-- Vitality Sustention Points / Augmenting Stone: Artifact Book -->
+	<item id="60368" count="2" premiumId="81054" premiumCount="10" /> <!-- Season Pass Bonus / Freya's Scroll of Storm Event -->
+	<item id="60306" count="40" premiumId="82398" premiumCount="5" /> <!-- Vitality Sustention Points / Augmenting Stone: Artifact Book -->
 	<!-- Page 9 -->
 	<item id="60368" count="2" premiumId="81815" premiumCount="2"/> <!-- Season Pass Bonus / Homunculus' Hourglass -->
 	<item id="48848" count="5" premiumId="60368" premiumCount="10" /> <!-- Freya's Ice Rose / Season Pass Bonus -->
 	<item id="60368" count="2" premiumId="80960" premiumCount="1" /> <!-- Season Pass Bonus / Pantheon's Museum's Time Stone -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="40" /> <!-- Season Pass Bonus / Freya's Ice Rose -->
+	<item id="81011" count="5" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
+	<item id="60368" count="2" premiumId="48848" premiumCount="20" /> <!-- Season Pass Bonus / Freya's Ice Rose -->
 	<item id="48857" count="5" premiumId="60368" premiumCount="20" /> <!-- Glowing Dragon's Attribute Potion (XP) / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Shining Nevit's Gold Hourglass -->
+	<item id="60368" count="2" premiumId="81013" premiumCount="10" /> <!-- Season Pass Bonus / Shining Nevit's Gold Hourglass -->
 	<item id="81815" count="1" premiumId="60368" premiumCount="10" /> <!-- Homunculus' Hourglass / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Emperor's Special Cocktail Event -->
+	<item id="60368" count="2" premiumId="81012" premiumCount="10" /> <!-- Season Pass Bonus / Emperor's Special Cocktail Event -->
 	<item id="60306" count="10" premiumId="60306" premiumCount="650" /> <!-- Vitality Sustention Points / Vitality Sustention Points -->
 	<!-- Page 10 -->
 	<item id="60368" count="2" premiumId="81815" premiumCount="4"/> <!-- Season Pass Bonus / Homunculus' Hourglass -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
 	<item id="60368" count="2" premiumId="80906" premiumCount="1" /> <!-- Season Pass Bonus / Jamoa's Camp's Time Stone -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="40" /> <!-- Season Pass Bonus / Honey Dark Beer -->
+	<item id="60368" count="2" premiumId="81011" premiumCount="20" /> <!-- Season Pass Bonus / Honey Dark Beer -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="40" /> <!-- Season Pass Bonus / Glowing Dragon's Attribute Potion (XP) -->
+	<item id="60368" count="2" premiumId="48857" premiumCount="20" /> <!-- Season Pass Bonus / Glowing Dragon's Attribute Potion (XP) -->
 	<item id="60368" count="2" premiumId="60368" premiumCount="10" /> <!-- Season Pass Bonus / Season Pass Bonus -->
-	<item id="60368" count="2" premiumId="60368" premiumCount="20" /> <!-- Season Pass Bonus / Freya's Scroll of Storm Event -->
+	<item id="60368" count="2" premiumId="81054" premiumCount="10" /> <!-- Season Pass Bonus / Freya's Scroll of Storm Event -->
 	<item id="82344" count="50" premiumId="60378" premiumCount="1" /> <!-- Tales of Dimensions / Final Reward Chest -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/InstanceNames.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/InstanceNames.xml
index bdf7023792..3f8c7f4b7f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/InstanceNames.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/InstanceNames.xml
@@ -322,6 +322,7 @@
 	<instance id="320" name="Crystal Caverns" />
 	<instance id="321" name="Nightmare Kamaloka" />
 	<instance id="322" name="Krofin's Nest" />
+	<instance id="323" name="Ice Queen's Castle (Party)" />
 	<instance id="1001" name="Session Zone - Fioren's Crystal Prison" />
 	<instance id="1006" name="Session Zone - Jamoa's Camp" />
 	<instance id="1007" name="Session Zone - Pantheon's Museum" />
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/33715-1.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/33715-1.htm
index 434e4276c9..351ef62b6a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/33715-1.htm
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/33715-1.htm
@@ -1,8 +1,9 @@
 <html><body>Seed Talisman Manager:<br>
-Gracia is interesting, yes, interesting for its seeds. Many seeds, very interesting!<br>
-We have found, let me see... Talisman - Infinity, Talisman - Destruction, Talisman - Annihilation, Talisman - Hellfire, Talisman - Desire, Talisman - Longing, and Talisman - Insanity! But I can only offer the Talisman - Infinity. But no worries! With the <font color="LEVEL">Energy of Destruction</font> and <font color="LEVEL">Giant's Energy</font>, you can create a Seed Talisman beyond that of Destruction! It does not always work, of course, but it is worth trying, yes! Oh, and when you're upgrading them, use <font color="LEVEL">Kaliel's Energy</font> or <font color="LEVEL">Elcyum</font> to increase the success rate.<br>
-Oh, and wearing multiple will not give you multiple effects!<br>
-Ah! I want you to know that I cannot help you create Talisman - Insanity. But if you use <font color="LEVEL">combination</font> in the inventory, you will be able to get one. But the chances are low because it is so rare.<br>
-All Seed Talismans are bound to you, but you can unbind the Talisman - Longing and Talisman - Insanity by sealing them.<br>
+Since Gracia and Aden have made an alliance, the research of Gracia's Seed is progressing at a quick rate. For instance, we've found talismans in several seeds.<br>
+Those are Talisman of Infinity, Talisman of Destruction, Talisman of Annihilation, Talisman of Hellfire, Talisman of Desire, Talisman of Longing, and Talisman of Insanity and Heavenly Talisman. However, I can give you only the Talisman of Infinity.<br>
+Don't worry! Using <font color="LEVEL">Energy of Destruction</font> and <font color="LEVEL">Giant's Energy</font>, you can create a Seed Talisman that's more powerful than Talisman of Destruction - if you're lucky, of course. You can equip several Seed Talismans, but only the most powerful of them will be active.<br>
+You can <font color="LEVEL">seal Talisman of Longing</font> and <font color="LEVEL">Talisman of Insanity</font> to <font color="LEVEL">give them</font> to <font color="LEVEL">another character</font>.<br>
+If you use several talismans, <font color="LEVEL">only one will be active</font>.<br>
+By the way, you can try crafting Talisman of Insanity and Heavenly Talisman by yourself via the <font color="LEVEL">compounding</font> option in your inventory. But I'd recommend using my services to increase your success rate, because these are very rare items and it's not that easy to get them.<br1>
 <Button ALIGN=LEFT ICON="RETURN" action="bypass -h npc_%objectId%_Chat 0">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34426.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34426.htm
new file mode 100644
index 0000000000..9d70e30f05
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34426.htm
@@ -0,0 +1,6 @@
+<html><body>Blackbird Clan Lord Leona Blackbird:<br>
+This place is the Atelia Outlet, the most important place of Atelia Refinery.<br>
+Embryos might sense your presence, so please be very careful.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10889_SaviorsPathFallenEmperorsThrone teleport">Teleport to the inside of Atelia Refinery.</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34525.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34525.htm
index c15b90e604..624283bd89 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34525.htm
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34525.htm
@@ -1,3 +1,3 @@
-<html><body>Overseer Merksman:<br>
+<html><body>Overseer Marksman:<br>
 There are many dangerous monsters outside the camps. Don't let your guard down.
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34530.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34529.htm
similarity index 71%
rename from L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34530.htm
rename to L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34529.htm
index 2e0ae6d173..936886e2bb 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34530.htm
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34529.htm
@@ -1,3 +1,3 @@
-<html><body>Investigators Guard:<br>
+<html><body>Expedition Guard:<br>
 There are many dangerous monsters outside the camps. Don't let your guard down.
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34542-6.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34542-6.htm
index 1597acac3a..dad79cf16e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34542-6.htm
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34542-6.htm
@@ -3,6 +3,6 @@ It's simple. You need to defeat Freya in the Ice Queen's Castle.<br>
 You can enter the Ice Queen's Castle in a <font color="LEVEL">party of 2-7 players of Lv. 115 or higher</font>. You won't need to choose difficulty level here: Unlike daily instance zones, here there is only one difficulty.<br>
 If you defeat Freya, you will be able to re-enter the Ice Queen's Castle only after resetting <font color="LEVEL">each Wednesday at 06:30</font>.<br>
 Note that during the battle you can re-enter the zone, but <font color="LEVEL">if all the members of your party left</font>, you need to return there <font color="LEVEL">within 1 minute</font>.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest IceQueensCastle enterInstance">Enter the Ice Queen's Castle</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Freya enterInstance">Enter the Ice Queen's Castle</Button>
 <Button ALIGN=LEFT ICON="RETURN" action="bypass -h npc_%objectId%_Chat 0">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34553.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34553.htm
new file mode 100644
index 0000000000..e43ae69016
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34553.htm
@@ -0,0 +1,3 @@
+<html><body>Search Team Guard:<br>
+There are many dangerous monsters out there. Don't let your guard down.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/TimedHunting/34569.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34569.htm
similarity index 78%
rename from L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/TimedHunting/34569.html
rename to L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34569.htm
index 2951107d95..f89999d41d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/TimedHunting/34569.html
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34569.htm
@@ -1,4 +1,4 @@
 <html><body>Patrol Guard:<br>
-Fafurion's Soldiers have occupied the fields. We found out rhat they have divided into two units.<br>
+Fafurion's Soldiers have occupied the fields. We found out that they have divided into two units.<br>
 The soldiers to the north in the Field of Silence are there to capture Krofins, and the elite soldiers are to the south in the Field of Whispers.
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34619.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34619.htm
new file mode 100644
index 0000000000..9923f31227
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34619.htm
@@ -0,0 +1,3 @@
+<html><body>Researchers' Guard:<br>
+There are many dangerous monsters outside the camps. Don't let your guard down.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34625.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34625.htm
new file mode 100644
index 0000000000..9923f31227
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34625.htm
@@ -0,0 +1,3 @@
+<html><body>Researchers' Guard:<br>
+There are many dangerous monsters outside the camps. Don't let your guard down.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34627.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34627.htm
new file mode 100644
index 0000000000..936886e2bb
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34627.htm
@@ -0,0 +1,3 @@
+<html><body>Expedition Guard:<br>
+There are many dangerous monsters outside the camps. Don't let your guard down.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34629.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34629.htm
new file mode 100644
index 0000000000..936886e2bb
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34629.htm
@@ -0,0 +1,3 @@
+<html><body>Expedition Guard:<br>
+There are many dangerous monsters outside the camps. Don't let your guard down.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34631.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34631.htm
new file mode 100644
index 0000000000..624283bd89
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34631.htm
@@ -0,0 +1,3 @@
+<html><body>Overseer Marksman:<br>
+There are many dangerous monsters outside the camps. Don't let your guard down.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34633.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34633.htm
new file mode 100644
index 0000000000..4995673073
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34633.htm
@@ -0,0 +1,3 @@
+<html><body>Overseer Guardian:<br>
+There are many dangerous monsters outside the camps. Don't let your guard down.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34648.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34648.htm
new file mode 100644
index 0000000000..f89999d41d
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34648.htm
@@ -0,0 +1,4 @@
+<html><body>Patrol Guard:<br>
+Fafurion's Soldiers have occupied the fields. We found out that they have divided into two units.<br>
+The soldiers to the north in the Field of Silence are there to capture Krofins, and the elite soldiers are to the south in the Field of Whispers.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34668.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34668.htm
new file mode 100644
index 0000000000..122cfedac0
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34668.htm
@@ -0,0 +1,5 @@
+<html><body>Fire Fortress Guide Casgard:<br>
+I hope these landscapes were not a disappointment to you. Although this place is called the <font color="LEVEL">Fire Fortress</font>, did you really think that you'll see only scorching ashes and harsh smoke here?<br>
+In any case, you've come a long way. For now, take a breath and look around. We'll discuss my request later.<br>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34669.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34669.htm
new file mode 100644
index 0000000000..bcc9ab46dd
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34669.htm
@@ -0,0 +1,5 @@
+<html><body>Fire Fortress Guide Ishrin:<br>
+Have you ever heard the expression <font color="LEVEL">"petals of fire"</font>? I've always found it strange. How could anyone compare hot scarlet flames with tender florwers?<br>
+Probably, that's the reason why I became so interested in the flowers that grow in the Fire Conquest area.<br>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34670.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34670.htm
new file mode 100644
index 0000000000..efb017de54
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/default/34670.htm
@@ -0,0 +1,8 @@
+<html><body>Fire Fortress Guide Kellond:<br>
+Greetings! I hope we'll become friends, and friends have no use for formalities. There is no need to call me Fire Fortress Guide.<br>
+Friends call me <font color="LEVEL">Kellond the Immortal</font>!<br>
+Care to know why? That's quite simple.<br>
+I'm called the Immortal because, unlike you, I never put myself at risk and try to avoid difficulties that threaten my life. What is even more important, I always keep to safe places!<br>
+To my mind, this is the safest place in all the Conquest world, which means I'll never ever leave it!<br>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34524.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34524.htm
index 7ff809ad56..64da928477 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34524.htm
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34524.htm
@@ -1,12 +1,8 @@
 <html><body>Overseer Teleporter:<br>
 I can teleport you to any Overseer camp.<br>
 Where would you like to teleport?<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 0">Golden Hills(north)</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 1">Golden Hills(south)</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 2">Golden Altar</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 3"><font color="f96464">Mimir's Altar(Lv. 112)</font></Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 4"><font color="f96464">Nornil's Altar(Lv. 112)</font></Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 5"><font color="f96464">Isle of Souls Harbor(Lv. 112)</font></Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 6"><font color="f96464">Kamael Village(East)(Lv. 112)</font></Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 7"><font color="f96464">Kamael Village(South)(Lv. 112)</font></Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 0">Pantheon's Museum</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 1">Golden Hills(north)</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 2">Golden Hills(south)</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 3">Golden Altar</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34526.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34526.htm
index 2d07f72068..1f194addfe 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34526.htm
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34526.htm
@@ -1,8 +1,9 @@
 <html><body>Expedition Teleporter:<br>
 We will safely send you to our camps.<br>
 Where would you like to go?<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 0">Eastern Camp</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 1">Western Camp</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 2">Southern Camp</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 3">Northern Camp</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 0">Jamoa's Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 1">Eastern Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 2">Western Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 3">Southern Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 4">Northern Camp</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34529.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34529.htm
index 09e500055d..87d8bb2279 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34529.htm
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34529.htm
@@ -1,8 +1,9 @@
 <html><body>Investigators Teleporter:<br>
 We will safely send you to our camps.<br>
 Where would you like to go?<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 0">Eastern Camp</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 1">Western Camp</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 2">Southern Camp</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 3">Northern Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 0">Fioren's Crystal Prison</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 1">Eastern Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 2">Western Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 3">Southern Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 4">Northern Camp</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/TimedHunting/34549.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34549.htm
similarity index 100%
rename from L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/TimedHunting/34549.html
rename to L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34549.htm
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34568.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34568.htm
index 4ea4e3049c..6b93180800 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34568.htm
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34568.htm
@@ -1,12 +1,13 @@
 <html><body>Patrol Teleporter:<br>
-The sudden attack of the Fafurion army has had my head spinning. The first group can be found in the Field of Silence to the north trying to subjugate the Krofin.
-The second one, composed of elite warriors, is setting up camp in the Field of Whispers to the south.<br>
-Out scouts think that the soldiers in the Field of Whispers are more dangerous, so be extra careful.<br>
-Where would you like to teleport? <br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 0">Eastern Border</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 1">Western Border</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 2">East of the Fields of Silence(Lv. 108)</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 3">Western Part of the Fields of Silence(Lv. 108)</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 4">Eastern Part of the Fields of Whispers(Lv. 114)</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 5">Western Part of the Fields of Silence(Lv. 114)</Button>
+The sudden attack of the Fafurion army has had my head spinning. The first group can be found in the Field of Silence to the north trying to subjugate
+the Krofin. The second one, composed of elite warriors, is setting up camp in the Field of Whispers to the south.<br>
+Our scouts think that the soldiers in the Fields of Whispers are more dangerous, so be extra careful.<br>
+Where would you like to teleport?<br>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 0">Return to Heine</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 1">Eastern Border</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 2">Western Border</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 3">East of the Field of Silence</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 4">Western part of the Field of Silence</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 5">Eastern part of the Field of Whispers</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 6">Western part of the Field of Whispers</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34618.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34618.htm
new file mode 100644
index 0000000000..87d8bb2279
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34618.htm
@@ -0,0 +1,9 @@
+<html><body>Investigators Teleporter:<br>
+We will safely send you to our camps.<br>
+Where would you like to go?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 0">Fioren's Crystal Prison</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 1">Eastern Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 2">Western Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 3">Southern Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 4">Northern Camp</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34624.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34624.htm
new file mode 100644
index 0000000000..a7ed83155a
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34624.htm
@@ -0,0 +1,9 @@
+<html><body>Researchers' Teleporter:<br>
+We will safely send you to our camps.<br>
+Where would you like to go?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 0">Fioren's Crystal Prison</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 1">Eastern Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 2">Western Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 3">Southern Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 4">Northern Camp</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34626.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34626.htm
new file mode 100644
index 0000000000..afc6ade7b9
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34626.htm
@@ -0,0 +1,8 @@
+<html><body>Expedition Teleporter:<br>
+We will safely send you to our camps.<br>
+Where would you like to go?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 0">Jamoas's Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 1">Eastern Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 2">Western Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 3">Northern Camp</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34628.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34628.htm
new file mode 100644
index 0000000000..049fd157a6
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34628.htm
@@ -0,0 +1,8 @@
+<html><body>Expedition Teleporter:<br>
+We will safely send you to our camps.<br>
+Where would you like to go?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 0">Jamoa's Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 1">Eastern Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 2">Western Camp</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 3">Northern Camp</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34630.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34630.htm
new file mode 100644
index 0000000000..3bc95d4631
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34630.htm
@@ -0,0 +1,10 @@
+<html><body>Overseer Teleporter:<br>
+I can teleport you to any Overseer camp.<br>
+Where would you like to teleport?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 0">Pantheon's Museum</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 1">Mimir's Altar</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 2">Nornil's Altar</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 3">Isle of Souls Harbor</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 4">Kamael Village (East)</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 5">Kamael Village (South)</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34632.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34632.htm
new file mode 100644
index 0000000000..02ecac71b4
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34632.htm
@@ -0,0 +1,9 @@
+<html><body>Overseer Teleporter:<br>
+I can teleport you to any Overseer camp.<br>
+Where would you like to teleport?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 0">Pantheon's Museum</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 1">Railroad Station</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 2">Plunderous Plains (West)</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 3">Plunderous Plains (East)</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 4">Sky Wagon Relic</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34646.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34646.htm
new file mode 100644
index 0000000000..14cf428a36
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34646.htm
@@ -0,0 +1,6 @@
+<html><body>Lionel Hunter:<br>
+Select the place you wish to teleport to.
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 0">Field of Silence</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 1">Field of Whispers</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 2">Alligator Beach</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/TimedHunting/34568.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34647.htm
similarity index 52%
rename from L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/TimedHunting/34568.html
rename to L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34647.htm
index f43b86a73b..e4eb271957 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/TimedHunting/34568.html
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/html/teleporter/34647.htm
@@ -3,10 +3,7 @@ The sudden attack of the Fafurion army has had my head spinning. The first group
 the Krofin. The second one, composed of elite warriors, is setting up camp in the Field of Whispers to the south.<br>
 Our scouts think that the soldiers in the Fields of Whispers are more dangerous, so be extra careful.<br>
 Where would you like to teleport?<br>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 0">Eastern Border</Button>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 1">Western Border</Button>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 2">East of the Field of Silence (Lv.108)</Button>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 3">Western part of the Field of Silence (Lv.108)</Button>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 4">Eastern part of the Field of Whispers (Lv.114)</Button>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 5">Western part of the Field of Whispers (Lv.114)</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 0">Return to Heine</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 1">Southern part of the Alligator Beach</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_teleport OTHER 2">Northern of the Alligator Beach</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/instances/IceQueensCastle.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/instances/IceQueensCastle.xml
new file mode 100644
index 0000000000..b83cf486bb
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/instances/IceQueensCastle.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Ice Queen's Castle -->
+<instance id="323" maxWorlds="100" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+	<time duration="60" empty="0" />
+	<locations>
+		<enter type="FIXED">
+			<location x="114722" y="-113870" z="-11207" />
+		</enter>
+		<exit type="FIXED">
+			<location x="146981" y="26877" z="-2208" />
+		</exit>
+	</locations>
+	<conditions>
+		<condition type="Party" showMessageAndHtml="true">
+			<param name="html" value="condNoEnter.html" />
+		</condition>
+		<condition type="PartyLeader" showMessageAndHtml="true">
+			<param name="html" value="condNoEnter.html" />
+		</condition>
+		<condition type="GroupMin">
+			<param name="html" value="condNoEnter.html" />
+			<param name="limit" value="2" />
+		</condition>
+		<condition type="GroupMax">
+			<param name="limit" value="7" />
+		</condition>
+		<condition type="Level" showMessageAndHtml="true">
+			<param name="html" value="condNoEnter.html" />
+			<param name="min" value="115" />
+		</condition>
+		<condition type="Distance" />
+		<condition type="Reenter" />
+	</conditions>
+	<reenter apply="ON_FINISH">
+		<reset day="WEDNESDAY" hour="6" minute="30" />
+	</reenter>
+	<doorlist>
+		<door id="23140101">
+			<openStatus default="close" />
+		</door>
+	</doorlist>
+	<spawnlist>
+		<group name="FREYA_STAGE_1" spawnByDefault="false">
+			<npc id="26511" x="114721" y="-114809" z="-11208" heading="16117" /> <!-- Freya -->
+		</group>
+		<group name="FREYA_STAGE_2" spawnByDefault="false">
+			<npc id="26512" x="114723" y="-117531" z="-10676" heading="16117" /> <!-- Freya -->
+		</group>
+		<group name="FREYA_STAGE_3" spawnByDefault="false">
+			<npc id="26513" x="114721" y="-114809" z="-11208" heading="16117" /> <!-- Freya -->
+		</group>
+		<group name="GLAKIAS" spawnByDefault="false">
+			<npc id="26514" x="114721" y="-114809" z="-11208" heading="16117" /> <!-- Glakias -->
+		</group>
+		<group name="KANNAS_KNIGHTS" spawnByDefault="false">
+			<npc id="26521" x="113916" y="-114006" z="-11203" heading="57456" /> <!-- Adrini -->
+			<npc id="26522" x="113916" y="-115602" z="-11203" heading="8079" /> <!-- Belkshin -->
+			<npc id="26523" x="115526" y="-115602" z="-11203" heading="24096" /> <!-- Kamel -->
+			<npc id="26524" x="115532" y="-114006" z="-11203" heading="40815" /> <!-- Diastin -->
+		</group>
+		<group name="WINTER_CRYSTAL" spawnByDefault="false">
+			<npc id="26518" x="114871" y="-114817" z="-11208" heading="16154" /> <!-- Winter Crystal -->
+		</group>
+		<group name="ICICLES_1" spawnByDefault="false">
+			<npc id="26520" x="114730" y="-117205" z="-11083" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-117005" z="-11083" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-116805" z="-11083" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-116605" z="-11099" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-116405" z="-11177" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-116205" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-116005" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-115805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-115605" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-115405" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-115205" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-115005" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-114605" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-114405" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-114205" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-114005" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-113805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-113605" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-113405" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-113205" z="-10989" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-113005" z="-10989" heading="0" /> <!-- Huge Icicle -->
+		</group>
+		<group name="ICICLES_2" spawnByDefault="false">
+			<npc id="26520" x="112930" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="113130" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="113330" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="113530" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="113730" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="113930" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114130" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114330" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114530" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114930" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="115130" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="115330" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="115530" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="115730" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="115930" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="116130" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="116330" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="116530" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+		</group>
+		<group name="ICICLES_3" spawnByDefault="false">
+			<npc id="26520" x="114730" y="-117205" z="-11083" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-117005" z="-11083" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-116805" z="-11083" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-116605" z="-11099" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-116405" z="-11177" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-116205" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-116005" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-115805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-115605" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-115405" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-115205" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-115005" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-114605" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-114405" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-114205" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-114005" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-113805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-113605" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-113405" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-113205" z="-10989" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-113005" z="-10989" heading="0" /> <!-- Huge Icicle -->
+		</group>
+		<group name="ICICLES_4" spawnByDefault="false">
+			<npc id="26520" x="112930" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="113130" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="113330" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="113530" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="113730" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="113930" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114130" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114330" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114530" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114730" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="114930" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="115130" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="115330" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="115530" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="115730" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="115930" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="116130" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="116330" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+			<npc id="26520" x="116530" y="-114805" z="-11200" heading="0" /> <!-- Huge Icicle -->
+		</group>
+	</spawnlist>
+</instance>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/2061.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/2061.xml
index 8711f6a17c..0f790b68b8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/2061.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/2061.xml
@@ -7,7 +7,7 @@
 		<ingredient id="37714" count="1" /> <!-- Talisman - Lilith -->
 		<ingredient id="37715" count="1" /> <!-- Talisman - Anakim -->
 		<ingredient id="37716" count="1" /> <!-- Seven Signs' Energy -->
-		<ingredient id="57" count="5600000" /> <!-- Seven Signs' Energy -->
+		<ingredient id="57" count="22400000" /> <!-- Adena -->
 		<production id="37717" count="1" /> <!-- Talisman - Seven Signs -->
 	</item>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/3105301.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/3105301.xml
index 5022eea6f5..0d3ceea1c5 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/3105301.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/3105301.xml
@@ -13,6 +13,10 @@
 		<npc>31308</npc> <!-- Achim -->
 		<npc>31953</npc> <!-- Rankar -->
 	</npcs>
+	<item>
+		<ingredient count="5" id="60319" /> <!-- Forgotten Lord's Crystal of Dyes -->
+		<production count="1" id="60321" /> <!-- Forgotten Lord's Dye Lv.1 (CON +1) -->
+	</item>
 	<item>
 		<ingredient count="10" id="81134" /> <!-- Crystal Of Dye -->
 		<production count="1" id="81055" /> <!-- Legendary Dye Lv.1 (P. Atk) -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/3105302.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/3105302.xml
index 9d1fbd7cba..59c00b8f04 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/3105302.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/3105302.xml
@@ -17,81 +17,81 @@
 		<ingredient id="57" count="1000000" /> <!-- Adena -->
 		<production id="17825" count="1" chance="0" /> <!-- STR Dye -->
 		<production id="17625" count="1" chance="35" /> <!-- Giant STR Dye Lv.1 -->
-		<production id="17631" count="1" chance="20" /> <!-- Ancient STR Dye Lv.1 -->
-		<production id="17637" count="1" chance="20" /> <!-- Legendary STR Dye Lv.1 -->
-		<production id="17643" count="1" chance="5" /> <!-- Giant STR Dye Lv.2 -->
-		<production id="17649" count="1" chance="5" /> <!-- Ancient STR Dye Lv.2 -->
-		<production id="17655" count="1" chance="3" /> <!-- Legendary STR Dye Lv.2 -->
-		<production id="17661" count="1" chance="2" /> <!-- Giant STR Dye Lv.3 -->
-		<production id="17667" count="1" chance="2" /> <!-- Ancient STR Dye Lv.3 -->
-		<production id="17673" count="1" chance="2" /> <!-- Legendary STR Dye Lv.3 -->
-		<production id="17697" count="1" chance="2" /> <!-- Giant STR Dye Lv.5 -->
-		<production id="17703" count="1" chance="2" /> <!-- Ancient STR Dye Lv.5 -->
-		<production id="17709" count="1" chance="2" /> <!-- Legendary STR Dye Lv.5 -->
+		<production id="17631" count="1" chance="25" /> <!-- Ancient STR Dye Lv.1 -->
+		<production id="17637" count="1" chance="15" /> <!-- Legendary STR Dye Lv.1 -->
+		<production id="17643" count="1" chance="9" /> <!-- Giant STR Dye Lv.2 -->
+		<production id="17649" count="1" chance="7" /> <!-- Ancient STR Dye Lv.2 -->
+		<production id="17655" count="1" chance="4" /> <!-- Legendary STR Dye Lv.2 -->
+		<production id="17661" count="1" chance="3" /> <!-- Giant STR Dye Lv.3 -->
+		<production id="17667" count="1" chance="1.5" /> <!-- Ancient STR Dye Lv.3 -->
+		<production id="17673" count="1" chance="0.3" /> <!-- Legendary STR Dye Lv.3 -->
+		<production id="17697" count="1" chance="0.1" /> <!-- Giant STR Dye Lv.5 -->
+		<production id="17703" count="1" chance="0.07" /> <!-- Ancient STR Dye Lv.5 -->
+		<production id="17709" count="1" chance="0.03" /> <!-- Legendary STR Dye Lv.5 -->
 	</item>
 	<item>
 		<ingredient id="57" count="1000000" /> <!-- Adena -->
 		<production id="17826" count="1" chance="0" /> <!-- DEX Dye -->
 		<production id="17626" count="1" chance="35" /> <!-- Giant DEX Dye Lv.1 -->
-		<production id="17632" count="1" chance="20" /> <!-- Ancient DEX Dye Lv.1 -->
-		<production id="17638" count="1" chance="20" /> <!-- Legendary DEX Dye Lv.1 -->
-		<production id="17644" count="1" chance="5" /> <!-- Giant DEX Dye Lv.2 -->
-		<production id="17650" count="1" chance="5" /> <!-- Ancient DEX Dye Lv.2 -->
-		<production id="17656" count="1" chance="3" /> <!-- Legendary DEX Dye Lv.2 -->
-		<production id="17662" count="1" chance="2" /> <!-- Giant DEX Dye Lv.3 -->
-		<production id="17668" count="1" chance="2" /> <!-- Ancient DEX Dye Lv.3 -->
-		<production id="17674" count="1" chance="2" /> <!-- Legendary DEX Dye Lv.3 -->
-		<production id="17698" count="1" chance="2" /> <!-- Giant DEX Dye Lv.5 -->
-		<production id="17704" count="1" chance="2" /> <!-- Ancient DEX Dye Lv.5 -->
-		<production id="17710" count="1" chance="2" /> <!-- Legendary DEX Dye Lv.5 -->
+		<production id="17632" count="1" chance="25" /> <!-- Ancient DEX Dye Lv.1 -->
+		<production id="17638" count="1" chance="15" /> <!-- Legendary DEX Dye Lv.1 -->
+		<production id="17644" count="1" chance="9" /> <!-- Giant DEX Dye Lv.2 -->
+		<production id="17650" count="1" chance="7" /> <!-- Ancient DEX Dye Lv.2 -->
+		<production id="17656" count="1" chance="4" /> <!-- Legendary DEX Dye Lv.2 -->
+		<production id="17662" count="1" chance="3" /> <!-- Giant DEX Dye Lv.3 -->
+		<production id="17668" count="1" chance="1.5" /> <!-- Ancient DEX Dye Lv.3 -->
+		<production id="17674" count="1" chance="0.3" /> <!-- Legendary DEX Dye Lv.3 -->
+		<production id="17698" count="1" chance="0.1" /> <!-- Giant DEX Dye Lv.5 -->
+		<production id="17704" count="1" chance="0.07" /> <!-- Ancient DEX Dye Lv.5 -->
+		<production id="17710" count="1" chance="0.03" /> <!-- Legendary DEX Dye Lv.5 -->
 	</item>
 	<item>
 		<ingredient id="57" count="1000000" /> <!-- Adena -->
 		<production id="17827" count="1" chance="0" /> <!-- CON Dye -->
 		<production id="17627" count="1" chance="35" /> <!-- Giant CON Dye Lv.1 -->
-		<production id="17633" count="1" chance="20" /> <!-- Ancient CON Dye Lv.1 -->
-		<production id="17639" count="1" chance="20" /> <!-- Legendary CON Dye Lv.1 -->
-		<production id="17645" count="1" chance="5" /> <!-- Giant CON Dye Lv.2 -->
-		<production id="17651" count="1" chance="5" /> <!-- Ancient CON Dye Lv.2 -->
-		<production id="17657" count="1" chance="3" /> <!-- Legendary CON Dye Lv.2 -->
-		<production id="17663" count="1" chance="2" /> <!-- Giant CON Dye Lv.3 -->
-		<production id="17669" count="1" chance="2" /> <!-- Ancient CON Dye Lv.3 -->
-		<production id="17675" count="1" chance="2" /> <!-- Legendary CON Dye Lv.3 -->
-		<production id="17699" count="1" chance="2" /> <!-- Giant CON Dye Lv.5 -->
-		<production id="17705" count="1" chance="2" /> <!-- Ancient CON Dye Lv.5 -->
-		<production id="17711" count="1" chance="2" /> <!-- Legendary CON Dye Lv.5 -->
+		<production id="17633" count="1" chance="25" /> <!-- Ancient CON Dye Lv.1 -->
+		<production id="17639" count="1" chance="15" /> <!-- Legendary CON Dye Lv.1 -->
+		<production id="17645" count="1" chance="9" /> <!-- Giant CON Dye Lv.2 -->
+		<production id="17651" count="1" chance="7" /> <!-- Ancient CON Dye Lv.2 -->
+		<production id="17657" count="1" chance="4" /> <!-- Legendary CON Dye Lv.2 -->
+		<production id="17663" count="1" chance="3" /> <!-- Giant CON Dye Lv.3 -->
+		<production id="17669" count="1" chance="1.5" /> <!-- Ancient CON Dye Lv.3 -->
+		<production id="17675" count="1" chance="0.3" /> <!-- Legendary CON Dye Lv.3 -->
+		<production id="17699" count="1" chance="0.1" /> <!-- Giant CON Dye Lv.5 -->
+		<production id="17705" count="1" chance="0.07" /> <!-- Ancient CON Dye Lv.5 -->
+		<production id="17711" count="1" chance="0.03" /> <!-- Legendary CON Dye Lv.5 -->
 	</item>
 	<item>
 		<ingredient id="57" count="1000000" /> <!-- Adena -->
 		<production id="17828" count="1" chance="0" /> <!-- INT Dye -->
 		<production id="17628" count="1" chance="35" /> <!-- Giant INT Dye Lv.1 -->
-		<production id="17634" count="1" chance="20" /> <!-- Ancient INT Dye Lv.1 -->
-		<production id="17640" count="1" chance="20" /> <!-- Legendary INT Dye Lv.1 -->
-		<production id="17646" count="1" chance="5" /> <!-- Giant INT Dye Lv.2 -->
-		<production id="17652" count="1" chance="5" /> <!-- Ancient INT Dye Lv.2 -->
-		<production id="17658" count="1" chance="3" /> <!-- Legendary INT Dye Lv.2 -->
-		<production id="17664" count="1" chance="2" /> <!-- Giant INT Dye Lv.3 -->
-		<production id="17670" count="1" chance="2" /> <!-- Ancient INT Dye Lv.3 -->
-		<production id="17676" count="1" chance="2" /> <!-- Legendary INT Dye Lv.3 -->
-		<production id="17700" count="1" chance="2" /> <!-- Giant INT Dye Lv.5 -->
-		<production id="17706" count="1" chance="2" /> <!-- Ancient INT Dye Lv.5 -->
-		<production id="17712" count="1" chance="2" /> <!-- Legendary INT Dye Lv.5 -->
+		<production id="17634" count="1" chance="25" /> <!-- Ancient INT Dye Lv.1 -->
+		<production id="17640" count="1" chance="15" /> <!-- Legendary INT Dye Lv.1 -->
+		<production id="17646" count="1" chance="9" /> <!-- Giant INT Dye Lv.2 -->
+		<production id="17652" count="1" chance="7" /> <!-- Ancient INT Dye Lv.2 -->
+		<production id="17658" count="1" chance="4" /> <!-- Legendary INT Dye Lv.2 -->
+		<production id="17664" count="1" chance="3" /> <!-- Giant INT Dye Lv.3 -->
+		<production id="17670" count="1" chance="1.5" /> <!-- Ancient INT Dye Lv.3 -->
+		<production id="17676" count="1" chance="0.3" /> <!-- Legendary INT Dye Lv.3 -->
+		<production id="17700" count="1" chance="0.1" /> <!-- Giant INT Dye Lv.5 -->
+		<production id="17706" count="1" chance="0.07" /> <!-- Ancient INT Dye Lv.5 -->
+		<production id="17712" count="1" chance="0.03" /> <!-- Legendary INT Dye Lv.5 -->
 	</item>
 	<item>
 		<ingredient id="57" count="1000000" /> <!-- Adena -->
 		<production id="17829" count="1" chance="0" /> <!-- WIT Dye -->
 		<production id="17629" count="1" chance="35" /> <!-- Giant WIT Dye Lv.1 -->
-		<production id="17635" count="1" chance="20" /> <!-- Ancient WIT Dye Lv.1 -->
-		<production id="17641" count="1" chance="20" /> <!-- Legendary WIT Dye Lv.1 -->
-		<production id="17647" count="1" chance="5" /> <!-- Giant WIT Dye Lv.2 -->
-		<production id="17653" count="1" chance="5" /> <!-- Ancient WIT Dye Lv.2 -->
-		<production id="17659" count="1" chance="3" /> <!-- Legendary WIT Dye Lv.2 -->
-		<production id="17665" count="1" chance="2" /> <!-- Giant WIT Dye Lv.3 -->
-		<production id="17671" count="1" chance="2" /> <!-- Ancient WIT Dye Lv.3 -->
-		<production id="17677" count="1" chance="2" /> <!-- Legendary WIT Dye Lv.3 -->
-		<production id="17701" count="1" chance="2" /> <!-- Giant WIT Dye Lv.5 -->
-		<production id="17707" count="1" chance="2" /> <!-- Ancient WIT Dye Lv.5 -->
-		<production id="17713" count="1" chance="2" /> <!-- Legendary WIT Dye Lv.5 -->
+		<production id="17635" count="1" chance="25" /> <!-- Ancient WIT Dye Lv.1 -->
+		<production id="17641" count="1" chance="15" /> <!-- Legendary WIT Dye Lv.1 -->
+		<production id="17647" count="1" chance="9" /> <!-- Giant WIT Dye Lv.2 -->
+		<production id="17653" count="1" chance="7" /> <!-- Ancient WIT Dye Lv.2 -->
+		<production id="17659" count="1" chance="4" /> <!-- Legendary WIT Dye Lv.2 -->
+		<production id="17665" count="1" chance="3" /> <!-- Giant WIT Dye Lv.3 -->
+		<production id="17671" count="1" chance="1.5" /> <!-- Ancient WIT Dye Lv.3 -->
+		<production id="17677" count="1" chance="0.3" /> <!-- Legendary WIT Dye Lv.3 -->
+		<production id="17701" count="1" chance="0.1" /> <!-- Giant WIT Dye Lv.5 -->
+		<production id="17707" count="1" chance="0.07" /> <!-- Ancient WIT Dye Lv.5 -->
+		<production id="17713" count="1" chance="0.03" /> <!-- Legendary WIT Dye Lv.5 -->
 	</item>
 	<item>
 		<ingredient id="57" count="1000000" /> <!-- Adena -->
@@ -103,38 +103,38 @@
 		<production id="17654" count="1" chance="5" /> <!-- Ancient MEN Dye Lv.2 -->
 		<production id="17660" count="1" chance="3" /> <!-- Legendary MEN Dye Lv.2 -->
 		<production id="17666" count="1" chance="2" /> <!-- Giant MEN Dye Lv.3 -->
-		<production id="17672" count="1" chance="2" /> <!-- Ancient MEN Dye Lv.3 -->
-		<production id="17678" count="1" chance="2" /> <!-- Legendary MEN Dye Lv.3 -->
-		<production id="17702" count="1" chance="2" /> <!-- Giant MEN Dye Lv.5 -->
-		<production id="17708" count="1" chance="2" /> <!-- Ancient MEN Dye Lv.5 -->
-		<production id="17714" count="1" chance="2" /> <!-- Legendary MEN Dye Lv.5 -->
+		<production id="17672" count="1" chance="1.5" /> <!-- Ancient MEN Dye Lv.3 -->
+		<production id="17678" count="1" chance="0.3" /> <!-- Legendary MEN Dye Lv.3 -->
+		<production id="17702" count="1" chance="0.1" /> <!-- Giant MEN Dye Lv.5 -->
+		<production id="17708" count="1" chance="0.07" /> <!-- Ancient MEN Dye Lv.5 -->
+		<production id="17714" count="1" chance="0.03" /> <!-- Legendary MEN Dye Lv.5 -->
 	</item>
 	<item>
 		<ingredient id="57" count="1000000" /> <!-- Adena -->
 		<production id="39381" count="1" chance="0" /> <!-- Windy CHA Dye -->
 		<production id="39381" count="1" chance="35" /> <!-- Windy CHA Dye Lv.1 -->
-		<production id="39382" count="1" chance="20" /> <!-- Windy CHA Dye Lv.2 -->
-		<production id="39383" count="1" chance="20" /> <!-- Windy CHA Dye Lv.3 -->
-		<production id="39384" count="1" chance="5" /> <!-- Windy CHA Dye Lv.4 -->
-		<production id="39385" count="1" chance="5" /> <!-- Windy CHA Dye Lv.5 -->
-		<production id="39451" count="1" chance="3" /> <!-- Windy CHA Dye (Luck) Lv.1 -->
+		<production id="39382" count="1" chance="25" /> <!-- Windy CHA Dye Lv.2 -->
+		<production id="39383" count="1" chance="15" /> <!-- Windy CHA Dye Lv.3 -->
+		<production id="39384" count="1" chance="9" /> <!-- Windy CHA Dye Lv.4 -->
+		<production id="39385" count="1" chance="7" /> <!-- Windy CHA Dye Lv.5 -->
+		<production id="39451" count="1" chance="4" /> <!-- Windy CHA Dye (Luck) Lv.1 -->
 		<production id="39452" count="1" chance="3" /> <!-- Windy CHA Dye (Luck) Lv.2 -->
-		<production id="39453" count="1" chance="3" /> <!-- Windy CHA Dye (Luck) Lv.3 -->
-		<production id="39454" count="1" chance="3" /> <!-- Windy CHA Dye (Luck) Lv.4 -->
-		<production id="39455" count="1" chance="3" /> <!-- Windy CHA Dye (Luck) Lv.5 -->
+		<production id="39453" count="1" chance="1.9" /> <!-- Windy CHA Dye (Luck) Lv.3 -->
+		<production id="39454" count="1" chance="0.07" /> <!-- Windy CHA Dye (Luck) Lv.4 -->
+		<production id="39455" count="1" chance="0.03" /> <!-- Windy CHA Dye (Luck) Lv.5 -->
 	</item>
 	<item>
 		<ingredient id="57" count="1000000" /> <!-- Adena -->
 		<production id="39386" count="1" chance="0" /> <!-- Windy LUC Dye -->
 		<production id="39386" count="1" chance="35" /> <!-- Windy LUC Dye Lv.1 -->
-		<production id="39387" count="1" chance="20" /> <!-- Windy LUC Dye Lv.2 -->
-		<production id="39388" count="1" chance="20" /> <!-- Windy LUC Dye Lv.3 -->
-		<production id="39389" count="1" chance="5" /> <!-- Windy LUC Dye Lv.4 -->
-		<production id="39390" count="1" chance="5" /> <!-- Windy LUC Dye Lv.5 -->
-		<production id="39456" count="1" chance="3" /> <!-- Windy LUC Dye (Charisma) Lv.1 -->
+		<production id="39387" count="1" chance="25" /> <!-- Windy LUC Dye Lv.2 -->
+		<production id="39388" count="1" chance="15" /> <!-- Windy LUC Dye Lv.3 -->
+		<production id="39389" count="1" chance="9" /> <!-- Windy LUC Dye Lv.4 -->
+		<production id="39390" count="1" chance="7" /> <!-- Windy LUC Dye Lv.5 -->
+		<production id="39456" count="1" chance="4" /> <!-- Windy LUC Dye (Charisma) Lv.1 -->
 		<production id="39457" count="1" chance="3" /> <!-- Windy LUC Dye (Charisma) Lv.2 -->
-		<production id="39458" count="1" chance="3" /> <!-- Windy LUC Dye (Charisma) Lv.3 -->
-		<production id="39459" count="1" chance="3" /> <!-- Windy LUC Dye (Charisma) Lv.4 -->
-		<production id="39460" count="1" chance="3" /> <!-- Windy LUC Dye (Charisma) Lv.5 -->
+		<production id="39458" count="1" chance="1.9" /> <!-- Windy LUC Dye (Charisma) Lv.3 -->
+		<production id="39459" count="1" chance="0.07" /> <!-- Windy LUC Dye (Charisma) Lv.4 -->
+		<production id="39460" count="1" chance="0.03" /> <!-- Windy LUC Dye (Charisma) Lv.5 -->
 	</item>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/3160302.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/3160302.xml
index 6af21ef56b..3a3f695b72 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/3160302.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/3160302.xml
@@ -42,7 +42,7 @@
 		<production count="1" id="38568" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
@@ -50,7 +50,7 @@
 		<production count="1" id="38569" />
 	</item>
 	<item>
-		<!-- Enhanced Tauti's Bracelet  -->
+		<!-- Enhanced Tauti's Bracelet  -->
 		<ingredient count="1" id="35294" />
 		<!-- Raidboss Points -->
 		<ingredient count="1000" id="-500" />
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/324780010.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/324780010.xml
index 3ee58c3a52..951bad27a4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/324780010.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/324780010.xml
@@ -13,15 +13,15 @@
 		<production id="29759" count="1" /> <!-- Heir's Radiance Shard -->
 	</item>
 	<item>
-		<ingredient id="26455" count="1" /> <!-- High-grade Talisman of Abundance Lv. 1 -->
+		<ingredient id="26338" count="1" /> <!-- High-grade Talisman of Abundance Lv. 1 -->
 		<production id="29759" count="15" /> <!-- Heir's Radiance Shard -->
 	</item>
 	<item>
-		<ingredient id="26456" count="1" /> <!-- High-grade Talisman of Abundance Lv. 2 -->
+		<ingredient id="26339" count="1" /> <!-- High-grade Talisman of Abundance Lv. 2 -->
 		<production id="29759" count="60" /> <!-- Heir's Radiance Shard -->
 	</item>
 	<item>
-		<ingredient id="26457" count="1" /> <!-- High-grade Talisman of Abundance Lv. 3 -->
+		<ingredient id="26340" count="1" /> <!-- High-grade Talisman of Abundance Lv. 3 -->
 		<production id="29759" count="200" /> <!-- Heir's Radiance Shard -->
 	</item>
 	<item>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/3368502.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/3368502.xml
index bf84aa5da5..5d542c3402 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/3368502.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/3368502.xml
@@ -20,7 +20,7 @@
 	<item>
 		<ingredient count="10" id="45584" />
 		<ingredient count="500000" id="57" />
-		<production count="1" id="37894" /> <!-- Hero’s Recovery Potion -->
+		<production count="1" id="37894" /> <!-- Hero's Recovery Potion -->
 	</item>
 	<item>
 		<ingredient count="2" id="45584" />
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/861.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/861.xml
index 57fcb759cc..7166b44a84 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/861.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/861.xml
@@ -4,7 +4,7 @@
 		<npc>33715</npc> <!-- Seed Talisman Manager -->
 	</npcs>
 	<item>
-		<ingredient id="57" count="76000000" /> <!-- Adena -->
+		<ingredient id="57" count="88000000" /> <!-- Adena -->
 		<production id="34985" count="1" /> <!-- Talisman - Destruction -->
 	</item>
 	<item>
@@ -14,13 +14,13 @@
 	<item>
 		<ingredient id="35567" count="1" /> <!-- Dark Armor Enhancement Stone -->
 		<ingredient id="47952" count="10" /> <!-- Crystal of Protection -->
-		<ingredient id="57" count="980000" /> <!-- Adena -->
+		<ingredient id="57" count="3920000" /> <!-- Adena -->
 		<production id="80963" count="1" /> <!-- Blood-Stained Talisman of Protection 8 Hours -->
 	</item>
 	<item>
 		<ingredient id="35569" count="1" /> <!-- Bloody Armor Enhancement Stone -->
 		<ingredient id="47952" count="10" /> <!-- Crystal of Protection -->
-		<ingredient id="57" count="980000" /> <!-- Adena -->
+		<ingredient id="57" count="3920000" /> <!-- Adena -->
 		<production id="80963" count="1" /> <!-- Blood-Stained Talisman of Protection 8 Hours -->
 	</item>
 	<item>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/862.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/862.xml
index 09eeecbf54..b39522e2f1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/862.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/862.xml
@@ -7,21 +7,14 @@
 		<ingredient id="34989" count="1" /> <!-- Talisman - Longing -->
 		<ingredient id="35562" count="72" /> <!-- Energy of Destruction -->
 		<ingredient id="35563" count="200" /> <!-- Giant's Energy -->
-		<ingredient id="57" count="4900000" /> <!-- Adena -->
+		<ingredient id="57" count="19600000" /> <!-- Adena -->
 		<production id="35649" count="1" /> <!-- Sealed Talisman - Longing -->
 	</item>
 	<item>
 		<ingredient id="39572" count="1" /> <!-- Talisman - Insanity -->
 		<ingredient id="35562" count="100" /> <!-- Energy of Destruction -->
 		<ingredient id="35563" count="900" /> <!-- Giant's Energy -->
-		<ingredient id="57" count="22050000" /> <!-- Adena -->
+		<ingredient id="57" count="88200000" /> <!-- Adena -->
 		<production id="39573" count="1" /> <!-- Sealed Talisman - Insanity -->
 	</item>
-	<item>
-		<ingredient id="80957" count="1" /> <!-- Talisman - Heavenly -->
-		<ingredient id="35562" count="130" /> <!-- Energy of Destruction -->
-		<ingredient id="35563" count="900" /> <!-- Giant's Energy -->
-		<ingredient id="57" count="99225000" /> <!-- Adena -->
-		<production id="80958" count="1" /> <!-- Sealed Talisman - Heavenly -->
-	</item>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/863.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/863.xml
index 36e822a6c4..475a129074 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/863.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/863.xml
@@ -6,6 +6,7 @@
 	<item>
 		<ingredient id="34984" count="1" /> <!-- Talisman - Infinity -->
 		<ingredient id="57" count="44000000" /> <!-- Adena -->
+		<production id="34985" count="1" /> <!-- Talisman - Destruction -->
 		<production id="34985" count="1" chance="100" /> <!-- Talisman - Destruction -->
 	</item>
 	<item>
@@ -15,7 +16,7 @@
 		<ingredient id="57" count="5500000" /> <!-- Adena -->
 		<production id="34986" count="1" /> <!-- Talisman - Annihilation -->
 		<production id="34986" count="1" chance="50" /> <!-- Talisman - Annihilation -->
-		<production id="34986" count="1" chance="50" /> <!-- Talisman - Annihilation -->
+		<production id="34985" count="1" chance="50" /> <!-- Talisman - Destruction -->
 	</item>
 	<item>
 		<ingredient id="34986" count="1" /> <!-- Talisman - Annihilation -->
@@ -23,8 +24,8 @@
 		<ingredient id="35563" count="30" /> <!-- Giant's Energy -->
 		<ingredient id="57" count="11000000" /> <!-- Adena -->
 		<production id="34987" count="1" /> <!-- Talisman - Hellfire -->
-		<production id="34987" count="1" chance="45" /> <!-- Talisman - Hellfire -->
-		<production id="34986" count="1" chance="55" /> <!-- Talisman - Annihilation -->
+		<production id="34987" count="1" chance="40" /> <!-- Talisman - Hellfire -->
+		<production id="34986" count="1" chance="60" /> <!-- Talisman - Annihilation -->
 	</item>
 	<item>
 		<ingredient id="34987" count="1" /> <!-- Talisman - Hellfire -->
@@ -32,8 +33,8 @@
 		<ingredient id="35563" count="45" /> <!-- Giant's Energy -->
 		<ingredient id="57" count="22000000" /> <!-- Adena -->
 		<production id="34988" count="1" /> <!-- Talisman - Desire -->
-		<production id="34988" count="1" chance="35" /> <!-- Talisman - Desire -->
-		<production id="34987" count="1" chance="65" /> <!-- Talisman - Hellfire -->
+		<production id="34988" count="1" chance="30" /> <!-- Talisman - Desire -->
+		<production id="34987" count="1" chance="70" /> <!-- Talisman - Hellfire -->
 	</item>
 	<item>
 		<ingredient id="34988" count="1" /> <!-- Talisman - Desire -->
@@ -41,8 +42,8 @@
 		<ingredient id="35563" count="60" /> <!-- Giant's Energy -->
 		<ingredient id="57" count="44000000" /> <!-- Adena -->
 		<production id="34989" count="1" /> <!-- Talisman - Longing -->
-		<production id="34989" count="1" chance="15" /> <!-- Talisman - Longing -->
-		<production id="34988" count="1" chance="85" /> <!-- Talisman - Desire -->
+		<production id="34989" count="1" chance="20" /> <!-- Talisman - Longing -->
+		<production id="34988" count="1" chance="80" /> <!-- Talisman - Desire -->
 	</item>
 	<item>
 		<ingredient id="34989" count="1" /> <!-- Talisman - Longing -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/870.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/870.xml
index 2a6ff3f451..93cb231461 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/870.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/multisell/870.xml
@@ -8,19 +8,19 @@
 		<production id="81150" count="1" /> <!-- Energy of Destruction -->
 	</item>
 	<item>
-		<ingredient id="57" count="3800000" /> <!-- Adena -->
+		<ingredient id="57" count="4400000" /> <!-- Adena -->
 		<production id="36184" count="1" /> <!-- Annihilation Energy -->
 	</item>
 	<item>
-		<ingredient id="57" count="14250000" /> <!-- Adena -->
+		<ingredient id="57" count="16500000" /> <!-- Adena -->
 		<production id="36185" count="1" /> <!-- Hellfire Energy -->
 	</item>
 	<item>
-		<ingredient id="57" count="142500000" /> <!-- Adena -->
+		<ingredient id="57" count="165000000" /> <!-- Adena -->
 		<production id="36186" count="1" /> <!-- Energy of Desire -->
 	</item>
 	<item>
-		<ingredient id="57" count="485300000" /> <!-- Adena -->
+		<ingredient id="57" count="561200000" /> <!-- Adena -->
 		<production id="26291" count="1" /> <!-- Kaliel's Energy Longing -->
 	</item>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/34441-00.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/34441-00.html
index 38abe8af39..d6ebe7d441 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/34441-00.html
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/34441-00.html
@@ -9,7 +9,7 @@ the area controlled by Devil Varos,<br>
 the area controlled by Demonic Weiss.<br>
 <Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery entrance">Teleport to the Atelia Refinery</Button>
 <Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery outlet">Teleport to the Atelia Outlet</Button>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery first_area">Teleport to the area controlled by Demonic Pontus</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery first_area">Teleport to the area controlled by Death Pondus</Button>
 <Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery second_area">Teleport to the area controlled by Devil Varos</Button>
 <Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery third_area">Teleport to the area controlled by Demonic Weiss</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/34441-02.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/34441-02.html
new file mode 100644
index 0000000000..4786a46a5c
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/34441-02.html
@@ -0,0 +1,13 @@
+<html><body>Atelia Refinery Teleport Device:<br>
+A device for teleporting to Atelia Refinery settled by the Blackbird Clan.<br>
+Choose your destination.<br><br>
+<center>Places:<br>
+Outside of Atelia Refinery,<br>
+the area controlled by Death Pondus,<br>
+the area controlled by Devil Varos,<br>
+the area controlled by Demonic Weiss.<br>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery exit">Teleport from Atelia Refinery</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery first_area">Teleport to the area controlled by Death Pondus</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery second_area">Teleport to the area controlled by Devil Varos</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery third_area">Teleport to the area controlled by Demonic Weiss</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/34441-03.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/34441-03.html
new file mode 100644
index 0000000000..840fff7767
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/34441-03.html
@@ -0,0 +1,15 @@
+<html><body>Atelia Refinery Teleport Device:<br>
+A device for teleporting to Atelia Refinery settled by the Blackbird Clan.<br>
+Choose your destination.<br><br>
+<center>Places:<br>
+Outside of Atelia Refinery,<br>
+Atelia Outlet,<br>
+the area controlled by Death Pondus,<br>
+the area controlled by Devil Varos,<br>
+the area controlled by Demonic Weiss.<br>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery exit">Teleport from Atelia Refinery</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery outlet">Teleport to the Atelia Outlet</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery first_area">Teleport to the area controlled by Death Pondus</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery second_area">Teleport to the area controlled by Devil Varos</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery third_area">Teleport to the area controlled by Demonic Weiss</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/34441.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/34441.html
index 3be1b0a176..4362f2f72a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/34441.html
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/34441.html
@@ -7,7 +7,7 @@ the area controlled by Death Pondus,<br>
 the area controlled by Devil Varos,<br>
 the area controlled by Demonic Weiss.<br>
 <Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery entrance">Teleport to the Atelia Refinery</Button>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery first_area">Teleport to the area controlled by Demonic Pontus</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery first_area">Teleport to the area controlled by Death Pondus</Button>
 <Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery second_area">Teleport to the area controlled by Devil Varos</Button>
 <Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AteliaRefinery third_area">Teleport to the area controlled by Demonic Weiss</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
index 28d63997fa..17ce64d654 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java
@@ -39,6 +39,7 @@ public class AteliaRefinery extends AbstractNpcAI
 		new Location(-56096, 49688, -8729), // First Area
 		new Location(-56160, 45406, -8847), // Second Area
 		new Location(-56140, 41067, -8965), // Third Area
+		new Location(-51716, 60243, -3344), // Exit
 	};
 	// Special Mobs
 	private static final int HARKE = 24161;
@@ -109,6 +110,12 @@ public class AteliaRefinery extends AbstractNpcAI
 				htmltext = "34441-01.html";
 				break;
 			}
+			case "exit":
+			{
+				player.teleToLocation(TELE_LOCATIONS[5]);
+				htmltext = "34441-01.html";
+				break;
+			}
 		}
 		return htmltext;
 	}
@@ -136,11 +143,20 @@ public class AteliaRefinery extends AbstractNpcAI
 	public String onFirstTalk(Npc npc, Player player)
 	{
 		String htmltext = null;
+		Location npcLoc = npc.getLocation();
 		final QuestState qs = player.getQuestState(Q10890_SaviorsPathHallOfEtina.class.getSimpleName());
-		if (((qs != null) && qs.isCompleted()))
+		if (((qs != null) && qs.isCompleted()) && ((npcLoc.getX() == -59891) && (npcLoc.getY() == 52625)))
+		{
+			htmltext = "34441-03.html";
+		}
+		else if (((qs != null) && qs.isCompleted()))
 		{
 			htmltext = "34441-00.html";
 		}
+		else if ((npcLoc.getX() == -59891) && (npcLoc.getY() == 52625))
+		{
+			htmltext = "34441-02.html";
+		}
 		else
 		{
 			htmltext = "34441.html";
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestEngine.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestEngine.java
index a0af6ff9bd..396966fb42 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestEngine.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestEngine.java
@@ -70,17 +70,27 @@ public class ConquestEngine extends AbstractNpcAI
 	// Queries
 	private static final String LOAD_CONQUEST_DATA = "SELECT current_cycle, conquest_season_end FROM conquest_data WHERE id = 0";
 	private static final String SAVE_CONQUEST_DATA = "INSERT INTO conquest_data (id, current_cycle, conquest_season_end) VALUES (0,?,?) ON DUPLICATE KEY UPDATE current_cycle=?, conquest_season_end=?";
-	private static final String CLEAR_CONQUEST_PREVIOUS_RANKLIST = "DELETE FROM conquest_prev_season_ranklist;";
-	private static final String SAVE_CONQUEST_PREVIOUS_RANKLIST = "INSERT INTO conquest_prev_season_ranklist (charId, char_name, personal_points) SELECT a.charId, a.val, b.val FROM character_variables a, character_variables b WHERE a.var=\"CONQUEST_NAME\" AND b.var=\"CONQUEST_PERSONAL_POINTS\" AND a.charId=b.charId;";
+	private static final String CLEAR_CONQUEST_PREVIOUS_RANKLIST = "DELETE FROM conquest_prev_season_ranklist";
+	private static final String SAVE_CONQUEST_PREVIOUS_RANKLIST = "INSERT INTO conquest_prev_season_ranklist (charId, char_name, personal_points) SELECT a.charId, a.val, b.val FROM character_variables a, character_variables b WHERE a.var=\"CONQUEST_NAME\" AND b.var=\"CONQUEST_PERSONAL_POINTS\" AND a.charId=b.charId";
+	private static final String CLEAR_CONQUEST_PREVIOUS_PLAYER_DATA = "DELETE FROM character_variables WHERE var=?";
 	
 	// Variables
 	private static final String CONQUEST_AVAILABLE_VAR = "CONQUEST_AVAILABLE";
 	private static final String CONQUEST_CONNECTED_VAR = "CONQUEST_CONNECTED";
 	private static final String CONQUEST_SERVER_POINTS_VAR = "CONQUEST_SERVER_POINTS";
 	private static final String CONQUEST_PREV_SEASON_SERVER_POINTS_VAR = "CONQUEST_PREV_SEASON_SERVER_POINTS";
+	private static final String CONQUEST_SERVER_SOUL_ORBS_VAR = "CONQUEST_SOUL_ORBS";
+	private static final String CONQUEST_PREV_SEASON_SERVER_SOUL_ORBS_VAR = "CONQUEST_PREV_SEASON_SERVER_SOUL_ORBS";
+	
+	// Zone Name Vars used only for reset points
+	private static final String CONQUEST_ZONE_ASA_VAR = "CONQUEST_ZONE_ASA_POINTS";
+	private static final String CONQUEST_ZONE_ANIMA_VAR = "CONQUEST_ZONE_ANIMA_POINTS";
+	private static final String CONQUEST_ZONE_NOX_VAR = "CONQUEST_ZONE_NOX_POINTS";
+	private static final String CONQUEST_ZONE_VITA_VAR = "CONQUEST_ZONE_VITA_POINTS";
+	private static final String CONQUEST_ZONE_IGNIS_VAR = "CONQUEST_ZONE_IGNIS_POINTS";
 	
 	// Skills
-	private static final int FIRE_SOURCE_CENTER = 34490;
+	private static final int FIRE_SOURCE_CENTER_SKILL_ID = 34490;
 	
 	protected static boolean _isConquestAvailable = GlobalVariablesManager.getInstance().getBoolean(CONQUEST_AVAILABLE_VAR, false);
 	protected int _currentCycle;
@@ -408,6 +418,7 @@ public class ConquestEngine extends AbstractNpcAI
 			saveConquestData();
 			saveConquestPrevSeasonRanklistData();
 			saveConquestPrevSeasonServerPoints();
+			clearConquestPrevSeasonPlayerData();
 			_currentCycle++;
 			setNewConquestSeasonEnd();
 			init();
@@ -442,7 +453,7 @@ public class ConquestEngine extends AbstractNpcAI
 	{
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement ps1 = con.prepareStatement(CLEAR_CONQUEST_PREVIOUS_RANKLIST);
-			PreparedStatement ps2 = con.prepareStatement(SAVE_CONQUEST_PREVIOUS_RANKLIST))
+			PreparedStatement ps2 = con.prepareStatement(SAVE_CONQUEST_PREVIOUS_RANKLIST);)
 		{
 			ps1.execute();
 			ps2.execute();
@@ -458,9 +469,44 @@ public class ConquestEngine extends AbstractNpcAI
 	 */
 	public void saveConquestPrevSeasonServerPoints()
 	{
+		// Save previous season Server Points and Soul Orbs
 		GlobalVariablesManager.getInstance().set(CONQUEST_PREV_SEASON_SERVER_POINTS_VAR, GlobalVariablesManager.getInstance().getLong(CONQUEST_SERVER_POINTS_VAR));
+		GlobalVariablesManager.getInstance().set(CONQUEST_PREV_SEASON_SERVER_SOUL_ORBS_VAR, GlobalVariablesManager.getInstance().getLong(CONQUEST_SERVER_SOUL_ORBS_VAR));
+		// Reset Server Points and Soul Orbs for next season
 		GlobalVariablesManager.getInstance().set(CONQUEST_SERVER_POINTS_VAR, 0);
-		// Maybe add here soul orbs as well.
+		GlobalVariablesManager.getInstance().set(CONQUEST_SERVER_SOUL_ORBS_VAR, 0);
+		// Reset Zone Points for next season
+		GlobalVariablesManager.getInstance().set(CONQUEST_ZONE_ASA_VAR, 0);
+		GlobalVariablesManager.getInstance().set(CONQUEST_ZONE_ANIMA_VAR, 0);
+		GlobalVariablesManager.getInstance().set(CONQUEST_ZONE_NOX_VAR, 0);
+		GlobalVariablesManager.getInstance().set(CONQUEST_ZONE_VITA_VAR, 0);
+		GlobalVariablesManager.getInstance().set(CONQUEST_ZONE_IGNIS_VAR, 0);
+		GlobalVariablesManager.getInstance().storeMe();
+	}
+	
+	public void clearConquestPrevSeasonPlayerData()
+	{
+		// Update data for offline players.
+		try (Connection con = DatabaseFactory.getConnection();
+			PreparedStatement ps = con.prepareStatement(CLEAR_CONQUEST_PREVIOUS_PLAYER_DATA);)
+		
+		{
+			ps.setString(1, PlayerVariables.CONQUEST_PERSONAL_POINTS);
+			ps.execute();
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset Conquest Previous Season player data: " + e);
+		}
+		
+		// Update data for online players.
+		for (Player player : World.getInstance().getPlayers())
+		{
+			player.getVariables().remove(PlayerVariables.CONQUEST_PERSONAL_POINTS);
+			player.getVariables().storeMe();
+		}
+		
+		LOGGER.info(ConquestEngine.class.getSimpleName() + ": Conquest Previous Season player data has been reset.");
 	}
 	
 	/**
@@ -474,7 +520,7 @@ public class ConquestEngine extends AbstractNpcAI
 		{
 			LOGGER.info(ConquestEngine.class.getSimpleName() + ": Attack Points updated for player: " + player.getName() + " from " + getAttackPoints(player) + " to " + (getAttackPoints(player) + attackPoints) + ".");
 		}
-		player.getVariables().set("CONQUEST_ATTACK_POINTS", getAttackPoints(player) + attackPoints);
+		player.getVariables().set(PlayerVariables.CONQUEST_ATTACK_POINTS, getAttackPoints(player) + attackPoints);
 	}
 	
 	/**
@@ -488,7 +534,7 @@ public class ConquestEngine extends AbstractNpcAI
 		{
 			LOGGER.info(ConquestEngine.class.getSimpleName() + ": Life Points updated for player: " + player.getName() + " from " + getLifePoints(player) + " to " + (getLifePoints(player) + lifePoints) + ".");
 		}
-		player.getVariables().set("CONQUEST_LIFE_POINTS", getLifePoints(player) + lifePoints);
+		player.getVariables().set(PlayerVariables.CONQUEST_LIFE_POINTS, getLifePoints(player) + lifePoints);
 	}
 	
 	/**
@@ -519,6 +565,20 @@ public class ConquestEngine extends AbstractNpcAI
 		GlobalVariablesManager.getInstance().set(CONQUEST_SERVER_POINTS_VAR, getServerPoints() + serverPoints);
 	}
 	
+	/**
+	 * Sets the Conquest Soul Orbs.
+	 * @param player the activeChar
+	 * @param serverSoulOrbs the server soul orbs amount to set
+	 */
+	public void setServerSoulOrbs(Player player, long serverSoulOrbs)
+	{
+		if (DEBUG)
+		{
+			LOGGER.info(ConquestEngine.class.getSimpleName() + ": Soul Orbs updated from " + getServerSoulOrbs() + " to " + (getServerSoulOrbs() + serverSoulOrbs) + ".");
+		}
+		GlobalVariablesManager.getInstance().set(CONQUEST_SERVER_SOUL_ORBS_VAR, getServerSoulOrbs() + serverSoulOrbs);
+	}
+	
 	/**
 	 * Gets the Conquest Zone name by id.
 	 * @param zoneId the zone id
@@ -575,11 +635,12 @@ public class ConquestEngine extends AbstractNpcAI
 	 * @param player the activeChar
 	 * @param personalPoints the personal points
 	 * @param serverPoints the server points
+	 * @param serverSoulOrbs the server soul orbs
 	 * @param zonePoints the zone points
 	 * @param zoneId the zone id
 	 * @param useRates if {@code true} it will use Conquest rates multipliers
 	 */
-	public synchronized void updatePoints(Player player, int personalPoints, int serverPoints, int zonePoints, int zoneId, boolean useRates)
+	public synchronized void updatePoints(Player player, int personalPoints, int serverPoints, int serverSoulOrbs, int zonePoints, int zoneId, boolean useRates)
 	{
 		if (!_isConquestAvailable)
 		{
@@ -588,15 +649,18 @@ public class ConquestEngine extends AbstractNpcAI
 		
 		long finalPersonalPoints = personalPoints;
 		long finalServerPoints = serverPoints;
+		long finalServerSoulOrbs = serverSoulOrbs;
 		int finalZonePoints = zonePoints;
 		if (useRates)
 		{
 			finalPersonalPoints = personalPoints * Config.CONQUEST_RATE_PERSONAL_POINTS;
 			finalServerPoints = serverPoints * Config.CONQUEST_RATE_SERVER_POINTS;
+			finalServerSoulOrbs = serverSoulOrbs * Config.CONQUEST_RATE_SERVER_SOUL_ORBS;
 			finalZonePoints = zonePoints * Config.CONQUEST_RATE_ZONE_POINTS;
 		}
 		setPersonalPoints(player, finalPersonalPoints);
 		setServerPoints(player, finalServerPoints);
+		setServerSoulOrbs(player, finalServerSoulOrbs);
 		setZonePoints(zoneId, finalZonePoints);
 	}
 	
@@ -607,7 +671,7 @@ public class ConquestEngine extends AbstractNpcAI
 	 */
 	public int getAttackPoints(Player player)
 	{
-		return player.getVariables().getInt("CONQUEST_ATTACK_POINTS", Config.CONQUEST_ATTACK_POINTS);
+		return player.getVariables().getInt(PlayerVariables.CONQUEST_ATTACK_POINTS, Config.CONQUEST_ATTACK_POINTS);
 	}
 	
 	/**
@@ -617,7 +681,7 @@ public class ConquestEngine extends AbstractNpcAI
 	 */
 	public int getLifePoints(Player player)
 	{
-		return player.getVariables().getInt("CONQUEST_LIFE_POINTS", Config.CONQUEST_LIFE_POINTS);
+		return player.getVariables().getInt(PlayerVariables.CONQUEST_LIFE_POINTS, Config.CONQUEST_LIFE_POINTS);
 	}
 	
 	/**
@@ -639,6 +703,15 @@ public class ConquestEngine extends AbstractNpcAI
 		return GlobalVariablesManager.getInstance().getLong(CONQUEST_SERVER_POINTS_VAR, 0);
 	}
 	
+	/**
+	 * Gets the Conquest soul orbs.
+	 * @return the soul orbs amount
+	 */
+	public long getServerSoulOrbs()
+	{
+		return GlobalVariablesManager.getInstance().getLong(CONQUEST_SERVER_SOUL_ORBS_VAR, 0);
+	}
+	
 	/**
 	 * Gets the Conquest zone points.
 	 * @param zoneId the zone id to get point for
@@ -655,7 +728,7 @@ public class ConquestEngine extends AbstractNpcAI
 		if (_isConquestAvailable)
 		{
 			final int npcId = npc.getId();
-			updatePoints(killer, CONQUEST_POINT_DATA.getPersonalPointsAmount(npcId), CONQUEST_POINT_DATA.getServerPointsAmount(npcId), CONQUEST_POINT_DATA.getZonePointsAmount(npcId), CONQUEST_POINT_DATA.getZoneId(npcId), true);
+			updatePoints(killer, CONQUEST_POINT_DATA.getPersonalPointsAmount(npcId), CONQUEST_POINT_DATA.getServerPointsAmount(npcId), 1, CONQUEST_POINT_DATA.getZonePointsAmount(npcId), CONQUEST_POINT_DATA.getZoneId(npcId), true);
 		}
 		return super.onKill(npc, killer, isSummon);
 	}
@@ -664,16 +737,16 @@ public class ConquestEngine extends AbstractNpcAI
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
 	public void onPlayerPvPKill(OnPlayerPvPKill event)
 	{
-		if (_isConquestAvailable && event.getPlayer().isInsideZone(ZoneId.CONQUEST) && event.getTarget().isInsideZone(ZoneId.CONQUEST) && !event.getPlayer().getEffectList().isAffectedBySkill(FIRE_SOURCE_CENTER))
+		if (_isConquestAvailable && event.getPlayer().isInsideZone(ZoneId.CONQUEST) && event.getTarget().isInsideZone(ZoneId.CONQUEST) && !event.getPlayer().getEffectList().isAffectedBySkill(FIRE_SOURCE_CENTER_SKILL_ID))
 		{
 			final Player attackerPlayer = event.getPlayer();
 			final Player targetPlayer = event.getTarget();
 			if (CONQUEST_POINT_DATA.getPvpPointsInfo().containsKey(targetPlayer.getLevel()))
 			{
-				updatePoints(attackerPlayer, CONQUEST_POINT_DATA.getPvpPersonalPointsAmount(targetPlayer.getLevel()), CONQUEST_POINT_DATA.getPvpServerPointsAmount(targetPlayer.getLevel()), 0, 0, true);
+				updatePoints(attackerPlayer, CONQUEST_POINT_DATA.getPvpPersonalPointsAmount(targetPlayer.getLevel()), CONQUEST_POINT_DATA.getPvpServerPointsAmount(targetPlayer.getLevel()), 0, 0, 0, true);
 				if ((getAttackPoints(attackerPlayer) >= 1) && (getLifePoints(targetPlayer) >= 1))
 				{
-					attackerPlayer.addItem("ConquestCoins", BLOODY_COIN, CONQUEST_POINT_DATA.getCoinsAmount(targetPlayer.getLevel()), attackerPlayer, true);
+					attackerPlayer.addItem("ConquestCoins", BLOODY_COIN, CONQUEST_POINT_DATA.getCoinsAmount(targetPlayer.getLevel()) * Config.CONQUEST_RATE_BLOODY_COINS, attackerPlayer, true);
 					setAttackPoints(attackerPlayer, -1);
 					setLifePoints(targetPlayer, -1);
 					
@@ -685,7 +758,7 @@ public class ConquestEngine extends AbstractNpcAI
 					// Winner Message
 					SystemMessage sm2 = new SystemMessage(SystemMessageId.YOU_HAVE_DEFEATED_C1_AND_GOT_BLOODY_COINS_X_S2_PERSONAL_CONQUEST_POINTS_X_S3_SERVER_CONQUEST_POINTS_X_S4_ATTACK_POINTS_1_TO_CHECK_THEIR_CURRENT_AMOUNT_ENTER_BLOODYCOIN_IN_YOUR_CHAT_WINDOW);
 					sm2.addString(targetPlayer.getName());
-					sm2.addString(Integer.toString(CONQUEST_POINT_DATA.getCoinsAmount(targetPlayer.getLevel())));
+					sm2.addString(Integer.toString(CONQUEST_POINT_DATA.getCoinsAmount(targetPlayer.getLevel()) * Config.CONQUEST_RATE_BLOODY_COINS));
 					sm2.addString(Long.toString(CONQUEST_POINT_DATA.getPvpPersonalPointsAmount(targetPlayer.getLevel())));
 					sm2.addString(Long.toString(CONQUEST_POINT_DATA.getPvpServerPointsAmount(targetPlayer.getLevel())));
 					attackerPlayer.sendPacket(sm2);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/34596-01.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/34596-01.html
index dda665b0b5..4ce4bf4859 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/34596-01.html
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/34596-01.html
@@ -1,9 +1,9 @@
 <html><body>Conquest Teleport Device:<br>
 Where would you like to go?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice waterZone0">Fire & Water Border (Fire Side)</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice waterZone2">Zone 1 - Asa</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice waterZone3">Zone 2 - Anima</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice waterZone4">Zone 3 - Nox</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice waterZone5">Callide's Hall</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice waterZone6">Eigis</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice waterZone7">Fire & Water Border (Water Side)</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/34597-01.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/34597-01.html
index 48566e126d..ac5bfce9e1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/34597-01.html
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/34597-01.html
@@ -1,10 +1,10 @@
 <html><body>Conquest Teleport Device:<br>
 Where would you like to go?<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice fireZone1">Fire & Water Border (Fire Side)</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice fireZone2">Fire Fortress</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice fireZone3">Kellond's Secret Barracks</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice fireZone4">Zone 1 - Vita</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice fireZone5">Zone 2 - Ignis</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice fireZone6">Fire Source (Common Area)</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice fireZone7">Fire Source (Central Area)</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice waterZone0">Fire & Water Border (Water Side)</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice fireZone1">Fire Fortress</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice fireZone2">Kellond's Secret Barracks</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice fireZone3">Zone 1 - Vita</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice fireZone4">Zone 2 - Ignis</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice fireZone5">Fire Source (Common Area)</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice fireZone6">Fire Source (Central Area)</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/34661-01.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/34661-01.html
index 222386f117..7ed06fdb12 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/34661-01.html
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/34661-01.html
@@ -2,7 +2,7 @@
 Those who have occupied Conquest may use the teleport function to teleport to important places in Conquest area.<br>
 <font color="LEVEL">(Only characters from the occupying Clan may use teleport.)</font><br>
 Where would you like to go?<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice waterZone7">Teleport on the Water Side</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice fireZone0">Teleport on the Fire Side</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice waterZone1">Conquest Town</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice waterZone2">Zone 1 - Asa</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest ConquestTeleportDevice waterZone3">Zone 2 - Anima</Button>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/ConquestTeleportDevice.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/ConquestTeleportDevice.java
index c814e077ca..c2a22fa9b9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/ConquestTeleportDevice.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/ConquestTeleportDevice/ConquestTeleportDevice.java
@@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.RankManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.clan.ClanMember;
 
 import ai.AbstractNpcAI;
 
@@ -35,7 +36,16 @@ public class ConquestTeleportDevice extends AbstractNpcAI
 	private static final int DEVICE2 = 34597; // Teleport Device 2 ( Water Side Teleporter)
 	private static final int DEVICE3 = 34661; // Teleport Device 3 ( Fire Side Teleporter)
 	
-	// Locations
+	// Enter Locations
+	private static final Location[] ENTER_LOCS =
+	{
+		// Water Area
+		new Location(-525, -201894, -3016), // Fire & Water Border (Water Side)
+		// Fire Area
+		new Location(446, -201800, -3000), // Fire & Water Border (Fire Side)
+	};
+	
+	// Hunt Locations
 	private static final Location[] HUNT_LOCS =
 	{
 		// Water Areas
@@ -45,9 +55,7 @@ public class ConquestTeleportDevice extends AbstractNpcAI
 		new Location(-2570, -213261, -3603), // Zone 3 - Nox
 		new Location(-11731, -215556, -2800), // Zone 4 - Callide Hall
 		new Location(-24036, -220963, -3511), // Eigis Seat
-		new Location(-525, -201894, -3016), // Fire & Water Border (Water Side)
 		// Fire Areas
-		new Location(446, -201800, -3000), // Fire & Water Border (Fire Side)
 		new Location(7515, -202872, -3184), // Fire Fortress
 		new Location(21937, -225270, -3800), // Kellond's Secret Barracks
 		new Location(10256, -217176, -3568), // Zone 1 - Vita (Lv. 124)
@@ -80,86 +88,111 @@ public class ConquestTeleportDevice extends AbstractNpcAI
 				checkPrivs(player);
 				break;
 			}
-		}
-		if (checkPrivs(player))
-		{
-			switch (event)
+			case "waterZone0":
 			{
-				case "waterZone1":
+				player.teleToLocation(ENTER_LOCS[0], 0, player.getInstanceWorld());
+				break;
+			}
+			case "fireZone0":
+			{
+				player.teleToLocation(ENTER_LOCS[1], 0, player.getInstanceWorld());
+				break;
+			}
+			case "waterZone1":
+			{
+				if (checkPrivs(player))
 				{
 					player.teleToLocation(HUNT_LOCS[0], 0, player.getInstanceWorld());
-					break;
 				}
-				case "waterZone2":
+				break;
+			}
+			case "waterZone2":
+			{
+				if (checkPrivs(player))
 				{
 					player.teleToLocation(HUNT_LOCS[1], 0, player.getInstanceWorld());
-					break;
 				}
-				case "waterZone3":
+				break;
+			}
+			case "waterZone3":
+			{
+				if (checkPrivs(player))
 				{
 					player.teleToLocation(HUNT_LOCS[2], 0, player.getInstanceWorld());
-					break;
 				}
-				case "waterZone4":
+				break;
+			}
+			case "waterZone4":
+			{
+				if (checkPrivs(player))
 				{
 					player.teleToLocation(HUNT_LOCS[3], 0, player.getInstanceWorld());
-					break;
 				}
-				case "waterZone5":
+				break;
+			}
+			case "waterZone5":
+			{
+				if (checkPrivs(player))
 				{
 					player.teleToLocation(HUNT_LOCS[4], 0, player.getInstanceWorld());
-					break;
 				}
-				case "waterZone6":
+				break;
+			}
+			case "waterZone6":
+			{
+				if (checkPrivs(player))
 				{
 					player.teleToLocation(HUNT_LOCS[5], 0, player.getInstanceWorld());
-					break;
 				}
-				case "waterZone7":
+				break;
+			}
+			case "fireZone1":
+			{
+				if (checkPrivs(player))
 				{
 					player.teleToLocation(HUNT_LOCS[6], 0, player.getInstanceWorld());
-					break;
 				}
-				case "fireZone1":
+				break;
+			}
+			case "fireZone2":
+			{
+				if (checkPrivs(player))
 				{
 					player.teleToLocation(HUNT_LOCS[7], 0, player.getInstanceWorld());
-					break;
 				}
-				case "fireZone2":
+				break;
+			}
+			case "fireZone3":
+			{
+				if (checkPrivs(player))
 				{
 					player.teleToLocation(HUNT_LOCS[8], 0, player.getInstanceWorld());
-					break;
 				}
-				case "fireZone3":
+				break;
+			}
+			case "fireZone4":
+			{
+				if (checkPrivs(player))
 				{
 					player.teleToLocation(HUNT_LOCS[9], 0, player.getInstanceWorld());
-					break;
 				}
-				case "fireZone4":
+				break;
+			}
+			case "fireZone5":
+			{
+				if (checkPrivs(player))
 				{
 					player.teleToLocation(HUNT_LOCS[10], 0, player.getInstanceWorld());
-					break;
 				}
-				case "fireZone5":
+				break;
+			}
+			case "fireZone6":
+			{
+				if (checkPrivs(player))
 				{
 					player.teleToLocation(HUNT_LOCS[11], 0, player.getInstanceWorld());
-					break;
-				}
-				case "fireZone6":
-				{
-					player.teleToLocation(HUNT_LOCS[12], 0, player.getInstanceWorld());
-					break;
-				}
-				case "fireZone7":
-				{
-					player.teleToLocation(HUNT_LOCS[13], 0, player.getInstanceWorld());
-					break;
-				}
-				default:
-				{
-					player.sendMessage("You can't use the teleport device.");
-					break;
 				}
+				break;
 			}
 		}
 		return htmltext;
@@ -167,13 +200,28 @@ public class ConquestTeleportDevice extends AbstractNpcAI
 	
 	private boolean checkPrivs(Player player)
 	{
-		final int prevSeasonConquerorId = RankManager.getInstance().getPreviousConquestRankList().get(1) != null ? RankManager.getInstance().getPreviousConquestRankList().get(1).getInt("charId") : 0;
-		if (Config.CONQUEST_TELEPORTS_FOR_ALL || (player.getClan().getLeaderId() == prevSeasonConquerorId))
+		final int prevSeasonRank1Id = RankManager.getInstance().getPreviousConquestRankList().get(1) != null ? RankManager.getInstance().getPreviousConquestRankList().get(1).getInt("charId") : 0;
+		final int currentSeasonRank1Id = RankManager.getInstance().getCurrentConquestRankList().get(1) != null ? RankManager.getInstance().getCurrentConquestRankList().get(1).getInt("charId") : 0;
+		if (Config.CONQUEST_TELEPORTS_FOR_ALL)
 		{
 			player.sendMessage("You are free to use this teleport device.");
 			return true;
 		}
-		
+		// Check if rank 1 player id is in checker clan or not
+		else if (player.getClan() != null)
+		{
+			for (ClanMember member : player.getClan().getMembers())
+			{
+				if ((member.getObjectId() == prevSeasonRank1Id) || (member.getObjectId() == (currentSeasonRank1Id)))
+				{
+					player.sendMessage("You are free to use this teleport device.");
+					return true;
+				}
+				player.sendMessage("You can't use this teleport device, because you don't belong to the conquest conqueror clan.");
+				return false;
+			}
+		}
+		// If no clan
 		player.sendMessage("You can't use this teleport device, because you don't belong to the conquest conqueror clan.");
 		return false;
 	}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/Flowers/Flowers.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/Flowers/Flowers.java
index 2c67d9503f..06e13196ef 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/Flowers/Flowers.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/Flowers/Flowers.java
@@ -104,7 +104,7 @@ public class Flowers extends AbstractNpcAI
 					// Notify to scripts.
 					if (EventDispatcher.getInstance().hasListener(EventType.ON_CONQUEST_FLOWER_COLLECT))
 					{
-						EventDispatcher.getInstance().notifyEventAsync(new OnConquestFlowerCollect(player));
+						EventDispatcher.getInstance().notifyEventAsync(new OnConquestFlowerCollect(player, npc.getId()));
 					}
 					
 					if (player.isInventoryUnder90(false))
@@ -144,7 +144,7 @@ public class Flowers extends AbstractNpcAI
 						}
 						else
 						{
-							player.getVariables().set(PlayerVariables.CONQUEST_PERSONAL_POINTS, player.getVariables().getLong(PlayerVariables.CONQUEST_PERSONAL_POINTS) + PERSONAL_POINTS_AMOUNT);
+							player.getVariables().set(PlayerVariables.CONQUEST_PERSONAL_POINTS, player.getVariables().getLong(PlayerVariables.CONQUEST_PERSONAL_POINTS, 0) + PERSONAL_POINTS_AMOUNT);
 							player.sendPacket(SystemMessageId.YOU_HAVE_RECEIVED_PERSONAL_CONQUEST_POINTS);
 						}
 					}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/SacredFire/SacredFire.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/SacredFire/SacredFire.java
index 1f6198190e..057a50c280 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/SacredFire/SacredFire.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/SacredFire/SacredFire.java
@@ -32,12 +32,14 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.ListenerRegisterType;
 import org.l2jmobius.gameserver.model.events.annotations.Id;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterType;
 import org.l2jmobius.gameserver.model.events.impl.OnServerStart;
+import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSacredFire;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemUse;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
@@ -352,6 +354,8 @@ public class SacredFire extends AbstractNpcAI
 				sacredFire.getVariables().set("SLOT", sacredFireSlot);
 				sacredFire.getVariables().set("SUMMON_TIME", System.currentTimeMillis());
 				
+				checkSummonSacredFireListener(player);
+				
 				// Update owner current Sacred Fires count.
 				player.getVariables().set(PlayerVariables.CONQUEST_SACRED_FIRE_SLOT_COUNT, player.getVariables().getInt(PlayerVariables.CONQUEST_SACRED_FIRE_SLOT_COUNT, 0) + 1);
 				
@@ -470,6 +474,15 @@ public class SacredFire extends AbstractNpcAI
 		removeSacredFireVars();
 	}
 	
+	private void checkSummonSacredFireListener(Player player)
+	{
+		// Notify to scripts.
+		if (EventDispatcher.getInstance().hasListener(EventType.ON_PLAYER_SUMMON_SACRED_FIRE))
+		{
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerSummonSacredFire(player, SACRED_FIRE));
+		}
+	}
+	
 	public static void main(String[] args)
 	{
 		new SacredFire();
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/conquestPoints.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/conquestPoints.xml
index 4755a85237..fbceb687ee 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/conquestPoints.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Conquest/conquestPoints.xml
@@ -8,7 +8,7 @@
 	<npc id="27704" personalPoints="20" serverPoints="20" /> <!-- Craigo -->
 	<npc id="27705" personalPoints="4" serverPoints="4" /> <!-- Kiku -->
 	<npc id="27706" personalPoints="4" serverPoints="4" /> <!-- Floato -->
-	<npc id="19816" personalPoints="4" serverPoints="4" /> <!-- Soul Flower -->
+	<npc id="19816" personalPoints="40" serverPoints="40" /> <!-- Soul Flower -->
 	
 	<!-- Daril Phran's Water Source (Lv. 116) -->
 	<npc id="27707" personalPoints="6" serverPoints="6" /> <!-- Daril Phran -->
@@ -17,112 +17,112 @@
 	<npc id="27710" personalPoints="30" serverPoints="30" /> <!-- Craigo Phran -->
 	<npc id="27711" personalPoints="6" serverPoints="6" /> <!-- Kiku Phran -->
 	<npc id="27712" personalPoints="6" serverPoints="6" /> <!-- Floato Phran -->
-	<npc id="19817" personalPoints="6" serverPoints="6" /> <!-- Soul Flower -->
+	<npc id="19817" personalPoints="60" serverPoints="60" /> <!-- Soul Flower -->
 
 	<!-- Asa Area 1 (Lv. 116) -->
-	<npc id="27713" personalPoints="9" serverPoints="9" zonePoints="19" zoneId="1" /> <!-- Daril Asa Ar -->
-	<npc id="27714" personalPoints="30" serverPoints="30" zonePoints="19" zoneId="1" /> <!-- Seo Asa Ar -->
-	<npc id="27715" personalPoints="9" serverPoints="9" zonePoints="19" zoneId="1" /> <!-- Floato Asa Ar -->
-	<npc id="27716" personalPoints="9" serverPoints="9" zonePoints="19" zoneId="1" /> <!-- Asa Ar Hunter -->
-	<npc id="27717" personalPoints="9" serverPoints="9" zonePoints="19" zoneId="1" /> <!-- Asa Ar Sorceress -->
-	<npc id="27718" personalPoints="9" serverPoints="9" zonePoints="19" zoneId="1" /> <!-- Saida Asa Ar -->
-	<npc id="19830" personalPoints="9" serverPoints="9" zonePoints="19" zoneId="1" /> <!-- Luminous Soul -->
-	<npc id="19818" personalPoints="45" serverPoints="45" zonePoints="95" zoneId="1" /> <!-- Soul Flower -->
+	<npc id="27713" personalPoints="18" serverPoints="18" zonePoints="19" zoneId="1" /> <!-- Daril Asa Ar -->
+	<npc id="27714" personalPoints="18" serverPoints="18" zonePoints="19" zoneId="1" /> <!-- Seo Asa Ar -->
+	<npc id="27715" personalPoints="18" serverPoints="18" zonePoints="19" zoneId="1" /> <!-- Floato Asa Ar -->
+	<npc id="27716" personalPoints="18" serverPoints="18" zonePoints="19" zoneId="1" /> <!-- Asa Ar Hunter -->
+	<npc id="27717" personalPoints="18" serverPoints="18" zonePoints="19" zoneId="1" /> <!-- Asa Ar Sorceress -->
+	<npc id="27718" personalPoints="18" serverPoints="18" zonePoints="19" zoneId="1" /> <!-- Saida Asa Ar -->
+	<npc id="19830" personalPoints="267" serverPoints="267" zonePoints="810" zoneId="1" /> <!-- Luminous Soul -->
+	<npc id="19818" personalPoints="180" serverPoints="180" zonePoints="95" zoneId="1" /> <!-- Soul Flower -->
 	
 	<!-- Asa Area 2 (Lv. 120) -->
-	<npc id="27719" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="1" /> <!-- Atron Asa Mide -->
-	<npc id="27720" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="1" /> <!-- Craigo Asa Mide -->
-	<npc id="27721" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="1" /> <!-- Kerberos Asa Mide -->
-	<npc id="27722" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="1" /> <!-- Asa Mide Hunter -->
-	<npc id="27723" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="1" /> <!-- Asa Mide Sorceress -->
-	<npc id="27724" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="1" /> <!-- Saida Asa Mide -->
-	<npc id="27725" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="1" /> <!-- Asa Mide Blader -->
-	<npc id="19819" personalPoints="55" serverPoints="55" zonePoints="110" zoneId="1" /> <!-- Soul Flower -->
+	<npc id="27719" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="1" /> <!-- Atron Asa Mide -->
+	<npc id="27720" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="1" /> <!-- Craigo Asa Mide -->
+	<npc id="27721" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="1" /> <!-- Kerberos Asa Mide -->
+	<npc id="27722" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="1" /> <!-- Asa Mide Hunter -->
+	<npc id="27723" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="1" /> <!-- Asa Mide Sorceress -->
+	<npc id="27724" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="1" /> <!-- Saida Asa Mide -->
+	<npc id="27725" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="1" /> <!-- Asa Mide Blader -->
+	<npc id="19819" personalPoints="280" serverPoints="280" zonePoints="110" zoneId="1" /> <!-- Soul Flower -->
 	
 	<!-- Asa Area 3 (Lv. 124) -->
-	<npc id="27726" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="1" /> <!-- Atron Asa Telro -->
-	<npc id="27727" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="1" /> <!-- Craigo Asa Telro -->
-	<npc id="27728" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="1" /> <!-- Beor Asa Telro -->
-	<npc id="27729" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="1" /> <!-- Asa Telro Hunter -->
-	<npc id="27730" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="1" /> <!-- Asa Telro Sorceress -->
-	<npc id="27731" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="1" /> <!-- Saida Asa Telro -->
-	<npc id="27732" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="1" /> <!-- Asa Telro Blader -->
-	<npc id="27733" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="1" /> <!-- Asa Telro Guard -->
-	<npc id="19820" personalPoints="80" serverPoints="80" zonePoints="160" zoneId="1" /> <!-- Soul Flower -->
-	<npc id="19827" personalPoints="462" serverPoints="2314" zonePoints="13888" zoneId="1" /> <!-- Soul Tree -->
-	<npc id="27776" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="1" /> <!-- Catshi Trickster Asa Guardian -->
-	<npc id="27777" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="1" /> <!-- Catshi Muse Asa Guardian -->
-	<npc id="27778" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="1" /> <!-- Catshi Ripper Asa Guardian -->
+	<npc id="27726" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="1" /> <!-- Atron Asa Telro -->
+	<npc id="27727" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="1" /> <!-- Craigo Asa Telro -->
+	<npc id="27728" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="1" /> <!-- Beor Asa Telro -->
+	<npc id="27729" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="1" /> <!-- Asa Telro Hunter -->
+	<npc id="27730" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="1" /> <!-- Asa Telro Sorceress -->
+	<npc id="27731" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="1" /> <!-- Saida Asa Telro -->
+	<npc id="27732" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="1" /> <!-- Asa Telro Blader -->
+	<npc id="27733" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="1" /> <!-- Asa Telro Guard -->
+	<npc id="19820" personalPoints="430" serverPoints="430" zonePoints="160" zoneId="1" /> <!-- Soul Flower -->
+	<npc id="19827" personalPoints="3326" serverPoints="997920" zonePoints="159667" zoneId="1" /> <!-- Soul Tree -->
+	<npc id="27776" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="1" /> <!-- Catshi Trickster Asa Guardian -->
+	<npc id="27777" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="1" /> <!-- Catshi Muse Asa Guardian -->
+	<npc id="27778" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="1" /> <!-- Catshi Ripper Asa Guardian -->
 
 	<!-- Anima Area 1 (Lv. 116) -->
-	<npc id="27755" personalPoints="9" serverPoints="9" zonePoints="19" zoneId="2" /> <!-- Daril Anima Ar -->
+	<npc id="27755" personalPoints="18" serverPoints="18" zonePoints="19" zoneId="2" /> <!-- Daril Anima Ar -->
 	<npc id="27756" personalPoints="30" serverPoints="30" zonePoints="19" zoneId="2" /> <!-- Seo Anima Ar -->
-	<npc id="27757" personalPoints="9" serverPoints="9" zonePoints="19" zoneId="2" /> <!-- Floato Anima Ar -->
-	<npc id="27758" personalPoints="9" serverPoints="9" zonePoints="19" zoneId="2" /> <!-- Anima Ar Hunter -->
-	<npc id="27759" personalPoints="9" serverPoints="9" zonePoints="19" zoneId="2" /> <!-- Anima Ar Sorceress -->
-	<npc id="27760" personalPoints="9" serverPoints="9" zonePoints="19" zoneId="2" /> <!-- Saida Anima Ar -->
-	<npc id="19832" personalPoints="46" serverPoints="115" zonePoints="277" zoneId="2" /> <!-- Luminous Soul -->
-	<npc id="19824" personalPoints="45" serverPoints="45" zonePoints="95" zoneId="2" /> <!-- Soul Flower -->
+	<npc id="27757" personalPoints="18" serverPoints="18" zonePoints="19" zoneId="2" /> <!-- Floato Anima Ar -->
+	<npc id="27758" personalPoints="18" serverPoints="18" zonePoints="19" zoneId="2" /> <!-- Anima Ar Hunter -->
+	<npc id="27759" personalPoints="18" serverPoints="18" zonePoints="19" zoneId="2" /> <!-- Anima Ar Sorceress -->
+	<npc id="27760" personalPoints="18" serverPoints="18" zonePoints="19" zoneId="2" /> <!-- Saida Anima Ar -->
+	<npc id="19832" personalPoints="267" serverPoints="267" zonePoints="810" zoneId="2" /> <!-- Luminous Soul -->
+	<npc id="19824" personalPoints="180" serverPoints="180" zonePoints="95" zoneId="2" /> <!-- Soul Flower -->
 	
 	<!-- Anima Area 2 (Lv. 120) -->
-	<npc id="27761" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="2" /> <!-- Atron Anima Mide -->
-	<npc id="27762" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="2" /> <!-- Craigo Anima Mide -->
-	<npc id="27763" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="2" /> <!-- Kerberos Anima Mide -->
-	<npc id="27764" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="2" /> <!-- Anima Mide Hunter -->
-	<npc id="27765" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="2" /> <!-- Anima Mide Sorceress -->
-	<npc id="27766" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="2" /> <!-- Saida Anima Mide -->
-	<npc id="27767" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="2" /> <!-- Anima Mide Blader -->
-	<npc id="19825" personalPoints="55" serverPoints="55" zonePoints="110" zoneId="2" /> <!-- Soul Flower -->
+	<npc id="27761" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="2" /> <!-- Atron Anima Mide -->
+	<npc id="27762" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="2" /> <!-- Craigo Anima Mide -->
+	<npc id="27763" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="2" /> <!-- Kerberos Anima Mide -->
+	<npc id="27764" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="2" /> <!-- Anima Mide Hunter -->
+	<npc id="27765" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="2" /> <!-- Anima Mide Sorceress -->
+	<npc id="27766" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="2" /> <!-- Saida Anima Mide -->
+	<npc id="27767" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="2" /> <!-- Anima Mide Blader -->
+	<npc id="19825" personalPoints="280" serverPoints="280" zonePoints="110" zoneId="2" /> <!-- Soul Flower -->
 	
 	<!-- Anima Area 3 (Lv. 124) -->
-	<npc id="27768" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="2" /> <!-- Atron Anima Telro -->
-	<npc id="27769" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="2" /> <!-- Craigo Anima Telro -->
-	<npc id="27770" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="2" /> <!-- Beor Anima Telro -->
-	<npc id="27771" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="2" /> <!-- Anima Telro Hunter -->
-	<npc id="27772" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="2" /> <!-- Anima Telro Sorceress -->
-	<npc id="27773" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="2" /> <!-- Saida Anima Telro -->
-	<npc id="27774" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="2" /> <!-- Anima Telro Blader -->
-	<npc id="27775" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="2" /> <!-- Anima Telro Guard -->
-	<npc id="19826" personalPoints="80" serverPoints="80" zonePoints="160" zoneId="2" /> <!-- Soul Flower -->
-	<npc id="19829" personalPoints="462" serverPoints="2314" zonePoints="13888" zoneId="2" /> <!-- Soul Tree -->
-	<npc id="27782" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="2" /> <!-- Catshi Trickster Anima Guardian -->
-	<npc id="27783" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="2" /> <!-- Catshi Muse Anima Guardian -->
-	<npc id="27784" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="2" /> <!-- Catshi Ripper Anima Guardian -->
+	<npc id="27768" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="2" /> <!-- Atron Anima Telro -->
+	<npc id="27769" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="2" /> <!-- Craigo Anima Telro -->
+	<npc id="27770" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="2" /> <!-- Beor Anima Telro -->
+	<npc id="27771" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="2" /> <!-- Anima Telro Hunter -->
+	<npc id="27772" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="2" /> <!-- Anima Telro Sorceress -->
+	<npc id="27773" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="2" /> <!-- Saida Anima Telro -->
+	<npc id="27774" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="2" /> <!-- Anima Telro Blader -->
+	<npc id="27775" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="2" /> <!-- Anima Telro Guard -->
+	<npc id="19826" personalPoints="430" serverPoints="430" zonePoints="160" zoneId="2" /> <!-- Soul Flower -->
+	<npc id="19829" personalPoints="3326" serverPoints="997920" zonePoints="159667" zoneId="2" /> <!-- Soul Tree -->
+	<npc id="27782" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="2" /> <!-- Catshi Trickster Anima Guardian -->
+	<npc id="27783" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="2" /> <!-- Catshi Muse Anima Guardian -->
+	<npc id="27784" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="2" /> <!-- Catshi Ripper Anima Guardian -->
 	
 	<!-- Nox Area 1 (Lv. 116) -->
-	<npc id="27734" personalPoints="9" serverPoints="9" zonePoints="19" zoneId="3" /> <!-- Daril Nox Ar -->
+	<npc id="27734" personalPoints="18" serverPoints="18" zonePoints="19" zoneId="3" /> <!-- Daril Nox Ar -->
 	<npc id="27735" personalPoints="30" serverPoints="30" zonePoints="19" zoneId="3" /> <!-- Seo Nox Ar -->
-	<npc id="27736" personalPoints="9" serverPoints="9" zonePoints="19" zoneId="3" /> <!-- Floato Nox Ar -->
-	<npc id="27737" personalPoints="9" serverPoints="9" zonePoints="19" zoneId="3" /> <!-- Nox Ar Hunter -->
-	<npc id="27738" personalPoints="9" serverPoints="9" zonePoints="19" zoneId="3" /> <!-- Nox Ar Sorceress -->
-	<npc id="27739" personalPoints="9" serverPoints="9" zonePoints="19" zoneId="3" /> <!-- Saida Nox Ar -->
-	<npc id="19831" personalPoints="46" serverPoints="115" zonePoints="277" zoneId="3" /> <!-- Luminous Soul -->
-	<npc id="19821" personalPoints="45" serverPoints="45" zonePoints="95" zoneId="3" /> <!-- Soul Flower -->
+	<npc id="27736" personalPoints="18" serverPoints="18" zonePoints="19" zoneId="3" /> <!-- Floato Nox Ar -->
+	<npc id="27737" personalPoints="18" serverPoints="18" zonePoints="19" zoneId="3" /> <!-- Nox Ar Hunter -->
+	<npc id="27738" personalPoints="18" serverPoints="18" zonePoints="19" zoneId="3" /> <!-- Nox Ar Sorceress -->
+	<npc id="27739" personalPoints="18" serverPoints="18" zonePoints="19" zoneId="3" /> <!-- Saida Nox Ar -->
+	<npc id="19831" personalPoints="267" serverPoints="267" zonePoints="810" zoneId="3" /> <!-- Luminous Soul -->
+	<npc id="19821" personalPoints="180" serverPoints="180" zonePoints="95" zoneId="3" /> <!-- Soul Flower -->
 	
 	<!-- Nox Area 2 (Lv. 120) -->
-	<npc id="27740" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="3" /> <!-- Atron Nox Mide -->
-	<npc id="27741" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="3" /> <!-- Craigo Nox Mide -->
-	<npc id="27742" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="3" /> <!-- Kerberos Nox Mide -->
-	<npc id="27743" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="3" /> <!-- Nox Mide Hunter -->
-	<npc id="27744" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="3" /> <!-- Nox Mide Sorceress -->
-	<npc id="27745" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="3" /> <!-- Saida Nox Mide -->
-	<npc id="27746" personalPoints="11" serverPoints="11" zonePoints="22" zoneId="3" /> <!-- Nox Mide Blader -->
-	<npc id="19822" personalPoints="55" serverPoints="55" zonePoints="110" zoneId="3" /> <!-- Soul Flower -->
+	<npc id="27740" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="3" /> <!-- Atron Nox Mide -->
+	<npc id="27741" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="3" /> <!-- Craigo Nox Mide -->
+	<npc id="27742" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="3" /> <!-- Kerberos Nox Mide -->
+	<npc id="27743" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="3" /> <!-- Nox Mide Hunter -->
+	<npc id="27744" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="3" /> <!-- Nox Mide Sorceress -->
+	<npc id="27745" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="3" /> <!-- Saida Nox Mide -->
+	<npc id="27746" personalPoints="28" serverPoints="28" zonePoints="22" zoneId="3" /> <!-- Nox Mide Blader -->
+	<npc id="19822" personalPoints="280" serverPoints="280" zonePoints="110" zoneId="3" /> <!-- Soul Flower -->
 	
 	<!-- Nox Area 3 (Lv. 124) -->
-	<npc id="27747" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="3" /> <!-- Atron Nox Telro -->
-	<npc id="27748" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="3" /> <!-- Craigo Nox Telro -->
-	<npc id="27749" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="3" /> <!-- Beor Nox Telro -->
-	<npc id="27750" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="3" /> <!-- Nox Telro Hunter -->
-	<npc id="27751" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="3" /> <!-- Nox Telro Sorceress -->
-	<npc id="27752" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="3" /> <!-- Saida Nox Telro -->
-	<npc id="27753" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="3" /> <!-- Nox Telro Blader -->
-	<npc id="27754" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="3" /> <!-- Nox Telro Guard -->
-	<npc id="19823" personalPoints="80" serverPoints="80" zonePoints="160" zoneId="3" /> <!-- Soul Flower -->
-	<npc id="19828" personalPoints="462" serverPoints="2314" zonePoints="13888" zoneId="3" /> <!-- Soul Tree -->
-	<npc id="27779" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="3" /> <!-- Catshi Trickster Nox Guardian -->
-	<npc id="27780" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="3" /> <!-- Catshi Muse Nox Guardian -->
-	<npc id="27781" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="3" /> <!-- Catshi Ripper Nox Guardian -->
+	<npc id="27747" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="3" /> <!-- Atron Nox Telro -->
+	<npc id="27748" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="3" /> <!-- Craigo Nox Telro -->
+	<npc id="27749" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="3" /> <!-- Beor Nox Telro -->
+	<npc id="27750" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="3" /> <!-- Nox Telro Hunter -->
+	<npc id="27751" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="3" /> <!-- Nox Telro Sorceress -->
+	<npc id="27752" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="3" /> <!-- Saida Nox Telro -->
+	<npc id="27753" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="3" /> <!-- Nox Telro Blader -->
+	<npc id="27754" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="3" /> <!-- Nox Telro Guard -->
+	<npc id="19823" personalPoints="430" serverPoints="430" zonePoints="160" zoneId="3" /> <!-- Soul Flower -->
+	<npc id="19828" personalPoints="3326" serverPoints="997920" zonePoints="159667" zoneId="3" /> <!-- Soul Tree -->
+	<npc id="27779" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="3" /> <!-- Catshi Trickster Nox Guardian -->
+	<npc id="27780" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="3" /> <!-- Catshi Muse Nox Guardian -->
+	<npc id="27781" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="3" /> <!-- Catshi Ripper Nox Guardian -->
 	
 	<!-- Fiery Field (no PvP) (Lv. 116) -->
 	<npc id="27801" personalPoints="6" serverPoints="6" /> <!-- Seo Agel -->
@@ -133,42 +133,42 @@
 	<npc id="27806" personalPoints="6" serverPoints="6" /> <!-- Catshi Agel Knight -->
 		
 	<!-- Garden of Flames (no PvP) (Lv. 120) -->
-	<npc id="27794" personalPoints="6" serverPoints="6" /> <!-- Delia Gof -->
-	<npc id="27795" personalPoints="6" serverPoints="6" /> <!-- Aselon Gof -->
-	<npc id="27796" personalPoints="6" serverPoints="6" /> <!-- Retel Gof -->
-	<npc id="27797" personalPoints="6" serverPoints="6" /> <!-- Catshi Gof Wizard -->
-	<npc id="27798" personalPoints="6" serverPoints="6" /> <!-- Catshi Gof Archer -->
-	<npc id="27799" personalPoints="6" serverPoints="6" /> <!-- Catshi Gof Warrior -->
+	<npc id="27794" personalPoints="9" serverPoints="9" /> <!-- Delia Gof -->
+	<npc id="27795" personalPoints="9" serverPoints="9" /> <!-- Aselon Gof -->
+	<npc id="27796" personalPoints="9" serverPoints="9" /> <!-- Retel Gof -->
+	<npc id="27797" personalPoints="9" serverPoints="9" /> <!-- Catshi Gof Wizard -->
+	<npc id="27798" personalPoints="9" serverPoints="9" /> <!-- Catshi Gof Archer -->
+	<npc id="27799" personalPoints="9" serverPoints="9" /> <!-- Catshi Gof Warrior -->
 	
 	<!-- Vita Area 1 (Lv. 124) -->
-	<npc id="27808" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="4" /> <!-- Renard Vita -->
-	<npc id="27810" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="4" /> <!-- Catshi Vita Wizard -->
-	<npc id="27811" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="4" /> <!-- Catshi Vita Archer -->
-	<npc id="27812" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="4" /> <!-- Catshi Vita Warrior -->
-	<npc id="27813" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="4" /> <!-- Catshi Vita Knight -->
-	<npc id="27814" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="4" /> <!-- Vita Sorceress -->
-	<npc id="27815" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="4" /> <!-- Vita Seeker -->
-	<npc id="27816" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="4" /> <!-- Vita Reaper -->
+	<npc id="27808" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="4" /> <!-- Renard Vita -->
+	<npc id="27810" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="4" /> <!-- Catshi Vita Wizard -->
+	<npc id="27811" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="4" /> <!-- Catshi Vita Archer -->
+	<npc id="27812" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="4" /> <!-- Catshi Vita Warrior -->
+	<npc id="27813" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="4" /> <!-- Catshi Vita Knight -->
+	<npc id="27814" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="4" /> <!-- Vita Sorceress -->
+	<npc id="27815" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="4" /> <!-- Vita Seeker -->
+	<npc id="27816" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="4" /> <!-- Vita Reaper -->
 	<npc id="19840" personalPoints="80" serverPoints="80" zonePoints="160" zoneId="4" /> <!-- Soul Flower -->
-	<npc id="19842" personalPoints="462" serverPoints="2314" zonePoints="13888" zoneId="4" /> <!-- Soul Tree -->
-	<npc id="27826" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="4" /> <!-- Catshi Trickster - Vita Guardian -->
-	<npc id="27827" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="4" /> <!-- Catshi Muse - Vita Guardian -->
-	<npc id="27828" personalPoints="16" serverPoints="16" zonePoints="32" zoneId="4" /> <!-- Catshi Guard - Vita Guardian -->
+	<npc id="19842" personalPoints="3326" serverPoints="997920" zonePoints="159667" zoneId="4" /> <!-- Soul Tree -->
+	<npc id="27826" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="4" /> <!-- Catshi Trickster - Vita Guardian -->
+	<npc id="27827" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="4" /> <!-- Catshi Muse - Vita Guardian -->
+	<npc id="27828" personalPoints="43" serverPoints="43" zonePoints="32" zoneId="4" /> <!-- Catshi Guard - Vita Guardian -->
 	
 	<!-- Ignis Area 1 (Lv. 128) -->
-	<npc id="27817" personalPoints="20" serverPoints="20" zonePoints="40" zoneId="5" /> <!-- Beor Ignis -->
-	<npc id="27819" personalPoints="20" serverPoints="20" zonePoints="40" zoneId="5" /> <!-- Catshi Ignis Wizard -->
-	<npc id="27820" personalPoints="20" serverPoints="20" zonePoints="40" zoneId="5" /> <!-- Catshi Ignis Archer -->
-	<npc id="27821" personalPoints="20" serverPoints="20" zonePoints="40" zoneId="5" /> <!-- Ignis Sorceress -->
-	<npc id="27822" personalPoints="20" serverPoints="20" zonePoints="40" zoneId="5" /> <!-- Ignis Seeker -->
-	<npc id="27823" personalPoints="20" serverPoints="20" zonePoints="40" zoneId="5" /> <!-- Ignis Reaper -->
-	<npc id="27824" personalPoints="20" serverPoints="20" zonePoints="40" zoneId="5" /> <!-- Ignis Swordsman -->
-	<npc id="27825" personalPoints="20" serverPoints="20" zonePoints="40" zoneId="5" /> <!-- Ignis Guardian -->
-	<npc id="19841" personalPoints="80" serverPoints="80" zonePoints="160" zoneId="5" /> <!-- Soul Flower -->
-	<npc id="19843" personalPoints="462" serverPoints="2314" zonePoints="13888" zoneId="5" /> <!-- Soul Tree -->
-	<npc id="27829" personalPoints="20" serverPoints="20" zonePoints="40" zoneId="5" /> <!-- Catshi Trickster - Ignis Guardian -->
-	<npc id="27830" personalPoints="20" serverPoints="20" zonePoints="40" zoneId="5" /> <!-- Catshi Muse - Ignis Guardian -->
-	<npc id="27831" personalPoints="20" serverPoints="20" zonePoints="40" zoneId="5" /> <!-- Catshi Guard - Ignis Guardian -->
+	<npc id="27817" personalPoints="67" serverPoints="67" zonePoints="42" zoneId="5" /> <!-- Beor Ignis -->
+	<npc id="27819" personalPoints="67" serverPoints="67" zonePoints="42" zoneId="5" /> <!-- Catshi Ignis Wizard -->
+	<npc id="27820" personalPoints="67" serverPoints="67" zonePoints="42" zoneId="5" /> <!-- Catshi Ignis Archer -->
+	<npc id="27821" personalPoints="67" serverPoints="67" zonePoints="42" zoneId="5" /> <!-- Ignis Sorceress -->
+	<npc id="27822" personalPoints="67" serverPoints="67" zonePoints="42" zoneId="5" /> <!-- Ignis Seeker -->
+	<npc id="27823" personalPoints="67" serverPoints="67" zonePoints="42" zoneId="5" /> <!-- Ignis Reaper -->
+	<npc id="27824" personalPoints="67" serverPoints="67" zonePoints="42" zoneId="5" /> <!-- Ignis Swordsman -->
+	<npc id="27825" personalPoints="67" serverPoints="67" zonePoints="42" zoneId="5" /> <!-- Ignis Guardian -->
+	<npc id="19841" personalPoints="670" serverPoints="670" zonePoints="210" zoneId="5" /> <!-- Soul Flower -->
+	<npc id="19843" personalPoints="3326" serverPoints="997920" zonePoints="159667" zoneId="5" /> <!-- Soul Tree -->
+	<npc id="27829" personalPoints="67" serverPoints="20" zonePoints="42" zoneId="5" /> <!-- Catshi Trickster - Ignis Guardian -->
+	<npc id="27830" personalPoints="67" serverPoints="67" zonePoints="42" zoneId="5" /> <!-- Catshi Muse - Ignis Guardian -->
+	<npc id="27831" personalPoints="67" serverPoints="67" zonePoints="42" zoneId="5" /> <!-- Catshi Guard - Ignis Guardian -->
 
 	<!-- Players Points -->
 	<player level="110" personalPoints="33" serverPoints="16" bloodyCoins="50" /> <!-- Player level 110 -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
index 7e7e0f4f08..03bc679ddc 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Heine/LionelHunter/LionelHunter.java
@@ -58,10 +58,10 @@ public class LionelHunter extends AbstractNpcAI
 	private static final int VITALITY_OF_THE_EXALTED_LV2 = 47855;
 	private static final int DIGNITY_OF_THE_EXALTED_LV6 = 80970;
 	private static final int FAVOR_OF_THE_EXLATED = 45870;
-	private static final int COMMON_BOX_PHYSCAL = 81207;
+	private static final int COMMON_BOX_PHYSICAL = 81207;
 	private static final int COMMON_BOX_MAGIC = 81208;
-	private static final int SPECIAL_BOX_MAGIC = 81209;
-	private static final int SPECIAL_BOX_PHYSICAL = 81210;
+	private static final int SPECIAL_BOX_PHYSICAL = 81209;
+	private static final int SPECIAL_BOX_MAGIC = 81210;
 	
 	private LionelHunter()
 	{
@@ -98,28 +98,31 @@ public class LionelHunter extends AbstractNpcAI
 			}
 			case "getSupplyBox":
 			{
-				if ((qs7 != null) && qs7.isCompleted())
+				if (((qs7 != null) && !qs7.isCompleted()) || (qs7 == null))
 				{
-					if (player.isMageClass())
+					htmltext = "33907-06-no.html";
+				}
+				else if (qs7.isCompleted())
+				{
+					if (player.getVariables().getBoolean("LIONEL_REWARD_RECEIVED", false) == true)
 					{
-						giveItems(player, COMMON_BOX_MAGIC, 1);
-						giveItems(player, SPECIAL_BOX_MAGIC, 1);
+						htmltext = "33907-06-received.html";
 					}
 					else
 					{
-						giveItems(player, COMMON_BOX_PHYSCAL, 1);
-						giveItems(player, SPECIAL_BOX_PHYSICAL, 1);
+						if (player.isMageClass())
+						{
+							giveItems(player, COMMON_BOX_MAGIC, 1);
+							giveItems(player, SPECIAL_BOX_MAGIC, 1);
+						}
+						else
+						{
+							giveItems(player, COMMON_BOX_PHYSICAL, 1);
+							giveItems(player, SPECIAL_BOX_PHYSICAL, 1);
+						}
+						player.getVariables().set("LIONEL_REWARD_RECEIVED", true);
+						player.getVariables().storeMe();
 					}
-					player.getVariables().set("LIONEL_REWARD_RECEIVED", true);
-					player.getVariables().storeMe();
-				}
-				else if (player.getVariables().getBoolean("LIONEL_REWARD_RECEIVED", false))
-				{
-					htmltext = "33907-06-received.html";
-				}
-				else
-				{
-					htmltext = "33907-06-no.html";
 				}
 				break;
 			}
@@ -234,7 +237,6 @@ public class LionelHunter extends AbstractNpcAI
 					htmltext = "33907-not-completed.html";
 				}
 				break;
-				
 			}
 		}
 		return htmltext;
@@ -250,4 +252,4 @@ public class LionelHunter extends AbstractNpcAI
 	{
 		new LionelHunter();
 	}
-}
\ No newline at end of file
+}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
new file mode 100644
index 0000000000..beaa3f26da
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/areas/Rune/SwampOfScreams/SwampOfScreamsSiege.java
@@ -0,0 +1,181 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.Rune.SwampOfScreams;
+
+import java.util.Calendar;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.l2jmobius.commons.util.CommonUtil;
+import org.l2jmobius.gameserver.data.xml.SpawnData;
+import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.spawns.SpawnGroup;
+import org.l2jmobius.gameserver.model.spawns.SpawnTemplate;
+import org.l2jmobius.gameserver.network.NpcStringId;
+
+import ai.AbstractNpcAI;
+
+/**
+ * @author Tanatos
+ */
+public class SwampOfScreamsSiege extends AbstractNpcAI
+{
+	// NPCs
+	private static final int[] SWAMP_MONSTERS =
+	{
+		24570,
+		24571,
+		24572,
+		24573
+	};
+	private static final int SWAMP_PETRA = 24574;
+	private static final AtomicReference<SpawnTemplate> SPAWN_SWAMP_MONSTERS = new AtomicReference<>();
+	// Misc
+	private static final int[] DAYS_OF_WEEK =
+	{
+		Calendar.MONDAY,
+		Calendar.TUESDAY,
+		Calendar.WEDNESDAY,
+		Calendar.THURSDAY,
+		Calendar.FRIDAY,
+		Calendar.SATURDAY,
+		Calendar.SUNDAY
+	};
+	// Schedule: 10-11 & 22-23
+	private static final int[] DAY_TIME =
+	{
+		10,
+		00
+	};
+	private static final int[] NIGHT_TIME =
+	{
+		22,
+		00
+	};
+	private static final long DESPAWN_DELAY = 3600000;
+	private static boolean _daytime = false;
+	
+	private SwampOfScreamsSiege()
+	{
+		addKillId(SWAMP_MONSTERS);
+		scheduleDayTime();
+		scheduleNightTime();
+		LOGGER.info("Swamp of Screams siege starts from 10:00 to 11:00 and from 22:00 to 23:00.");
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "day_time_spawn":
+			{
+				World.getInstance().getPlayers().forEach(p -> showOnScreenMsg(p, NpcStringId.HERALD_S_ANNOUNCEMENT_10_00_11_00_MONSTERS_ARE_SPAWNING_IN_THE_SWAMP_OF_SCREAMS_KILL_THEM_ALL, 2, 10000, true));
+				SPAWN_SWAMP_MONSTERS.set(SpawnData.getInstance().getSpawnByName("SwampOfScreamsMonsters"));
+				SPAWN_SWAMP_MONSTERS.get().getGroups().forEach(SpawnGroup::spawnAll);
+				_daytime = true;
+				startQuestTimer("despawn", DESPAWN_DELAY, null, null);
+				break;
+			}
+			case "night_time_spawn":
+			{
+				World.getInstance().getPlayers().forEach(p -> showOnScreenMsg(p, NpcStringId.HERALD_S_ANNOUNCEMENT_10_00_P_M_11_00_P_M_MONSTERS_ARE_INVADING_THE_SWAMP_OF_SCREAMS_AT_NIGHT_TIME, 2, 10000, true));
+				SPAWN_SWAMP_MONSTERS.set(SpawnData.getInstance().getSpawnByName("SwampOfScreamsMonsters"));
+				SPAWN_SWAMP_MONSTERS.get().getGroups().forEach(SpawnGroup::spawnAll);
+				_daytime = false;
+				startQuestTimer("despawn", DESPAWN_DELAY, null, null);
+				break;
+			}
+			case "despawn":
+			{
+				if (_daytime)
+				{
+					World.getInstance().getPlayers().forEach(p -> showOnScreenMsg(p, NpcStringId.HERALD_S_ANNOUNCEMENT_10_P_M_11_00_P_M_MONSTERS_OF_THE_SWAMP_OF_SCREAMS_HAVE_FLED_AWAY, 2, 10000, true));
+				}
+				else
+				{
+					World.getInstance().getPlayers().forEach(p -> showOnScreenMsg(p, NpcStringId.HERALD_S_ANNOUNCEMENT_10_00_11_00_MONSTERS_OF_THE_SWAMP_OF_SCREAMS_ARE_DEFEATED, 2, 10000, true));
+				}
+				SPAWN_SWAMP_MONSTERS.set(SpawnData.getInstance().getSpawnByName("SwampOfScreamsMonsters"));
+				SPAWN_SWAMP_MONSTERS.get().getGroups().forEach(SpawnGroup::despawnAll);
+				break;
+			}
+		}
+		return super.onAdvEvent(event, npc, player);
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player killer, boolean isSummon)
+	{
+		if ((CommonUtil.contains(SWAMP_MONSTERS, npc.getId())) && (getRandom(100) < 3))
+		{
+			addSpawn(SWAMP_PETRA, npc.getLocation(), false, 600000, false);
+		}
+		return super.onKill(npc, killer, isSummon);
+	}
+	
+	private void scheduleDayTime()
+	{
+		long time = Long.MAX_VALUE;
+		for (int day : DAYS_OF_WEEK)
+		{
+			final long nextDateMillis = getNextDateMilis(day, DAY_TIME[0], DAY_TIME[1]);
+			if (nextDateMillis < time)
+			{
+				time = nextDateMillis;
+			}
+		}
+		startQuestTimer("day_time_spawn", time - System.currentTimeMillis(), null, null);
+	}
+	
+	private void scheduleNightTime()
+	{
+		long time = Long.MAX_VALUE;
+		for (int day : DAYS_OF_WEEK)
+		{
+			final long nextDateMillis = getNextDateMilis(day, NIGHT_TIME[0], NIGHT_TIME[1]);
+			if (nextDateMillis < time)
+			{
+				time = nextDateMillis;
+			}
+		}
+		startQuestTimer("night_time_spawn", time - System.currentTimeMillis(), null, null);
+	}
+	
+	private long getNextDateMilis(int dayOfWeek, int hour, int minute)
+	{
+		final Calendar calendar = Calendar.getInstance();
+		calendar.set(Calendar.HOUR_OF_DAY, hour);
+		calendar.set(Calendar.MINUTE, minute);
+		calendar.set(Calendar.SECOND, 0);
+		for (int i = 0; i < 7; i++)
+		{
+			if ((calendar.get(Calendar.DAY_OF_WEEK) == dayOfWeek) && (calendar.getTimeInMillis() > System.currentTimeMillis()))
+			{
+				return calendar.getTimeInMillis();
+			}
+			calendar.add(Calendar.DAY_OF_WEEK, 1);
+		}
+		return calendar.getTimeInMillis();
+	}
+	
+	public static void main(String[] args)
+	{
+		new SwampOfScreamsSiege();
+	}
+}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AdenReconstructorManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
index 84fc8a8360..ee8e2039c8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AdenReconstructorManager.java
@@ -46,25 +46,9 @@ public class AdenReconstructorManager extends AbstractNpcAI
 	{
 		if (npc != null)
 		{
-			switch (event)
+			if (event.equals("SPAM_TEXT"))
 			{
-				case "SPAM_TEXT":
-				{
-					npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THE_LAND_OF_ADEN_IS_IN_NEED_OF_MATERIALS_TO_REBUILD_FROM_SHILLIEN_S_DESTRUCTION);
-					startQuestTimer("SPAM_TEXT2", 1000, npc, null);
-					break;
-				}
-				case "SPAM_TEXT2":
-				{
-					npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.PLEASE_DONATE_ANY_UNUSED_MATERIALS_YOU_HAVE_TO_HELP_REBUILD_ADEN);
-					startQuestTimer("SPAM_TEXT3", 1000, npc, null);
-					break;
-				}
-				case "SPAM_TEXT3":
-				{
-					npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_LL_RECEIVE_A_GIFT_FOR_ANY_APPLICABLE_DONATION);
-					break;
-				}
+				npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THE_LAND_OF_ADEN_IS_IN_NEED_OF_MATERIALS_TO_REBUILD_FROM_SHILLIEN_S_DESTRUCTION);
 			}
 		}
 		return super.onAdvEvent(event, npc, player);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AetherDrops.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AetherDrops.java
index 9149997c4e..e7cff46397 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AetherDrops.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/AetherDrops.java
@@ -38,85 +38,84 @@ public class AetherDrops extends AbstractNpcAI
 	// Monsters
 	private static final int[] MONSTERS =
 	{
-		23487, // Magma Ailith
+		// Blazing Swamp
 		23488, // Magma Apophis
-		23489, // Lava Wyrm
-		23490, // Lava Drake
-		23491, // Lava Wendigo
-		23492, // Lava Stone Golem
-		23493, // Lava Leviah
+		23496, // Magma Ifrit
+		// Abandoned Coal Mines
 		24577, // Black Hammer Artisan
 		24578, // Black Hammer Collector
 		24579, // Black Hammer Protector
-		// Cemetery Lv.117
-		24844, // Royal Guard Captain
-		24846, // Commander of Operations
+		// Cemetery Lv.118
 		24843, // Royal Guard
+		24844, // Royal Guard Captain
 		24845, // Royal Field Officer
-		24848, // Wizard Captain
+		24846, // Commander of Operations
 		24847, // Elite Wizard
-		// Fields of Massacre Lv.115
+		24848, // Wizard Captain
+		// Fields of Massacre Lv.116
 		24488, // Doom Archer
 		24489, // Doom Scout
 		24490, // Doom Soldier
 		24487, // Graveyard Predator
 		24486, // Dismal Pole
 		24491, // Doom Knight
-		// Silent Valley 105
+		// Silent Valley 106
 		24506, // Silence Witch
 		24507, // Silence Preacle
 		24508, // Silence Warrior
 		24509, // Silence Slave
 		24510, // Silence Hannibal
-		// Ivory Tower Crater Lv.105
+		// Ivory Tower Crater Lv.106
 		24421, // Stone Gargoyle
 		24422, // Stone Golem
 		24423, // Monster Eye
 		24424, // Gargoyle Hunter
 		24425, // Steel Golem
 		24426, // Stone Cube
-		// Enchanted Valley Lv.103
+		// Enchanted Valley Lv.104
+		23567, // Nymph Rose
+		23568, // Nymph Lily
 		23569, // Nymph Lily
+		23570, // Nymph Tulip
 		23571, // Nymph Tulip
 		23572, // Nymph Cosmos
-		23567, // Nymph Rose
+		23573, // Nymph Cosmos
 		23578, // Nymph Guardian
-		19600, // Flower Bud
 		23581, // Apherus
-		// Forest of Mirrors Lv.109
+		// Forest of Mirrors Lv.110
 		24461, // Forest Ghost
 		24462, // Bewildered Expedition Member
 		24463, // Bewildered Patrol
 		24464, // Bewildered Dwarf Adventurer
 		24465, // Forest Evil Spirit
 		24466, // Demonic Mirror
-		// Desert Query Lv.101
+		// Desert Query Lv.102
 		23811, // Cantera Tanya
 		23812, // Cantera Deathmoz
 		23813, // Cantera Floxis
 		23814, // Cantera Belika
 		23815, // Cantera Bridget
-		// Beleth's Magic Circle Lv.101
+		// Beleth's Magic Circle Lv.102
 		23354, // Decay Hannibal
 		23355, // Armor Beast
 		23356, // Klein Soldier
 		23357, // Disorder Warrior
 		23360, // Bizuard
 		23361, // Mutated Fly
-		// Phantasmal Ridge Lv.103
+		// Phantasmal Ridge Lv.104
 		24511, // Lunatikan
 		24512, // Garion Neti
 		24513, // Desert Wendigo
 		24514, // Koraza
 		24515, // Kandiloth
-		// Wasteland Lv.117
+		// Wasteland Lv.118
 		24500, // Sand Golem
 		24501, // Centaur Fighter
 		24502, // Centaur Marksman
 		24503, // Centaur Wizard
 		24504, // Centaur Warlord
 		24505, // Earth Elemental Lord
-		// Tanor Canyon Lv. 107
+		// Tanor Canyon Lv. 108
 		24587, // Tanor Silenos
 		20936, // Tanor Silenos
 		20937, // Tanor Silenos Soldier
@@ -124,25 +123,25 @@ public class AetherDrops extends AbstractNpcAI
 		20939, // Tanor Silenos Warrior
 		20942, // Nightmare Guide
 		20943, // Nightmare Watchman
-		// Alligator Island Lv.107
+		// Alligator Island Lv.108
 		24373, // Dailaon Lad
 		24376, // Nos Lad
 		24377, // Swamp Tribe
 		24378, // Swamp Alligator
 		24379, // Swamp Warrior
-		// Field of Silence Lv.109
+		// Field of Silence Lv.110
 		24517, // Kropiora
 		24520, // Krotania
 		24521, // Krophy
 		24522, // Spiz Krphy
 		24523, // Krotany
-		// Field of Whispers Lv.111
+		// Field of Whispers Lv.112
 		24304, // Groz Kropiora
 		24305, // Groz Krotania
 		24306, // Groz Krophy
 		24307, // Groz Krotany
 		24308, // Groz Water Drake
-		// Isle of Prayer
+		// Isle of Prayer Lv.112
 		24445, // Lizardman Rouge
 		24446, // Island Guard
 		24447, // Niasis
@@ -150,7 +149,7 @@ public class AetherDrops extends AbstractNpcAI
 		24449, // Lizardman Warrior
 		24450, // Lizardman Wizard
 		24451, // Lizardman Defender
-		// Fafurion Temple
+		// Fafurion Temple Lv.124
 		24318, // Temple Guard Captain
 		24321, // Temple Patrol Guard
 		24322, // Temple Knight Recruit
@@ -169,62 +168,97 @@ public class AetherDrops extends AbstractNpcAI
 		23780, // Royal Templar Colonel
 		23781, // Royal Sharpshooter
 		23782, // Royal Archmage
-		// Breka's Stronghold Lv.113
+		// Breka's Stronghold Lv.114
 		24415, // Breka Orc Scout
 		24416, // Breka Orc Scout Captain
 		24417, // Breka Orc Archer
 		24418, // Breka Orc Shaman
 		24419, // Breka Orc Slaughterer
 		24420, // Breka Orc prefect
-		// Dragon Valley Lv.124
-		24617, // Dragon Peltast
-		24618, // Dragon Officer
-		24619, // Behemoth Dragon
-		24620, // Soul Hunter
-		// Swamp of Screams
+		// Swamp of Screams Lv.116
 		24570, // Dire Stakato Drone
 		24571, // Dire Stakato Berserker
 		24572, // Dire Stakato Shaman
 		24573, // Dire Stakato Witch
-		// Sel Mahum Training Grounds Lv.113
+		// Sel Mahum Training Grounds Lv.114
 		24492, // Sel Mahum Soldier
 		24493, // Sel Mahum Squad Leader
 		24494, // Sel Mahum Warrior
 		24495, // Keltron
-		// Plains of the Lizardman Lv.113
+		// Plains of the Lizardman Lv.114
 		24496, // Tanta Lizardman Warrior
 		24497, // Tanta Lizardman Archer
 		24498, // Tanta Lizardman Wizard
 		24499, // Priest Uguros
-		// Varka Silenos Barracks Lv.111
+		// Varka Silenos Barracks Lv.114
 		24636, // Varka Silenos Magus
 		24637, // Varka Silenos Shaman
 		24638, // Varka Silenos Footman
 		24639, // Varka Silenos Seargeant
 		24640, // Varka Silenos Officer
-		// Ketra Orc Barracks Lv.111
+		// Ketra Orc Barracks Lv.112
 		24631, // Ketra Orc Shaman
 		24632, // Ketra Orc Prophet
 		24633, // Ketra Orc Warrior
 		24634, // Ketra Orc Lieutenant
 		24635, // Battalion Commander
-		// Wall of Argos Lv.115
+		// Wall of Argos Lv.116
 		24606, // Captive Antelope
 		24607, // Captive Bandersnatch
 		24608, // Captive Buffalo
 		24609, // Captive Grendel
 		24610, // Eye of Watchman
 		24611, // Elder Homunculus
-		// Neutral Zone
+		// Neutral Zone Lv.110
 		24641, // Tel Mahum Wizard
 		24642, // Tel Mahum Legionary
 		24643, // Tel Mahum Footman
 		24644, // Tel Mahum Lieutenant
-		// Sea of Spores
+		// Sea of Spores Lv.116
 		24621, // Laikel
 		24622, // Harane
 		24623, // Lesatanas
 		24624, // Arbor
+		// Cruma Marshlands Lv.122
+		24930, // Black Demon Knight
+		24931, // Black Demon Warrior
+		24932, // Black Demon Scout
+		24933, // Black Demon Wizard
+		// Frozen Labyrinth Lv.122
+		24934, // Frozen Soldier
+		24935, // Frozen Defender
+		24936, // Ice Knight
+		24937, // Glacier Golem
+		24938, // Ice Fairy
+		// Sel Mahum Base Lv.124
+		24961, // Sel Mahum Footman
+		24962, // Sel Mahum Elite Soldier
+		24963, // Sel Mahum Shaman
+		24964, // Sel Mahum Wizard
+		// Dragon Valley West Lv.120
+		24664, // Graveyard Death Lich
+		24665, // Graveyard Death Berserker
+		24666, // Graveyard Death Soldier
+		24667, // Graveyard Death Knight
+		// Dragon Valley East Lv.122
+		24669, // Dragon Officer
+		24670, // Dragon Beast
+		24671, // Dragon Centurion
+		24672, // Elite Dragon Guard
+		// Shadow Of The Mother Tree Lv.120
+		24965, // Creeper Rampike
+		24966, // Fila Aprias
+		24967, // Flush Teasle
+		24968, // Treant Blossom
+		24969, // Arsos Butterfly
+		// Execution Grounds Lv.126
+		24673, // Zombie Orc
+		24674, // Zombie Dark Elf
+		24675, // Zombie Dwarf
+		24676, // Schnabel Stalker
+		24677, // Henker Hacker
+		24678, // Schnabel Doctor
+		24679, // Henker Anatomist
 	};
 	// Item
 	private static final int AETHER = 81215;
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 7c1cf411a3..8ab21a2de5 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -42,10 +42,12 @@ import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.SkillLearn;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.ListenerRegisterType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterType;
+import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBecomeNoblesse;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin;
@@ -266,6 +268,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 				else
 				{
 					player.setNobleLevel(1);
+					checkNobleListener(player);
 					player.broadcastUserInfo();
 					// TODO: SetOneTimeQuestFlag(talker, 10385, 1);
 					htmltext = "test_server_helper025.html";
@@ -402,6 +405,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 						if (data.isRewardNoblesse())
 						{
 							player.setNobleLevel(1);
+							checkNobleListener(player);
 						}
 						// Give possible hero status reward.
 						if (data.isRewardHero())
@@ -859,6 +863,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 				if (data.isRewardNoblesse())
 				{
 					player.setNobleLevel(1);
+					checkNobleListener(player);
 				}
 				// Give possible hero status reward.
 				if (data.isRewardHero())
@@ -1170,6 +1175,15 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 		return null;
 	}
 	
+	private void checkNobleListener(Player player)
+	{
+		// Notify to scripts.
+		if (EventDispatcher.getInstance().hasListener(EventType.ON_PLAYER_BECOME_NOBLESSE))
+		{
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerBecomeNoblesse(player));
+		}
+	}
+	
 	public static void main(String[] args)
 	{
 		new ClassMaster();
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/GreedyTreasureChests.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/GreedyTreasureChests.java
index ce4c9405e7..22d5cf2751 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/GreedyTreasureChests.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/GreedyTreasureChests.java
@@ -600,7 +600,7 @@ public class GreedyTreasureChests extends AbstractNpcAI
 					else if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_NZ_2", 0))
 					{
 						addSpawn(CHEST_LV110, npc, true, 0, true);
-						GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_FM_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET)));
+						GlobalVariablesManager.getInstance().set("TREASURE_CHEST_RESPAWN_NZ_2", Long.toString(currentTime + RESPAWN_DELAY + getRandom(RND_OFFSET)));
 					}
 					break;
 				}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/34641.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/34641.html
new file mode 100644
index 0000000000..a602ca161d
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/34641.html
@@ -0,0 +1,26 @@
+<html><body scroll="no">
+<font color="af9878">
+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">
+	<tr><td height=30></td></tr>
+	<tr>
+		<td align="center">
+			<table border=0 cellspacing=0 width=250 height=250>
+				<tr>
+					<td align="center">
+					"O Cantabile!<br1>
+					Your beautiful voice flows like a river!"
+					</td>
+				</tr>
+				<tr>
+					<td align=center>
+						Welcome, my friend! I am sure you will enjoy your stand in this wonderful place where exquisite music fills the air!<br>
+						The town is divided into 3 zones and each one of them has its own features.<br>
+						The first zone is overseen by Amoroso, the second by Delicato and the third by Comodo. Talk to them to learn more.
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+</font>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/34642.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/34642.html
new file mode 100644
index 0000000000..3df8e6e071
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/34642.html
@@ -0,0 +1,25 @@
+<html><body scroll="no">
+<font color="af9878">
+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">
+	<tr><td height=30></td></tr>
+	<tr>
+		<td align="center">
+			<table border=0 cellspacing=0 width=250 height=200>
+				<tr>
+					<td align="center">
+					"O Amoroso!<br1>
+					Sing us your song of love and beauty!"
+					</td>
+				</tr>
+				<tr>
+					<td align=center>
+						My name is Amoroso, I oversee Adagio (Zone 1)! I train dancers who have 10-34 on their PK counter.<br>
+						We are putting on an amazing, truly incredible concert! You must be dying of anticipation, right? Ha-ha!
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+</font>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/34643.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/34643.html
new file mode 100644
index 0000000000..9844339570
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/34643.html
@@ -0,0 +1,25 @@
+<html><body scroll="no">
+<font color="af9878">
+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">
+	<tr><td height=30></td></tr>
+	<tr>
+		<td align="center">
+			<table border=0 cellspacing=0 width=250 height=225>
+				<tr>
+					<td align="center">
+					"O Delicato!<br1>
+					Your intrincate songs move and inspire us!"
+					</td>
+				</tr>
+				<tr>
+					<td align=center>
+						My name is Delicato, I oversee Andante (Zone 2). Lord Narcissus has asked me to look after Pomposo and Dolce.<br>
+						Their petals are very valuable, but almost imposible to collect. Heroes who hace 35-39 on their PK counter can grow these flowers by bleeding over them.
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+</font>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/34644.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/34644.html
new file mode 100644
index 0000000000..da8fec9e47
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/34644.html
@@ -0,0 +1,26 @@
+<html><body scroll="no">
+<font color="af9878">
+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">
+	<tr><td height=30></td></tr>
+	<tr>
+		<td align="center">
+			<table border=0 cellspacing=0 width=250 height=275>
+				<tr>
+					<td align="center">
+					"O Comodo!<br1>
+					Your mellow melodies please our ears and soothe our souls!"
+					</td>
+				</tr>
+				<tr>
+					<td align=center>
+						My name is Comodo, I oversee Allegro (Zone 3).<br>
+						I've managed to find a Pure Crystal to offer as tribute to Narcissus, but then I learned that the poor Angel is possessed by evil spirits! Can you imagine?<br>
+						It is possible to exorcize the spirits, but only the heroes who have 40+ on their Pk counter can do it.
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+</font>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java
index 1dc6e07854..2634f960ad 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/PrisonManager/PrisonManager.java
@@ -37,6 +37,16 @@ import ai.AbstractNpcAI;
  */
 public class PrisonManager extends AbstractNpcAI
 {
+	// NPC
+	private static final int MORENDO = 34637;
+	private static final int POMPOSO = 34638;
+	private static final int DOLLOROSO = 34639;
+	private static final int DOLCE = 34640;
+	private static final int CANTABILE = 34641;
+	private static final int AMOROSO = 34642;
+	private static final int DELICATO = 34643;
+	private static final int COMODO = 34644;
+	// Misc
 	private static final ScriptZone PRISON_ZONE_1 = ZoneManager.getInstance().getZoneById(26010, ScriptZone.class);
 	private static final ScriptZone PRISON_ZONE_2 = ZoneManager.getInstance().getZoneById(26011, ScriptZone.class);
 	private static final ScriptZone PRISON_ZONE_3 = ZoneManager.getInstance().getZoneById(26012, ScriptZone.class);
@@ -48,8 +58,8 @@ public class PrisonManager extends AbstractNpcAI
 	
 	public PrisonManager()
 	{
-		addFirstTalkId(34637, 34638, 34639, 34640);
-		addTalkId(34637, 34638, 34639, 34640);
+		addFirstTalkId(MORENDO, POMPOSO, DOLLOROSO, DOLCE, CANTABILE, AMOROSO, DELICATO, COMODO);
+		addTalkId(MORENDO, POMPOSO, DOLLOROSO, DOLCE, CANTABILE, AMOROSO, DELICATO, COMODO);
 		addEnterZoneId(PRISON_ZONE_1.getId(), PRISON_ZONE_2.getId(), PRISON_ZONE_3.getId(), PRISON_ENTER_ZONE.getId(), PRISON_ENTER_ZONE2.getId());
 		addExitZoneId(PRISON_ZONE_1.getId(), PRISON_ZONE_2.getId(), PRISON_ZONE_3.getId(), PRISON_ENTER_ZONE2.getId());
 	}
@@ -68,6 +78,10 @@ public class PrisonManager extends AbstractNpcAI
 			case "34639-no.html":
 			case "34640.html":
 			case "34640-no.html":
+			case "34641.html":
+			case "34642.html":
+			case "34643.html":
+			case "34644.html":
 			{
 				htmltext = event;
 				break;
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java
index db1186a7a4..5ea3c6dee4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java
@@ -38,16 +38,16 @@ public class WaterDragonEliteSupplyDrops extends AbstractNpcAI
 	// Monsters
 	private static final int[] MONSTERS =
 	{
-		24596, // Water Dragon's Elite Archer
-		24597, // Water Dragon's Elite Mage
 		24598, // Water Dragon's Elite Raider
 		24599, // Water Dragon's Elite Swordsman
 		24600, // Water Dragon's Elite Wyrm
-		24601, // Water Dragon's Shaman
-		24602, // Water Dragon's Mage
 		24603, // Water Dragon's Pikeman
 		24604, // Water Dragon's Swordsman
 		24605, // Weakened Krotania
+		24957, // Fafurion's Praetorian Knight
+		24958, // Fafurion's Praetorian Pikeman
+		24959, // Fafurion's Praetorian Swordsman
+		24960 // Fafurion's Praetorian Water Dragon
 	};
 	// Item
 	private static final int WATER_DRAGON_ELITE_SUPPLIES = 81758;
@@ -57,7 +57,7 @@ public class WaterDragonEliteSupplyDrops extends AbstractNpcAI
 	private static final int DROP_DAILY = 100;
 	private static final int DROP_MIN = 1;
 	private static final int DROP_MAX = 1;
-	private static final double CHANCE = 10;
+	private static final double CHANCE = 7.2;
 	
 	private WaterDragonEliteSupplyDrops()
 	{
@@ -97,7 +97,7 @@ public class WaterDragonEliteSupplyDrops extends AbstractNpcAI
 			}
 			catch (Exception e)
 			{
-				LOGGER.log(Level.SEVERE, "Could not reset Corroded Fields drop count: ", e);
+				LOGGER.log(Level.SEVERE, "Could not reset Ravaged Innadril drop count: ", e);
 			}
 			
 			// Update data for online players.
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 2056d8c59a..c92f62bcce 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -235,6 +236,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
index 4b43e2d3f0..c9ef3f3b35 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
@@ -291,7 +291,20 @@ public class Eraton extends AbstractNpcAI
 				}
 				takeItem(player, STONE_OF_DESTINY);
 				
-				player.removeAllSkills();
+				if (Config.ERATON_RETAINED_SKILLS.isEmpty())
+				{
+					player.removeAllSkills();
+				}
+				else
+				{
+					for (Skill skill : player.getAllSkills())
+					{
+						if (!Config.ERATON_RETAINED_SKILLS.contains(skill.getId()))
+						{
+							player.removeSkill(skill);
+						}
+					}
+				}
 				
 				// Stop auto use.
 				for (Shortcut shortcut : player.getAllShortCuts())
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 964934525b..a04e7270e8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -37,6 +37,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AbnormalTimeChangeBySkillId", AbnormalTimeChangeBySkillId::new);
 		EffectHandler.getInstance().registerHandler("AbsorbDamage", AbsorbDamage::new);
 		EffectHandler.getInstance().registerHandler("Accuracy", Accuracy::new);
+		EffectHandler.getInstance().registerHandler("AddFireSourcePoints", AddFireSourcePoints::new);
 		EffectHandler.getInstance().registerHandler("AddHate", AddHate::new);
 		EffectHandler.getInstance().registerHandler("AddHomunculusPoints", AddHomunculusPoints::new);
 		EffectHandler.getInstance().registerHandler("AddHuntingTime", AddHuntingTime::new);
@@ -44,6 +45,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AgathionSlot", AgathionSlot::new);
@@ -204,6 +207,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("HpToOwner", HpToOwner::new);
 		EffectHandler.getInstance().registerHandler("Ignition", Ignition::new);
 		EffectHandler.getInstance().registerHandler("IgnoreDeath", IgnoreDeath::new);
+		EffectHandler.getInstance().registerHandler("IgnoreReduceDamage", IgnoreReduceDamage::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageBonus", ImmobileDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageResist", ImmobileDamageResist::new);
 		EffectHandler.getInstance().registerHandler("ImmobilePetBuff", ImmobilePetBuff::new);
@@ -243,7 +247,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java
index a32c9ee9fb..6d4121edb0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java
@@ -48,6 +48,7 @@ public class SkillConditionMasterHandler
 		SkillConditionHandler.getInstance().registerHandler("CanUseInDragonLair", CanUseInDragonLairSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CanUseSwoopCannon", CanUseSwoopCannonSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("HasVitalityPoints", HasVitalityPointsSkillCondition::new);
+		SkillConditionHandler.getInstance().registerHandler("CanUseSymbolSealIncreaseItem", CanUseSymbolSealIncreaseItemSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new);
 		SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index 2e561149da..7fc45cfcd3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -49,6 +49,10 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.EventType;
+import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBecomeExalted;
+import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBecomeNoblesse;
 import org.l2jmobius.gameserver.model.html.PageBuilder;
 import org.l2jmobius.gameserver.model.html.PageResult;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -913,12 +917,22 @@ public class AdminEditChar implements IAdminCommandHandler
 					{
 						player.setNobleLevel(1);
 						player.sendMessage("A GM added you nobless status!");
+						// Notify to scripts.
+						if (EventDispatcher.getInstance().hasListener(EventType.ON_PLAYER_BECOME_NOBLESSE))
+						{
+							EventDispatcher.getInstance().notifyEventAsync(new OnPlayerBecomeNoblesse(player));
+						}
 						break;
 					}
 					case 1:
 					{
 						player.setNobleLevel(2);
 						player.sendMessage("A GM changed your nobless status to exalted!");
+						// Notify to scripts.
+						if (EventDispatcher.getInstance().hasListener(EventType.ON_PLAYER_BECOME_EXALTED))
+						{
+							EventDispatcher.getInstance().notifyEventAsync(new OnPlayerBecomeExalted(player));
+						}
 						break;
 					}
 					case 2:
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/AddFireSourcePoints.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/AddFireSourcePoints.java
new file mode 100644
index 0000000000..1cda99a381
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/AddFireSourcePoints.java
@@ -0,0 +1,66 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.events.AbstractScript;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.variables.PlayerVariables;
+
+/*
+ * @author CostyKiller
+ */
+public class AddFireSourcePoints extends AbstractEffect
+{
+	
+	public AddFireSourcePoints(StatSet params)
+	{
+	}
+	
+	@Override
+	public boolean isInstant()
+	{
+		return true;
+	}
+	
+	@Override
+	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		if (!effected.isPlayable())
+		{
+			return;
+		}
+		
+		final Player player = effected.getActingPlayer();
+		if (AbstractScript.getRandom(100) < Config.CONQUEST_ABILITY_FIRE_SOURCE_UPGRADE_CHANCE)
+		{
+			player.getVariables().set(PlayerVariables.CONQUEST_ABILITY_FIRE_SOURCE_EXP, player.getVariables().getInt(PlayerVariables.CONQUEST_ABILITY_FIRE_SOURCE_EXP, 0) + Config.CONQUEST_ABILITY_FIRE_SOURCE_EXP_AMOUNT);
+			player.sendMessage("You have added Fire Source points.");
+			AbstractScript.showOnScreenMsg(player, "You have added Fire Source points.", 5000);
+		}
+		else
+		{
+			player.sendMessage("You have failed to add Fire Source points.");
+			AbstractScript.showOnScreenMsg(player, "You have failed to add Fire Source points.", 5000);
+		}
+	}
+}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index faca7879c5..ec320c5082 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/ConquestFireCentralAreaReward.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/ConquestFireCentralAreaReward.java
index b447028e78..0768580554 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/ConquestFireCentralAreaReward.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/ConquestFireCentralAreaReward.java
@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.variables.PlayerVariables;
 import org.l2jmobius.gameserver.model.zone.ZoneType;
+import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * @author CostyKiller
@@ -59,6 +60,8 @@ public class ConquestFireCentralAreaReward extends AbstractEffect
 			if (AbstractScript.getRandom(100) < Config.CONQUEST_ABILITY_FIRE_SOURCE_UPGRADE_CHANCE)
 			{
 				player.getVariables().set(PlayerVariables.CONQUEST_ABILITY_FIRE_SOURCE_EXP, player.getVariables().getInt(PlayerVariables.CONQUEST_ABILITY_FIRE_SOURCE_EXP, 0) + Config.CONQUEST_ABILITY_FIRE_SOURCE_EXP_AMOUNT);
+				player.sendPacket(SystemMessageId.YOU_HAVE_RECEIVED_FIRE_SOURCE_POINTS);
+				AbstractScript.showOnScreenMsg(player, "You have received Fire Source points.", 5000);
 			}
 		}
 	}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
new file mode 100644
index 0000000000..5405ccd4be
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class IgnoreReduceDamage extends AbstractStatEffect
+{
+	public IgnoreReduceDamage(StatSet params)
+	{
+		super(params, Stat.IGNORE_REDUCE_DAMAGE);
+	}
+}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
index 1f5992cc6a..efa3a0f694 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.enums.StatModifierType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener;
 import org.l2jmobius.gameserver.model.events.returns.DamageReturn;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author Sdw
@@ -32,10 +34,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 public class ReduceDamage extends AbstractEffect
 {
 	private final double _amount;
+	private final StatModifierType _mode;
 	
 	public ReduceDamage(StatSet params)
 	{
 		_amount = params.getDouble("amount");
+		_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
 	}
 	
 	private DamageReturn onDamageReceivedEvent(OnCreatureDamageReceived event)
@@ -46,7 +50,15 @@ public class ReduceDamage extends AbstractEffect
 			return null;
 		}
 		
-		final double newDamage = event.getDamage() * (_amount / 100);
+		final double newDamage;
+		if (_mode == StatModifierType.PER)
+		{
+			newDamage = event.getDamage() - (event.getDamage() * (_amount / 100));
+		}
+		else // DIFF
+		{
+			newDamage = event.getDamage() - Math.max((_amount - event.getAttacker().getStat().getAdd(Stat.IGNORE_REDUCE_DAMAGE)), 0.0);
+		}
 		
 		return new DamageReturn(false, true, false, newDamage);
 	}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java
index 8d6469ae61..27c5a18a16 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java
@@ -16,14 +16,21 @@
  */
 package handlers.effecthandlers;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import org.l2jmobius.Config;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.enums.StatModifierType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.effects.EffectType;
+import org.l2jmobius.gameserver.model.holders.ItemSkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author NviX
@@ -39,6 +46,12 @@ public class RestoreSymbolSeal extends AbstractEffect
 		_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.PER);
 	}
 	
+	@Override
+	public EffectType getEffectType()
+	{
+		return EffectType.RESTORE_SYMBOL_SEAL;
+	}
+	
 	@Override
 	public boolean isInstant()
 	{
@@ -77,6 +90,33 @@ public class RestoreSymbolSeal extends AbstractEffect
 			player.updateSymbolSealSkills();
 			player.sendSkillList();
 			player.broadcastUserInfo();
+			
+			// Send item list to update Dye Powder with red icon in inventory.
+			ThreadPool.schedule(() ->
+			{
+				final List<Item> items = new LinkedList<>();
+				ITEMS: for (Item i : effected.getActingPlayer().getInventory().getItems())
+				{
+					if (i.getTemplate().hasSkills())
+					{
+						for (ItemSkillHolder s : i.getTemplate().getAllSkills())
+						{
+							if (s.getSkill().hasEffectType(EffectType.RESTORE_SYMBOL_SEAL))
+							{
+								items.add(i);
+								continue ITEMS;
+							}
+						}
+					}
+				}
+				
+				if (!items.isEmpty())
+				{
+					final InventoryUpdate iu = new InventoryUpdate();
+					iu.addItems(items);
+					effected.getActingPlayer().sendInventoryUpdate(iu);
+				}
+			}, 1000);
 		}
 	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java
index deead4a540..2ab5c27685 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java
@@ -16,6 +16,11 @@
  */
 package handlers.effecthandlers;
 
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
 import org.l2jmobius.gameserver.data.xml.ExperienceData;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.enums.Race;
@@ -33,11 +38,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
  * SummonMulti effect implementation.
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class SummonMulti extends AbstractEffect
 {
 	private final int _npcId;
+	private final Map<Integer, Integer> _levelTemplates;
 	private final float _expMultiplier;
 	private final ItemHolder _consumeItem;
 	private final int _lifeTime;
@@ -46,7 +52,21 @@ public class SummonMulti extends AbstractEffect
 	
 	public SummonMulti(StatSet params)
 	{
-		_npcId = params.getInt("npcId");
+		_npcId = params.getInt("npcId", 0);
+		if (_npcId > 0)
+		{
+			_levelTemplates = null;
+		}
+		else
+		{
+			final List<Integer> summonerLevels = params.getIntegerList("summonerLevels");
+			final List<Integer> npcIds = params.getIntegerList("npcIds");
+			_levelTemplates = new LinkedHashMap<>(npcIds.size());
+			for (int i = 0; i < npcIds.size(); i++)
+			{
+				_levelTemplates.put(summonerLevels.get(i), npcIds.get(i));
+			}
+		}
 		_expMultiplier = params.getFloat("expMultiplier", 1);
 		_consumeItem = new ItemHolder(params.getInt("consumeItemId", 0), params.getInt("consumeItemCount", 1));
 		_consumeItemInterval = params.getInt("consumeItemInterval", 0);
@@ -80,7 +100,31 @@ public class SummonMulti extends AbstractEffect
 			return;
 		}
 		
-		final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
+		final NpcTemplate template;
+		if (_npcId > 0)
+		{
+			template = NpcData.getInstance().getTemplate(_npcId);
+		}
+		else
+		{
+			Entry<Integer, Integer> levelTemplate = null;
+			for (Entry<Integer, Integer> entry : _levelTemplates.entrySet())
+			{
+				if ((levelTemplate == null) || (player.getLevel() >= entry.getKey()))
+				{
+					levelTemplate = entry;
+				}
+			}
+			if (levelTemplate != null)
+			{
+				template = NpcData.getInstance().getTemplate(levelTemplate.getValue());
+			}
+			else // Should never happen.
+			{
+				template = NpcData.getInstance().getTemplate(_levelTemplates.keySet().stream().findFirst().get());
+			}
+		}
+		
 		final Servitor summon = new Servitor(template, player);
 		final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
 		
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index 1ae3ab2ae8..41fd35ba57 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -210,6 +210,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()) || _renewDuration)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByBaseStat.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByBaseStat.java
index 4e47c369a2..320ea1a78d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByBaseStat.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByBaseStat.java
@@ -34,6 +34,7 @@ public class TriggerSkillByBaseStat extends AbstractEffect
 	private final BaseStat _baseStat;
 	private final int _skillId;
 	private final int _skillLevel;
+	private final int _skillSubLevel;
 	private final int _min;
 	private final int _max;
 	
@@ -42,6 +43,7 @@ public class TriggerSkillByBaseStat extends AbstractEffect
 		_baseStat = params.getEnum("baseStat", BaseStat.class);
 		_skillId = params.getInt("skillId", 0);
 		_skillLevel = params.getInt("skillLevel", 1);
+		_skillSubLevel = params.getInt("skillSubLevel", 0);
 		_min = params.getInt("min", 0);
 		_max = params.getInt("max", 9999);
 	}
@@ -101,7 +103,7 @@ public class TriggerSkillByBaseStat extends AbstractEffect
 				{
 					if (!target.isAffectedBySkill(_skillId))
 					{
-						SkillCaster.triggerCast(target, target, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+						SkillCaster.triggerCast(target, target, SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel));
 					}
 				}
 				else
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index b58c80876e..9a802942ba 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByStat.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByStat.java
index b5416f6f10..a355ce9ed0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByStat.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByStat.java
@@ -34,6 +34,7 @@ public class TriggerSkillByStat extends AbstractEffect
 	private final Stat _stat;
 	private final int _skillId;
 	private final int _skillLevel;
+	private final int _skillSubLevel;
 	private final int _min;
 	private final int _max;
 	
@@ -42,6 +43,7 @@ public class TriggerSkillByStat extends AbstractEffect
 		_stat = params.getEnum("stat", Stat.class);
 		_skillId = params.getInt("skillId", 0);
 		_skillLevel = params.getInt("skillLevel", 1);
+		_skillSubLevel = params.getInt("skillSubLevel", 0);
 		_min = params.getInt("min", 0);
 		_max = params.getInt("max", 9999);
 	}
@@ -63,7 +65,7 @@ public class TriggerSkillByStat extends AbstractEffect
 				{
 					if (!target.isAffectedBySkill(_skillId))
 					{
-						SkillCaster.triggerCast(target, target, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+						SkillCaster.triggerCast(target, target, SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel));
 					}
 				}
 				else
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
index e6aca114c0..479f697dcf 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
@@ -17,7 +17,13 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author Sero
@@ -28,4 +34,46 @@ public class WeaponBonusMAtk extends AbstractStatAddEffect
 	{
 		super(params, Stat.WEAPON_BONUS_MAGIC_ATTACK);
 	}
+	
+	@Override
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
index 52060ceef6..0909b1d0f6 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
@@ -17,7 +17,13 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author Sero
@@ -28,4 +34,46 @@ public class WeaponBonusPAtk extends AbstractStatAddEffect
 	{
 		super(params, Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
 	}
+	
+	@Override
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 56a0e14968..470470855c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,61 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_SATIETY_REACHES_0_YOU_CANNOT_CONTROL_IT);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetHold.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetHold.java
index 796e3890cb..e01838998c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetHold.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetHold.java
@@ -52,4 +52,10 @@ public class PetHold implements IPlayerActionHandler
 			((SummonAI) pet.getAI()).notifyFollowStatusChange();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetMove.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetMove.java
index 9922c8ae01..abcf541e93 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetMove.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetMove.java
@@ -53,4 +53,10 @@ public class PetMove implements IPlayerActionHandler
 			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, player.getTarget().getLocation());
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
index 639e83e997..097fa4e677 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
@@ -77,4 +77,10 @@ public class PetSkillUse implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetStop.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetStop.java
index 843fe9cd0d..f00814772e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetStop.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/PetStop.java
@@ -51,4 +51,10 @@ public class PetStop implements IPlayerActionHandler
 			pet.cancelAction();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 1a9adbd92c..e6ba7b9145 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,52 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorHold.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
index 5770babd1f..2879dc6282 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
@@ -48,4 +48,10 @@ public class ServitorHold implements IPlayerActionHandler
 			((SummonAI) s.getAI()).notifyFollowStatusChange();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorMode.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
index feeec57b16..bd74d78cf0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
@@ -68,4 +68,10 @@ public class ServitorMode implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorMove.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
index a54e5f037a..fcdc5bdb2b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
@@ -56,4 +56,10 @@ public class ServitorMove implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
index 5a4d56e857..5a5629db67 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
@@ -62,4 +62,10 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			}
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorStop.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
index 6f7e11ac11..6e013c09f9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
@@ -47,4 +47,10 @@ public class ServitorStop implements IPlayerActionHandler
 			s.cancelAction();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
index ec175a945f..981d23429a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
@@ -62,4 +62,10 @@ public class UnsummonPet implements IPlayerActionHandler
 			pet.unSummon(player);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
index aba3571a99..5bca36e736 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
@@ -69,4 +69,10 @@ public class UnsummonServitor implements IPlayerActionHandler
 			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSymbolSealIncreaseItemSkillCondition.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSymbolSealIncreaseItemSkillCondition.java
new file mode 100644
index 0000000000..3ab0d0bb69
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSymbolSealIncreaseItemSkillCondition.java
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.skillconditionhandlers;
+
+import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.skill.ISkillCondition;
+import org.l2jmobius.gameserver.model.skill.Skill;
+
+/**
+ * @author CostyKiller
+ */
+public class CanUseSymbolSealIncreaseItemSkillCondition implements ISkillCondition
+{
+	private final int _amount;
+	
+	public CanUseSymbolSealIncreaseItemSkillCondition(StatSet params)
+	{
+		_amount = params.getInt("amount", 0);
+	}
+	
+	@Override
+	public boolean canUse(Creature caster, Skill skill, WorldObject target)
+	{
+		return caster.isPlayer() && ((caster.getActingPlayer().getSymbolSealPoints() + ((Config.MAX_SYMBOL_SEAL_POINTS * _amount) / 100)) <= Config.MAX_SYMBOL_SEAL_POINTS);
+	}
+}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 9785766b0f..a23a6139ad 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index e836ebce13..acee337ee6 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
index 73a94f9c12..fd0979380b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java
@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc;
 import org.l2jmobius.gameserver.model.actor.instance.Monster;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.quest.QuestState;
@@ -46,10 +47,11 @@ public class ChamberOfProphecies extends AbstractInstance
 {
 	// NPCs
 	private static final int KAIN_VAN_HALTER = 31639;
-	private static final int VAN_HALTER = 33999;
-	private static final int FERIN = 34001;
 	private static final int GRAIL = 33996;
 	private static final int MYSTERIOUS_WIZARD = 33980;
+	// Helper NPCs
+	private static final int HELPER_VAN_HALTER = 33999;
+	private static final int HELPER_FERIN = 34001;
 	// Misc
 	private static final int DOOR_2 = 17230102;
 	private static final int DOOR_3 = 17230103;
@@ -66,7 +68,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		addStartNpc(KAIN_VAN_HALTER);
 		addFirstTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
 		addTalkId(KAIN_VAN_HALTER, GRAIL, MYSTERIOUS_WIZARD);
-		addCreatureSeeId(FERIN, VAN_HALTER);
+		addCreatureSeeId(HELPER_FERIN, HELPER_VAN_HALTER);
 	}
 	
 	@Override
@@ -145,12 +147,12 @@ public class ChamberOfProphecies extends AbstractInstance
 				{
 					return null;
 				}
-				final Npc valHalter = world.getNpc(VAN_HALTER);
-				if (valHalter != null)
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
+				if (vanHalter != null)
 				{
-					valHalter.deleteMe(); // probably needs another npc id for initial room
+					vanHalter.deleteMe(); // probably needs another npc id for initial room
 				}
-				final Npc ferin = world.getNpc(FERIN);
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
 				if (ferin != null)
 				{
 					ferin.deleteMe(); // probably needs another npc id for initial room
@@ -190,6 +192,8 @@ public class ChamberOfProphecies extends AbstractInstance
 			case "CHECK_STATUS":
 			{
 				final Instance world = player.getInstanceWorld();
+				final FriendlyNpc ferin = (FriendlyNpc) world.getNpc(HELPER_FERIN);
+				final FriendlyNpc vanHalter = (FriendlyNpc) world.getNpc(HELPER_VAN_HALTER);
 				if (!isInInstance(world))
 				{
 					return null;
@@ -200,8 +204,8 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
-							startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY2", 14000, ferin, player);
+							startQuestTimer("SEY_KAIN", 24000, vanHalter, player);
 							startQuestTimer("OPEN_DOOR1", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -221,7 +225,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					{
 						if (world.getAliveNpcs(Monster.class).isEmpty())
 						{
-							startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY3", 8000, ferin, player);
 							startQuestTimer("OPEN_DOOR2", 5000, npc, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
@@ -234,7 +238,7 @@ public class ChamberOfProphecies extends AbstractInstance
 							world.setStatus(4);
 							world.spawnGroup("wof_room3_2");
 							world.openCloseDoor(DOOR_3, false);
-							startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
+							startQuestTimer("SEY_KAIN_1", 5000, vanHalter, player);
 						}
 						startQuestTimer("CHECK_STATUS", 7000, npc, player);
 						break;
@@ -245,8 +249,8 @@ public class ChamberOfProphecies extends AbstractInstance
 						{
 							world.setStatus(5);
 							world.spawnGroup("wof_room4");
-							startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
-							startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
+							startQuestTimer("SEY_KAIN_2", 3000, vanHalter, player);
+							startQuestTimer("SEY4", 7000, ferin, player);
 						}
 						else
 						{
@@ -304,7 +308,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					return null;
 				}
 				cancelQuestTimer("ATTACK1", npc, player);
-				startQuestTimer("ATTACK2", 200, world.getNpc(VAN_HALTER), player, true);
+				startQuestTimer("ATTACK2", 200, world.getNpc(HELPER_VAN_HALTER), player, true);
 				world.setStatus(3);
 				world.spawnGroup("wof_room3");
 				world.openCloseDoor(DOOR_3, true);
@@ -321,7 +325,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY2":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.YOU_CAN_T_DIE_HERE_I_DIDN_T_LEARN_RESURRECT_YET));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_4", 0, 0, 0, 0, 0));
@@ -330,7 +334,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GISELLE_WAS_SUCH_A_SWEET_CHILD));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_1", 0, 0, 0, 0, 0));
@@ -340,7 +344,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY3":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.DO_YOU_THINK_I_LL_GROW_TALLER_IF_I_EAT_LOTS_AND_LOTS));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.apple_quest_6", 0, 0, 0, 0, 0));
@@ -349,7 +353,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_1":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.SUCH_MONSTERS_IN_A_PLACE_LIKE_THIS_UNBELIEVABLE));
 				}
@@ -357,7 +361,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_2":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.THAT_S_THE_MONSTER_THAT_ATTACKED_FAERON_YOU_RE_OUTMATCHED_HERE_GO_AHEAD_I_LL_CATCH_UP));
 					player.sendPacket(new PlaySound(3, "Npcdialog1.holter_quest_6", 0, 0, 0, 0, 0));
@@ -367,7 +371,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY4":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.GO_NOW_KAIN_CAN_HANDLE_THIS));
 					npc.setScriptValue(1);
@@ -377,7 +381,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "SEY_KAIN_3":
 			{
-				if ((npc != null) && (npc.getId() == VAN_HALTER))
+				if ((npc != null) && (npc.getId() == HELPER_VAN_HALTER))
 				{
 					npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NpcStringId.LEAVE_THIS_TO_ME_GO));
 					npc.setScriptValue(1);
@@ -387,7 +391,7 @@ public class ChamberOfProphecies extends AbstractInstance
 			}
 			case "REST":
 			{
-				if ((npc != null) && (npc.getId() == FERIN))
+				if ((npc != null) && (npc.getId() == HELPER_FERIN))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, player);
 				}
@@ -508,7 +512,7 @@ public class ChamberOfProphecies extends AbstractInstance
 		{
 			switch (npc.getId())
 			{
-				case FERIN:
+				case HELPER_FERIN:
 				{
 					if (creature.isPlayer() && !creature.isDead() && npc.isScriptValue(0))
 					{
@@ -516,7 +520,7 @@ public class ChamberOfProphecies extends AbstractInstance
 					}
 					break;
 				}
-				case VAN_HALTER:
+				case HELPER_VAN_HALTER:
 				{
 					if (creature.isPlayer() && !creature.isDead() && world.isStatus(0))
 					{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/IceQueensCastle/Freya.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/IceQueensCastle/Freya.java
new file mode 100644
index 0000000000..4558870c36
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/IceQueensCastle/Freya.java
@@ -0,0 +1,886 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package instances.IceQueensCastle;
+
+import java.util.List;
+
+import org.l2jmobius.gameserver.enums.Movie;
+import org.l2jmobius.gameserver.model.Party;
+import org.l2jmobius.gameserver.model.actor.Attackable;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.ItemHolder;
+import org.l2jmobius.gameserver.model.holders.SkillHolder;
+import org.l2jmobius.gameserver.model.instancezone.Instance;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.NpcStringId;
+import org.l2jmobius.gameserver.network.SystemMessageId;
+import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
+
+import instances.AbstractInstance;
+
+/**
+ * @author Tanatos
+ * @URL https://www.youtube.com/watch?v=3l9JuxM5lk0&t
+ * @URL https://l2central.info/main/locations/instance_zones/party/ice_queen_castle/
+ */
+public class Freya extends AbstractInstance
+{
+	// NPCs
+	private static final int BENUSTA = 34542;
+	private static final int FREYA_THRONE = 26511;
+	private static final int FREYA_WAITING = 26512;
+	private static final int FREYA_STAND = 26513;
+	private static final int GLAKIAS = 26514;
+	private static final int WINTER_CRYSTAL = 26518;
+	private static final int ICE_WALL = 26519;
+	private static final int HUGE_ICICLE = 26520;
+	// Skills
+	private static final SkillHolder ICE_BOLT = new SkillHolder(34437, 1); // Queen's Ice Bolt
+	private static final SkillHolder FREEZING_BOLT = new SkillHolder(34437, 2); // Queen's Freezing Bolt
+	private static final SkillHolder ICE_STORM = new SkillHolder(34438, 1); // Queen's Ice Storm
+	private static final SkillHolder FREEZING_STORM = new SkillHolder(34438, 2); // Queen's Freezing Storm
+	private static final SkillHolder ICE_HURRICANE = new SkillHolder(34439, 1); // Queen's Ice Hurricane
+	private static final SkillHolder FREEZING_HURRICANE = new SkillHolder(34439, 2); // Queen's Freezing Hurricane
+	private static final SkillHolder FREEZING_BLIZARD = new SkillHolder(34440, 1); // Queen's Freezing Blizzard
+	private static final SkillHolder FREEZING_QUEEN_WAVE = new SkillHolder(34441, 2); // Queen's Freezing Wave
+	private static final SkillHolder ETERNAL_BLIZZARD = new SkillHolder(34442, 1); // Eternal Blizzard
+	private static final SkillHolder FREEZING_STRIKE = new SkillHolder(34443, 1); // Freezing Strike
+	private static final SkillHolder FREEZING_SMASH = new SkillHolder(34444, 1); // Freezing Smash
+	private static final SkillHolder FREEZING_WAVE = new SkillHolder(34445, 1); // Freezing Wave
+	private static final SkillHolder FINAL_FREEZING = new SkillHolder(34447, 1); // Final Freezing Burst
+	private static final SkillHolder FREEZING_CHAIN = new SkillHolder(34449, 1); // Freezing Chain
+	private static final SkillHolder FREEZING_MASS_CHAIN = new SkillHolder(34449, 2); // Mass Freezing Chain
+	private static final SkillHolder FROSTY_COMMAND = new SkillHolder(34451, 1); // Frosty Command
+	private static final SkillHolder ICE_BOLTS = new SkillHolder(34452, 1); // Summon Ice Bolts
+	private static final SkillHolder FINAL_FREEZING_DISPLAY = new SkillHolder(6276, 1); // Final Freezing Burst Display
+	// Items
+	private static final ItemHolder JEWELRY_BOX = new ItemHolder(82497, 1);
+	private static final ItemHolder WARM_ENERGY = new ItemHolder(82491, 1);
+	private static final ItemHolder COOL_ENERGY = new ItemHolder(82492, 1);
+	private static final ItemHolder FREYAS_CLOAK = new ItemHolder(82493, 1);
+	private static final ItemHolder FREYAS_NECKLACE = new ItemHolder(82494, 1);
+	private static final ItemHolder FREYAS_STAFF = new ItemHolder(82495, 1);
+	private static final ItemHolder FREYAS_CROWN = new ItemHolder(82496, 1);
+	// Misc
+	private static final int TEMPLATE_ID = 323;
+	
+	public Freya()
+	{
+		super(TEMPLATE_ID);
+		addStartNpc(BENUSTA);
+		addAttackId(FREYA_THRONE, FREYA_STAND, GLAKIAS);
+		addKillId(FREYA_STAND);
+		addSpellFinishedId(HUGE_ICICLE, WINTER_CRYSTAL, FREYA_STAND);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "enterInstance":
+			{
+				final int templateId = TEMPLATE_ID;
+				if (player.isInParty())
+				{
+					final Party party = player.getParty();
+					if (!party.isLeader(player))
+					{
+						player.sendPacket(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER);
+						return null;
+					}
+					
+					if (player.isInCommandChannel())
+					{
+						player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_AS_YOU_DON_T_MEET_THE_REQUIREMENTS);
+						return null;
+					}
+					
+					final List<Player> members = party.getMembers();
+					for (Player member : members)
+					{
+						if (!member.isInsideRadius3D(npc, 1000))
+						{
+							player.sendMessage("Player " + member.getName() + " must come closer.");
+							return null;
+						}
+					}
+					
+					for (Player member : members)
+					{
+						enterInstance(member, npc, templateId);
+					}
+				}
+				else if (player.isGM())
+				{
+					enterInstance(player, npc, templateId);
+				}
+				else
+				{
+					player.sendPacket(SystemMessageId.YOU_ARE_NOT_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
+				}
+				
+				if (player.getInstanceWorld() != null)
+				{
+					startQuestTimer("movie_opening", 5000, null, player);
+				}
+				break;
+			}
+			case "movie_opening":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				world.setStatus(1);
+				playMovie(world, Movie.SC_BOSS_FREYA_OPENING);
+				startQuestTimer("check_status", 53500, null, player);
+				break;
+			}
+			case "movie_freya_waiting":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				playMovie(world, Movie.SC_BOSS_FREYA_PHASECH_A);
+				startQuestTimer("movie_glakias", 13100, null, player);
+				break;
+			}
+			case "movie_glakias":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				world.setStatus(2);
+				world.getNpc(FREYA_THRONE).deleteMe();
+				playMovie(world, Movie.SC_ICE_HEAVYKNIGHT_SPAWN);
+				startQuestTimer("check_status", 10000, null, player);
+				break;
+			}
+			case "movie_last_freya":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				world.setStatus(3);
+				world.getNpc(GLAKIAS).deleteMe();
+				world.getNpc(FREYA_WAITING).deleteMe();
+				world.getAliveNpcs(HUGE_ICICLE).forEach(icicle -> icicle.deleteMe());
+				playMovie(world, Movie.SC_BOSS_FREYA_PHASECH_B);
+				startQuestTimer("check_status", 21500, null, player);
+				break;
+			}
+			case "movie_ending":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				playMovie(world, Movie.SC_BOSS_FREYA_ENDING_A);
+				break;
+			}
+			case "freya_rage":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				if (world.getStatus() == 1)
+				{
+					for (int i = 0; i < 3; i++)
+					{
+						addSpawn(ICE_WALL, player.getX() + getRandom(-400, 400), player.getY() + getRandom(-400, 400), player.getZ() + 10, 0, false, 10000, false, world.getId());
+					}
+					addSpawn(ICE_WALL, player.getX(), player.getY(), player.getZ() + 10, 0, false, 10000, false, world.getId());
+					startQuestTimer("ice_hurricane_cast", 1000, null, player);
+				}
+				break;
+			}
+			case "glakias_rage":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				if (world.getStatus() == 2)
+				{
+					showOnScreenMsg(world, NpcStringId.I_WILL_FREEZE_YOUR_HEART, ExShowScreenMessage.TOP_CENTER, 10000, true);
+					world.spawnGroup("ICICLES_1");
+					world.spawnGroup("ICICLES_2");
+					world.spawnGroup("ICICLES_3");
+					world.spawnGroup("ICICLES_4");
+					startQuestTimer("ice_bolts_1", 1000, null, player);
+					startQuestTimer("ice_bolts_2", 1000, null, player);
+					startQuestTimer("ice_bolts_3", 7000, null, player);
+					startQuestTimer("ice_bolts_4", 7000, null, player);
+				}
+				break;
+			}
+			case "ice_bolts_1":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				if (world.getStatus() == 2)
+				{
+					world.getNpcsOfGroup("ICICLES_1").forEach(icicle ->
+					{
+						if (icicle != null)
+						{
+							icicle.setDisplayEffect(1);
+							try
+							{
+								Thread.sleep(700);
+							}
+							catch (Exception e)
+							{
+							}
+							icicle.setDisplayEffect(2);
+							icicle.doCast(ICE_BOLTS.getSkill());
+						}
+					});
+				}
+				break;
+			}
+			case "ice_bolts_2":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				if (world.getStatus() == 2)
+				{
+					world.getNpcsOfGroup("ICICLES_2").forEach(icicle ->
+					{
+						if (icicle != null)
+						{
+							icicle.setDisplayEffect(1);
+							try
+							{
+								Thread.sleep(810);
+							}
+							catch (Exception e)
+							{
+							}
+							icicle.setDisplayEffect(2);
+							icicle.doCast(ICE_BOLTS.getSkill());
+						}
+					});
+				}
+				break;
+			}
+			case "ice_bolts_3":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				if (world.getStatus() == 2)
+				{
+					world.getNpcsOfGroup("ICICLES_3").forEach(icicle ->
+					{
+						if (icicle != null)
+						{
+							icicle.setDisplayEffect(1);
+							try
+							{
+								Thread.sleep(500);
+							}
+							catch (Exception e)
+							{
+							}
+							icicle.setDisplayEffect(2);
+							icicle.doCast(ICE_BOLTS.getSkill());
+						}
+					});
+				}
+				break;
+			}
+			case "ice_bolts_4":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				if (world.getStatus() == 2)
+				{
+					world.getNpcsOfGroup("ICICLES_4").forEach(icicle ->
+					{
+						if (icicle != null)
+						{
+							icicle.setDisplayEffect(1);
+							try
+							{
+								Thread.sleep(578);
+							}
+							catch (Exception e)
+							{
+							}
+							icicle.setDisplayEffect(2);
+							icicle.doCast(ICE_BOLTS.getSkill());
+						}
+					});
+				}
+				break;
+			}
+			case "frosty_command":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				if (world.getStatus() == 2)
+				{
+					final boolean commandCasted = world.getParameters().getBoolean("COMMAND_CASTED", false);
+					if (!commandCasted)
+					{
+						final Npc glakias = world.getNpc(GLAKIAS);
+						glakias.doCast(FROSTY_COMMAND.getSkill());
+						world.getParameters().set("COMMAND_CASTED", true);
+					}
+					else
+					{
+						startQuestTimer("frosty_command", 1000, null, player);
+					}
+				}
+				break;
+			}
+			case "freezing_hurricane":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				if (world.getStatus() < 4)
+				{
+					for (int i = 0; i < 5; i++)
+					{
+						addSpawn(ICE_WALL, player.getX() + getRandom(-800, 800), player.getY() + getRandom(-800, 800), player.getZ() + 10, 0, false, 10000, false, world.getId());
+					}
+					addSpawn(ICE_WALL, player.getX(), player.getY(), player.getZ() + 10, 0, false, 10000, false, world.getId());
+					startQuestTimer("freezing_hurricane_cast", 1000, null, player);
+				}
+				break;
+			}
+			case "freezing_blizzard":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				if (world.getStatus() < 4)
+				{
+					for (int i = 0; i < 10; i++)
+					{
+						addSpawn(ICE_WALL, player.getX() + getRandom(-800, 800), player.getY() + getRandom(-800, 800), player.getZ() + 10, 0, false, 10000, false, world.getId());
+					}
+					addSpawn(ICE_WALL, player.getX(), player.getY(), player.getZ() + 10, 0, false, 10000, false, world.getId());
+					startQuestTimer("freezing_blizzard_cast", 1000, null, player);
+				}
+				break;
+			}
+			case "ice_hurricane_cast":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				if (world.getStatus() == 1)
+				{
+					world.getAliveNpcs(ICE_WALL).forEach(wall ->
+					{
+						if (wall != null)
+						{
+							wall.doCast(ICE_HURRICANE.getSkill());
+							
+						}
+					});
+					startQuestTimer("freya_rage", 12000, null, player);
+				}
+				break;
+			}
+			case "freezing_hurricane_cast":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				if (world.getStatus() == 3)
+				{
+					world.getAliveNpcs(ICE_WALL).forEach(wall ->
+					{
+						if (wall != null)
+						{
+							wall.doCast(FREEZING_HURRICANE.getSkill());
+							
+						}
+					});
+					startQuestTimer("freezing_hurricane", 20000, null, player);
+				}
+				break;
+			}
+			case "freezing_blizzard_cast":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				if (world.getStatus() == 3)
+				{
+					world.getAliveNpcs(ICE_WALL).forEach(wall ->
+					{
+						if (wall != null)
+						{
+							wall.doCast(FREEZING_BLIZARD.getSkill());
+							
+						}
+					});
+					startQuestTimer("freezing_blizzard", 30000, null, player);
+				}
+				break;
+			}
+			case "eternal_blizzard":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				if ((world.getStatus() == 3) && (world.getAliveNpcCount(WINTER_CRYSTAL) > 0))
+				{
+					final Npc winterCrystal = world.getNpc(WINTER_CRYSTAL);
+					winterCrystal.doCast(ETERNAL_BLIZZARD.getSkill());
+				}
+				break;
+			}
+			case "final_freezing_burst":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				if (world.getStatus() == 3)
+				{
+					showOnScreenMsg(world, NpcStringId.REST_IN_PEACE_FOREVER, ExShowScreenMessage.TOP_CENTER, 10000, true);
+					final Npc freya = world.getNpc(FREYA_STAND);
+					freya.doCast(FINAL_FREEZING.getSkill());
+				}
+				break;
+			}
+			case "summon_winter_crystal":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				if (world.getStatus() == 3)
+				{
+					world.spawnGroup("WINTER_CRYSTAL");
+					startQuestTimer("eternal_blizzard", 1000, null, player);
+				}
+				break;
+			}
+			case "check_status":
+			{
+				final Instance world = player.getInstanceWorld();
+				if (!isInInstance(world))
+				{
+					return null;
+				}
+				
+				switch (world.getStatus())
+				{
+					case 1:
+					{
+						final boolean freyaSpawned = world.getParameters().getBoolean("FREYA_SPAWNED", false);
+						if (!freyaSpawned)
+						{
+							world.spawnGroup("FREYA_STAGE_1");
+							showOnScreenMsg(world, NpcStringId.YOU_WILL_PAY_FOR_BREAKING_THE_SILENCE_OF_THE_CASTLE_HIDDEN_IN_THE_EVERLASTING_ICE, ExShowScreenMessage.TOP_CENTER, 10000, true);
+							world.getParameters().set("FREYA_SPAWNED", true);
+						}
+						break;
+					}
+					case 2:
+					{
+						final boolean glakiasSpawned = world.getParameters().getBoolean("GLAKIAS_SPAWNED", false);
+						if (!glakiasSpawned)
+						{
+							world.spawnGroup("GLAKIAS");
+							world.spawnGroup("FREYA_STAGE_2");
+							world.spawnGroup("KANNAS_KNIGHTS");
+							showOnScreenMsg(world, NpcStringId.GLAKIAS_ALLEGIANCE_TO_ICE_QUEEN_WILL_INCREASE_IN_5_MINUTES, ExShowScreenMessage.TOP_CENTER, 10000, true);
+							startQuestTimer("frosty_command", 300000, null, player);
+							world.getParameters().set("GLAKIAS_SPAWNED", true);
+							world.getParameters().set("FREYA_SPAWNED", false);
+						}
+						break;
+					}
+					case 3:
+					{
+						
+						final boolean freyaSpawned = world.getParameters().getBoolean("FREYA_SPAWNED", false);
+						if (!freyaSpawned)
+						{
+							world.spawnGroup("FREYA_STAGE_3");
+							world.getParameters().set("FREYA_SPAWNED", true);
+						}
+						break;
+					}
+				}
+				break;
+			}
+		}
+		return super.onAdvEvent(event, npc, player);
+	}
+	
+	@Override
+	public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
+	{
+		final Instance world = npc.getInstanceWorld();
+		if (isInInstance(world))
+		{
+			switch (npc.getId())
+			{
+				case FREYA_THRONE:
+				{
+					final Creature mostHated = ((Attackable) npc).getMostHated();
+					final boolean freya90 = world.getParameters().getBoolean("FREYA_90", false);
+					final boolean freya80 = world.getParameters().getBoolean("FREYA_80", false);
+					if ((npc.getCurrentHp() <= (npc.getMaxHp() * 0.9)) && !freya90)
+					{
+						showOnScreenMsg(world, NpcStringId.FEEL_THE_POWER_OF_MY_RAGE, ExShowScreenMessage.TOP_CENTER, 10000, true);
+						startQuestTimer("freya_rage", 100, null, attacker);
+						world.getParameters().set("FREYA_90", true);
+					}
+					else if ((npc.getCurrentHp() <= (npc.getMaxHp() * 0.8)) && !freya80)
+					{
+						startQuestTimer("movie_freya_waiting", 100, null, attacker);
+						world.getParameters().set("FREYA_80", true);
+					}
+					else
+					{
+						if (getRandom(100) < 40)
+						{
+							if (SkillCaster.checkUseConditions(npc, ICE_BOLT.getSkill()))
+							{
+								npc.setTarget(mostHated);
+								npc.doCast(ICE_BOLT.getSkill());
+							}
+						}
+						else
+						{
+							if (SkillCaster.checkUseConditions(npc, ICE_STORM.getSkill()))
+							{
+								npc.doCast(ICE_STORM.getSkill());
+							}
+						}
+					}
+					break;
+				}
+				
+				case GLAKIAS:
+				{
+					final Creature mostHated = ((Attackable) npc).getMostHated();
+					final boolean glakias50 = world.getParameters().getBoolean("GLAKIAS_50", false);
+					final boolean glakias5 = world.getParameters().getBoolean("GLAKIAS_5", false);
+					if ((npc.getCurrentHp() <= (npc.getMaxHp() * 0.5)) && !glakias50)
+					{
+						startQuestTimer("glakias_rage", 100, null, attacker);
+						world.getParameters().set("GLAKIAS_50", true);
+					}
+					else if ((npc.getCurrentHp() <= (npc.getMaxHp() * 0.05)) && !glakias5)
+					{
+						startQuestTimer("movie_last_freya", 100, null, attacker);
+						world.getParameters().set("GLAKIAS_5", true);
+					}
+					else
+					{
+						if (getRandom(100) < 20)
+						{
+							if (SkillCaster.checkUseConditions(npc, FREEZING_STRIKE.getSkill()))
+							{
+								npc.setTarget(mostHated);
+								npc.doCast(FREEZING_STRIKE.getSkill());
+							}
+						}
+						else if ((getRandom(100) < 40) && (getRandom(100) > 20))
+						{
+							if (SkillCaster.checkUseConditions(npc, FREEZING_SMASH.getSkill()))
+							{
+								npc.doCast(FREEZING_SMASH.getSkill());
+							}
+						}
+						else if ((getRandom(100) < 60) && (getRandom(100) > 40))
+						{
+							if (SkillCaster.checkUseConditions(npc, FREEZING_WAVE.getSkill()))
+							{
+								npc.doCast(FREEZING_WAVE.getSkill());
+							}
+						}
+						else if ((getRandom(100) < 80) && (getRandom(100) > 60))
+						{
+							if (SkillCaster.checkUseConditions(npc, FREEZING_CHAIN.getSkill()))
+							{
+								npc.setTarget(mostHated);
+								npc.doCast(FREEZING_CHAIN.getSkill());
+							}
+						}
+						else
+						{
+							if (SkillCaster.checkUseConditions(npc, FREEZING_MASS_CHAIN.getSkill()))
+							{
+								npc.setTarget(mostHated);
+								npc.doCast(FREEZING_MASS_CHAIN.getSkill());
+							}
+							
+						}
+					}
+					break;
+				}
+				case FREYA_STAND:
+				{
+					final Creature mostHated = ((Attackable) npc).getMostHated();
+					final boolean freya70 = world.getParameters().getBoolean("FREYA_70", false);
+					final boolean freya50 = world.getParameters().getBoolean("FREYA_50", false);
+					final boolean freya5 = world.getParameters().getBoolean("FREYA_5", false);
+					if ((npc.getCurrentHp() <= (npc.getMaxHp() * 0.9)) && !freya70)
+					{
+						startQuestTimer("freezing_hurricane", 1000, null, attacker);
+						startQuestTimer("freezing_blizzard", 5000, null, attacker);
+						world.getParameters().set("FREYA_70", true);
+					}
+					else if ((npc.getCurrentHp() <= (npc.getMaxHp() * 0.5)) && !freya50)
+					{
+						startQuestTimer("summon_winter_crystal", 100, null, attacker);
+						showOnScreenMsg(world, NpcStringId.ICE_QUEEN_S_POWER_WILL_PUT_YOU_THROUGH_THE_UNBEARABLE_SUFFERING, ExShowScreenMessage.TOP_CENTER, 10000, true);
+						world.getParameters().set("FREYA_50", true);
+					}
+					else if ((npc.getCurrentHp() <= (npc.getMaxHp() * 0.05)) && !freya5)
+					{
+						startQuestTimer("summon_winter_crystal", 100, null, attacker);
+						showOnScreenMsg(world, NpcStringId.ENOUGH_FACE_YOU_DEATH_ICE_QUEEN_IS_HER_NAME, ExShowScreenMessage.TOP_CENTER, 10000, true);
+						world.getParameters().set("FREYA_5", true);
+					}
+					else if (npc.getCurrentHp() <= (npc.getMaxHp() * 0.01))
+					{
+						startQuestTimer("final_freezing_burst", 100, null, attacker);
+					}
+					else
+					{
+						if (getRandom(100) < 33)
+						{
+							if (SkillCaster.checkUseConditions(npc, FREEZING_BOLT.getSkill()))
+							{
+								npc.setTarget(mostHated);
+								npc.doCast(FREEZING_BOLT.getSkill());
+							}
+						}
+						else if ((getRandom(100) < 66) && (getRandom(100) > 33))
+						{
+							if (SkillCaster.checkUseConditions(npc, FREEZING_STORM.getSkill()))
+							{
+								npc.doCast(FREEZING_STORM.getSkill());
+							}
+						}
+						else
+						{
+							if (SkillCaster.checkUseConditions(npc, FREEZING_QUEEN_WAVE.getSkill()))
+							{
+								npc.doCast(FREEZING_QUEEN_WAVE.getSkill());
+							}
+						}
+					}
+					break;
+				}
+			}
+		}
+		return super.onAttack(npc, attacker, damage, isSummon, skill);
+	}
+	
+	@Override
+	public String onSpellFinished(Npc npc, Player player, Skill skill)
+	{
+		final Instance world = npc.getInstanceWorld();
+		if (world != null)
+		{
+			switch (npc.getId())
+			{
+				case HUGE_ICICLE:
+				{
+					if ((skill.getId() == ICE_BOLTS.getSkillId()) && (world.getStatus() == 2))
+					{
+						npc.setDisplayEffect(3);
+					}
+					break;
+				}
+				case WINTER_CRYSTAL:
+				{
+					if ((skill.getId() == ETERNAL_BLIZZARD.getSkillId()) && (world.getStatus() == 3))
+					{
+						npc.setDisplayEffect(3);
+						world.getNpc(WINTER_CRYSTAL).doDie(npc);
+						world.getNpc(FREYA_STAND).setCurrentHp(world.getNpc(FREYA_STAND).getMaxHp() * 0.70);
+						for (Player member : world.getPlayers())
+						{
+							member.doDie(member);
+						}
+					}
+					break;
+				}
+				case FREYA_STAND:
+				{
+					if ((skill.getId() == FINAL_FREEZING.getSkillId()) && (world.getStatus() == 3))
+					{
+						world.getNpc(FREYA_STAND).setCurrentHp(world.getNpc(FREYA_STAND).getMaxHp() * 0.20);
+						npc.doCast(FINAL_FREEZING_DISPLAY.getSkill());
+						for (Player member : world.getPlayers())
+						{
+							member.doDie(member);
+						}
+					}
+					break;
+				}
+			}
+		}
+		return super.onSpellFinished(npc, player, skill);
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player killer, boolean isSummon)
+	{
+		final Instance world = npc.getInstanceWorld();
+		if (isInInstance(world))
+		{
+			if (npc.getId() == FREYA_STAND)
+			{
+				world.setStatus(4);
+				if (world.getAliveNpcCount(WINTER_CRYSTAL) > 0)
+				{
+					world.getNpc(WINTER_CRYSTAL).deleteMe();
+				}
+				
+				startQuestTimer("movie_ending", 100, null, killer);
+				
+				for (Player member : world.getPlayers())
+				{
+					if ((member.getParty() != null) || (member.isGM()))
+					{
+						giveItems(member, JEWELRY_BOX);
+					}
+				}
+				
+				for (Player member : world.getPlayers())
+				{
+					if ((member.getParty() != null) || (member.isGM()))
+					{
+						switch (getRandom(7))
+						{
+							case 0:
+							{
+								break;
+							}
+							case 1:
+							{
+								giveItems(member, WARM_ENERGY);
+								break;
+							}
+							case 2:
+							{
+								giveItems(member, COOL_ENERGY);
+								break;
+							}
+							case 3:
+							{
+								giveItems(member, FREYAS_CLOAK);
+								break;
+							}
+							case 4:
+							{
+								giveItems(member, FREYAS_NECKLACE);
+								break;
+							}
+							case 5:
+							{
+								giveItems(member, FREYAS_STAFF);
+								break;
+							}
+							case 6:
+							{
+								giveItems(member, FREYAS_CROWN);
+								break;
+							}
+						}
+					}
+				}
+				world.finishInstance(2);
+			}
+		}
+		return super.onKill(npc, killer, isSummon);
+	}
+	
+	public static void main(String[] args)
+	{
+		new Freya();
+	}
+}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/IceQueensCastle/condNoEnter.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/IceQueensCastle/condNoEnter.html
new file mode 100644
index 0000000000..6d472359c8
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/IceQueensCastle/condNoEnter.html
@@ -0,0 +1,6 @@
+<html><body>Benusta:<br>
+The instance zone is inaccessible at the time.<br>
+Only your party leader can ask me for the first-time visit to the instance zone. There is no other way to enter.<br>
+Keep in mind that the party cannot move to an instance zone if there is a character in the party, which does not meet level requirements. Also teleportation will be impossible if any of the party members stand too far from me.<br>
+Also you cannot enter an instance zone if other party is already in. Please, check the requirements once more.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java
index 67e0abe38f..bde333c743 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java
@@ -487,7 +487,7 @@ public class KrofinNest extends AbstractInstance
 				}
 				
 				final Npc dummy = world.getNpc(DUMMY);
-				if (!isInInstance(world))
+				if ((dummy == null) || !isInInstance(world))
 				{
 					return null;
 				}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
index d1719a798c..ec4256d246 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
@@ -30,10 +30,7 @@ import instances.AbstractInstance;
  */
 public class TimedHunting extends AbstractInstance
 {
-	// NPCs
-	private static final int PATROL_TELEPORTER = 34568;
-	private static final int PATROL_GUARD = 34569;
-	private static final int TELEPORT_SCOUT = 34549;
+	
 	// Misc
 	private static final int[] TEMPLATE_IDS =
 	{
@@ -47,9 +44,6 @@ public class TimedHunting extends AbstractInstance
 	public TimedHunting()
 	{
 		super(TEMPLATE_IDS);
-		addStartNpc(PATROL_TELEPORTER, PATROL_GUARD, TELEPORT_SCOUT);
-		addTalkId(PATROL_TELEPORTER, PATROL_GUARD, TELEPORT_SCOUT);
-		addFirstTalkId(PATROL_TELEPORTER, PATROL_GUARD, TELEPORT_SCOUT);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/MissingQuests.txt b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/MissingQuests.txt
index b07c64b9f2..962317e0c4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/MissingQuests.txt
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/MissingQuests.txt
@@ -50,10 +50,6 @@
 1901 Storm Isle - Furtive Deal
 10595 The Dimensional Warp, Part 8
 10596 The Dimensional Warp, Part 9
-10904 Journey to the Conquest World
-10905 Hunting Time
-10906 Chasing the Light
-10907 Where Flowers Blossom
 11028 Wind of Destiny - Encounter
 11029 Wind of Destiny - Promise
 11030 Wind of Destiny - Choice
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
index 75719091f5..7616d4bbf0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
@@ -51,7 +51,7 @@ public class Q00933_TombRaiders extends Quest
 	private static final int TOMB_SOULTAKER = 24583;
 	private static final int TOMB_PATROL = 24582;
 	// Item
-	private static final int BENUSTA_REWARD_BOX = 81151;
+	private static final int BENUSTA_REWARD_BOX = 82453;
 	// Misc
 	private static final String KILL_COUNT_VAR = "KillCount";
 	// Zone
@@ -177,7 +177,14 @@ public class Q00933_TombRaiders extends Quest
 		final Party party = killer.getParty();
 		if (party != null)
 		{
-			party.getMembers().forEach(p -> processKill(npc, p));
+			for (Player member : party.getMembers())
+			{
+				final QuestState qs = getQuestState(member, false);
+				if (qs != null)
+				{
+					processKill(npc, member);
+				}
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
index f1f87d30e4..549dcdca8b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10507_ObtainingNewPower/Q10507_ObtainingNewPower.java
@@ -167,12 +167,6 @@ public class Q10507_ObtainingNewPower extends Quest
 		24633, // Ketra Orc Warrior
 		24634, // Ketra Orc Lieutenant
 		24635, // Ketra Orc Battalion Commander
-		// Varka Silenos Barracks
-		24636, // Varka Silenos Magus
-		24637, // Varka Silenos Shaman
-		24638, // Varka Silenos Footman
-		24639, // Varka Silenos Sergeant
-		24640, // Varka Silenos Officer
 		// Breka's Stronghold
 		24420, // Breka Orc Prefect
 		24416, // Breka Orc Scout Captain
@@ -180,16 +174,22 @@ public class Q10507_ObtainingNewPower extends Quest
 		24415, // Breka Orc Scout
 		24417, // Breka Orc Archer
 		24418, // Breka Orc Shaman
-		// Sel Mahum Training Grounds
-		24492, // Sel Mahum Soldier
-		24494, // Sel Mahum Warrior
-		24493, // Sel Mahum Squad Leader
-		24495, // Keltron
 		// Plains of the Lizardmen
 		24496, // Tanta Lizardman Warrior
 		24498, // Tanta Lizardman Wizard
 		24499, // Priest Ugoros
 		24497, // Tanta Lizardman Archer
+		// Varka Silenos Barracks
+		24636, // Varka Silenos Magus
+		24637, // Varka Silenos Shaman
+		24638, // Varka Silenos Footman
+		24639, // Varka Silenos Sergeant
+		24640, // Varka Silenos Officer
+		// Sel Mahum Training Grounds
+		24492, // Sel Mahum Soldier
+		24494, // Sel Mahum Warrior
+		24493, // Sel Mahum Squad Leader
+		24495, // Keltron
 		// Fields of Massacre
 		24486, // Dismal Pole
 		24487, // Graveyard Predator
@@ -197,13 +197,6 @@ public class Q10507_ObtainingNewPower extends Quest
 		24491, // Doom Knight
 		24490, // Doom Soldier
 		24488, // Doom Archer
-		// Wall of Argos
-		24606, // Captive Antelope
-		24607, // Captive Bandersnatch
-		24608, // Captive Buffalo
-		24609, // Captive Grendel
-		24610, // Eye of Watchman
-		24611, // Elder Homunculus
 		// Sea Of Spores
 		24226, // Aranea
 		24227, // Keros
@@ -216,6 +209,13 @@ public class Q10507_ObtainingNewPower extends Quest
 		24236, // Tergus
 		24237, // Skeletus
 		24238, // Atrofine
+		// Wall of Argos
+		24606, // Captive Antelope
+		24607, // Captive Bandersnatch
+		24608, // Captive Buffalo
+		24609, // Captive Grendel
+		24610, // Eye of Watchman
+		24611, // Elder Homunculus
 		// Wasteland
 		24501, // Centaur Fighter
 		24504, // Centaur Warlord
@@ -223,6 +223,15 @@ public class Q10507_ObtainingNewPower extends Quest
 		24503, // Centaur Wizard
 		24500, // Sand Golem
 		24502, // Centaur Marksman
+		// Beast Farm
+		24651, // Red Kookaburra
+		24652, // Blue Kookaburra
+		24653, // White Cougar
+		24654, // Cougar
+		24655, // Black Buffalo
+		24656, // White Buffalo
+		24657, // Grandel
+		24658, // Black Grandel
 		// Cemetery
 		19455, // Aden Raider
 		19456, // Te Ochdumann
@@ -239,22 +248,6 @@ public class Q10507_ObtainingNewPower extends Quest
 		23298, // Royal Quartermaster
 		23299, // Operations Chief of the 7th Division
 		23300, // Commander of Operations
-		// Fafurion Temple
-		24329, // Starving Water Dragon
-		24318, // Temple Guard Captain
-		24325, // Temple Wizard
-		24324, // Temple Guardian Warrior
-		24326, // Temple Guardian Wizard
-		24323, // Temple Guard
-		24321, // Temple Patrol Guard
-		24322, // Temple Knight Recruit
-		// Dragon Valley
-		24480, // Dragon Legionnaire
-		24482, // Dragon Officer
-		24481, // Dragon Peltast
-		24483, // Dragon Centurion
-		24484, // Dragon Elite Guard
-		24485, // Behemoth Dragon
 		// Valley of Saints
 		24876, // Guide of Splendor
 		24877, // Herald of Splendor
@@ -268,15 +261,55 @@ public class Q10507_ObtainingNewPower extends Quest
 		24884, // Springs Dwarf Berserker
 		24885, // Springs Dwarf Priest
 		24886, // Springs Yeti
-		// Beast Farm
-		24651, // Red Kookaburra
-		24652, // Blue Kookaburra
-		24653, // White Cougar
-		24654, // Cougar
-		24655, // Black Buffalo
-		24656, // White Buffalo
-		24657, // Grandel
-		24658, // Black Grandel
+		// Cruma Marshlands
+		24930, // Black Demon Knight
+		24931, // Black Demon Warrior
+		24932, // Black Demon Scout
+		24933, // Black Demon Wizard
+		// Frozen Labyrinth
+		24934, // Frozen Soldier
+		24935, // Frozen Defender
+		24936, // Ice Knight
+		24937, // Glacier Golem
+		24938, // Ice Fairy
+		// Sel Mahum Base
+		24961, // Sel Mahum Footman
+		24962, // Sel Mahum Elite Soldier
+		24963, // Sel Mahum Shaman
+		24964, // Sel Mahum Wizard
+		// Fafurion Temple
+		24329, // Starving Water Dragon
+		24318, // Temple Guard Captain
+		24325, // Temple Wizard
+		24324, // Temple Guardian Warrior
+		24326, // Temple Guardian Wizard
+		24323, // Temple Guard
+		24321, // Temple Patrol Guard
+		24322, // Temple Knight Recruit
+		// Dragon Valley West
+		24664, // Graveyard Death Lich
+		24665, // Graveyard Death Berserker
+		24666, // Graveyard Death Soldier
+		24667, // Graveyard Death Knight
+		// Dragon Valley East
+		24669, // Dragon Officer
+		24670, // Dragon Beast
+		24671, // Dragon Centurion
+		24672, // Elite Dragon Guard
+		// Shadow Of The Mother Tree
+		24965, // Creeper Rampike
+		24966, // Fila Aprias
+		24967, // Flush Teasle
+		24968, // Treant Blossom
+		24969, // Arsos Butterfly
+		// Execution Grounds
+		24673, // Zombie Orc
+		24674, // Zombie Dark Elf
+		24675, // Zombie Dwarf
+		24676, // Schnabel Stalker
+		24677, // Henker Hacker
+		24678, // Schnabel Doctor
+		24679, // Henker Anatomist
 	};
 	
 	public Q10507_ObtainingNewPower()
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10510_PowerHarmony/Q10510_PowerHarmony.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10510_PowerHarmony/Q10510_PowerHarmony.java
index 1e27244d37..5df473a147 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10510_PowerHarmony/Q10510_PowerHarmony.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10510_PowerHarmony/Q10510_PowerHarmony.java
@@ -170,12 +170,6 @@ public class Q10510_PowerHarmony extends Quest
 		24633, // Ketra Orc Warrior
 		24634, // Ketra Orc Lieutenant
 		24635, // Ketra Orc Battalion Commander
-		// Varka Silenos Barracks
-		24636, // Varka Silenos Magus
-		24637, // Varka Silenos Shaman
-		24638, // Varka Silenos Footman
-		24639, // Varka Silenos Sergeant
-		24640, // Varka Silenos Officer
 		// Breka's Stronghold
 		24420, // Breka Orc Prefect
 		24416, // Breka Orc Scout Captain
@@ -183,16 +177,22 @@ public class Q10510_PowerHarmony extends Quest
 		24415, // Breka Orc Scout
 		24417, // Breka Orc Archer
 		24418, // Breka Orc Shaman
-		// Sel Mahum Training Grounds
-		24492, // Sel Mahum Soldier
-		24494, // Sel Mahum Warrior
-		24493, // Sel Mahum Squad Leader
-		24495, // Keltron
 		// Plains of the Lizardmen
 		24496, // Tanta Lizardman Warrior
 		24498, // Tanta Lizardman Wizard
 		24499, // Priest Ugoros
 		24497, // Tanta Lizardman Archer
+		// Varka Silenos Barracks
+		24636, // Varka Silenos Magus
+		24637, // Varka Silenos Shaman
+		24638, // Varka Silenos Footman
+		24639, // Varka Silenos Sergeant
+		24640, // Varka Silenos Officer
+		// Sel Mahum Training Grounds
+		24492, // Sel Mahum Soldier
+		24494, // Sel Mahum Warrior
+		24493, // Sel Mahum Squad Leader
+		24495, // Keltron
 		// Fields of Massacre
 		24486, // Dismal Pole
 		24487, // Graveyard Predator
@@ -200,13 +200,6 @@ public class Q10510_PowerHarmony extends Quest
 		24491, // Doom Knight
 		24490, // Doom Soldier
 		24488, // Doom Archer
-		// Wall of Argos
-		24606, // Captive Antelope
-		24607, // Captive Bandersnatch
-		24608, // Captive Buffalo
-		24609, // Captive Grendel
-		24610, // Eye of Watchman
-		24611, // Elder Homunculus
 		// Sea Of Spores
 		24226, // Aranea
 		24227, // Keros
@@ -219,6 +212,13 @@ public class Q10510_PowerHarmony extends Quest
 		24236, // Tergus
 		24237, // Skeletus
 		24238, // Atrofine
+		// Wall of Argos
+		24606, // Captive Antelope
+		24607, // Captive Bandersnatch
+		24608, // Captive Buffalo
+		24609, // Captive Grendel
+		24610, // Eye of Watchman
+		24611, // Elder Homunculus
 		// Wasteland
 		24501, // Centaur Fighter
 		24504, // Centaur Warlord
@@ -226,6 +226,15 @@ public class Q10510_PowerHarmony extends Quest
 		24503, // Centaur Wizard
 		24500, // Sand Golem
 		24502, // Centaur Marksman
+		// Beast Farm
+		24651, // Red Kookaburra
+		24652, // Blue Kookaburra
+		24653, // White Cougar
+		24654, // Cougar
+		24655, // Black Buffalo
+		24656, // White Buffalo
+		24657, // Grandel
+		24658, // Black Grandel
 		// Cemetery
 		19455, // Aden Raider
 		19456, // Te Ochdumann
@@ -242,22 +251,6 @@ public class Q10510_PowerHarmony extends Quest
 		23298, // Royal Quartermaster
 		23299, // Operations Chief of the 7th Division
 		23300, // Commander of Operations
-		// Fafurion Temple
-		24329, // Starving Water Dragon
-		24318, // Temple Guard Captain
-		24325, // Temple Wizard
-		24324, // Temple Guardian Warrior
-		24326, // Temple Guardian Wizard
-		24323, // Temple Guard
-		24321, // Temple Patrol Guard
-		24322, // Temple Knight Recruit
-		// Dragon Valley
-		24480, // Dragon Legionnaire
-		24482, // Dragon Officer
-		24481, // Dragon Peltast
-		24483, // Dragon Centurion
-		24484, // Dragon Elite Guard
-		24485, // Behemoth Dragon
 		// Valley of Saints
 		24876, // Guide of Splendor
 		24877, // Herald of Splendor
@@ -271,15 +264,55 @@ public class Q10510_PowerHarmony extends Quest
 		24884, // Springs Dwarf Berserker
 		24885, // Springs Dwarf Priest
 		24886, // Springs Yeti
-		// Beast Farm
-		24651, // Red Kookaburra
-		24652, // Blue Kookaburra
-		24653, // White Cougar
-		24654, // Cougar
-		24655, // Black Buffalo
-		24656, // White Buffalo
-		24657, // Grandel
-		24658, // Black Grandel
+		// Cruma Marshlands
+		24930, // Black Demon Knight
+		24931, // Black Demon Warrior
+		24932, // Black Demon Scout
+		24933, // Black Demon Wizard
+		// Frozen Labyrinth
+		24934, // Frozen Soldier
+		24935, // Frozen Defender
+		24936, // Ice Knight
+		24937, // Glacier Golem
+		24938, // Ice Fairy
+		// Sel Mahum Base
+		24961, // Sel Mahum Footman
+		24962, // Sel Mahum Elite Soldier
+		24963, // Sel Mahum Shaman
+		24964, // Sel Mahum Wizard
+		// Fafurion Temple
+		24329, // Starving Water Dragon
+		24318, // Temple Guard Captain
+		24325, // Temple Wizard
+		24324, // Temple Guardian Warrior
+		24326, // Temple Guardian Wizard
+		24323, // Temple Guard
+		24321, // Temple Patrol Guard
+		24322, // Temple Knight Recruit
+		// Dragon Valley West
+		24664, // Graveyard Death Lich
+		24665, // Graveyard Death Berserker
+		24666, // Graveyard Death Soldier
+		24667, // Graveyard Death Knight
+		// Dragon Valley East
+		24669, // Dragon Officer
+		24670, // Dragon Beast
+		24671, // Dragon Centurion
+		24672, // Elite Dragon Guard
+		// Shadow Of The Mother Tree
+		24965, // Creeper Rampike
+		24966, // Fila Aprias
+		24967, // Flush Teasle
+		24968, // Treant Blossom
+		24969, // Arsos Butterfly
+		// Execution Grounds
+		24673, // Zombie Orc
+		24674, // Zombie Dark Elf
+		24675, // Zombie Dwarf
+		24676, // Schnabel Stalker
+		24677, // Henker Hacker
+		24678, // Schnabel Doctor
+		24679, // Henker Anatomist
 	};
 	
 	public Q10510_PowerHarmony()
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
index 7544706976..7b4c393fd0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java
@@ -25,6 +25,9 @@ import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.EventType;
+import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBecomeNoblesse;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.quest.Quest;
@@ -209,6 +212,7 @@ public class Q10591_NobleMaterial extends Quest
 					giveItems(player, WARRIOR_CICLET_BOX_LV5, 1);
 					basicRewards(player);
 					player.setNobleLevel(1);
+					checkNobleListener(player);
 					player.broadcastInfo();
 					showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_S1_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
 					player.doCast(NOBLESSE_PRESENTATION.getSkill());
@@ -225,6 +229,7 @@ public class Q10591_NobleMaterial extends Quest
 					giveItems(player, WIZARD_CICLET_BOX_LV5, 1);
 					basicRewards(player);
 					player.setNobleLevel(1);
+					checkNobleListener(player);
 					player.broadcastInfo();
 					showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_S1_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
 					player.doCast(NOBLESSE_PRESENTATION.getSkill());
@@ -241,6 +246,7 @@ public class Q10591_NobleMaterial extends Quest
 					giveItems(player, KNIGHT_CICLET_BOX_LV5, 1);
 					basicRewards(player);
 					player.setNobleLevel(1);
+					checkNobleListener(player);
 					player.broadcastInfo();
 					showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_S1_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
 					player.doCast(NOBLESSE_PRESENTATION.getSkill());
@@ -573,4 +579,13 @@ public class Q10591_NobleMaterial extends Quest
 			}
 		}
 	}
+	
+	private void checkNobleListener(Player player)
+	{
+		// Notify to scripts.
+		if (EventDispatcher.getInstance().hasListener(EventType.ON_PLAYER_BECOME_NOBLESSE))
+		{
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerBecomeNoblesse(player));
+		}
+	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
index 2aa6629636..119b9fdae5 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java
@@ -163,12 +163,6 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 		24633, // Ketra Orc Warrior
 		24634, // Ketra Orc Lieutenant
 		24635, // Ketra Orc Battalion Commander
-		// Varka Silenos Barracks
-		24636, // Varka Silenos Magus
-		24637, // Varka Silenos Shaman
-		24638, // Varka Silenos Footman
-		24639, // Varka Silenos Sergeant
-		24640, // Varka Silenos Officer
 		// Breka's Stronghold
 		24420, // Breka Orc Prefect
 		24416, // Breka Orc Scout Captain
@@ -176,16 +170,22 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 		24415, // Breka Orc Scout
 		24417, // Breka Orc Archer
 		24418, // Breka Orc Shaman
-		// Sel Mahum Training Grounds
-		24492, // Sel Mahum Soldier
-		24494, // Sel Mahum Warrior
-		24493, // Sel Mahum Squad Leader
-		24495, // Keltron
 		// Plains of the Lizardmen
 		24496, // Tanta Lizardman Warrior
 		24498, // Tanta Lizardman Wizard
 		24499, // Priest Ugoros
 		24497, // Tanta Lizardman Archer
+		// Varka Silenos Barracks
+		24636, // Varka Silenos Magus
+		24637, // Varka Silenos Shaman
+		24638, // Varka Silenos Footman
+		24639, // Varka Silenos Sergeant
+		24640, // Varka Silenos Officer
+		// Sel Mahum Training Grounds
+		24492, // Sel Mahum Soldier
+		24494, // Sel Mahum Warrior
+		24493, // Sel Mahum Squad Leader
+		24495, // Keltron
 		// Fields of Massacre
 		24486, // Dismal Pole
 		24487, // Graveyard Predator
@@ -193,13 +193,6 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 		24491, // Doom Knight
 		24490, // Doom Soldier
 		24488, // Doom Archer
-		// Wall of Argos
-		24606, // Captive Antelope
-		24607, // Captive Bandersnatch
-		24608, // Captive Buffalo
-		24609, // Captive Grendel
-		24610, // Eye of Watchman
-		24611, // Elder Homunculus
 		// Sea Of Spores
 		24226, // Aranea
 		24227, // Keros
@@ -212,6 +205,13 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 		24236, // Tergus
 		24237, // Skeletus
 		24238, // Atrofine
+		// Wall of Argos
+		24606, // Captive Antelope
+		24607, // Captive Bandersnatch
+		24608, // Captive Buffalo
+		24609, // Captive Grendel
+		24610, // Eye of Watchman
+		24611, // Elder Homunculus
 		// Wasteland
 		24501, // Centaur Fighter
 		24504, // Centaur Warlord
@@ -219,6 +219,15 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 		24503, // Centaur Wizard
 		24500, // Sand Golem
 		24502, // Centaur Marksman
+		// Beast Farm
+		24651, // Red Kookaburra
+		24652, // Blue Kookaburra
+		24653, // White Cougar
+		24654, // Cougar
+		24655, // Black Buffalo
+		24656, // White Buffalo
+		24657, // Grandel
+		24658, // Black Grandel
 		// Cemetery
 		19455, // Aden Raider
 		19456, // Te Ochdumann
@@ -235,20 +244,6 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 		23298, // Royal Quartermaster
 		23299, // Operations Chief of the 7th Division
 		23300, // Commander of Operations
-		// Fafurion Temple
-		24329, // Starving Water Dragon
-		24318, // Temple Guard Captain
-		24325, // Temple Wizard
-		24324, // Temple Guardian Warrior
-		24326, // Temple Guardian Wizard
-		24323, // Temple Guard
-		24321, // Temple Patrol Guard
-		24322, // Temple Knight Recruit
-		// Dragon Valley
-		24617, // Dragon Peltast
-		24618, // Dragon Officer
-		24619, // Behemoth Dragon
-		24620, // Soul Hunter
 		// Valley of Saints
 		24876, // Guide of Splendor
 		24877, // Herald of Splendor
@@ -262,15 +257,55 @@ public class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
 		24884, // Springs Dwarf Berserker
 		24885, // Springs Dwarf Priest
 		24886, // Springs Yeti
-		// Beast Farm
-		24651, // Red Kookaburra
-		24652, // Blue Kookaburra
-		24653, // White Cougar
-		24654, // Cougar
-		24655, // Black Buffalo
-		24656, // White Buffalo
-		24657, // Grandel
-		24658, // Black Grandel
+		// Cruma Marshlands
+		24930, // Black Demon Knight
+		24931, // Black Demon Warrior
+		24932, // Black Demon Scout
+		24933, // Black Demon Wizard
+		// Frozen Labyrinth
+		24934, // Frozen Soldier
+		24935, // Frozen Defender
+		24936, // Ice Knight
+		24937, // Glacier Golem
+		24938, // Ice Fairy
+		// Sel Mahum Base
+		24961, // Sel Mahum Footman
+		24962, // Sel Mahum Elite Soldier
+		24963, // Sel Mahum Shaman
+		24964, // Sel Mahum Wizard
+		// Fafurion Temple
+		24329, // Starving Water Dragon
+		24318, // Temple Guard Captain
+		24325, // Temple Wizard
+		24324, // Temple Guardian Warrior
+		24326, // Temple Guardian Wizard
+		24323, // Temple Guard
+		24321, // Temple Patrol Guard
+		24322, // Temple Knight Recruit
+		// Dragon Valley West
+		24664, // Graveyard Death Lich
+		24665, // Graveyard Death Berserker
+		24666, // Graveyard Death Soldier
+		24667, // Graveyard Death Knight
+		// Dragon Valley East
+		24669, // Dragon Officer
+		24670, // Dragon Beast
+		24671, // Dragon Centurion
+		24672, // Elite Dragon Guard
+		// Shadow Of The Mother Tree
+		24965, // Creeper Rampike
+		24966, // Fila Aprias
+		24967, // Flush Teasle
+		24968, // Treant Blossom
+		24969, // Arsos Butterfly
+		// Execution Grounds
+		24673, // Zombie Orc
+		24674, // Zombie Dark Elf
+		24675, // Zombie Dwarf
+		24676, // Schnabel Stalker
+		24677, // Henker Hacker
+		24678, // Schnabel Doctor
+		24679, // Henker Anatomist
 	};
 	
 	public Q10811_ExaltedOneWhoFacesTheLimit()
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
index 4639462ada..056a84b2ba 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java
@@ -167,12 +167,6 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 		24633, // Ketra Orc Warrior
 		24634, // Ketra Orc Lieutenant
 		24635, // Ketra Orc Battalion Commander
-		// Varka Silenos Barracks
-		24636, // Varka Silenos Magus
-		24637, // Varka Silenos Shaman
-		24638, // Varka Silenos Footman
-		24639, // Varka Silenos Sergeant
-		24640, // Varka Silenos Officer
 		// Breka's Stronghold
 		24420, // Breka Orc Prefect
 		24416, // Breka Orc Scout Captain
@@ -180,16 +174,22 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 		24415, // Breka Orc Scout
 		24417, // Breka Orc Archer
 		24418, // Breka Orc Shaman
-		// Sel Mahum Training Grounds
-		24492, // Sel Mahum Soldier
-		24494, // Sel Mahum Warrior
-		24493, // Sel Mahum Squad Leader
-		24495, // Keltron
 		// Plains of the Lizardmen
 		24496, // Tanta Lizardman Warrior
 		24498, // Tanta Lizardman Wizard
 		24499, // Priest Ugoros
 		24497, // Tanta Lizardman Archer
+		// Varka Silenos Barracks
+		24636, // Varka Silenos Magus
+		24637, // Varka Silenos Shaman
+		24638, // Varka Silenos Footman
+		24639, // Varka Silenos Sergeant
+		24640, // Varka Silenos Officer
+		// Sel Mahum Training Grounds
+		24492, // Sel Mahum Soldier
+		24494, // Sel Mahum Warrior
+		24493, // Sel Mahum Squad Leader
+		24495, // Keltron
 		// Fields of Massacre
 		24486, // Dismal Pole
 		24487, // Graveyard Predator
@@ -197,13 +197,6 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 		24491, // Doom Knight
 		24490, // Doom Soldier
 		24488, // Doom Archer
-		// Wall of Argos
-		24606, // Captive Antelope
-		24607, // Captive Bandersnatch
-		24608, // Captive Buffalo
-		24609, // Captive Grendel
-		24610, // Eye of Watchman
-		24611, // Elder Homunculus
 		// Sea Of Spores
 		24226, // Aranea
 		24227, // Keros
@@ -216,6 +209,13 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 		24236, // Tergus
 		24237, // Skeletus
 		24238, // Atrofine
+		// Wall of Argos
+		24606, // Captive Antelope
+		24607, // Captive Bandersnatch
+		24608, // Captive Buffalo
+		24609, // Captive Grendel
+		24610, // Eye of Watchman
+		24611, // Elder Homunculus
 		// Wasteland
 		24501, // Centaur Fighter
 		24504, // Centaur Warlord
@@ -223,6 +223,15 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 		24503, // Centaur Wizard
 		24500, // Sand Golem
 		24502, // Centaur Marksman
+		// Beast Farm
+		24651, // Red Kookaburra
+		24652, // Blue Kookaburra
+		24653, // White Cougar
+		24654, // Cougar
+		24655, // Black Buffalo
+		24656, // White Buffalo
+		24657, // Grandel
+		24658, // Black Grandel
 		// Cemetery
 		19455, // Aden Raider
 		19456, // Te Ochdumann
@@ -239,20 +248,6 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 		23298, // Royal Quartermaster
 		23299, // Operations Chief of the 7th Division
 		23300, // Commander of Operations
-		// Fafurion Temple
-		24329, // Starving Water Dragon
-		24318, // Temple Guard Captain
-		24325, // Temple Wizard
-		24324, // Temple Guardian Warrior
-		24326, // Temple Guardian Wizard
-		24323, // Temple Guard
-		24321, // Temple Patrol Guard
-		24322, // Temple Knight Recruit
-		// Dragon Valley
-		24617, // Dragon Peltast
-		24618, // Dragon Officer
-		24619, // Behemoth Dragon
-		24620, // Soul Hunter
 		// Valley of Saints
 		24876, // Guide of Splendor
 		24877, // Herald of Splendor
@@ -266,15 +261,55 @@ public class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest
 		24884, // Springs Dwarf Berserker
 		24885, // Springs Dwarf Priest
 		24886, // Springs Yeti
-		// Beast Farm
-		24651, // Red Kookaburra
-		24652, // Blue Kookaburra
-		24653, // White Cougar
-		24654, // Cougar
-		24655, // Black Buffalo
-		24656, // White Buffalo
-		24657, // Grandel
-		24658, // Black Grandel
+		// Cruma Marshlands
+		24930, // Black Demon Knight
+		24931, // Black Demon Warrior
+		24932, // Black Demon Scout
+		24933, // Black Demon Wizard
+		// Frozen Labyrinth
+		24934, // Frozen Soldier
+		24935, // Frozen Defender
+		24936, // Ice Knight
+		24937, // Glacier Golem
+		24938, // Ice Fairy
+		// Sel Mahum Base
+		24961, // Sel Mahum Footman
+		24962, // Sel Mahum Elite Soldier
+		24963, // Sel Mahum Shaman
+		24964, // Sel Mahum Wizard
+		// Fafurion Temple
+		24329, // Starving Water Dragon
+		24318, // Temple Guard Captain
+		24325, // Temple Wizard
+		24324, // Temple Guardian Warrior
+		24326, // Temple Guardian Wizard
+		24323, // Temple Guard
+		24321, // Temple Patrol Guard
+		24322, // Temple Knight Recruit
+		// Dragon Valley West
+		24664, // Graveyard Death Lich
+		24665, // Graveyard Death Berserker
+		24666, // Graveyard Death Soldier
+		24667, // Graveyard Death Knight
+		// Dragon Valley East
+		24669, // Dragon Officer
+		24670, // Dragon Beast
+		24671, // Dragon Centurion
+		24672, // Elite Dragon Guard
+		// Shadow Of The Mother Tree
+		24965, // Creeper Rampike
+		24966, // Fila Aprias
+		24967, // Flush Teasle
+		24968, // Treant Blossom
+		24969, // Arsos Butterfly
+		// Execution Grounds
+		24673, // Zombie Orc
+		24674, // Zombie Dark Elf
+		24675, // Zombie Dwarf
+		24676, // Schnabel Stalker
+		24677, // Henker Hacker
+		24678, // Schnabel Doctor
+		24679, // Henker Anatomist
 	};
 	
 	public Q10817_ExaltedOneWhoOvercomesTheLimit()
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
index c5079a74f1..7f7838492a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java
@@ -174,12 +174,6 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 		24633, // Ketra Orc Warrior
 		24634, // Ketra Orc Lieutenant
 		24635, // Ketra Orc Battalion Commander
-		// Varka Silenos Barracks
-		24636, // Varka Silenos Magus
-		24637, // Varka Silenos Shaman
-		24638, // Varka Silenos Footman
-		24639, // Varka Silenos Sergeant
-		24640, // Varka Silenos Officer
 		// Breka's Stronghold
 		24420, // Breka Orc Prefect
 		24416, // Breka Orc Scout Captain
@@ -187,16 +181,22 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 		24415, // Breka Orc Scout
 		24417, // Breka Orc Archer
 		24418, // Breka Orc Shaman
-		// Sel Mahum Training Grounds
-		24492, // Sel Mahum Soldier
-		24494, // Sel Mahum Warrior
-		24493, // Sel Mahum Squad Leader
-		24495, // Keltron
 		// Plains of the Lizardmen
 		24496, // Tanta Lizardman Warrior
 		24498, // Tanta Lizardman Wizard
 		24499, // Priest Ugoros
 		24497, // Tanta Lizardman Archer
+		// Varka Silenos Barracks
+		24636, // Varka Silenos Magus
+		24637, // Varka Silenos Shaman
+		24638, // Varka Silenos Footman
+		24639, // Varka Silenos Sergeant
+		24640, // Varka Silenos Officer
+		// Sel Mahum Training Grounds
+		24492, // Sel Mahum Soldier
+		24494, // Sel Mahum Warrior
+		24493, // Sel Mahum Squad Leader
+		24495, // Keltron
 		// Fields of Massacre
 		24486, // Dismal Pole
 		24487, // Graveyard Predator
@@ -204,13 +204,6 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 		24491, // Doom Knight
 		24490, // Doom Soldier
 		24488, // Doom Archer
-		// Wall of Argos
-		24606, // Captive Antelope
-		24607, // Captive Bandersnatch
-		24608, // Captive Buffalo
-		24609, // Captive Grendel
-		24610, // Eye of Watchman
-		24611, // Elder Homunculus
 		// Sea Of Spores
 		24226, // Aranea
 		24227, // Keros
@@ -223,6 +216,13 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 		24236, // Tergus
 		24237, // Skeletus
 		24238, // Atrofine
+		// Wall of Argos
+		24606, // Captive Antelope
+		24607, // Captive Bandersnatch
+		24608, // Captive Buffalo
+		24609, // Captive Grendel
+		24610, // Eye of Watchman
+		24611, // Elder Homunculus
 		// Wasteland
 		24501, // Centaur Fighter
 		24504, // Centaur Warlord
@@ -230,6 +230,15 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 		24503, // Centaur Wizard
 		24500, // Sand Golem
 		24502, // Centaur Marksman
+		// Beast Farm
+		24651, // Red Kookaburra
+		24652, // Blue Kookaburra
+		24653, // White Cougar
+		24654, // Cougar
+		24655, // Black Buffalo
+		24656, // White Buffalo
+		24657, // Grandel
+		24658, // Black Grandel
 		// Cemetery
 		19455, // Aden Raider
 		19456, // Te Ochdumann
@@ -246,20 +255,6 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 		23298, // Royal Quartermaster
 		23299, // Operations Chief of the 7th Division
 		23300, // Commander of Operations
-		// Fafurion Temple
-		24329, // Starving Water Dragon
-		24318, // Temple Guard Captain
-		24325, // Temple Wizard
-		24324, // Temple Guardian Warrior
-		24326, // Temple Guardian Wizard
-		24323, // Temple Guard
-		24321, // Temple Patrol Guard
-		24322, // Temple Knight Recruit
-		// Dragon Valley
-		24617, // Dragon Peltast
-		24618, // Dragon Officer
-		24619, // Behemoth Dragon
-		24620, // Soul Hunter
 		// Valley of Saints
 		24876, // Guide of Splendor
 		24877, // Herald of Splendor
@@ -273,15 +268,55 @@ public class Q10823_ExaltedOneWhoShattersTheLimit extends Quest
 		24884, // Springs Dwarf Berserker
 		24885, // Springs Dwarf Priest
 		24886, // Springs Yeti
-		// Beast Farm
-		24651, // Red Kookaburra
-		24652, // Blue Kookaburra
-		24653, // White Cougar
-		24654, // Cougar
-		24655, // Black Buffalo
-		24656, // White Buffalo
-		24657, // Grandel
-		24658, // Black Grandel
+		// Cruma Marshlands
+		24930, // Black Demon Knight
+		24931, // Black Demon Warrior
+		24932, // Black Demon Scout
+		24933, // Black Demon Wizard
+		// Frozen Labyrinth
+		24934, // Frozen Soldier
+		24935, // Frozen Defender
+		24936, // Ice Knight
+		24937, // Glacier Golem
+		24938, // Ice Fairy
+		// Sel Mahum Base
+		24961, // Sel Mahum Footman
+		24962, // Sel Mahum Elite Soldier
+		24963, // Sel Mahum Shaman
+		24964, // Sel Mahum Wizard
+		// Fafurion Temple
+		24329, // Starving Water Dragon
+		24318, // Temple Guard Captain
+		24325, // Temple Wizard
+		24324, // Temple Guardian Warrior
+		24326, // Temple Guardian Wizard
+		24323, // Temple Guard
+		24321, // Temple Patrol Guard
+		24322, // Temple Knight Recruit
+		// Dragon Valley West
+		24664, // Graveyard Death Lich
+		24665, // Graveyard Death Berserker
+		24666, // Graveyard Death Soldier
+		24667, // Graveyard Death Knight
+		// Dragon Valley East
+		24669, // Dragon Officer
+		24670, // Dragon Beast
+		24671, // Dragon Centurion
+		24672, // Elite Dragon Guard
+		// Shadow Of The Mother Tree
+		24965, // Creeper Rampike
+		24966, // Fila Aprias
+		24967, // Flush Teasle
+		24968, // Treant Blossom
+		24969, // Arsos Butterfly
+		// Execution Grounds
+		24673, // Zombie Orc
+		24674, // Zombie Dark Elf
+		24675, // Zombie Dwarf
+		24676, // Schnabel Stalker
+		24677, // Henker Hacker
+		24678, // Schnabel Doctor
+		24679, // Henker Anatomist
 	};
 	
 	public Q10823_ExaltedOneWhoShattersTheLimit()
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
index 8f46d43003..3c06ec65b3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10873_ExaltedReachingAnotherLevel/Q10873_ExaltedReachingAnotherLevel.java
@@ -166,12 +166,6 @@ public class Q10873_ExaltedReachingAnotherLevel extends Quest
 		24633, // Ketra Orc Warrior
 		24634, // Ketra Orc Lieutenant
 		24635, // Ketra Orc Battalion Commander
-		// Varka Silenos Barracks
-		24636, // Varka Silenos Magus
-		24637, // Varka Silenos Shaman
-		24638, // Varka Silenos Footman
-		24639, // Varka Silenos Sergeant
-		24640, // Varka Silenos Officer
 		// Breka's Stronghold
 		24420, // Breka Orc Prefect
 		24416, // Breka Orc Scout Captain
@@ -179,16 +173,22 @@ public class Q10873_ExaltedReachingAnotherLevel extends Quest
 		24415, // Breka Orc Scout
 		24417, // Breka Orc Archer
 		24418, // Breka Orc Shaman
-		// Sel Mahum Training Grounds
-		24492, // Sel Mahum Soldier
-		24494, // Sel Mahum Warrior
-		24493, // Sel Mahum Squad Leader
-		24495, // Keltron
 		// Plains of the Lizardmen
 		24496, // Tanta Lizardman Warrior
 		24498, // Tanta Lizardman Wizard
 		24499, // Priest Ugoros
 		24497, // Tanta Lizardman Archer
+		// Varka Silenos Barracks
+		24636, // Varka Silenos Magus
+		24637, // Varka Silenos Shaman
+		24638, // Varka Silenos Footman
+		24639, // Varka Silenos Sergeant
+		24640, // Varka Silenos Officer
+		// Sel Mahum Training Grounds
+		24492, // Sel Mahum Soldier
+		24494, // Sel Mahum Warrior
+		24493, // Sel Mahum Squad Leader
+		24495, // Keltron
 		// Fields of Massacre
 		24486, // Dismal Pole
 		24487, // Graveyard Predator
@@ -196,13 +196,6 @@ public class Q10873_ExaltedReachingAnotherLevel extends Quest
 		24491, // Doom Knight
 		24490, // Doom Soldier
 		24488, // Doom Archer
-		// Wall of Argos
-		24606, // Captive Antelope
-		24607, // Captive Bandersnatch
-		24608, // Captive Buffalo
-		24609, // Captive Grendel
-		24610, // Eye of Watchman
-		24611, // Elder Homunculus
 		// Sea Of Spores
 		24226, // Aranea
 		24227, // Keros
@@ -215,6 +208,13 @@ public class Q10873_ExaltedReachingAnotherLevel extends Quest
 		24236, // Tergus
 		24237, // Skeletus
 		24238, // Atrofine
+		// Wall of Argos
+		24606, // Captive Antelope
+		24607, // Captive Bandersnatch
+		24608, // Captive Buffalo
+		24609, // Captive Grendel
+		24610, // Eye of Watchman
+		24611, // Elder Homunculus
 		// Wasteland
 		24501, // Centaur Fighter
 		24504, // Centaur Warlord
@@ -222,6 +222,15 @@ public class Q10873_ExaltedReachingAnotherLevel extends Quest
 		24503, // Centaur Wizard
 		24500, // Sand Golem
 		24502, // Centaur Marksman
+		// Beast Farm
+		24651, // Red Kookaburra
+		24652, // Blue Kookaburra
+		24653, // White Cougar
+		24654, // Cougar
+		24655, // Black Buffalo
+		24656, // White Buffalo
+		24657, // Grandel
+		24658, // Black Grandel
 		// Cemetery
 		19455, // Aden Raider
 		19456, // Te Ochdumann
@@ -238,20 +247,6 @@ public class Q10873_ExaltedReachingAnotherLevel extends Quest
 		23298, // Royal Quartermaster
 		23299, // Operations Chief of the 7th Division
 		23300, // Commander of Operations
-		// Fafurion Temple
-		24329, // Starving Water Dragon
-		24318, // Temple Guard Captain
-		24325, // Temple Wizard
-		24324, // Temple Guardian Warrior
-		24326, // Temple Guardian Wizard
-		24323, // Temple Guard
-		24321, // Temple Patrol Guard
-		24322, // Temple Knight Recruit
-		// Dragon Valley
-		24617, // Dragon Peltast
-		24618, // Dragon Officer
-		24619, // Behemoth Dragon
-		24620, // Soul Hunter
 		// Valley of Saints
 		24876, // Guide of Splendor
 		24877, // Herald of Splendor
@@ -265,15 +260,55 @@ public class Q10873_ExaltedReachingAnotherLevel extends Quest
 		24884, // Springs Dwarf Berserker
 		24885, // Springs Dwarf Priest
 		24886, // Springs Yeti
-		// Beast Farm
-		24651, // Red Kookaburra
-		24652, // Blue Kookaburra
-		24653, // White Cougar
-		24654, // Cougar
-		24655, // Black Buffalo
-		24656, // White Buffalo
-		24657, // Grandel
-		24658, // Black Grandel
+		// Cruma Marshlands
+		24930, // Black Demon Knight
+		24931, // Black Demon Warrior
+		24932, // Black Demon Scout
+		24933, // Black Demon Wizard
+		// Frozen Labyrinth
+		24934, // Frozen Soldier
+		24935, // Frozen Defender
+		24936, // Ice Knight
+		24937, // Glacier Golem
+		24938, // Ice Fairy
+		// Sel Mahum Base
+		24961, // Sel Mahum Footman
+		24962, // Sel Mahum Elite Soldier
+		24963, // Sel Mahum Shaman
+		24964, // Sel Mahum Wizard
+		// Fafurion Temple
+		24329, // Starving Water Dragon
+		24318, // Temple Guard Captain
+		24325, // Temple Wizard
+		24324, // Temple Guardian Warrior
+		24326, // Temple Guardian Wizard
+		24323, // Temple Guard
+		24321, // Temple Patrol Guard
+		24322, // Temple Knight Recruit
+		// Dragon Valley West
+		24664, // Graveyard Death Lich
+		24665, // Graveyard Death Berserker
+		24666, // Graveyard Death Soldier
+		24667, // Graveyard Death Knight
+		// Dragon Valley East
+		24669, // Dragon Officer
+		24670, // Dragon Beast
+		24671, // Dragon Centurion
+		24672, // Elite Dragon Guard
+		// Shadow Of The Mother Tree
+		24965, // Creeper Rampike
+		24966, // Fila Aprias
+		24967, // Flush Teasle
+		24968, // Treant Blossom
+		24969, // Arsos Butterfly
+		// Execution Grounds
+		24673, // Zombie Orc
+		24674, // Zombie Dark Elf
+		24675, // Zombie Dwarf
+		24676, // Schnabel Stalker
+		24677, // Henker Hacker
+		24678, // Schnabel Doctor
+		24679, // Henker Anatomist
 	};
 	
 	public Q10873_ExaltedReachingAnotherLevel()
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
index fc55423e19..f04a9018bb 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10879_ExaltedGuideToPower/Q10879_ExaltedGuideToPower.java
@@ -166,12 +166,6 @@ public class Q10879_ExaltedGuideToPower extends Quest
 		24633, // Ketra Orc Warrior
 		24634, // Ketra Orc Lieutenant
 		24635, // Ketra Orc Battalion Commander
-		// Varka Silenos Barracks
-		24636, // Varka Silenos Magus
-		24637, // Varka Silenos Shaman
-		24638, // Varka Silenos Footman
-		24639, // Varka Silenos Sergeant
-		24640, // Varka Silenos Officer
 		// Breka's Stronghold
 		24420, // Breka Orc Prefect
 		24416, // Breka Orc Scout Captain
@@ -179,16 +173,22 @@ public class Q10879_ExaltedGuideToPower extends Quest
 		24415, // Breka Orc Scout
 		24417, // Breka Orc Archer
 		24418, // Breka Orc Shaman
-		// Sel Mahum Training Grounds
-		24492, // Sel Mahum Soldier
-		24494, // Sel Mahum Warrior
-		24493, // Sel Mahum Squad Leader
-		24495, // Keltron
 		// Plains of the Lizardmen
 		24496, // Tanta Lizardman Warrior
 		24498, // Tanta Lizardman Wizard
 		24499, // Priest Ugoros
 		24497, // Tanta Lizardman Archer
+		// Varka Silenos Barracks
+		24636, // Varka Silenos Magus
+		24637, // Varka Silenos Shaman
+		24638, // Varka Silenos Footman
+		24639, // Varka Silenos Sergeant
+		24640, // Varka Silenos Officer
+		// Sel Mahum Training Grounds
+		24492, // Sel Mahum Soldier
+		24494, // Sel Mahum Warrior
+		24493, // Sel Mahum Squad Leader
+		24495, // Keltron
 		// Fields of Massacre
 		24486, // Dismal Pole
 		24487, // Graveyard Predator
@@ -196,13 +196,6 @@ public class Q10879_ExaltedGuideToPower extends Quest
 		24491, // Doom Knight
 		24490, // Doom Soldier
 		24488, // Doom Archer
-		// Wall of Argos
-		24606, // Captive Antelope
-		24607, // Captive Bandersnatch
-		24608, // Captive Buffalo
-		24609, // Captive Grendel
-		24610, // Eye of Watchman
-		24611, // Elder Homunculus
 		// Sea Of Spores
 		24226, // Aranea
 		24227, // Keros
@@ -215,6 +208,13 @@ public class Q10879_ExaltedGuideToPower extends Quest
 		24236, // Tergus
 		24237, // Skeletus
 		24238, // Atrofine
+		// Wall of Argos
+		24606, // Captive Antelope
+		24607, // Captive Bandersnatch
+		24608, // Captive Buffalo
+		24609, // Captive Grendel
+		24610, // Eye of Watchman
+		24611, // Elder Homunculus
 		// Wasteland
 		24501, // Centaur Fighter
 		24504, // Centaur Warlord
@@ -222,6 +222,15 @@ public class Q10879_ExaltedGuideToPower extends Quest
 		24503, // Centaur Wizard
 		24500, // Sand Golem
 		24502, // Centaur Marksman
+		// Beast Farm
+		24651, // Red Kookaburra
+		24652, // Blue Kookaburra
+		24653, // White Cougar
+		24654, // Cougar
+		24655, // Black Buffalo
+		24656, // White Buffalo
+		24657, // Grandel
+		24658, // Black Grandel
 		// Cemetery
 		19455, // Aden Raider
 		19456, // Te Ochdumann
@@ -238,20 +247,6 @@ public class Q10879_ExaltedGuideToPower extends Quest
 		23298, // Royal Quartermaster
 		23299, // Operations Chief of the 7th Division
 		23300, // Commander of Operations
-		// Fafurion Temple
-		24329, // Starving Water Dragon
-		24318, // Temple Guard Captain
-		24325, // Temple Wizard
-		24324, // Temple Guardian Warrior
-		24326, // Temple Guardian Wizard
-		24323, // Temple Guard
-		24321, // Temple Patrol Guard
-		24322, // Temple Knight Recruit
-		// Dragon Valley
-		24617, // Dragon Peltast
-		24618, // Dragon Officer
-		24619, // Behemoth Dragon
-		24620, // Soul Hunter
 		// Valley of Saints
 		24876, // Guide of Splendor
 		24877, // Herald of Splendor
@@ -265,15 +260,55 @@ public class Q10879_ExaltedGuideToPower extends Quest
 		24884, // Springs Dwarf Berserker
 		24885, // Springs Dwarf Priest
 		24886, // Springs Yeti
-		// Beast Farm
-		24651, // Red Kookaburra
-		24652, // Blue Kookaburra
-		24653, // White Cougar
-		24654, // Cougar
-		24655, // Black Buffalo
-		24656, // White Buffalo
-		24657, // Grandel
-		24658, // Black Grandel
+		// Cruma Marshlands
+		24930, // Black Demon Knight
+		24931, // Black Demon Warrior
+		24932, // Black Demon Scout
+		24933, // Black Demon Wizard
+		// Frozen Labyrinth
+		24934, // Frozen Soldier
+		24935, // Frozen Defender
+		24936, // Ice Knight
+		24937, // Glacier Golem
+		24938, // Ice Fairy
+		// Sel Mahum Base
+		24961, // Sel Mahum Footman
+		24962, // Sel Mahum Elite Soldier
+		24963, // Sel Mahum Shaman
+		24964, // Sel Mahum Wizard
+		// Fafurion Temple
+		24329, // Starving Water Dragon
+		24318, // Temple Guard Captain
+		24325, // Temple Wizard
+		24324, // Temple Guardian Warrior
+		24326, // Temple Guardian Wizard
+		24323, // Temple Guard
+		24321, // Temple Patrol Guard
+		24322, // Temple Knight Recruit
+		// Dragon Valley West
+		24664, // Graveyard Death Lich
+		24665, // Graveyard Death Berserker
+		24666, // Graveyard Death Soldier
+		24667, // Graveyard Death Knight
+		// Dragon Valley East
+		24669, // Dragon Officer
+		24670, // Dragon Beast
+		24671, // Dragon Centurion
+		24672, // Elite Dragon Guard
+		// Shadow Of The Mother Tree
+		24965, // Creeper Rampike
+		24966, // Fila Aprias
+		24967, // Flush Teasle
+		24968, // Treant Blossom
+		24969, // Arsos Butterfly
+		// Execution Grounds
+		24673, // Zombie Orc
+		24674, // Zombie Dark Elf
+		24675, // Zombie Dwarf
+		24676, // Schnabel Stalker
+		24677, // Henker Hacker
+		24678, // Schnabel Doctor
+		24679, // Henker Anatomist
 	};
 	
 	public Q10879_ExaltedGuideToPower()
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-01.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-01.htm
index 6d2bd2036f..9a6b1c5b8b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-01.htm
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-01.htm
@@ -1,4 +1,6 @@
 <html><body>Verdure Elder Elikia:<br>
-Have you brought me the message from Leona Blackbird?
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-03.html">"Yes, here it is."</Button>
+Greetings! I've been expecting you for a while.<br>
+Leona asked me to tell you something.<br>
+I hope you are ready to hear me out and help.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-02.htm">"What has Leona asked you to tell?"</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.htm
new file mode 100644
index 0000000000..e7fc7b5818
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.htm
@@ -0,0 +1,6 @@
+<html><body>Verdure Elder Elikia:<br>
+I see you are ready. Now I'm going to tell you what Leona has told me.<br>
+In the last combat with Etis van Etina, Leona was badly wounded, so she had to train to recover her strength. Unfortunately, she had no time to complete the trainings because she received a message. It said about a dungeon of Atelia Fortress. Something connected to Etis van Etina was found there. That place was very odd and was called <font color="LEVEL">Atelia Refinery</font>.<br>
+Leona wanted to meet you personally, but there was an urgent business, so she asked me to see you and explain the situation. My mission is connected with that place.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-03.htm">Ask about Atelia Refinery</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.html
deleted file mode 100644
index aa6affb7f6..0000000000
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-02.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Verdure Elder Elikia:<br>
-I don't see any message from Leona Blackbird, make sure you bring that to me.
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.htm
new file mode 100644
index 0000000000..32f35f5524
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.htm
@@ -0,0 +1,6 @@
+<html><body>Verdure Elder Elikia:<br>
+We're assuming by the name that it's where Atelia is refined.<br>
+It's located at the underground of Atelia Fortress, so we didn't know about it until now.<br>
+I think Atelia refined from there is sent to the great temple where Etis van Etina is.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-04.html">"What has happened so far?"</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.html
deleted file mode 100644
index e1b7125a91..0000000000
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-03.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Verdure Elder Elikia:<br>
-Great! You have brought it, now let me read it.<br>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.htm
deleted file mode 100644
index ec59d1c19e..0000000000
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Verdure Elder Elikia:<br>
-I've read the message from Leona Blackbird you should go see her to tell you what you have to do.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery 34057-05.html">"Ok, I'll go."</Button>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.html
new file mode 100644
index 0000000000..30f55b94dd
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-04.html
@@ -0,0 +1,6 @@
+<html><body>Verdure Elder Elikia:<br>
+Leona was lost in despair for some time but she finally rose again and started investigating the Atelia Refinery.<br>
+But our strength still isn't enough, so we're asking for your help once again.<br>
+Leona will be at the entrance of the Atelia Refinery. You'll find it if you leave camp and follow the passage of Dimensional Energy to the west.<br>
+Leona will fill you in with more details.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-05.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-05.html
deleted file mode 100644
index 549cf956f1..0000000000
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/34057-05.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Verdure Elder Elikia:<br>
-Leona Blackbird is waiting for you at Atelia Refinery entrance.
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Message.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Message.html
deleted file mode 100644
index 07644194b9..0000000000
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Message.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Message:<br>
-You received a message from Leona Blackbird, this means you can start Savior's Path quests.<br>
-To learn more, go to Blackbird Campsite and talk to Elikia.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10885_SaviorsPathDiscovery closeMessage">"Close message."</Button>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
index 2bc2bd71d5..377cc0827d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10885_SaviorsPathDiscovery/Q10885_SaviorsPathDiscovery.java
@@ -16,6 +16,7 @@
  */
 package quests.Q10885_SaviorsPathDiscovery;
 
+import org.l2jmobius.gameserver.enums.Movie;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.Quest;
@@ -58,20 +59,27 @@ public class Q10885_SaviorsPathDiscovery extends Quest
 		String htmltext = null;
 		switch (event)
 		{
-			case "34057-03.html":
+			case "34057-02.htm":
+			{
+				qs.startQuest();
+				htmltext = event;
+				break;
+			}
+			case "34057-03.htm":
 			{
 				if (qs.isCond(1))
 				{
-					takeItems(player, -1, LEONA_BLACKBIRDS_MESSAGE);
 					qs.setCond(2);
 				}
 				htmltext = event;
 				break;
 			}
-			case "34057-05.html":
+			case "34057-04.html":
 			{
 				if (qs.isCond(2))
 				{
+					giveItems(player, LEONA_BLACKBIRDS_MESSAGE, 1, true);
+					playMovie(player, Movie.EP5_ASTATINE_QST_START);
 					qs.setCond(3);
 				}
 				htmltext = event;
@@ -83,6 +91,7 @@ public class Q10885_SaviorsPathDiscovery extends Quest
 				{
 					if ((player.getLevel() >= MIN_LEVEL))
 					{
+						takeItems(player, -1, LEONA_BLACKBIRDS_MESSAGE);
 						addExpAndSp(player, 90638, 82);
 						qs.exitQuest(false, true);
 						htmltext = event;
@@ -137,7 +146,11 @@ public class Q10885_SaviorsPathDiscovery extends Quest
 						}
 						else if (qs.isCond(2))
 						{
-							htmltext = "34057-04.htm";
+							htmltext = "34057-03.htm";
+						}
+						else if (qs.isCond(3))
+						{
+							htmltext = "34057-04.html";
 						}
 						break;
 					}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/34425-04.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/34425-04.html
index 8369fc1b4a..0475175b73 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/34425-04.html
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10886_SaviorsPathSearchTheRefinery/34425-04.html
@@ -1,4 +1,4 @@
 <html><body>Blackbird Clan Lord Leona Blackbird:<br>
-Yes. Go speak to <font color="LEVEL">Devianne</font>.
+Yes. Go speak to <font color="LEVEL">Devianne</font>.<br>
 Devianne will tell you how to get to the Atelia Refinery and what you must do there.<br>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-00.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-00.html
new file mode 100644
index 0000000000..c9012038ad
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-00.html
@@ -0,0 +1,3 @@
+<html><body>Conquest Guide Entropy:<br>
+I don't see any invitation from Conquest Guide Chloe, make sure you bring that to me.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-01.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-01.htm
new file mode 100644
index 0000000000..cb3365b298
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-01.htm
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Entropy:<br>
+Have you brought the invitation that Conquest Guide Chloe gave you?
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10904_JourneyToTheConquestWorld 34599-02.html">"Yes, here it is."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-02.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-02.html
new file mode 100644
index 0000000000..a079e26eae
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-02.html
@@ -0,0 +1,3 @@
+<html><body>Conquest Guide Entropy:<br>
+Oh! Let me see if it's genuine, come back later.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-03.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-03.htm
new file mode 100644
index 0000000000..6fb447dcef
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-03.htm
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Entropy:<br>
+Checking the invitation...<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10904_JourneyToTheConquestWorld 34599-04.html">"How is it?"</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-04.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-04.html
new file mode 100644
index 0000000000..673c255fff
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34599-04.html
@@ -0,0 +1,3 @@
+<html><body>Conquest Guide Entropy:<br>
+Great! You have brought the right one, here is your reward.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34600-00.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34600-00.html
new file mode 100644
index 0000000000..27ec4acf46
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34600-00.html
@@ -0,0 +1,5 @@
+<html><body>Conquest Guide Chloe:<br>
+Hello, adventurer!<br>
+I have no news for you. There's nothing I can tell you.<br>
+(Available to characters of Lv. 110+.)<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34600-01.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34600-01.htm
new file mode 100644
index 0000000000..e1ffb19ff5
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34600-01.htm
@@ -0,0 +1,6 @@
+<html><body>Conquest Guide Chloe:<br>
+Hello, adventurer!<br>
+The most upstanding warriors receive an invitation to visit a new world - the Conquest.<br>
+To learn more, go to Conquest Town and talk to Entropy.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10904_JourneyToTheConquestWorld 34600-02.html">Here, take this invitation.</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34600-02.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34600-02.html
new file mode 100644
index 0000000000..69730173ee
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/34600-02.html
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Chloe:<br>
+You can go now,<br>
+you must give the invitation to Conquest Guide Entropy, in the Conquest Town.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/Q10904_JourneyToTheConquestWorld.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/Q10904_JourneyToTheConquestWorld.java
new file mode 100644
index 0000000000..a720ce3330
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10904_JourneyToTheConquestWorld/Q10904_JourneyToTheConquestWorld.java
@@ -0,0 +1,144 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q10904_JourneyToTheConquestWorld;
+
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.quest.Quest;
+import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
+
+/**
+ * @author CostyKiller
+ */
+public class Q10904_JourneyToTheConquestWorld extends Quest
+{
+	// NPCs
+	private static final int ENTROPY = 34599;
+	private static final int CHLOE = 34600;
+	// Items
+	private static final int CONQUEST_NAME_CHANGE_COUPON = 81979;
+	private static final int CHLOE_INVITATION = 82176;
+	// Misc
+	private static final int MIN_LEVEL = 110;
+	
+	public Q10904_JourneyToTheConquestWorld()
+	{
+		super(10904);
+		addStartNpc(CHLOE);
+		addTalkId(CHLOE, ENTROPY);
+		addCondMinLevel(MIN_LEVEL, "34600-00.html");
+		registerQuestItems(CHLOE_INVITATION);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if (qs == null)
+		{
+			return null;
+		}
+		
+		String htmltext = null;
+		switch (event)
+		{
+			case "34600-02.html":
+			{
+				if ((player.getLevel() >= MIN_LEVEL))
+				{
+					qs.startQuest();
+					giveItems(player, CHLOE_INVITATION, 1);
+					htmltext = event;
+				}
+				break;
+			}
+			case "34599-02.html":
+			{
+				if (qs.isCond(1) && (hasQuestItems(player, CHLOE_INVITATION)))
+				{
+					takeItems(player, -1, CHLOE_INVITATION);
+					qs.setCond(2);
+					htmltext = event;
+				}
+				break;
+			}
+			case "34599-04.html":
+			{
+				if (qs.isCond(2))
+				{
+					giveItems(player, CONQUEST_NAME_CHANGE_COUPON, 1);
+					qs.exitQuest(false, true);
+					htmltext = event;
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onTalk(Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, true);
+		String htmltext = getNoQuestMsg(player);
+		switch (qs.getState())
+		{
+			case State.CREATED:
+			{
+				if (npc.getId() == CHLOE)
+				{
+					htmltext = "34600-01.htm";
+				}
+				break;
+			}
+			case State.STARTED:
+			{
+				switch (npc.getId())
+				{
+					case CHLOE:
+					{
+						if (qs.isCond(1))
+						{
+							htmltext = "34600-02.html";
+						}
+						break;
+					}
+					case ENTROPY:
+					{
+						if (qs.isCond(1))
+						{
+							htmltext = "34599-01.htm";
+						}
+						else if (qs.isCond(2))
+						{
+							htmltext = "34599-03.htm";
+						}
+						break;
+					}
+				}
+				break;
+			}
+			case State.COMPLETED:
+			{
+				htmltext = getAlreadyCompletedMsg(player);
+				break;
+			}
+		}
+		return htmltext;
+	}
+}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-00.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-00.html
new file mode 100644
index 0000000000..975f1f53b9
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-00.html
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Entropy:<br>
+You are not ready for this yet.<br>
+(This quest is for characters Lv. 110 and higher who have completed the Journey to the Conquest World quest.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-01.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-01.htm
new file mode 100644
index 0000000000..b5b1ebc72a
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-01.htm
@@ -0,0 +1,6 @@
+<html><body>Conquest Guide Entropy:<br>
+You must learn about Conquest World, there are three zones out there and you must hunt in each one of them.<br>
+Defeat the specified number of monsters in each of the following zones: <font color="LEVEL">600 in the Outer Lands, 600 in Zone 1 (Asa), 600 in Zone 2 (Anima) and 600 in Zone 3 (Nox).</font><br>
+Monsters to hunt: <font color="LEVEL">all monsters in water hunting zones of the Conquest world.</font><br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10905_HuntingTime 34599-02.html">"OK, let's do it."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-02.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-02.html
new file mode 100644
index 0000000000..1641d5e7f1
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-02.html
@@ -0,0 +1,5 @@
+<html><body>Conquest Guide Entropy:<br>
+Defeat the specified number of monsters in each of the following zones: <font color="LEVEL">600 in the Outer Lands, 600 in Zone 1 (Asa), 600 in Zone 2 (Anima) and 600 in Zone 3 (Nox).</font><br>
+Monsters to hunt: <font color="LEVEL">all monsters in water hunting zones of the Conquest world.</font><br>
+When you are done come back to me, to get your reward.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-03.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-03.htm
new file mode 100644
index 0000000000..94fd846b39
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-03.htm
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Entropy:<br>
+Have you killed all the monsters?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10905_HuntingTime 34599-05.html">"Yes, sure."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-04.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-04.html
new file mode 100644
index 0000000000..fe78df4a7a
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-04.html
@@ -0,0 +1,6 @@
+<html><body>Conquest Guide Entropy:<br>
+Don't try to foul me...<br>
+Defeat the specified number of monsters in each of the following zones: <font color="LEVEL">600 in the Outer Lands, 600 in Zone 1 (Asa), 600 in Zone 2 (Anima) and 600 in Zone 3 (Nox).</font><br>
+Monsters to hunt: <font color="LEVEL">all monsters in water hunting zones of the Conquest world.</font><br>
+When you are done come back to me, to get your reward.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-05.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-05.html
new file mode 100644
index 0000000000..d3902cf585
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/34599-05.html
@@ -0,0 +1,3 @@
+<html><body>Conquest Guide Entropy:<br>
+Congratulations. You have completed all the tasks.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/Q10905_HuntingTime.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/Q10905_HuntingTime.java
new file mode 100644
index 0000000000..dbaa7de9ce
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10905_HuntingTime/Q10905_HuntingTime.java
@@ -0,0 +1,345 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q10905_HuntingTime;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.l2jmobius.commons.util.CommonUtil;
+import org.l2jmobius.gameserver.enums.QuestSound;
+import org.l2jmobius.gameserver.model.Party;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
+import org.l2jmobius.gameserver.model.quest.Quest;
+import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
+import org.l2jmobius.gameserver.network.NpcStringId;
+
+import quests.Q10904_JourneyToTheConquestWorld.Q10904_JourneyToTheConquestWorld;
+
+/**
+ * @author CostyKiller
+ */
+public class Q10905_HuntingTime extends Quest
+{
+	// NPC
+	private static final int ENTROPY = 34599;
+	// Monsters
+	private static final int[] MONSTERS_OUTER_CASTLE =
+	{
+		// Daril's Water Source (Lv. 112)
+		27701, // Daril
+		27702, // Atron
+		27703, // Seo
+		27704, // Craigo
+		27705, // Kiku
+		27706, // Floato
+		// Daril Phran's Water Source (Lv. 116)
+		27707, // Daril Phran
+		27708, // Atron Phran
+		27709, // Seo Phran
+		27710, // Craigo Phran
+		27711, // Kiku Phran
+		27712, // Floato Phran
+	};
+	private static final int[] MONSTERS_ASA =
+	{
+		// Asa Area 1 (Lv. 116)
+		27713, // Daril Asa Ar
+		27714, // Seo Asa Ar
+		27715, // Floato Asa Ar
+		27716, // Asa Ar Hunter
+		27717, // Asa Ar Sorceress
+		27718, // Saida Asa Ar
+		19830, // Luminous Soul
+		// Asa Area 2 (Lv. 120)
+		27719, // Atron Asa Mide
+		27720, // Craigo Asa Mide
+		27721, // Kerberos Asa Mide
+		27722, // Asa Mide Hunter
+		27723, // Asa Mide Sorceress
+		27724, // Saida Asa Mide
+		27725, // Asa Mide Blader
+		// Asa Area 3 (Lv. 124)
+		27726, // Atron Asa Telro
+		27727, // Craigo Asa Telro
+		27728, // Beor Asa Telro
+		27729, // Asa Telro Hunter
+		27730, // Asa Telro Sorceress
+		27731, // Saida Asa Telro
+		27732, // Asa Telro Blader
+		27733, // Asa Telro Guard
+	};
+	private static final int[] MONSTERS_ANIMA =
+	{
+		// Anima Area 1 (Lv. 116)
+		27755, // Daril Anima Ar
+		27756, // Seo Anima Ar
+		27757, // Floato Anima Ar
+		27758, // Anima Ar Hunter
+		27759, // Anima Ar Sorceress
+		27760, // Saida Anima Ar
+		// Anima Area 2 (Lv. 120)
+		27761, // Atron Anima Mide
+		27762, // Craigo Anima Mide
+		27763, // Kerberos Anima Mide
+		27764, // Anima Mide Hunter
+		27765, // Anima Mide Sorceress
+		27766, // Saida Anima Mide
+		27767, // Anima Mide Blader
+		// Anima Area 3 (Lv. 124)
+		27768, // Atron Anima Telro
+		27769, // Craigo Anima Telro
+		27770, // Beor Anima Telro
+		27771, // Anima Telro Hunter
+		27772, // Anima Telro Sorceress
+		27773, // Saida Anima Telro
+		27774, // Anima Telro Blader
+		27775, // Anima Telro Guard
+	};
+	private static final int[] MONSTERS_NOX =
+	{
+		// Nox Area 1 (Lv. 116)
+		27734, // Daril Nox Ar
+		27735, // Seo Nox Ar
+		27736, // Floato Nox Ar
+		27737, // Nox Ar Hunter
+		27738, // Nox Ar Sorceress
+		27739, // Saida Nox Ar
+		// Nox Area 2 (Lv. 120)
+		27740, // Atron Nox Mide
+		27741, // Craigo Nox Mide
+		27742, // Kerberos Nox Mide
+		27743, // Nox Mide Hunter
+		27744, // Nox Mide Sorceress
+		27745, // Saida Nox Mide
+		27746, // Nox Mide Blader
+		// Nox Area 3 (Lv. 124)
+		27747, // Atron Nox Telro
+		27748, // Craigo Nox Telro
+		27749, // Beor Nox Telro
+		27750, // Nox Telro Hunter
+		27751, // Nox Telro Sorceress
+		27752, // Saida Nox Telro
+		27753, // Nox Telro Blader
+		27754, // Nox Telro Guard
+	};
+	// Misc
+	private static final int MIN_LEVEL = 110;
+	private static final String KILL_COUNT_VAR_OUTER_CASTLE = "KillCountOuterCastle";
+	private static final String KILL_COUNT_VAR_ASA = "KillCountAsa";
+	private static final String KILL_COUNT_VAR_ANIMA = "KillCountAnima";
+	private static final String KILL_COUNT_VAR_NOX = "KillCountNox";
+	// Monsters Kill Target
+	private static final int MAX_KILLED_MOBS_OUTER_CASTLE = 600;
+	private static final int MAX_KILLED_MOBS_ASA = 600;
+	private static final int MAX_KILLED_MOBS_ANIMA = 600;
+	private static final int MAX_KILLED_MOBS_NOX = 600;
+	
+	public Q10905_HuntingTime()
+	{
+		super(10905);
+		addStartNpc(ENTROPY);
+		addTalkId(ENTROPY);
+		addKillId(MONSTERS_OUTER_CASTLE);
+		addKillId(MONSTERS_ASA);
+		addKillId(MONSTERS_ANIMA);
+		addKillId(MONSTERS_NOX);
+		addCondCompletedQuest(Q10904_JourneyToTheConquestWorld.class.getSimpleName(), "34599-00.html");
+		addCondMinLevel(MIN_LEVEL, "34599-00.html");
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if (qs == null)
+		{
+			return null;
+		}
+		
+		String htmltext = null;
+		switch (event)
+		{
+			case "34599-02.html":
+			{
+				if ((player.getLevel() >= MIN_LEVEL))
+				{
+					qs.startQuest();
+					qs.setMemoState(1);
+					htmltext = event;
+				}
+				break;
+			}
+			case "34599-05.html":
+			{
+				if (qs.isCond(2))
+				{
+					addExpAndSp(player, 26617381116L, 23955643);
+					qs.exitQuest(false, true);
+					htmltext = event;
+				}
+				else
+				{
+					htmltext = "34599-04.html";
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onTalk(Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, true);
+		String htmltext = getNoQuestMsg(player);
+		switch (qs.getState())
+		{
+			case State.CREATED:
+			{
+				if (npc.getId() == ENTROPY)
+				{
+					htmltext = "34599-01.htm";
+				}
+				break;
+			}
+			case State.STARTED:
+			{
+				switch (npc.getId())
+				{
+					case ENTROPY:
+					{
+						if ((qs.isCond(1) & qs.isMemoState(1)) || qs.isCond(2))
+						{
+							htmltext = "34599-03.htm";
+						}
+						break;
+					}
+				}
+				break;
+			}
+			case State.COMPLETED:
+			{
+				htmltext = getAlreadyCompletedMsg(player);
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player killer, boolean isSummon)
+	{
+		final Party party = killer.getParty();
+		if (party != null)
+		{
+			for (Player member : party.getMembers())
+			{
+				final QuestState qs = getQuestState(member, false);
+				if (qs != null)
+				{
+					processKill(npc, member);
+				}
+			}
+		}
+		else
+		{
+			processKill(npc, killer);
+		}
+		return super.onKill(npc, killer, isSummon);
+	}
+	
+	private void processKill(Npc npc, Player killer)
+	{
+		final QuestState qs = getRandomPartyMemberState(killer, 1, 3, npc);
+		if (qs != null)
+		{
+			final Player player = qs.getPlayer();
+			final int killCountOuterCastle = qs.getInt(KILL_COUNT_VAR_OUTER_CASTLE);
+			final int killCountAsa = qs.getInt(KILL_COUNT_VAR_ASA);
+			final int killCountAnima = qs.getInt(KILL_COUNT_VAR_ANIMA);
+			final int killCountNox = qs.getInt(KILL_COUNT_VAR_NOX);
+			
+			if (CommonUtil.contains(MONSTERS_OUTER_CASTLE, npc.getId()))
+			{
+				if (killCountOuterCastle < MAX_KILLED_MOBS_OUTER_CASTLE)
+				{
+					qs.set(KILL_COUNT_VAR_OUTER_CASTLE, killCountOuterCastle + 1);
+					playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					checkKillProgress(killer);
+				}
+			}
+			if (CommonUtil.contains(MONSTERS_ASA, npc.getId()))
+			{
+				if (killCountAsa < MAX_KILLED_MOBS_ASA)
+				{
+					qs.set(KILL_COUNT_VAR_ASA, killCountAsa + 1);
+					playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					checkKillProgress(killer);
+				}
+			}
+			if (CommonUtil.contains(MONSTERS_ANIMA, npc.getId()))
+			{
+				if (killCountAnima < MAX_KILLED_MOBS_ANIMA)
+				{
+					qs.set(KILL_COUNT_VAR_ANIMA, killCountAnima + 1);
+					playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					checkKillProgress(killer);
+				}
+			}
+			if (CommonUtil.contains(MONSTERS_NOX, npc.getId()))
+			{
+				if (killCountNox < MAX_KILLED_MOBS_NOX)
+				{
+					qs.set(KILL_COUNT_VAR_NOX, killCountNox + 1);
+					playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					checkKillProgress(killer);
+				}
+			}
+			
+			sendNpcLogList(player);
+		}
+	}
+	
+	private void checkKillProgress(Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if ((qs.getInt(KILL_COUNT_VAR_OUTER_CASTLE) >= MAX_KILLED_MOBS_OUTER_CASTLE) && (qs.getInt(KILL_COUNT_VAR_ASA) >= MAX_KILLED_MOBS_ASA) && (qs.getInt(KILL_COUNT_VAR_ANIMA) >= MAX_KILLED_MOBS_ANIMA) && (qs.getInt(KILL_COUNT_VAR_NOX) >= MAX_KILLED_MOBS_NOX))
+		{
+			qs.setCond(2, true);
+			playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+		}
+	}
+	
+	@Override
+	public Set<NpcLogListHolder> getNpcLogList(Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if ((qs != null) && qs.isCond(1))
+		{
+			final Set<NpcLogListHolder> holder = new HashSet<>();
+			holder.add(new NpcLogListHolder(NpcStringId.MONSTERS_IN_THE_OUTER_CASTLE.getId(), true, qs.getInt(KILL_COUNT_VAR_OUTER_CASTLE)));
+			holder.add(new NpcLogListHolder(NpcStringId.MONSTERS_IN_THE_ASA_ZONE.getId(), true, qs.getInt(KILL_COUNT_VAR_ASA)));
+			holder.add(new NpcLogListHolder(NpcStringId.MONSTERS_IN_THE_ANIMA_ZONE.getId(), true, qs.getInt(KILL_COUNT_VAR_ANIMA)));
+			holder.add(new NpcLogListHolder(NpcStringId.MONSTERS_IN_THE_NOX_ZONE.getId(), true, qs.getInt(KILL_COUNT_VAR_NOX)));
+			return holder;
+		}
+		return super.getNpcLogList(player);
+	}
+}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-00.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-00.html
new file mode 100644
index 0000000000..975f1f53b9
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-00.html
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Entropy:<br>
+You are not ready for this yet.<br>
+(This quest is for characters Lv. 110 and higher who have completed the Journey to the Conquest World quest.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-01.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-01.htm
new file mode 100644
index 0000000000..18c376a9c8
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-01.htm
@@ -0,0 +1,6 @@
+<html><body>Conquest Guide Entropy:<br>
+You must learn about a new way to succeed in conquering the Conquest world.<br>
+Defeat <font color="LEVEL">30 Luminous Souls</font> that can be encountered in certain zones of the Conquest world, and collect their fragments.<br>
+Monster to hunt: <font color="LEVEL">Luminous Soul.</font><br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10906_ChasingTheLight 34599-02.html">"OK, let's start."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-02.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-02.html
new file mode 100644
index 0000000000..714d176159
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-02.html
@@ -0,0 +1,5 @@
+<html><body>Conquest Guide Entropy:<br>
+Defeat <font color="LEVEL">30 Luminous Souls</font> that can be encountered in certain zones of the Conquest world, and collect their fragments.<br>
+Monster to hunt: <font color="LEVEL">Luminous Soul.</font><br>
+When you are done come back to me, to get your reward.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-03.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-03.htm
new file mode 100644
index 0000000000..375c0e8783
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-03.htm
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Entropy:<br>
+Have you collected all the required luminous soul fragments?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10906_ChasingTheLight 34599-05.html">"Yes, sure."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-04.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-04.html
new file mode 100644
index 0000000000..52892111fa
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-04.html
@@ -0,0 +1,6 @@
+<html><body>Conquest Guide Entropy:<br>
+Don't try to foul me...<br>
+Defeat <font color="LEVEL">30 Luminous Souls</font> that can be encountered in certain zones of the Conquest world, and collect their fragments.<br>
+Monster to hunt: <font color="LEVEL">Luminous Soul.</font><br>
+When you are done come back to me, to get your reward.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-05.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-05.html
new file mode 100644
index 0000000000..d3902cf585
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/34599-05.html
@@ -0,0 +1,3 @@
+<html><body>Conquest Guide Entropy:<br>
+Congratulations. You have completed all the tasks.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/Q10906_ChasingTheLight.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/Q10906_ChasingTheLight.java
new file mode 100644
index 0000000000..8fa1226328
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10906_ChasingTheLight/Q10906_ChasingTheLight.java
@@ -0,0 +1,164 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q10906_ChasingTheLight;
+
+import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.enums.QuestSound;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.quest.Quest;
+import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
+
+import quests.Q10904_JourneyToTheConquestWorld.Q10904_JourneyToTheConquestWorld;
+
+/**
+ * @author CostyKiller
+ */
+public class Q10906_ChasingTheLight extends Quest
+{
+	// NPC
+	private static final int ENTROPY = 34599;
+	// Monsters
+	private static final int[] MONSTERS =
+	{
+		19830, // Luminous Soul - Asa Area 1 (Lv. 116)
+		19832, // Luminous Soul - Anima Area 1 (Lv. 116)
+		19831, // Luminous Soul - Nox Area 1 (Lv. 116)
+	};
+	// Item
+	private static final int LUMINOUS_SOUL_FRAGMENT = 82177;
+	// Misc
+	private static final int MIN_LEVEL = 110;
+	private static final int LUMINOUS_SOUL_FRAGMENT_NEEDED = 30;
+	
+	public Q10906_ChasingTheLight()
+	{
+		super(10906);
+		addStartNpc(ENTROPY);
+		addTalkId(ENTROPY);
+		addKillId(MONSTERS);
+		addCondCompletedQuest(Q10904_JourneyToTheConquestWorld.class.getSimpleName(), "34599-00.html");
+		addCondMinLevel(MIN_LEVEL, "34599-00.html");
+		registerQuestItems(LUMINOUS_SOUL_FRAGMENT);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if (qs == null)
+		{
+			return null;
+		}
+		
+		String htmltext = null;
+		switch (event)
+		{
+			case "34599-02.html":
+			{
+				if ((player.getLevel() >= MIN_LEVEL))
+				{
+					qs.startQuest();
+					qs.setMemoState(1);
+					htmltext = event;
+				}
+				break;
+			}
+			case "34599-05.html":
+			{
+				if (qs.isCond(2))
+				{
+					takeItems(player, LUMINOUS_SOUL_FRAGMENT, 30);
+					addExpAndSp(player, 8872460372L, 7985214);
+					qs.exitQuest(false, true);
+					htmltext = event;
+				}
+				else
+				{
+					htmltext = "34599-04.html";
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onTalk(Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, true);
+		String htmltext = getNoQuestMsg(player);
+		switch (qs.getState())
+		{
+			case State.CREATED:
+			{
+				if (npc.getId() == ENTROPY)
+				{
+					htmltext = "34599-01.htm";
+				}
+				break;
+			}
+			case State.STARTED:
+			{
+				switch (npc.getId())
+				{
+					case ENTROPY:
+					{
+						if ((qs.isCond(1) & qs.isMemoState(1)) || qs.isCond(2))
+						{
+							htmltext = "34599-03.htm";
+						}
+						break;
+					}
+				}
+				break;
+			}
+			case State.COMPLETED:
+			{
+				htmltext = getAlreadyCompletedMsg(player);
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player player, boolean isSummon)
+	{
+		executeForEachPlayer(player, npc, isSummon, true, false);
+		return super.onKill(npc, player, isSummon);
+	}
+	
+	@Override
+	public void actionForEachPlayer(Player player, Npc npc, boolean isSummon)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if ((qs != null) && qs.isCond(1) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
+		{
+			if (getQuestItemsCount(player, LUMINOUS_SOUL_FRAGMENT) < LUMINOUS_SOUL_FRAGMENT_NEEDED)
+			{
+				giveItems(player, LUMINOUS_SOUL_FRAGMENT, 1);
+				playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			}
+			if (getQuestItemsCount(player, LUMINOUS_SOUL_FRAGMENT) >= LUMINOUS_SOUL_FRAGMENT_NEEDED)
+			{
+				qs.setCond(2, true);
+			}
+		}
+	}
+}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-00.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-00.html
new file mode 100644
index 0000000000..975f1f53b9
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-00.html
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Entropy:<br>
+You are not ready for this yet.<br>
+(This quest is for characters Lv. 110 and higher who have completed the Journey to the Conquest World quest.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-01.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-01.htm
new file mode 100644
index 0000000000..0b29b2dda9
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-01.htm
@@ -0,0 +1,6 @@
+<html><body>Conquest Guide Entropy:<br>
+I need you to bring me petals of the special flowers that grow only in the Conquest world.<br>
+Defeat <font color="LEVEL">120 Soul Flowers</font> that sometimes appear while hunting monsters in the Conquest world, and gather their petals.<br>
+Monster to hunt: <font color="LEVEL">Soul Flower.</font><br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10907_WhereFlowersBlossom 34599-02.html">"OK, let's start."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-02.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-02.html
new file mode 100644
index 0000000000..c715627758
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-02.html
@@ -0,0 +1,5 @@
+<html><body>Conquest Guide Entropy:<br>
+Defeat <font color="LEVEL">120 Soul Flowers</font> that sometimes appear while hunting monsters in the Conquest world, and gather their petals.<br>
+Monster to hunt: <font color="LEVEL">Soul Flower.</font><br>
+When you are done come back to me, to get your reward.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-03.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-03.htm
new file mode 100644
index 0000000000..800061b434
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-03.htm
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Entropy:<br>
+Have you gathered all the required flower petals?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10907_WhereFlowersBlossom 34599-05.html">"Yes, sure."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-04.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-04.html
new file mode 100644
index 0000000000..376cf18f5e
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-04.html
@@ -0,0 +1,6 @@
+<html><body>Conquest Guide Entropy:<br>
+Don't try to foul me...<br>
+Defeat <font color="LEVEL">120 Soul Flowers</font> that sometimes appear while hunting monsters in the Conquest world, and gather their petals.<br>
+Monster to hunt: <font color="LEVEL">Soul Flower.</font><br>
+When you are done come back to me, to get your reward.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-05.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-05.html
new file mode 100644
index 0000000000..d3902cf585
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/34599-05.html
@@ -0,0 +1,3 @@
+<html><body>Conquest Guide Entropy:<br>
+Congratulations. You have completed all the tasks.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/Q10907_WhereFlowersBlossom.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/Q10907_WhereFlowersBlossom.java
new file mode 100644
index 0000000000..bf7448011d
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10907_WhereFlowersBlossom/Q10907_WhereFlowersBlossom.java
@@ -0,0 +1,172 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q10907_WhereFlowersBlossom;
+
+import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.enums.QuestSound;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.quest.Quest;
+import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
+
+import quests.Q10904_JourneyToTheConquestWorld.Q10904_JourneyToTheConquestWorld;
+
+/**
+ * @author CostyKiller
+ */
+public class Q10907_WhereFlowersBlossom extends Quest
+{
+	// NPC
+	private static final int ENTROPY = 34599;
+	// Monsters
+	private static final int[] MONSTERS =
+	{
+		19818, // Soul Flower - Asa Area 1 (Lv. 116)
+		19819, // Soul Flower - Asa Area 2 (Lv. 120)
+		19820, // Soul Flower - Asa Area 3 (Lv. 124)
+		19824, // Soul Flower - Anima Area 1 (Lv. 116)
+		19825, // Soul Flower - Anima Area 2 (Lv. 120)
+		19826, // Soul Flower - Anima Area 3 (Lv. 124)
+		19821, // Soul Flower - Nox Area 1 (Lv. 116)
+		19822, // Soul Flower - Nox Area 2 (Lv. 120)
+		19823, // Soul Flower - Nox Area 3 (Lv. 124)
+		19840, // Soul Flower - Vita (Lv. 124)
+		19841, // Soul Flower - Ignis (Lv. 128)
+	};
+	// Item
+	private static final int SOUL_FLOWER_PETAL = 82178;
+	// Misc
+	private static final int MIN_LEVEL = 110;
+	private static final int SOUL_FLOWER_PETAL_NEEDED = 120;
+	
+	public Q10907_WhereFlowersBlossom()
+	{
+		super(10907);
+		addStartNpc(ENTROPY);
+		addTalkId(ENTROPY);
+		addKillId(MONSTERS);
+		addCondCompletedQuest(Q10904_JourneyToTheConquestWorld.class.getSimpleName(), "34599-00.html");
+		addCondMinLevel(MIN_LEVEL, "34599-00.html");
+		registerQuestItems(SOUL_FLOWER_PETAL);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if (qs == null)
+		{
+			return null;
+		}
+		
+		String htmltext = null;
+		switch (event)
+		{
+			case "34599-02.html":
+			{
+				if ((player.getLevel() >= MIN_LEVEL))
+				{
+					qs.startQuest();
+					qs.setMemoState(1);
+					htmltext = event;
+				}
+				break;
+			}
+			case "34599-05.html":
+			{
+				if (qs.isCond(2))
+				{
+					takeItems(player, SOUL_FLOWER_PETAL, 120);
+					addExpAndSp(player, 8872460372L, 7985214);
+					qs.exitQuest(false, true);
+					htmltext = event;
+				}
+				else
+				{
+					htmltext = "34599-04.html";
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onTalk(Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, true);
+		String htmltext = getNoQuestMsg(player);
+		switch (qs.getState())
+		{
+			case State.CREATED:
+			{
+				if (npc.getId() == ENTROPY)
+				{
+					htmltext = "34599-01.htm";
+				}
+				break;
+			}
+			case State.STARTED:
+			{
+				switch (npc.getId())
+				{
+					case ENTROPY:
+					{
+						if ((qs.isCond(1) & qs.isMemoState(1)) || qs.isCond(2))
+						{
+							htmltext = "34599-03.htm";
+						}
+						break;
+					}
+				}
+				break;
+			}
+			case State.COMPLETED:
+			{
+				htmltext = getAlreadyCompletedMsg(player);
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player player, boolean isSummon)
+	{
+		executeForEachPlayer(player, npc, isSummon, true, false);
+		return super.onKill(npc, player, isSummon);
+	}
+	
+	@Override
+	public void actionForEachPlayer(Player player, Npc npc, boolean isSummon)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if ((qs != null) && qs.isCond(1) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
+		{
+			if (getQuestItemsCount(player, SOUL_FLOWER_PETAL) < SOUL_FLOWER_PETAL_NEEDED)
+			{
+				giveItems(player, SOUL_FLOWER_PETAL, 1);
+				playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			}
+			if (getQuestItemsCount(player, SOUL_FLOWER_PETAL) >= SOUL_FLOWER_PETAL_NEEDED)
+			{
+				qs.setCond(2, true);
+			}
+		}
+	}
+}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34600-00.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34600-00.html
new file mode 100644
index 0000000000..27ec4acf46
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34600-00.html
@@ -0,0 +1,5 @@
+<html><body>Conquest Guide Chloe:<br>
+Hello, adventurer!<br>
+I have no news for you. There's nothing I can tell you.<br>
+(Available to characters of Lv. 110+.)<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34600-01.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34600-01.htm
new file mode 100644
index 0000000000..cad13d8640
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34600-01.htm
@@ -0,0 +1,6 @@
+<html><body>Conquest Guide Chloe:<br>
+Hello, adventurer!<br>
+The most upstanding warriors receive an invitation to visit a new world - the Conquest Fire Area<br>
+To learn more, go to Fire Fortress and talk to Guide Casgard.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10908_DarkSunPrimordialFlame 34600-02.html">Here, take this invitation.</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34600-02.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34600-02.html
new file mode 100644
index 0000000000..eb87e9665e
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34600-02.html
@@ -0,0 +1,4 @@
+<html><body>Conquest Guide Chloe:<br>
+You can go now,<br>
+you must give the invitation to Fire Fortress Guide Casgard, in the Fire Fortress.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34668-00.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34668-00.html
new file mode 100644
index 0000000000..ed6e89dcd1
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34668-00.html
@@ -0,0 +1,3 @@
+<html><body>Fire Fortress Guide Casgard:<br>
+I don't see any invitation from Conquest Guide Chloe, make sure you bring that to me.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34668-01.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34668-01.htm
new file mode 100644
index 0000000000..295ddd1b68
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34668-01.htm
@@ -0,0 +1,4 @@
+<html><body>Fire Fortress Guide Casgard:<br>
+Have you brought the invitation that Conquest Guide Chloe gave you?
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10908_DarkSunPrimordialFlame 34668-02.html">"Yes, here it is."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34668-02.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34668-02.html
new file mode 100644
index 0000000000..bba2b323eb
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34668-02.html
@@ -0,0 +1,3 @@
+<html><body>Fire Fortress Guide Casgard:<br>
+Oh! Let me see if it's genuine, come back later.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34668-03.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34668-03.htm
new file mode 100644
index 0000000000..91f09b0aad
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34668-03.htm
@@ -0,0 +1,4 @@
+<html><body>Fire Fortress Guide Casgard:<br>
+Checking the invitation...<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10908_DarkSunPrimordialFlame 34668-04.html">"How is it?"</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34668-04.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34668-04.html
new file mode 100644
index 0000000000..cb882ecfff
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/34668-04.html
@@ -0,0 +1,3 @@
+<html><body>Fire Fortress Guide Casgard:<br>
+Great! You have brought the right one, here is your reward.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/Q10908_DarkSunPrimordialFlame.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/Q10908_DarkSunPrimordialFlame.java
new file mode 100644
index 0000000000..92e604b84c
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10908_DarkSunPrimordialFlame/Q10908_DarkSunPrimordialFlame.java
@@ -0,0 +1,151 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q10908_DarkSunPrimordialFlame;
+
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.quest.Quest;
+import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
+
+import quests.Q10904_JourneyToTheConquestWorld.Q10904_JourneyToTheConquestWorld;
+
+/**
+ * @author CostyKiller
+ */
+public class Q10908_DarkSunPrimordialFlame extends Quest
+{
+	// NPCs
+	private static final int CASGARD = 34668;
+	private static final int CHLOE = 34600;
+	// Items
+	private static final int SACRED_FIRE_SUMMON_SCROLL = 82614;
+	private static final int CHLOE_INVITATION = 82661;
+	// Misc
+	private static final int MIN_LEVEL = 110;
+	
+	public Q10908_DarkSunPrimordialFlame()
+	{
+		super(10908);
+		addStartNpc(CHLOE);
+		addTalkId(CHLOE, CASGARD);
+		addCondCompletedQuest(Q10904_JourneyToTheConquestWorld.class.getSimpleName(), "34600-00.html");
+		addCondMinLevel(MIN_LEVEL, "34600-00.html");
+		registerQuestItems(CHLOE_INVITATION);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if (qs == null)
+		{
+			return null;
+		}
+		
+		String htmltext = null;
+		switch (event)
+		{
+			case "34600-02.html":
+			{
+				if ((player.getLevel() >= MIN_LEVEL))
+				{
+					qs.startQuest();
+					giveItems(player, CHLOE_INVITATION, 1);
+					htmltext = event;
+				}
+				break;
+			}
+			case "34668-02.html":
+			{
+				if (qs.isCond(1) && (hasQuestItems(player, CHLOE_INVITATION)))
+				{
+					takeItems(player, -1, CHLOE_INVITATION);
+					qs.setCond(2);
+					htmltext = event;
+				}
+				else
+				{
+					htmltext = "34668-00.html";
+				}
+				break;
+			}
+			case "34668-04.html":
+			{
+				if (qs.isCond(2))
+				{
+					giveItems(player, SACRED_FIRE_SUMMON_SCROLL, 1);
+					qs.exitQuest(false, true);
+					htmltext = event;
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onTalk(Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, true);
+		String htmltext = getNoQuestMsg(player);
+		switch (qs.getState())
+		{
+			case State.CREATED:
+			{
+				if (npc.getId() == CHLOE)
+				{
+					htmltext = "34600-01.htm";
+				}
+				break;
+			}
+			case State.STARTED:
+			{
+				switch (npc.getId())
+				{
+					case CHLOE:
+					{
+						if (qs.isCond(1))
+						{
+							htmltext = "34600-02.html";
+						}
+						break;
+					}
+					case CASGARD:
+					{
+						if (qs.isCond(1))
+						{
+							htmltext = "34668-01.htm";
+						}
+						else if (qs.isCond(2))
+						{
+							htmltext = "34668-03.htm";
+						}
+						break;
+					}
+				}
+				break;
+			}
+			case State.COMPLETED:
+			{
+				htmltext = getAlreadyCompletedMsg(player);
+				break;
+			}
+		}
+		return htmltext;
+	}
+}
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/34668-00.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/34668-00.html
new file mode 100644
index 0000000000..15967486be
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/34668-00.html
@@ -0,0 +1,4 @@
+<html><body>Fire Fortress Guide Casgard:<br>
+You are not ready for this yet.<br>
+(This quest is for characters Lv. 110 and higher who have completed the Journey to the Conquest World quest.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/34668-01.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/34668-01.htm
new file mode 100644
index 0000000000..7e42b4d722
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/34668-01.htm
@@ -0,0 +1,6 @@
+<html><body>Fire Fortress Guide Casgard:<br>
+It's high time for you to hunt monsters in the Fire Conquest area.<br>
+Defeat monsters in the following zones: <font color="LEVEL">600 in the Fiery Field, 600 in the Garden of Flames, 600 in Zone 1 - Vita and 600 in Zone 2 - Ignis.</font><br>
+Monsters to hunt: <font color="LEVEL">all monsters in the Fire Conquest area.</font><br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10909_FlameHunting 34668-02.html">"OK, let's do it."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/34668-02.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/34668-02.html
new file mode 100644
index 0000000000..6acd98a608
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/34668-02.html
@@ -0,0 +1,5 @@
+<html><body>Fire Fortress Guide Casgard:<br>
+Defeat monsters in the following zones: <font color="LEVEL">600 in the Fiery Field, 600 in the Garden of Flames, 600 in Zone 1 - Vita and 600 in Zone 2 - Ignis.</font><br>
+Monsters to hunt: <font color="LEVEL">all monsters in the Fire Conquest area.</font><br>
+When you are done come back to me, to get your reward.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/34668-03.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/34668-03.htm
new file mode 100644
index 0000000000..b11b6b60cb
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/34668-03.htm
@@ -0,0 +1,4 @@
+<html><body>Fire Fortress Guide Casgard:<br>
+Have you killed all the monsters?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10909_FlameHunting 34668-05.html">"Yes, sure."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/34668-04.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/34668-04.html
new file mode 100644
index 0000000000..93013f6ba1
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/34668-04.html
@@ -0,0 +1,6 @@
+<html><body>Fire Fortress Guide Casgard:<br>
+Don't try to foul me...<br>
+Defeat monsters in the following zones: <font color="LEVEL">600 in the Fiery Field, 600 in the Garden of Flames, 600 in Zone 1 - Vita and 600 in Zone 2 - Ignis.</font><br>
+Monsters to hunt: <font color="LEVEL">all monsters in the Fire Conquest area.</font><br>
+When you are done come back to me, to get your reward.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/34668-05.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/34668-05.html
new file mode 100644
index 0000000000..9e4762d7db
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/34668-05.html
@@ -0,0 +1,3 @@
+<html><body>Fire Fortress Guide Casgard:<br>
+Congratulations. You have completed all the tasks.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/Q10909_FlameHunting.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/Q10909_FlameHunting.java
new file mode 100644
index 0000000000..1acc1f00c6
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10909_FlameHunting/Q10909_FlameHunting.java
@@ -0,0 +1,293 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q10909_FlameHunting;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.l2jmobius.commons.util.CommonUtil;
+import org.l2jmobius.gameserver.enums.QuestSound;
+import org.l2jmobius.gameserver.model.Party;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
+import org.l2jmobius.gameserver.model.quest.Quest;
+import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
+import org.l2jmobius.gameserver.network.NpcStringId;
+
+import quests.Q10904_JourneyToTheConquestWorld.Q10904_JourneyToTheConquestWorld;
+
+/**
+ * @author Mobius
+ */
+public class Q10909_FlameHunting extends Quest
+{
+	
+	// NPC
+	private static final int CASGARD = 34668;
+	
+	// Monsters
+	private static final int[] MONSTERS_FIERY_FIELD =
+	{
+		// Fiery Field (no PvP) (Lv. 116)
+		27801, // Seo Agel
+		27802, // Craigo Agel
+		27803, // Catshi Agel Wizard
+		27804, // Catshi Agel Archer
+		27805, // Catshi Agel Warrior
+		27806, // Catshi Agel Knight
+	};
+	private static final int[] MONSTERS_GARDEN_OF_FLAMES =
+	{
+		// Garden of Flames (no PvP) (Lv. 120)
+		27794, // Delia Gof
+		27795, // Aselon Gof
+		27796, // Retel Gof
+		27797, // Catshi Gof Wizard
+		27798, // Catshi Gof Archer
+		27799, // Catshi Gof Warrior
+	};
+	private static final int[] MONSTERS_VITA =
+	{
+		// Vita Area 1 (Lv. 124)
+		27808, // Renard Vita
+		27810, // Catshi Vita Wizard
+		27811, // Catshi Vita Archer
+		27812, // Catshi Vita Warrior
+		27813, // Catshi Vita Knight
+		27814, // Vita Sorceress
+		27815, // Vita Seeker
+		27816, // Vita Reaper
+	};
+	private static final int[] MONSTERS_IGNIS =
+	{
+		// Ignis Area 1 (Lv. 128)
+		27817, // Beor Ignis
+		27819, // Catshi Ignis Wizard
+		27820, // Catshi Ignis Archer
+		27821, // Ignis Sorceress
+		27822, // Ignis Seeker
+		27823, // Ignis Reaper
+		27824, // Ignis Swordsman
+		27825, // Ignis Guardian
+	};
+	// Misc
+	private static final int MIN_LEVEL = 110;
+	private static final String KILL_COUNT_VAR_FIERY_FIELD = "KillCountFF";
+	private static final String KILL_COUNT_VAR_GARDEN_OF_FLAMES = "KillCountGoF";
+	private static final String KILL_COUNT_VAR_VITA = "KillCountVita";
+	private static final String KILL_COUNT_VAR_IGNIS = "KillCountIgnis";
+	
+	// Monsters Kill Target
+	private static final int MAX_KILLED_MOBS_FIERY_FIELD = 600;
+	private static final int MAX_KILLED_MOBS_GARDEN_OF_FLAMES = 600;
+	private static final int MAX_KILLED_MOBS_VITA = 600;
+	private static final int MAX_KILLED_MOBS_IGNIS = 600;
+	
+	public Q10909_FlameHunting()
+	{
+		super(10909);
+		addStartNpc(CASGARD);
+		addTalkId(CASGARD);
+		addKillId(MONSTERS_FIERY_FIELD);
+		addKillId(MONSTERS_GARDEN_OF_FLAMES);
+		addKillId(MONSTERS_VITA);
+		addKillId(MONSTERS_IGNIS);
+		addCondCompletedQuest(Q10904_JourneyToTheConquestWorld.class.getSimpleName(), "34668-00.html");
+		addCondMinLevel(MIN_LEVEL, "34668-00.html");
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if (qs == null)
+		{
+			return null;
+		}
+		
+		String htmltext = null;
+		switch (event)
+		{
+			case "34668-02.html":
+			{
+				if ((player.getLevel() >= MIN_LEVEL))
+				{
+					qs.startQuest();
+					qs.setMemoState(1);
+					htmltext = event;
+				}
+				break;
+			}
+			case "34668-05.html":
+			{
+				if (qs.isCond(2))
+				{
+					addExpAndSp(player, 26617381116L, 23955643);
+					qs.exitQuest(false, true);
+					htmltext = event;
+				}
+				else
+				{
+					htmltext = "34668-04.html";
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onTalk(Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, true);
+		String htmltext = getNoQuestMsg(player);
+		switch (qs.getState())
+		{
+			case State.CREATED:
+			{
+				if (npc.getId() == CASGARD)
+				{
+					htmltext = "34668-01.htm";
+				}
+				break;
+			}
+			case State.STARTED:
+			{
+				switch (npc.getId())
+				{
+					case CASGARD:
+					{
+						if ((qs.isCond(1) & qs.isMemoState(1)) || qs.isCond(2))
+						{
+							htmltext = "34668-03.htm";
+						}
+						break;
+					}
+				}
+				break;
+			}
+			case State.COMPLETED:
+			{
+				htmltext = getAlreadyCompletedMsg(player);
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player killer, boolean isSummon)
+	{
+		final Party party = killer.getParty();
+		if (party != null)
+		{
+			for (Player member : party.getMembers())
+			{
+				final QuestState qs = getQuestState(member, false);
+				if (qs != null)
+				{
+					processKill(npc, member);
+				}
+			}
+		}
+		else
+		{
+			processKill(npc, killer);
+		}
+		return super.onKill(npc, killer, isSummon);
+	}
+	
+	private void processKill(Npc npc, Player killer)
+	{
+		final QuestState qs = getRandomPartyMemberState(killer, 1, 3, npc);
+		if (qs != null)
+		{
+			final Player player = qs.getPlayer();
+			
+			int killCountFieryField = qs.getInt(KILL_COUNT_VAR_FIERY_FIELD);
+			int killCountGardenOfFlames = qs.getInt(KILL_COUNT_VAR_GARDEN_OF_FLAMES);
+			int killCountVita = qs.getInt(KILL_COUNT_VAR_VITA);
+			int killCountIgnis = qs.getInt(KILL_COUNT_VAR_IGNIS);
+			
+			if (CommonUtil.contains(MONSTERS_FIERY_FIELD, npc.getId()))
+			{
+				if (killCountFieryField < MAX_KILLED_MOBS_FIERY_FIELD)
+				{
+					qs.set(KILL_COUNT_VAR_FIERY_FIELD, killCountFieryField + 1);
+					playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					checkKillProgress(killer);
+				}
+			}
+			if (CommonUtil.contains(MONSTERS_GARDEN_OF_FLAMES, npc.getId()))
+			{
+				if (killCountGardenOfFlames < MAX_KILLED_MOBS_GARDEN_OF_FLAMES)
+				{
+					qs.set(KILL_COUNT_VAR_GARDEN_OF_FLAMES, killCountGardenOfFlames + 1);
+					playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					checkKillProgress(killer);
+				}
+			}
+			if (CommonUtil.contains(MONSTERS_VITA, npc.getId()))
+			{
+				if (killCountVita < MAX_KILLED_MOBS_VITA)
+				{
+					qs.set(KILL_COUNT_VAR_VITA, killCountVita + 1);
+					playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					checkKillProgress(killer);
+				}
+			}
+			if (CommonUtil.contains(MONSTERS_IGNIS, npc.getId()))
+			{
+				if (killCountIgnis < MAX_KILLED_MOBS_IGNIS)
+				{
+					qs.set(KILL_COUNT_VAR_IGNIS, killCountIgnis + 1);
+					playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					checkKillProgress(killer);
+				}
+			}
+			sendNpcLogList(player);
+		}
+	}
+	
+	private void checkKillProgress(Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if ((qs.getInt(KILL_COUNT_VAR_FIERY_FIELD) >= MAX_KILLED_MOBS_FIERY_FIELD) && (qs.getInt(KILL_COUNT_VAR_GARDEN_OF_FLAMES) >= MAX_KILLED_MOBS_GARDEN_OF_FLAMES) && (qs.getInt(KILL_COUNT_VAR_VITA) >= MAX_KILLED_MOBS_VITA) && (qs.getInt(KILL_COUNT_VAR_IGNIS) >= MAX_KILLED_MOBS_IGNIS))
+		{
+			qs.setCond(2, true);
+			playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+		}
+	}
+	
+	@Override
+	public Set<NpcLogListHolder> getNpcLogList(Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if ((qs != null) && qs.isCond(1))
+		{
+			final Set<NpcLogListHolder> holder = new HashSet<>();
+			holder.add(new NpcLogListHolder(NpcStringId.MONSTERS_IN_THE_FIERY_FIELD.getId(), true, qs.getInt(KILL_COUNT_VAR_FIERY_FIELD)));
+			holder.add(new NpcLogListHolder(NpcStringId.MONSTERS_IN_THE_GARDEN_OF_FLAMES.getId(), true, qs.getInt(KILL_COUNT_VAR_GARDEN_OF_FLAMES)));
+			holder.add(new NpcLogListHolder(NpcStringId.MONSTERS_IN_THE_VITA_ZONE.getId(), true, qs.getInt(KILL_COUNT_VAR_VITA)));
+			holder.add(new NpcLogListHolder(NpcStringId.MONSTERS_IN_THE_IGNIS_ZONE.getId(), true, qs.getInt(KILL_COUNT_VAR_IGNIS)));
+			return holder;
+		}
+		return super.getNpcLogList(player);
+	}
+}
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-01.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-01.htm
new file mode 100644
index 0000000000..2dd363696a
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-01.htm
@@ -0,0 +1,5 @@
+<html><body>Fire Power Zealot:<br>
+Hello stranger!<br>
+So, Fire Fortress Guide Ishrin sent you to see me?
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10910_InSearchOfTheFireSource 34663-02.htm">"Yes, he sent me."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-02.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-02.htm
new file mode 100644
index 0000000000..1aefb9cf46
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-02.htm
@@ -0,0 +1,4 @@
+<html><body>Fire Power Zealot:<br>
+Ok! Conquest Guide Ishrin has promised me that he'll introduce someone to a Fire Conquest area expert like me. I will tell you all you need to know about <font color="LEVEL">Sacred Fires</font>.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10910_InSearchOfTheFireSource 34663-03.htm">"Alright, go on."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-03.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-03.htm
new file mode 100644
index 0000000000..7ffb06a313
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-03.htm
@@ -0,0 +1,9 @@
+<html><body>Fire Power Zealot:<br>
+Sacred Fire can only be summoned in the common area of the Fire Source in Conquest's Fire Area (after entering the area your character will turn into a rabbit).<br>
+To extinguish a Sacred Fire that has been lit by a another player, you need to either steal it or destroy it.<br>
+If a Sacred Fire hasn't been extinguished for 25 minutes, the character that has summoned it will receive Divine Fire with 100% chance.<br>
+To protect the Sacred Fire for 25 minutes, you should use Flame Essence and Flame Guardian that are sold in the special Conquest store.<br>
+Flame Essence increases the Sacred Fire's HP while Flame Guardian prevents other players from stealing your Sacred Fire for 25 minutes.<br><br>
+Did you understood what I've told you until now?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10910_InSearchOfTheFireSource 34663-04.htm">"Yes, tell me more"</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-04.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-04.htm
new file mode 100644
index 0000000000..0cb16f3d11
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-04.htm
@@ -0,0 +1,13 @@
+<html><body>Fire Power Zealot:<br>
+Ok, good...<br>
+There can be up to 3 Sacred Fires lit at the same time.<br>
+To check the status of the Sacred Fire, press the flame icon in the upper part of the Fire category in the ability enhancement UI.<br>
+If the summoned Sacred Fire has been extinguished, you may summon a new one.<br><br>
+Summoned Sacred Fire will disappear if it's successfully protected, destroyed, stolen or if the character that summoned it leaves the world of Conquest.<br>
+If your inventory is more than 90% full, you will not be able to receive the reward and your Sacred Fire will be extinguished.<br><br>
+Sacred Fire summoned by characters from other servers or through different means can be stolen.<br>
+Each attempt costs 900 Conquest points and 400,000 SP.<br>
+The price is paid even if the attempt ends in a failure.<br><br>
+Are you ready to hear the rewards part?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10910_InSearchOfTheFireSource 34663-05.htm">"Sure!"</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-05.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-05.htm
new file mode 100644
index 0000000000..9cf7a91485
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-05.htm
@@ -0,0 +1,17 @@
+<html><body>Fire Power Zealot:<br>
+Rewards that are available after summoning Sacred Fire are listed below.
+If the Sacred Fire that you summoned is stolen or destroyed, you may receive a Soul-imbued Flower with a certain chance.<br>
+Successful defense:<br>
+(all rewards guaranteed)<br><br>
+1 x Divine Fire<br>
+2 x Seed of Fire<br>
+1 x Soul-imbued Flower<br><br>
+Successful theft:<br>
+(one of the rewards with a certain chance)<br><br>
+1 x Sealed Fire Source<br>
+1 x Divine Fire<br>
+1 x Soul-imbued Flower<br>
+1 x Seed of Fire<br>
+Now you can go try summon a Sacred Fire!<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10910_InSearchOfTheFireSource 34663-06.html">"Ok let me try..."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-06.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-06.html
new file mode 100644
index 0000000000..14d6e4f162
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-06.html
@@ -0,0 +1,3 @@
+<html><body>Fire Power Zealot:<br>
+Fine, let's see if you got it right.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-07.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-07.htm
new file mode 100644
index 0000000000..f5001ca8bd
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-07.htm
@@ -0,0 +1,4 @@
+<html><body>Fire Power Zealot:<br>
+Did you managed to spawn the Sacred Fire?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10910_InSearchOfTheFireSource 34663-09.html">"Yes, I did."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-08.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-08.html
new file mode 100644
index 0000000000..95db43f26c
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-08.html
@@ -0,0 +1,3 @@
+<html><body>Fire Power Zealot:<br>
+It seems you didn't, try again harder.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-09.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-09.html
new file mode 100644
index 0000000000..33a71bd2f8
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34663-09.html
@@ -0,0 +1,4 @@
+<html><body>Fire Power Zealot:<br>
+Fine, you got it right.<br>
+Now go back to Guide Ishrin and tell him what you've learned.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34669-00.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34669-00.html
new file mode 100644
index 0000000000..7976f37be6
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34669-00.html
@@ -0,0 +1,5 @@
+<html><body>Fire Fortress Guide Ishrin:<br>
+Hello, adventurer!<br>
+I have no news for you. There's nothing I can tell you.<br>
+(Available to characters of Lv. 110+.)<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34669-01.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34669-01.htm
new file mode 100644
index 0000000000..0f72047be1
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34669-01.htm
@@ -0,0 +1,6 @@
+<html><body>Fire Fortress Guide Ishrin:<br>
+I have come to the Conquest world following the rumors about mysterious fires in the Fire Conquest area. Orcs revere these fires and even worship them.<br>
+The story has caught my interest, and I decided to investigate the Sacred Fires. Unfortunately, these fires are too few, so I need your help.<br>
+ For start, go find Fire Power Zealot in the Fire Source.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10910_InSearchOfTheFireSource 34669-02.html">Fine, I'll go see him.</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34669-02.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34669-02.html
new file mode 100644
index 0000000000..d00d13c59b
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34669-02.html
@@ -0,0 +1,4 @@
+<html><body>Fire Fortress Guide Ishrin:<br>
+You can go now,<br>
+you must find Fire Power Zealot in Fire Source Common Area, he will tell you all you need to know about Sacred Fires.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34669-03.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34669-03.htm
new file mode 100644
index 0000000000..fc50b2f8c5
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34669-03.htm
@@ -0,0 +1,5 @@
+<html><body>Fire Fortress Guide Ishrin:<br>
+So, did you managed to find Fire Power Zealot?<br>
+He told you everything about Sacred Fires?
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10910_InSearchOfTheFireSource 34669-04.html">Yes, I did, he explained very well.</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34669-04.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34669-04.html
new file mode 100644
index 0000000000..104141490a
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/34669-04.html
@@ -0,0 +1,3 @@
+<html><body>Fire Fortress Guide Ishrin:<br>
+Congratulations. You have completed all the tasks.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/Q10910_InSearchOfTheFireSource.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/Q10910_InSearchOfTheFireSource.java
new file mode 100644
index 0000000000..c48cbbd4fb
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10910_InSearchOfTheFireSource/Q10910_InSearchOfTheFireSource.java
@@ -0,0 +1,227 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q10910_InSearchOfTheFireSource;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.l2jmobius.gameserver.enums.QuestSound;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.events.Containers;
+import org.l2jmobius.gameserver.model.events.EventType;
+import org.l2jmobius.gameserver.model.events.ListenerRegisterType;
+import org.l2jmobius.gameserver.model.events.annotations.Id;
+import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
+import org.l2jmobius.gameserver.model.events.annotations.RegisterType;
+import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSacredFire;
+import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
+import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
+import org.l2jmobius.gameserver.model.quest.Quest;
+import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
+import org.l2jmobius.gameserver.network.NpcStringId;
+
+import quests.Q10904_JourneyToTheConquestWorld.Q10904_JourneyToTheConquestWorld;
+
+/**
+ * @author Mobius
+ */
+public class Q10910_InSearchOfTheFireSource extends Quest
+{
+	// NPCs
+	private static final int ISHRIN = 34669;
+	private static final int FIRE_POWER_ZEALOT = 34663;
+	private static final int SACRED_FIRE = 34658;
+	// Items
+	private static final int SACRED_FIRE_SUMMON_SCROLL = 82614;
+	// Misc
+	private static final int MIN_LEVEL = 110;
+	private static final String SUMMON_COUNT_VAR = "SummonCount";
+	
+	public Q10910_InSearchOfTheFireSource()
+	{
+		super(10910);
+		addStartNpc(ISHRIN);
+		addTalkId(ISHRIN, FIRE_POWER_ZEALOT);
+		addCondCompletedQuest(Q10904_JourneyToTheConquestWorld.class.getSimpleName(), "34663-00.html");
+		addCondMinLevel(MIN_LEVEL, "34663-00.html");
+		addSummonSpawnId(SACRED_FIRE);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if (qs == null)
+		{
+			return null;
+		}
+		
+		String htmltext = null;
+		switch (event)
+		{
+			case "34669-02.html":
+			{
+				if ((player.getLevel() >= MIN_LEVEL))
+				{
+					qs.startQuest();
+					htmltext = event;
+					Containers.Global().addListener(new ConsumerEventListener(player, EventType.ON_PLAYER_SUMMON_SACRED_FIRE, (OnPlayerSummonSacredFire eventListener) -> onPlayerSummonSacredFire(eventListener), this));
+				}
+				break;
+			}
+			case "34669-04.html":
+			{
+				if (qs.isCond(3))
+				{
+					addExpAndSp(player, 8872460372L, 7985214);
+					qs.exitQuest(false, true);
+					Containers.Global().removeListener(new ConsumerEventListener(player, EventType.ON_PLAYER_SUMMON_SACRED_FIRE, (OnPlayerSummonSacredFire eventListener) -> onPlayerSummonSacredFire(eventListener), this));
+					htmltext = event;
+				}
+				break;
+			}
+			case "34663-02.htm":
+			case "34663-03.htm":
+			case "34663-04.htm":
+			case "34663-05.htm":
+			{
+				htmltext = event;
+				break;
+			}
+			case "34663-06.html":
+			{
+				if (qs.isCond(1))
+				{
+					qs.setCond(2);
+					htmltext = event;
+				}
+				break;
+			}
+			case "34663-09.html":
+			{
+				if (qs.isCond(3))
+				{
+					htmltext = event;
+				}
+				else
+				{
+					htmltext = "34663-08.html";
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onTalk(Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, true);
+		String htmltext = getNoQuestMsg(player);
+		switch (qs.getState())
+		{
+			case State.CREATED:
+			{
+				if (npc.getId() == ISHRIN)
+				{
+					htmltext = "34669-01.htm";
+				}
+				break;
+			}
+			case State.STARTED:
+			{
+				switch (npc.getId())
+				{
+					case ISHRIN:
+					{
+						if (qs.isCond(1) || qs.isCond(2))
+						{
+							htmltext = "34669-02.html";
+						}
+						else if (qs.isCond(3))
+						{
+							htmltext = "34669-03.htm";
+						}
+						break;
+					}
+					case FIRE_POWER_ZEALOT:
+					{
+						if (qs.isCond(1))
+						{
+							htmltext = "34663-01.htm";
+						}
+						else if (qs.isCond(2) || qs.isCond(3))
+						{
+							htmltext = "34663-07.htm";
+						}
+						break;
+					}
+				}
+				break;
+			}
+			case State.COMPLETED:
+			{
+				htmltext = getAlreadyCompletedMsg(player);
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@RegisterEvent(EventType.ON_PLAYER_SUMMON_SACRED_FIRE)
+	@RegisterType(ListenerRegisterType.ITEM)
+	@Id(SACRED_FIRE_SUMMON_SCROLL)
+	public void onPlayerSummonSacredFire(OnPlayerSummonSacredFire event)
+	{
+		if (event.getNpcId() != SACRED_FIRE)
+		{
+			return;
+		}
+		final Player player = event.getPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		final QuestState qs = getQuestState(player, true);
+		int summonCount = qs.getInt(SUMMON_COUNT_VAR);
+		if (summonCount < 5)
+		{
+			qs.set(SUMMON_COUNT_VAR, summonCount + 1);
+			playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			sendNpcLogList(player);
+		}
+		if (summonCount >= 4)
+		{
+			qs.setCond(3, true);
+		}
+	}
+	
+	@Override
+	public Set<NpcLogListHolder> getNpcLogList(Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if ((qs != null) && qs.isCond(2))
+		{
+			final Set<NpcLogListHolder> holder = new HashSet<>();
+			holder.add(new NpcLogListHolder(NpcStringId.SUMMON_THE_SACRED_FIRE.getId(), true, qs.getInt(SUMMON_COUNT_VAR)));
+			return holder;
+		}
+		return super.getNpcLogList(player);
+	}
+}
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34668-00.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34668-00.html
new file mode 100644
index 0000000000..b925fd42b3
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34668-00.html
@@ -0,0 +1,5 @@
+<html><body>Fire Fortress Guide Casgard:<br>
+Hello, adventurer!<br>
+I have no news for you. There's nothing I can tell you.<br>
+(Available to characters of Lv. 110+.)<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34668-01.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34668-01.htm
new file mode 100644
index 0000000000..0807ed8af9
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34668-01.htm
@@ -0,0 +1,7 @@
+<html><body>Fire Fortress Guide Casgard:<br>
+Hi again!<br>
+It seems that you are a great hunter, do you know that there are other things to do in the Conquest world beside hunting monsters?<br>
+My colleague who is studying amazing flowers that grow here can tell more about them.<br>
+Go to the Fire Fortress Guide Ishrin to learn more.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10911_FireSmell 34668-02.html">Ok, I'll go see him.</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34668-02.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34668-02.html
new file mode 100644
index 0000000000..077c0b811b
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34668-02.html
@@ -0,0 +1,3 @@
+<html><body>Fire Fortress Guide Casgard:<br>
+Go to the Fire Fortress Guide Ishrin to learn more about special flowers that bloom in the Fire Conquest area.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-01.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-01.htm
new file mode 100644
index 0000000000..27a0986b27
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-01.htm
@@ -0,0 +1,5 @@
+<html><body>Fire Fortress Guide Ishrin:<br>
+Hello stranger!<br>
+So, Fire Fortress Guide Casgard sent you to see me?
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10911_FireSmell 34669-02.htm">"Yes, he sent me."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-02.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-02.htm
new file mode 100644
index 0000000000..a57e207ebe
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-02.htm
@@ -0,0 +1,7 @@
+<html><body>Fire Fortress Guide Ishrin:<br>
+Ok! Conquest Guide Casgard has told you that I'm studying the <font color="LEVEL">amazing flowers</font> that grow in the Fire Conquest area.<br>
+There are 3 types of flowers: <font color="LEVEL">Power Flower, Life Flower, Fire Flower</font>.<br>
+Fire Flowers grow only in the central area of Fire Source, while Life Flowers and Power Flowers can be found all over the Fire Area.<br>
+You want to know more?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10911_FireSmell 34669-03.htm">"Yes, of course."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-03.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-03.htm
new file mode 100644
index 0000000000..482bbd1889
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-03.htm
@@ -0,0 +1,8 @@
+<html><body>Fire Fortress Guide Ishrin:<br>
+More it is then:<br>
+- To collect the Flowers, you will need <font color="LEVEL">1000 HP and 500,000 SP</font>.<br>
+- When you collect the Flowers you might receive the following items with a certain chance: Seed of Fire, Ghost Soul, personal Conquest points, server Conquest points, Fire Source points, Sacred Fire Summon Scroll and Eigis Armor Fragment.<br>
+- When you collect Fire Flowers, you may also receive Divine Flower that is needed to enhance the Flame Spark Primordial Fire Source ability.<br><br>
+Now if you understood everything, I need you to get me something.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10911_FireSmell 34669-04.htm">"Yes, what do you need?"</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-04.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-04.htm
new file mode 100644
index 0000000000..2dd301b9a0
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-04.htm
@@ -0,0 +1,7 @@
+<html><body>Fire Fortress Guide Ishrin:<br>
+Ok, then...<br><br>
+These special flowers that bloom in the Fire Conquest area, are said to grant certain abilities.<br>
+I want you to bring me <font color="LEVEL">Bright Scarlet Petals</font> of Power Flowers and Life Flowers that grow in the hunting zones, and also <font color="LEVEL">Ardent Scarlet Petals</font> of Fire Flowers that grow only in central area of Fire Source.<br>
+Target: <font color="LEVEL">Power Flower, Life Flower, Fire Flower</font>.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10911_FireSmell 34669-05.html">"Fine, I'll go now!"</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-05.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-05.html
new file mode 100644
index 0000000000..1808dd55be
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-05.html
@@ -0,0 +1,3 @@
+<html><body>Fire Fortress Guide Ishrin:<br>
+Fine, make sure you bring me those petals.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-06.htm b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-06.htm
new file mode 100644
index 0000000000..f801d70285
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-06.htm
@@ -0,0 +1,4 @@
+<html><body>Fire Fortress Guide Ishrin:<br>
+Did you gathered all the petals?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10911_FireSmell 34669-08.html">"Yes, I did."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-07.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-07.html
new file mode 100644
index 0000000000..942d06bff2
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-07.html
@@ -0,0 +1,3 @@
+<html><body>Fire Fortress Guide Ishrin:<br>
+It seems you didn't, try again harder.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-08.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-08.html
new file mode 100644
index 0000000000..104141490a
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/34669-08.html
@@ -0,0 +1,3 @@
+<html><body>Fire Fortress Guide Ishrin:<br>
+Congratulations. You have completed all the tasks.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/Q10911_FireSmell.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/Q10911_FireSmell.java
new file mode 100644
index 0000000000..f2d826f729
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q10911_FireSmell/Q10911_FireSmell.java
@@ -0,0 +1,212 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q10911_FireSmell;
+
+import org.l2jmobius.gameserver.enums.QuestSound;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.events.Containers;
+import org.l2jmobius.gameserver.model.events.EventType;
+import org.l2jmobius.gameserver.model.events.ListenerRegisterType;
+import org.l2jmobius.gameserver.model.events.annotations.Id;
+import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
+import org.l2jmobius.gameserver.model.events.annotations.RegisterType;
+import org.l2jmobius.gameserver.model.events.impl.conquest.OnConquestFlowerCollect;
+import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
+import org.l2jmobius.gameserver.model.quest.Quest;
+import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
+
+import quests.Q10904_JourneyToTheConquestWorld.Q10904_JourneyToTheConquestWorld;
+
+/**
+ * @author CostyKiller
+ */
+public class Q10911_FireSmell extends Quest
+{
+	// NPCs
+	private static final int CASGARD = 34668;
+	private static final int ISHRIN = 34669;
+	// Flowers
+	private static final int FIRE_FLOWER = 34655;
+	private static final int LIFE_FLOWER = 34656;
+	private static final int POWER_FLOWER = 34657;
+	// Items
+	private static final int BRIGHT_SCARLET_PETAL = 82662;
+	private static final int ARDENT_SCARLET_PETAL = 82663;
+	// Misc
+	private static final int MIN_LEVEL = 110;
+	private static final int BRIGHT_PETALS_NEEDED = 30;
+	private static final int ARDENT_PETALS_NEEDED = 30;
+	
+	public Q10911_FireSmell()
+	{
+		super(10911);
+		addStartNpc(CASGARD);
+		addTalkId(CASGARD, ISHRIN);
+		addCondCompletedQuest(Q10904_JourneyToTheConquestWorld.class.getSimpleName(), "34668-00.html");
+		addCondMinLevel(MIN_LEVEL, "34668-00.html");
+		registerQuestItems(BRIGHT_SCARLET_PETAL, ARDENT_SCARLET_PETAL);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if (qs == null)
+		{
+			return null;
+		}
+		
+		String htmltext = null;
+		switch (event)
+		{
+			case "34668-02.html":
+			{
+				if ((player.getLevel() >= MIN_LEVEL))
+				{
+					qs.startQuest();
+					htmltext = event;
+					Containers.Global().addListener(new ConsumerEventListener(player, EventType.ON_CONQUEST_FLOWER_COLLECT, (OnConquestFlowerCollect eventListener) -> onConquestFlowerCollect(eventListener), this));
+				}
+				break;
+			}
+			case "34669-02.htm":
+			case "34669-03.htm":
+			case "34669-04.htm":
+			{
+				htmltext = event;
+				break;
+			}
+			case "34669-05.html":
+			{
+				if (qs.isCond(1))
+				{
+					qs.setCond(2);
+					htmltext = event;
+				}
+				break;
+			}
+			case "34669-08.html":
+			{
+				if (qs.isCond(3))
+				{
+					addExpAndSp(player, 8872460372L, 7985214);
+					Containers.Global().removeListener(new ConsumerEventListener(player, EventType.ON_CONQUEST_FLOWER_COLLECT, (OnConquestFlowerCollect eventListener) -> onConquestFlowerCollect(eventListener), this));
+					qs.exitQuest(false, true);
+					htmltext = event;
+				}
+				else
+				{
+					htmltext = "34669-07.html";
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onTalk(Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, true);
+		String htmltext = getNoQuestMsg(player);
+		switch (qs.getState())
+		{
+			case State.CREATED:
+			{
+				if (npc.getId() == CASGARD)
+				{
+					htmltext = "34668-01.htm";
+				}
+				break;
+			}
+			case State.STARTED:
+			{
+				switch (npc.getId())
+				{
+					case CASGARD:
+					{
+						htmltext = "34668-02.html";
+						break;
+					}
+					case ISHRIN:
+					{
+						if (qs.isCond(1))
+						{
+							htmltext = "34669-01.htm";
+						}
+						else if (qs.isCond(2) || qs.isCond(3))
+						{
+							htmltext = "34669-06.htm";
+						}
+						break;
+					}
+				}
+				break;
+			}
+			case State.COMPLETED:
+			{
+				htmltext = getAlreadyCompletedMsg(player);
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@RegisterEvent(EventType.ON_CONQUEST_FLOWER_COLLECT)
+	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
+	@Id(FIRE_FLOWER)
+	@Id(LIFE_FLOWER)
+	@Id(POWER_FLOWER)
+	private void onConquestFlowerCollect(OnConquestFlowerCollect event)
+	{
+		final Player player = event.getPlayer();
+		if ((player.getLevel() < MIN_LEVEL))
+		{
+			return;
+		}
+		if (event.getNpcId() == FIRE_FLOWER)
+		{
+			if (getQuestItemsCount(player, ARDENT_SCARLET_PETAL) < ARDENT_PETALS_NEEDED)
+			{
+				giveItems(player, ARDENT_SCARLET_PETAL, 1);
+				playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				checkQuestProgress(player);
+			}
+		}
+		else if ((event.getNpcId() == LIFE_FLOWER) || (event.getNpcId() == POWER_FLOWER))
+		{
+			if (getQuestItemsCount(player, BRIGHT_SCARLET_PETAL) < BRIGHT_PETALS_NEEDED)
+			{
+				giveItems(player, BRIGHT_SCARLET_PETAL, 1);
+				playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				checkQuestProgress(player);
+			}
+		}
+	}
+	
+	private void checkQuestProgress(Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if ((getQuestItemsCount(player, BRIGHT_SCARLET_PETAL) >= BRIGHT_PETALS_NEEDED) && (getQuestItemsCount(player, ARDENT_SCARLET_PETAL) >= ARDENT_PETALS_NEEDED))
+		{
+			qs.setCond(3, true);
+			playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+		}
+	}
+}
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
index b05fcbec85..d32965c2a7 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
@@ -614,7 +614,7 @@ public class Q11025_PathOfDestinyProving extends Quest
 				holder.add(new NpcLogListHolder(NpcStringId.KILL_SKELETONS_3.getId(), true, qs.getInt(KILL_COUNT_VAR)));
 				return holder;
 			}
-			else if (qs.isCond(11))
+			else if (qs.isCond(12))
 			{
 				final Set<NpcLogListHolder> holder = new HashSet<>();
 				holder.add(new NpcLogListHolder(NpcStringId.INVESTIGATE_THE_SURROUNDINGS.getId(), true, qs.getInt(KILL_COUNT_VAR2)));
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
index 87b0fdae8c..3a17382c3f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
@@ -312,7 +312,6 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT1);
 				}
-				htmltext = event;
 				break;
 			}
 			case "teleport2":
@@ -321,7 +320,6 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT2);
 				}
-				htmltext = event;
 				break;
 			}
 			case "teleport3":
@@ -330,7 +328,6 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT3);
 				}
-				htmltext = event;
 				break;
 			}
 			case "teleport4":
@@ -339,7 +336,6 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT4);
 				}
-				htmltext = event;
 				break;
 			}
 			case "teleport5":
@@ -348,10 +344,8 @@ public class Q11026_PathOfDestinyConviction extends Quest
 				{
 					player.teleToLocation(TRAINING_GROUNDS_TELEPORT5);
 				}
-				htmltext = event;
 				break;
 			}
-			
 		}
 		return htmltext;
 	}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/33932-04.html b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/33932-04.html
index e02efa765d..e0c6752097 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/33932-04.html
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/33932-04.html
@@ -3,7 +3,7 @@
 <font color="LEVEL">When the god's voice will no longer be heard.</font><br>
 <font color="LEVEL">A red river flows...</font><br>
 <font color="LEVEL">Hard frost upon the earth... And one of half-noble blood, descending with the winds to become the prophesied one.</font><br>
-<font color="LEVEL">Your lonely, solitary journey has begun. A small child in the middle of a blocked road appears. When joined by one of nobility, the path will open to the Grail.</center><br>
+<font color="LEVEL">Your lonely, solitary journey has begun. A small child in the middle of a blocked road appears. When joined by one of nobility, the path will open to the Grail.</font></center><br>
 So it wasn't a coincidence that you left on your journey.<br>
 <Button ALIGN=LEFT ICON="Normal" action="bypass -h Quest Q11027_PathOfDestinyOvercome 33932-05.html">"What do you mean?"</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/QuestMasterHandler.java
index dd2b43e1fb..961128a663 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -60,6 +60,14 @@ import quests.Q10887_SaviorsPathDemonsAndAtelia.Q10887_SaviorsPathDemonsAndAteli
 import quests.Q10888_SaviorsPathDefeatTheEmbryo.Q10888_SaviorsPathDefeatTheEmbryo;
 import quests.Q10889_SaviorsPathFallenEmperorsThrone.Q10889_SaviorsPathFallenEmperorsThrone;
 import quests.Q10890_SaviorsPathHallOfEtina.Q10890_SaviorsPathHallOfEtina;
+import quests.Q10904_JourneyToTheConquestWorld.Q10904_JourneyToTheConquestWorld;
+import quests.Q10905_HuntingTime.Q10905_HuntingTime;
+import quests.Q10906_ChasingTheLight.Q10906_ChasingTheLight;
+import quests.Q10907_WhereFlowersBlossom.Q10907_WhereFlowersBlossom;
+import quests.Q10908_DarkSunPrimordialFlame.Q10908_DarkSunPrimordialFlame;
+import quests.Q10909_FlameHunting.Q10909_FlameHunting;
+import quests.Q10910_InSearchOfTheFireSource.Q10910_InSearchOfTheFireSource;
+import quests.Q10911_FireSmell.Q10911_FireSmell;
 import quests.Q11024_PathOfDestinyBeginning.Q11024_PathOfDestinyBeginning;
 import quests.Q11025_PathOfDestinyProving.Q11025_PathOfDestinyProving;
 import quests.Q11026_PathOfDestinyConviction.Q11026_PathOfDestinyConviction;
@@ -75,10 +83,6 @@ import quests.not_done.Q01900_StormIsleSecretSpot;
 import quests.not_done.Q01901_StormIsleFurtiveDeal;
 import quests.not_done.Q10595_TheDimensionalWarpPart8;
 import quests.not_done.Q10596_TheDimensionalWarpPart9;
-import quests.not_done.Q10904_JourneyToTheConquestWorld;
-import quests.not_done.Q10905_HuntingTime;
-import quests.not_done.Q10906_ChasingTheLight;
-import quests.not_done.Q10907_WhereFlowersBlossom;
 import quests.not_done.Q11028_WindOfDestinyEncounter;
 import quests.not_done.Q11029_WindOfDestinyPromise;
 import quests.not_done.Q11030_WindOfDestinyChoice;
@@ -144,10 +148,14 @@ public class QuestMasterHandler
 		Q10888_SaviorsPathDefeatTheEmbryo.class,
 		Q10889_SaviorsPathFallenEmperorsThrone.class,
 		Q10890_SaviorsPathHallOfEtina.class,
-		Q10904_JourneyToTheConquestWorld.class, // TODO: Not done.
-		Q10905_HuntingTime.class, // TODO: Not done.
-		Q10906_ChasingTheLight.class, // TODO: Not done.
-		Q10907_WhereFlowersBlossom.class, // TODO: Not done.
+		Q10904_JourneyToTheConquestWorld.class,
+		Q10905_HuntingTime.class,
+		Q10906_ChasingTheLight.class,
+		Q10907_WhereFlowersBlossom.class,
+		Q10908_DarkSunPrimordialFlame.class,
+		Q10909_FlameHunting.class,
+		Q10910_InSearchOfTheFireSource.class,
+		Q10911_FireSmell.class,
 		Q11028_WindOfDestinyEncounter.class, // TODO: Not done.
 		Q11029_WindOfDestinyPromise.class, // TODO: Not done.
 		Q11030_WindOfDestinyChoice.class, // TODO: Not done.
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/not_done/Q10904_JourneyToTheConquestWorld.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/not_done/Q10904_JourneyToTheConquestWorld.java
deleted file mode 100644
index 7e4ec90e82..0000000000
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/not_done/Q10904_JourneyToTheConquestWorld.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package quests.not_done;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.model.quest.Quest;
-
-/**
- * @author Mobius
- */
-public class Q10904_JourneyToTheConquestWorld extends Quest
-{
-	private static final int START_NPC = 34600;
-	
-	public Q10904_JourneyToTheConquestWorld()
-	{
-		super(10904);
-		addStartNpc(START_NPC);
-		addTalkId(START_NPC);
-		addCondMinLevel(Config.PLAYER_MAXIMUM_LEVEL, getNoQuestMsg(null));
-	}
-}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/not_done/Q10905_HuntingTime.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/not_done/Q10905_HuntingTime.java
deleted file mode 100644
index 2f59155944..0000000000
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/not_done/Q10905_HuntingTime.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package quests.not_done;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.model.quest.Quest;
-
-/**
- * @author Mobius
- */
-public class Q10905_HuntingTime extends Quest
-{
-	private static final int START_NPC = 34599;
-	
-	public Q10905_HuntingTime()
-	{
-		super(10905);
-		addStartNpc(START_NPC);
-		addTalkId(START_NPC);
-		addCondMinLevel(Config.PLAYER_MAXIMUM_LEVEL, getNoQuestMsg(null));
-	}
-}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/not_done/Q10906_ChasingTheLight.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/not_done/Q10906_ChasingTheLight.java
deleted file mode 100644
index 140a7a339b..0000000000
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/not_done/Q10906_ChasingTheLight.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package quests.not_done;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.model.quest.Quest;
-
-/**
- * @author Mobius
- */
-public class Q10906_ChasingTheLight extends Quest
-{
-	private static final int START_NPC = 34599;
-	
-	public Q10906_ChasingTheLight()
-	{
-		super(10906);
-		addStartNpc(START_NPC);
-		addTalkId(START_NPC);
-		addCondMinLevel(Config.PLAYER_MAXIMUM_LEVEL, getNoQuestMsg(null));
-	}
-}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/not_done/Q10907_WhereFlowersBlossom.java b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/not_done/Q10907_WhereFlowersBlossom.java
deleted file mode 100644
index c8e2cff6a1..0000000000
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/scripts/quests/not_done/Q10907_WhereFlowersBlossom.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package quests.not_done;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.model.quest.Quest;
-
-/**
- * @author Mobius
- */
-public class Q10907_WhereFlowersBlossom extends Quest
-{
-	private static final int START_NPC = 34599;
-	
-	public Q10907_WhereFlowersBlossom()
-	{
-		super(10907);
-		addStartNpc(START_NPC);
-		addTalkId(START_NPC);
-		addCondMinLevel(Config.PLAYER_MAXIMUM_LEVEL, getNoQuestMsg(null));
-	}
-}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/skillTrees/ErtheiaClass/Eviscerator.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/skillTrees/ErtheiaClass/Eviscerator.xml
index 4a0e04235f..7dc95c7f1d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/skillTrees/ErtheiaClass/Eviscerator.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/skillTrees/ErtheiaClass/Eviscerator.xml
@@ -390,5 +390,9 @@
 		<skill skillName="Left Sidestep" skillId="30507" skillLevel="27" getLevel="111" levelUpSp="436393" />
 		<skill skillName="Left Sidestep" skillId="30507" skillLevel="28" getLevel="116" levelUpSp="436393" />
 		
+		<!-- The Source of Flame -->
+		<skill skillName="Earth Fist" skillId="31154" skillLevel="1" getLevel="110" levelUpSp="436393">
+			<item id="81453" count="2" /> <!-- Improved Rune Stone -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Dion/CrumaMarshlands.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Dion/CrumaMarshlands.xml
index 1c3d697e79..26b0e188b0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Dion/CrumaMarshlands.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Dion/CrumaMarshlands.xml
@@ -1,421 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="CrumaMarshlands">
-		<group>
-			<npc id="20157" x="10145" y="114402" z="-3688" heading="48327" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="10157" y="113715" z="-3672" heading="59815" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="10221" y="115099" z="-3728" heading="30033" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="10557" y="106243" z="-3680" heading="49649" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="11062" y="115154" z="-3728" heading="49979" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="11245" y="106460" z="-3616" heading="40498" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="11368" y="115183" z="-3704" heading="27783" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="11535" y="106243" z="-3600" heading="32147" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="11906" y="114878" z="-3712" heading="53182" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="12859" y="105688" z="-3600" heading="12602" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="12998" y="103185" z="-3728" heading="8191" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="13164" y="104750" z="-3520" heading="39038" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="13663" y="120604" z="-3728" heading="28887" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="13851" y="106013" z="-3736" heading="30252" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="14260" y="103058" z="-3672" heading="4948" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="14424" y="120230" z="-3744" heading="55102" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="14563" y="118413" z="-3680" heading="22447" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="14643" y="117974" z="-3696" heading="10575" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="14832" y="126354" z="-3720" heading="28262" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="15373" y="120495" z="-3696" heading="27559" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="16547" y="120190" z="-3728" heading="2759" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="16703" y="105806" z="-3704" heading="57521" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="17427" y="120013" z="-3672" heading="60588" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="18772" y="122484" z="-3704" heading="10703" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="19249" y="122127" z="-3752" heading="47917" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="19413" y="125131" z="-3664" heading="20997" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="20565" y="123778" z="-3672" heading="31777" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="20807" y="123124" z="-3616" heading="45123" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="21290" y="121312" z="-3736" heading="15381" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="21588" y="121871" z="-3712" heading="761" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="22250" y="123654" z="-3640" heading="36646" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="5346" y="111475" z="-3736" heading="27876" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="6804" y="112311" z="-3680" heading="55699" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="7171" y="112952" z="-3680" heading="13584" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="7347" y="109401" z="-3688" heading="4667" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20157" x="9952" y="105918" z="-3648" heading="53213" respawnTime="60sec" /> <!-- Marsh Stakato -->
-			<npc id="20225" x="10654" y="123277" z="-3672" heading="5553" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="11994" y="124119" z="-3664" heading="63324" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="12392" y="122957" z="-3656" heading="55719" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="12416" y="123885" z="-3672" heading="50824" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="13085" y="122896" z="-3664" heading="14269" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="13427" y="122888" z="-3664" heading="63222" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="13674" y="124944" z="-3656" heading="5915" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="16208" y="123332" z="-3680" heading="10729" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="17213" y="124094" z="-3696" heading="15542" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="17570" y="124029" z="-3696" heading="6404" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="17628" y="122497" z="-3720" heading="60234" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="17690" y="124251" z="-3704" heading="22187" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="5117" y="114351" z="-3744" heading="15593" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="6644" y="116524" z="-3712" heading="52246" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="6835" y="115256" z="-3736" heading="24428" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="7214" y="115801" z="-3640" heading="21373" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="7341" y="116897" z="-3664" heading="39287" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="7819" y="115373" z="-3672" heading="12414" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="7881" y="117177" z="-3656" heading="6016" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="7918" y="113876" z="-3664" heading="4982" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="7961" y="116455" z="-3728" heading="24945" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="8365" y="119276" z="-3672" heading="10542" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="9393" y="118489" z="-3744" heading="46648" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20225" x="9665" y="118287" z="-3744" heading="26692" respawnTime="60sec" /> <!-- Giant Mist Leech -->
-			<npc id="20226" x="10839" y="120512" z="-3728" heading="31002" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="11226" y="124379" z="-3736" heading="28510" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="12030" y="125423" z="-3704" heading="42570" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="13165" y="125479" z="-3752" heading="43308" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="13325" y="124276" z="-3656" heading="2639" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="14644" y="124433" z="-3712" heading="9741" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="14769" y="126350" z="-3720" heading="17956" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="15350" y="126519" z="-3688" heading="8608" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="17084" y="124871" z="-3688" heading="32506" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="17102" y="124371" z="-3712" heading="41567" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="17679" y="125138" z="-3672" heading="10067" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="5416" y="116224" z="-3744" heading="22260" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="5995" y="115163" z="-3688" heading="1200" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="6823" y="117620" z="-3680" heading="57854" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="7025" y="117620" z="-3688" heading="23973" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="7915" y="114089" z="-3672" heading="62346" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="8684" y="115806" z="-3744" heading="50547" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="8714" y="118069" z="-3728" heading="58632" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="9667" y="121824" z="-3672" heading="43428" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20226" x="9838" y="117674" z="-3712" heading="21766" respawnTime="60sec" /> <!-- Gray Ant -->
-			<npc id="20227" x="10117" y="114913" z="-3720" heading="42196" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="11077" y="107279" z="-3696" heading="52327" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="11774" y="125103" z="-3728" heading="14069" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="11852" y="117144" z="-3736" heading="11734" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="12188" y="114424" z="-3760" heading="33550" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="12492" y="124095" z="-3656" heading="34023" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="13364" y="124494" z="-3640" heading="42550" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="14797" y="125236" z="-3672" heading="24502" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="14865" y="120098" z="-3752" heading="57906" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="16103" y="120992" z="-3680" heading="58458" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="16254" y="123233" z="-3696" heading="867" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="16687" y="124280" z="-3712" heading="628" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="16704" y="124971" z="-3680" heading="33533" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="17562" y="122661" z="-3744" heading="46250" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="18128" y="125457" z="-3672" heading="18970" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="18214" y="122774" z="-3736" heading="11431" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="18228" y="125072" z="-3680" heading="51290" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="18628" y="120861" z="-3744" heading="10620" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="18694" y="121525" z="-3744" heading="28179" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="19071" y="124402" z="-3672" heading="44317" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="19287" y="123542" z="-3656" heading="38787" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="20715" y="124824" z="-3648" heading="30111" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="20917" y="123834" z="-3680" heading="52690" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="6585" y="111657" z="-3680" heading="17583" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="6691" y="117583" z="-3672" heading="28362" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="6796" y="114174" z="-3704" heading="49674" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="7259" y="113979" z="-3656" heading="20425" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="7300" y="116673" z="-3704" heading="16593" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="7302" y="113243" z="-3672" heading="11734" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="7457" y="109464" z="-3688" heading="19970" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="7622" y="117001" z="-3648" heading="38023" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="7736" y="116409" z="-3728" heading="41574" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="7935" y="108697" z="-3704" heading="62015" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="7953" y="107836" z="-3656" heading="27262" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="8083" y="115815" z="-3704" heading="53122" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="8155" y="117441" z="-3656" heading="63662" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="8255" y="109191" z="-3728" heading="17465" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="8553" y="106089" z="-3728" heading="14750" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="9818" y="113533" z="-3672" heading="1819" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="9861" y="109564" z="-3736" heading="38883" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="9934" y="113339" z="-3688" heading="61917" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20227" x="9977" y="114873" z="-3696" heading="35291" respawnTime="60sec" /> <!-- Mist Horror Ripper -->
-			<npc id="20228" x="10049" y="109405" z="-3728" heading="30938" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="10187" y="111193" z="-3744" heading="53696" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="11543" y="115651" z="-3664" heading="41832" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="11979" y="117017" z="-3728" heading="56558" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="12268" y="113520" z="-3744" heading="40487" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="15206" y="119366" z="-3752" heading="53911" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="18621" y="121486" z="-3744" heading="25821" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="18695" y="121394" z="-3744" heading="21647" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="19181" y="120468" z="-3720" heading="13876" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="19267" y="120599" z="-3712" heading="49144" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="19543" y="123555" z="-3648" heading="58104" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="19978" y="124383" z="-3664" heading="22534" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="20734" y="122837" z="-3656" heading="43939" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="20737" y="122988" z="-3632" heading="60079" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="20814" y="122162" z="-3744" heading="35152" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="20899" y="123742" z="-3680" heading="8869" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="21745" y="121416" z="-3744" heading="3879" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="23073" y="123349" z="-3656" heading="9305" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="7702" y="110195" z="-3688" heading="58131" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="7895" y="111427" z="-3680" heading="27175" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="7970" y="107471" z="-3648" heading="5479" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="9023" y="109383" z="-3736" heading="52118" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="9503" y="110988" z="-3760" heading="55743" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="9807" y="114516" z="-3664" heading="43188" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="9867" y="108217" z="-3736" heading="25036" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20228" x="9918" y="108766" z="-3736" heading="5805" respawnTime="60sec" /> <!-- Giant Crimson Ant -->
-			<npc id="20229" x="11420" y="110501" z="-3704" heading="10853" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="11577" y="110700" z="-3728" heading="23518" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="11621" y="104239" z="-3536" heading="49037" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="12039" y="106370" z="-3672" heading="27737" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="12682" y="111327" z="-3720" heading="12744" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="12771" y="103659" z="-3592" heading="31252" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="12803" y="104665" z="-3512" heading="40761" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="13083" y="104023" z="-3528" heading="19647" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="13199" y="104119" z="-3520" heading="36715" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="14232" y="106110" z="-3736" heading="35506" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="14295" y="115560" z="-3672" heading="21841" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="14304" y="109920" z="-3760" heading="24073" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="14436" y="102422" z="-3728" heading="58409" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="14495" y="115205" z="-3624" heading="57673" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="14867" y="117805" z="-3696" heading="36125" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="15222" y="103955" z="-3624" heading="55911" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="15906" y="105026" z="-3720" heading="62315" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="16269" y="117620" z="-3744" heading="23857" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="17035" y="118106" z="-3752" heading="10906" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="17075" y="106199" z="-3664" heading="30716" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="17491" y="107449" z="-3736" heading="57960" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="17548" y="118904" z="-3688" heading="32073" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="20589" y="118996" z="-3752" heading="14804" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="22435" y="114712" z="-3704" heading="29411" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="22737" y="115968" z="-3752" heading="21816" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="23139" y="115746" z="-3720" heading="588" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="24822" y="115743" z="-3672" heading="8973" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="25040" y="115289" z="-3696" heading="43020" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="26248" y="117335" z="-3664" heading="56193" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="26944" y="114762" z="-3688" heading="39527" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="27028" y="112522" z="-3672" heading="12937" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="27056" y="116346" z="-3704" heading="14068" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="27215" y="113143" z="-3664" heading="65343" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="27215" y="117982" z="-3712" heading="1747" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="27298" y="114292" z="-3712" heading="11534" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="27328" y="117716" z="-3688" heading="27737" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="27584" y="112931" z="-3672" heading="47918" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="27652" y="114045" z="-3704" heading="64312" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="28137" y="115273" z="-3696" heading="3429" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="29490" y="112300" z="-3704" heading="53428" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="7923" y="110791" z="-3672" heading="18755" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="8225" y="107055" z="-3640" heading="22130" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="8997" y="107203" z="-3664" heading="59404" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="9411" y="108397" z="-3704" heading="17486" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20229" x="9626" y="110229" z="-3744" heading="26475" respawnTime="60sec" /> <!-- Weird Wasp -->
-			<npc id="20230" x="11195" y="104960" z="-3656" heading="48892" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="11373" y="111182" z="-3752" heading="4482" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="11400" y="110292" z="-3696" heading="43163" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="11861" y="105418" z="-3648" heading="49153" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="11976" y="109304" z="-3704" heading="21571" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="12253" y="110647" z="-3720" heading="22154" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="12296" y="106436" z="-3704" heading="32767" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="12911" y="106567" z="-3736" heading="30149" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="13033" y="104338" z="-3504" heading="40601" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="13565" y="111444" z="-3704" heading="25521" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="13624" y="112849" z="-3728" heading="54568" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="13674" y="104176" z="-3520" heading="2551" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="13722" y="112994" z="-3688" heading="40595" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="13804" y="112788" z="-3744" heading="23831" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="14085" y="112881" z="-3728" heading="32246" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="14175" y="117567" z="-3696" heading="41446" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="14180" y="117391" z="-3696" heading="21863" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="14201" y="115835" z="-3680" heading="41687" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="14249" y="106445" z="-3624" heading="21689" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="14290" y="110040" z="-3752" heading="7246" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="14392" y="117590" z="-3696" heading="63066" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="14704" y="109260" z="-3736" heading="15331" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="14706" y="111761" z="-3664" heading="10744" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="14880" y="117336" z="-3704" heading="46001" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="15187" y="110692" z="-3696" heading="17615" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="15191" y="110129" z="-3752" heading="21571" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="15625" y="118190" z="-3720" heading="63670" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="16415" y="104498" z="-3648" heading="18854" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="16634" y="106276" z="-3560" heading="9488" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="16830" y="116749" z="-3664" heading="22883" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="17618" y="117637" z="-3688" heading="57723" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="17635" y="110834" z="-3752" heading="63555" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="17885" y="118922" z="-3768" heading="28491" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="18018" y="118996" z="-3776" heading="43561" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="18737" y="117550" z="-3704" heading="10837" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="18953" y="118957" z="-3720" heading="34726" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="18982" y="117256" z="-3712" heading="13699" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="19966" y="113554" z="-3744" heading="22042" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="20235" y="118301" z="-3720" heading="32637" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="20532" y="113755" z="-3696" heading="21219" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="20685" y="113606" z="-3696" heading="35636" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="20739" y="114354" z="-3712" heading="64437" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="20789" y="113126" z="-3688" heading="44317" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="20933" y="118292" z="-3760" heading="16383" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="22308" y="115082" z="-3720" heading="13481" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="22743" y="117019" z="-3728" heading="9776" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="22965" y="117690" z="-3688" heading="1722" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="24350" y="115769" z="-3664" heading="52591" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="24762" y="115612" z="-3672" heading="45592" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="25693" y="117677" z="-3720" heading="2523" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="25960" y="116817" z="-3712" heading="42156" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="26740" y="112820" z="-3704" heading="22080" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="26791" y="115678" z="-3680" heading="14668" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="26791" y="117302" z="-3680" heading="13444" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="27101" y="118433" z="-3712" heading="2238" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="27873" y="116452" z="-3696" heading="9883" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="27996" y="118116" z="-3688" heading="1313" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="28540" y="116426" z="-3688" heading="37026" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20230" x="28681" y="113949" z="-3728" heading="65534" respawnTime="60sec" /> <!-- Marsh Stakato Worker -->
-			<npc id="20231" x="12108" y="109935" z="-3736" heading="33192" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="12226" y="111503" z="-3744" heading="26958" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="14139" y="111323" z="-3656" heading="17610" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="14254" y="113199" z="-3744" heading="54524" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="14934" y="109996" z="-3752" heading="42086" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="16381" y="108569" z="-3744" heading="45738" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="16603" y="102931" z="-3656" heading="39173" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="16607" y="111236" z="-3736" heading="4614" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="16987" y="109887" z="-3744" heading="44755" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="17078" y="109916" z="-3744" heading="56775" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="17147" y="103715" z="-3664" heading="34735" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="17270" y="107407" z="-3704" heading="23421" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="17611" y="108196" z="-3728" heading="18246" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="17968" y="109789" z="-3696" heading="53486" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="18059" y="103180" z="-3696" heading="52287" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="18356" y="105194" z="-3736" heading="41158" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="18859" y="105263" z="-3744" heading="25620" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="19317" y="119130" z="-3728" heading="40465" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="19505" y="103923" z="-3712" heading="53801" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="19805" y="103993" z="-3712" heading="37949" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="20192" y="102799" z="-3712" heading="21125" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="20242" y="118392" z="-3720" heading="17873" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="20463" y="118056" z="-3712" heading="33145" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="20552" y="119698" z="-3696" heading="61462" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="20647" y="102461" z="-3736" heading="33753" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="21134" y="104635" z="-3696" heading="50276" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="22009" y="110323" z="-3736" heading="46887" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="22032" y="112185" z="-3704" heading="63187" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="23457" y="115943" z="-3720" heading="1520" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="23983" y="115720" z="-3744" heading="11770" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="24389" y="116114" z="-3736" heading="5538" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="25004" y="115293" z="-3696" heading="19053" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="25266" y="118778" z="-3728" heading="61145" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="25333" y="120067" z="-3672" heading="5856" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="26660" y="114436" z="-3672" heading="6584" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="26693" y="113008" z="-3696" heading="58290" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="27049" y="116457" z="-3704" heading="29165" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="27398" y="119633" z="-3680" heading="13325" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="27444" y="113523" z="-3696" heading="20142" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="27542" y="107939" z="-3720" heading="47937" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="27695" y="110998" z="-3688" heading="47882" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="27758" y="114925" z="-3688" heading="34676" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="27824" y="112567" z="-3672" heading="24575" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="28454" y="112275" z="-3656" heading="19351" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="29081" y="116082" z="-3752" heading="61568" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="29908" y="114099" z="-3680" heading="27868" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="30185" y="112919" z="-3688" heading="5507" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20231" x="9970" y="112574" z="-3672" heading="25376" respawnTime="60sec" /> <!-- Toad Lord -->
-			<npc id="20232" x="11076" y="111832" z="-3720" heading="33579" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="11589" y="110205" z="-3712" heading="48287" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="14339" y="110054" z="-3752" heading="350" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="16786" y="103974" z="-3648" heading="20804" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="17007" y="106374" z="-3664" heading="50889" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="17690" y="111167" z="-3744" heading="36817" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="18042" y="110142" z="-3728" heading="32770" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="18984" y="101844" z="-3728" heading="3577" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="19532" y="103738" z="-3712" heading="26610" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="19722" y="103025" z="-3680" heading="22903" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="19930" y="115219" z="-3624" heading="10089" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="20107" y="104472" z="-3680" heading="18144" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="20319" y="113888" z="-3688" heading="10977" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="20554" y="106153" z="-3720" heading="30071" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="20794" y="113394" z="-3696" heading="12176" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="20876" y="103621" z="-3672" heading="33636" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="20905" y="111628" z="-3704" heading="50780" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="20947" y="110142" z="-3720" heading="32593" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="20991" y="112175" z="-3752" heading="43180" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="20994" y="109150" z="-3744" heading="58703" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="21005" y="106899" z="-3696" heading="15332" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="21102" y="103006" z="-3704" heading="20125" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="21787" y="106531" z="-3744" heading="19334" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="21795" y="112126" z="-3704" heading="8440" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="22118" y="104546" z="-3720" heading="17962" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="22193" y="106325" z="-3664" heading="53603" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="22385" y="108386" z="-3696" heading="33203" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="22542" y="102639" z="-3712" heading="33290" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="23102" y="112808" z="-3744" heading="40310" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="23239" y="103239" z="-3728" heading="20852" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="23255" y="105278" z="-3672" heading="47071" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="23643" y="106564" z="-3648" heading="12328" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="23888" y="102703" z="-3656" heading="8623" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="24631" y="112790" z="-3680" heading="62125" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="24687" y="109563" z="-3744" heading="8819" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="24712" y="113917" z="-3712" heading="19107" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="24958" y="106440" z="-3664" heading="468" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="25108" y="113378" z="-3712" heading="17518" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="25205" y="104662" z="-3744" heading="49327" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="25343" y="108736" z="-3672" heading="7201" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="26010" y="105064" z="-3728" heading="44200" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="26935" y="110879" z="-3704" heading="7065" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="26950" y="107831" z="-3680" heading="61014" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="27032" y="108397" z="-3640" heading="51484" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="29022" y="108189" z="-3704" heading="3577" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20232" x="29043" y="109080" z="-3704" heading="38495" respawnTime="60sec" /> <!-- Marsh Stakato Soldier -->
-			<npc id="20233" x="17106" y="102579" z="-3696" heading="12309" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="17777" y="106099" z="-3744" heading="62346" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="18120" y="102026" z="-3736" heading="12382" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="18487" y="106034" z="-3672" heading="62160" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="19161" y="101035" z="-3656" heading="40111" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="19417" y="103724" z="-3720" heading="63369" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="19445" y="102910" z="-3672" heading="53603" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="19845" y="101897" z="-3728" heading="50837" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="20666" y="106358" z="-3720" heading="63994" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="20704" y="106123" z="-3720" heading="15941" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="20952" y="110188" z="-3712" heading="10165" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="20959" y="104749" z="-3680" heading="32246" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="20976" y="110402" z="-3704" heading="16558" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="21345" y="103293" z="-3680" heading="28782" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="21605" y="111653" z="-3744" heading="36308" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="21678" y="112741" z="-3696" heading="21258" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="21957" y="106528" z="-3728" heading="4184" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="22544" y="104481" z="-3672" heading="7391" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="22689" y="110457" z="-3744" heading="20401" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="23009" y="104199" z="-3680" heading="10747" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="23406" y="106345" z="-3664" heading="31814" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="23579" y="102280" z="-3664" heading="5069" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="24061" y="104538" z="-3728" heading="3782" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="24480" y="104033" z="-3728" heading="18048" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="24688" y="109843" z="-3744" heading="2526" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="24723" y="109351" z="-3736" heading="31606" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="24979" y="114017" z="-3712" heading="14875" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="24985" y="105512" z="-3680" heading="46975" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="25076" y="109528" z="-3720" heading="22184" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="25131" y="103490" z="-3656" heading="814" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="25536" y="106284" z="-3672" heading="53627" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="26934" y="105362" z="-3656" heading="3507" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="27132" y="107838" z="-3688" heading="27854" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="27783" y="106741" z="-3688" heading="18854" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="28207" y="106937" z="-3688" heading="15859" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="28736" y="110009" z="-3744" heading="44782" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="28948" y="109201" z="-3704" heading="8253" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="29053" y="108116" z="-3712" heading="5142" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20233" x="29185" y="111553" z="-3736" heading="56299" respawnTime="60sec" /> <!-- Marsh Spider -->
-			<npc id="20234" x="20750" y="105615" z="-3720" heading="19636" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="21325" y="106363" z="-3736" heading="29480" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="21430" y="103848" z="-3680" heading="37607" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="22228" y="106385" z="-3680" heading="48957" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="22605" y="105969" z="-3664" heading="58060" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="22668" y="105779" z="-3672" heading="1930" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="22876" y="106068" z="-3672" heading="19367" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="22918" y="106086" z="-3672" heading="53333" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="22997" y="104192" z="-3680" heading="58968" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="23497" y="102856" z="-3640" heading="25740" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="24187" y="103985" z="-3736" heading="14312" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="24290" y="114360" z="-3744" heading="37334" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="24295" y="106499" z="-3664" heading="11300" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="24404" y="110801" z="-3672" heading="45323" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="24584" y="111857" z="-3648" heading="41906" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="24670" y="103798" z="-3688" heading="64325" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="24916" y="103319" z="-3648" heading="8544" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="25209" y="105752" z="-3680" heading="48664" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="25892" y="112055" z="-3736" heading="56629" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="25914" y="111332" z="-3728" heading="34267" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="25971" y="104178" z="-3656" heading="58877" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="25987" y="107922" z="-3712" heading="27321" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="26011" y="111203" z="-3704" heading="42485" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="26742" y="109088" z="-3640" heading="3871" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="27700" y="110114" z="-3696" heading="12572" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="28109" y="109247" z="-3736" heading="24204" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="28121" y="107303" z="-3688" heading="5815" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="28674" y="112689" z="-3680" heading="5382" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
-			<npc id="20234" x="28781" y="107327" z="-3688" heading="9325" respawnTime="60sec" /> <!-- Marsh Stakato Drone -->
+		<group> <!-- NPC -->
 			<npc id="30621" x="10580" y="118027" z="-3672" heading="59000" respawnTime="60sec" /> <!-- Nikola - Maestro -->
 			<npc id="30673" x="16539" y="113415" z="-3576" heading="0" respawnTime="60sec" /> <!-- Lorain - Researcher -->
 		</group>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Dion/CrumaMarshlandsMonsters.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Dion/CrumaMarshlandsMonsters.xml
new file mode 100644
index 0000000000..e15450e7e2
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Dion/CrumaMarshlandsMonsters.xml
@@ -0,0 +1,883 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="CrumaMarshlands"> <!-- MOB -->
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="7327" y="122763" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="5445" y="121197" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="4395" y="118904" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="4239" y="111903" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="5140" y="109595" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="5931" y="107280" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="12452" y="101817" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="15522" y="100811" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="17994" y="101074" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="25293" y="103656" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="26243" y="101439" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="28100" y="103067" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="29548" y="105033" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="27248" y="105837" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="29934" y="107474" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="30240" y="110924" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="30393" y="113388" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="30241" y="115828" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="30157" y="118236" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="29010" y="120788" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="25211" y="124424" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="24333" y="126699" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="21856" y="126450" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="16985" y="126909" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="13740" y="126707" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="10943" y="126567" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="9428" y="124699" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="8659" y="119586" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="7658" y="117189" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="5964" y="115177" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="7517" y="113314" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="7234" y="110933" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="8792" y="107210" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="10476" y="105353" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="12792" y="104372" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="14897" y="103072" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="17434" y="103684" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="20045" y="102228" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="19631" y="104645" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="22029" y="103838" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="23046" y="106043" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="25274" y="107255" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="25930" y="109509" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="28388" y="109377" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="27951" y="112042" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="27452" y="114440" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="26989" y="116814" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="25896" y="119227" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="23033" y="121853" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="20189" y="123657" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="17916" y="124241" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="15493" y="124939" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="13601" y="123422" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="11225" y="122676" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="11115" y="119251" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="10264" y="116090" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="11352" y="113907" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="9690" y="111935" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="11875" y="111545" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="9999" y="109496" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="11469" y="107635" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="13753" y="107677" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3600" maxZ="-3400" rad="200">
+				<node x="16216" y="106706" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="18577" y="107277" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="20761" y="107354" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="21201" y="110166" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="23223" y="108824" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="24266" y="111844" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="21877" y="112571" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="24934" y="114197" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="22000" y="115235" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="15650" y="119271" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="23741" y="117369" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="21096" y="117540" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3700" maxZ="-3500" rad="200">
+				<node x="20911" y="120467" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="18710" y="118250" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="17762" y="120553" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="15262" y="121710" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="14022" y="117381" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="cruma_marshlands" shape="Cylinder" minZ="-3800" maxZ="-3600" rad="200">
+				<node x="14435" y="110905" />
+			</territory>
+		</territories>
+		<npc id="24930" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Knight -->
+		<npc id="24931" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Warrior -->
+		<npc id="24932" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Scout -->
+		<npc id="24933" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Black Demon Wizard -->
+	</spawn>
+</list>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Dion/GuillotineFortress.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Dion/GuillotineFortress.xml
index f87d093888..ac7d75c741 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Dion/GuillotineFortress.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Dion/GuillotineFortress.xml
@@ -1,2303 +1,14 @@
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="dion05_2122_08m1">
-		<territories>
-			<territory name="dion05_2122_08" minZ="-4136" maxZ="-3136">
-				<node x="49874" y="141987" />
-				<node x="50136" y="142013" />
-				<node x="50433" y="142094" />
-				<node x="50564" y="142147" />
-				<node x="49902" y="143188" />
-				<node x="49237" y="142912" />
-				<node x="49471" y="142459" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="33682" respawnTime="60sec" /> <!-- Executed Maiden's Vengeful Spirit -->
-		<npc id="33683" respawnTime="60sec" /> <!-- Spirit of the Tortured Dwarf -->
-		<npc id="33684" respawnTime="60sec" /> <!-- Spirit of One Burned Alive -->
-	</spawn>
-	<spawn name="dion05_2122_07m1">
-		<territories>
-			<territory name="dion05_2122_07" minZ="-3300" maxZ="-2300">
-				<node x="45960" y="141503" />
-				<node x="47421" y="141372" />
-				<node x="47552" y="141517" />
-				<node x="48481" y="141970" />
-				<node x="47947" y="142537" />
-				<node x="46473" y="143018" />
-				<node x="45760" y="142300" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_06m1">
-		<territories>
-			<territory name="dion05_2122_06" minZ="-2877" maxZ="-1877">
-				<node x="42387" y="142224" />
-				<node x="43290" y="141904" />
-				<node x="45195" y="141401" />
-				<node x="44732" y="143006" />
-				<node x="43777" y="143369" />
-				<node x="42417" y="143415" />
-				<node x="41781" y="143143" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_05m1">
-		<territories>
-			<territory name="dion05_2122_05" minZ="-3872" maxZ="-2872">
-				<node x="51071" y="140261" />
-				<node x="51333" y="140287" />
-				<node x="51631" y="140368" />
-				<node x="51761" y="140420" />
-				<node x="51032" y="141585" />
-				<node x="50434" y="141186" />
-				<node x="50669" y="140733" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="33682" respawnTime="60sec" /> <!-- Executed Maiden's Vengeful Spirit -->
-		<npc id="33683" respawnTime="60sec" /> <!-- Spirit of the Tortured Dwarf -->
-		<npc id="33684" respawnTime="60sec" /> <!-- Spirit of One Burned Alive -->
-	</spawn>
-	<spawn name="dion05_2122_09m1">
-		<territories>
-			<territory name="dion05_2122_09" minZ="-2992" maxZ="-1992">
-				<node x="52593" y="140986" />
-				<node x="53185" y="140587" />
-				<node x="54230" y="140552" />
-				<node x="54245" y="141185" />
-				<node x="53698" y="142417" />
-				<node x="52237" y="142233" />
-				<node x="52190" y="141575" />
-			</territory>
-		</territories>
-		<npc id="23241" respawnTime="60sec" chaseRange="2500" /> <!-- Mandragora -->
-		<npc id="23240" respawnTime="60sec" chaseRange="2500" /> <!-- Mandragora -->
-	</spawn>
-	<spawn name="dion05_2122_04m1">
-		<territories>
-			<territory name="dion05_2122_04" minZ="-3275" maxZ="-2275">
-				<node x="48598" y="141291" />
-				<node x="49265" y="140490" />
-				<node x="50215" y="140649" />
-				<node x="49627" y="141058" />
-				<node x="49292" y="142141" />
-				<node x="48429" y="142469" />
-				<node x="47793" y="140801" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_03m1">
-		<territories>
-			<territory name="dion05_2122_03" minZ="-3244" maxZ="-2244">
-				<node x="46774" y="141209" />
-				<node x="47154" y="140678" />
-				<node x="47594" y="140836" />
-				<node x="47377" y="141547" />
-				<node x="46556" y="141446" />
-				<node x="45915" y="141595" />
-				<node x="45816" y="140800" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_02m1">
-		<territories>
-			<territory name="dion05_2122_02" minZ="-2691" maxZ="-1691">
-				<node x="44127" y="140783" />
-				<node x="44831" y="140147" />
-				<node x="45112" y="140212" />
-				<node x="45126" y="140563" />
-				<node x="45045" y="141280" />
-				<node x="44132" y="141594" />
-				<node x="43984" y="141059" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_01m1">
-		<territories>
-			<territory name="dion05_2122_01" minZ="-1726" maxZ="-726">
-				<node x="41717" y="139455" />
-				<node x="43507" y="139616" />
-				<node x="43748" y="139581" />
-				<node x="43763" y="140215" />
-				<node x="43216" y="141446" />
-				<node x="41754" y="141262" />
-				<node x="41042" y="140544" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="33682" respawnTime="60sec" /> <!-- Executed Maiden's Vengeful Spirit -->
-		<npc id="33683" respawnTime="60sec" /> <!-- Spirit of the Tortured Dwarf -->
-		<npc id="33684" respawnTime="60sec" /> <!-- Spirit of One Burned Alive -->
-	</spawn>
-	<spawn name="dion05_2122_36m1">
-		<territories>
-			<territory name="dion05_2122_36" minZ="-4016" maxZ="-3016">
-				<node x="42487" y="150223" />
-				<node x="43119" y="151044" />
-				<node x="43608" y="150858" />
-				<node x="43773" y="151097" />
-				<node x="42954" y="151673" />
-				<node x="42387" y="151694" />
-				<node x="42444" y="151488" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-	</spawn>
-	<spawn name="dion05_2122_35m1">
-		<territories>
-			<territory name="dion05_2122_35" minZ="-4086" maxZ="-3086">
-				<node x="38283" y="151043" />
-				<node x="38949" y="151076" />
-				<node x="39466" y="151073" />
-				<node x="40905" y="151051" />
-				<node x="40810" y="151112" />
-				<node x="39991" y="151254" />
-				<node x="38605" y="151249" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="33682" respawnTime="60sec" /> <!-- Executed Maiden's Vengeful Spirit -->
-		<npc id="33683" respawnTime="60sec" /> <!-- Spirit of the Tortured Dwarf -->
-		<npc id="33684" respawnTime="60sec" /> <!-- Spirit of One Burned Alive -->
-	</spawn>
-	<spawn name="dion05_2122_34m1">
-		<territories>
-			<territory name="dion05_2122_34" minZ="-2664" maxZ="-1664">
-				<node x="53726" y="149133" />
-				<node x="54277" y="148513" />
-				<node x="55277" y="148658" />
-				<node x="55562" y="149157" />
-				<node x="55016" y="150389" />
-				<node x="53554" y="150205" />
-				<node x="52842" y="149486" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_33m1">
-		<territories>
-			<territory name="dion05_2122_33" minZ="-2596" maxZ="-1596">
-				<node x="51730" y="147642" />
-				<node x="52717" y="147804" />
-				<node x="53041" y="148044" />
-				<node x="53150" y="148631" />
-				<node x="53230" y="149634" />
-				<node x="51768" y="149450" />
-				<node x="51056" y="148732" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_39m1">
-		<territories>
-			<territory name="dion05_2122_39" minZ="-4011" maxZ="-3011">
-				<node x="48881" y="149728" />
-				<node x="49307" y="149986" />
-				<node x="49600" y="150639" />
-				<node x="50367" y="151592" />
-				<node x="50733" y="151928" />
-				<node x="50151" y="152288" />
-				<node x="48927" y="150146" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="33682" respawnTime="60sec" /> <!-- Executed Maiden's Vengeful Spirit -->
-		<npc id="33683" respawnTime="60sec" /> <!-- Spirit of the Tortured Dwarf -->
-		<npc id="33684" respawnTime="60sec" /> <!-- Spirit of One Burned Alive -->
-	</spawn>
-	<spawn name="dion05_2122_38m1">
-		<territories>
-			<territory name="dion05_2122_38" minZ="-2909" maxZ="-1909">
-				<node x="46767" y="150527" />
-				<node x="47592" y="150184" />
-				<node x="47763" y="151397" />
-				<node x="49176" y="151609" />
-				<node x="48428" y="151792" />
-				<node x="47088" y="152415" />
-				<node x="46093" y="151616" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_37m1">
-		<territories>
-			<territory name="dion05_2122_37" minZ="-3117" maxZ="-2117">
-				<node x="43771" y="151628" />
-				<node x="44898" y="151406" />
-				<node x="46306" y="150947" />
-				<node x="45958" y="151541" />
-				<node x="43415" y="152268" />
-				<node x="42760" y="152709" />
-				<node x="42471" y="152253" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_32m1">
-		<territories>
-			<territory name="dion05_2122_32" minZ="-3940" maxZ="-2940">
-				<node x="47447" y="149401" />
-				<node x="47783" y="148317" />
-				<node x="48828" y="148282" />
-				<node x="48842" y="148916" />
-				<node x="48312" y="149747" />
-				<node x="46834" y="149963" />
-				<node x="46122" y="149245" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-	</spawn>
-	<spawn name="dion05_2122_31m1">
-		<territories>
-			<territory name="dion05_2122_31" minZ="-3996" maxZ="-2996">
-				<node x="43724" y="148885" />
-				<node x="44790" y="149030" />
-				<node x="45339" y="149027" />
-				<node x="46010" y="150557" />
-				<node x="45303" y="150860" />
-				<node x="43986" y="150836" />
-				<node x="43049" y="150054" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-	</spawn>
-	<spawn name="dion05_2122_30m1">
-		<territories>
-			<territory name="dion05_2122_30" minZ="-4231" maxZ="-3231">
-				<node x="37625" y="148746" />
-				<node x="39751" y="148193" />
-				<node x="41599" y="148515" />
-				<node x="41927" y="149908" />
-				<node x="41090" y="150805" />
-				<node x="38467" y="150911" />
-				<node x="37219" y="149523" />
-			</territory>
-		</territories>
-		<npc id="23241" respawnTime="60sec" chaseRange="2500" /> <!-- Mandragora -->
-		<npc id="23240" respawnTime="60sec" chaseRange="2500" /> <!-- Mandragora -->
-	</spawn>
-	<spawn name="dion05_2122_48m1">
-		<territories>
-			<territory name="dion05_2122_48" minZ="-2997" maxZ="-1997">
-				<node x="48354" y="153957" />
-				<node x="50248" y="153836" />
-				<node x="50541" y="153945" />
-				<node x="51084" y="155330" />
-				<node x="50761" y="155666" />
-				<node x="50285" y="154237" />
-				<node x="48476" y="155123" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_47m1">
-		<territories>
-			<territory name="dion05_2122_47" minZ="-2273" maxZ="-1273">
-				<node x="46911" y="153150" />
-				<node x="47500" y="153616" />
-				<node x="47784" y="154101" />
-				<node x="48101" y="155280" />
-				<node x="47717" y="155932" />
-				<node x="47390" y="154573" />
-				<node x="45988" y="154375" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_45m1">
-		<territories>
-			<territory name="dion05_2122_45" minZ="-2604" maxZ="-1604">
-				<node x="53585" y="150511" />
-				<node x="54572" y="150673" />
-				<node x="54640" y="150817" />
-				<node x="54970" y="151481" />
-				<node x="55085" y="152503" />
-				<node x="53623" y="152319" />
-				<node x="52911" y="151600" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_49m1">
-		<territories>
-			<territory name="dion05_2122_49" minZ="-3764" maxZ="-2764">
-				<node x="51048" y="152504" />
-				<node x="51555" y="153321" />
-				<node x="52008" y="153830" />
-				<node x="52182" y="154192" />
-				<node x="51556" y="155167" />
-				<node x="50942" y="153447" />
-				<node x="50518" y="152889" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="33682" respawnTime="60sec" /> <!-- Executed Maiden's Vengeful Spirit -->
-		<npc id="33683" respawnTime="60sec" /> <!-- Spirit of the Tortured Dwarf -->
-		<npc id="33684" respawnTime="60sec" /> <!-- Spirit of One Burned Alive -->
-	</spawn>
-	<spawn name="dion05_2122_40m1">
-		<territories>
-			<territory name="dion05_2122_40" minZ="-2825" maxZ="-1825">
-				<node x="50693" y="148960" />
-				<node x="51679" y="149122" />
-				<node x="52724" y="149086" />
-				<node x="52739" y="149720" />
-				<node x="52192" y="150952" />
-				<node x="50731" y="150768" />
-				<node x="51737" y="149875" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_44m1">
-		<territories>
-			<territory name="dion05_2122_44" minZ="-2727" maxZ="-1727">
-				<node x="51825" y="150637" />
-				<node x="52890" y="149726" />
-				<node x="53451" y="150345" />
-				<node x="53086" y="151161" />
-				<node x="52474" y="152432" />
-				<node x="51863" y="152445" />
-				<node x="51150" y="151726" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_43m1">
-		<territories>
-			<territory name="dion05_2122_43" minZ="-2982" maxZ="-1982">
-				<node x="48315" y="152834" />
-				<node x="48774" y="151716" />
-				<node x="49254" y="151785" />
-				<node x="50220" y="153710" />
-				<node x="49892" y="153748" />
-				<node x="48068" y="153806" />
-				<node x="47577" y="153027" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_42m1">
-		<territories>
-			<territory name="dion05_2122_42" minZ="-2130" maxZ="-1130">
-				<node x="44335" y="152749" />
-				<node x="45337" y="152507" />
-				<node x="46329" y="152380" />
-				<node x="45829" y="153393" />
-				<node x="45837" y="154340" />
-				<node x="44442" y="154012" />
-				<node x="44525" y="153410" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_41m1">
-		<territories>
-			<territory name="dion05_2122_41" minZ="-2182" maxZ="-1182">
-				<node x="42249" y="153342" />
-				<node x="42891" y="153235" />
-				<node x="44322" y="153297" />
-				<node x="44308" y="154102" />
-				<node x="43361" y="154587" />
-				<node x="42947" y="154522" />
-				<node x="43815" y="153526" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_19m1">
-		<territories>
-			<territory name="dion05_2122_19" minZ="-4172" maxZ="-3172">
-				<node x="42524" y="145745" />
-				<node x="43052" y="145801" />
-				<node x="43675" y="145616" />
-				<node x="43498" y="146118" />
-				<node x="43095" y="147834" />
-				<node x="42539" y="147936" />
-				<node x="42444" y="146998" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-	</spawn>
-	<spawn name="dion05_2122_18m1">
-		<territories>
-			<territory name="dion05_2122_18" minZ="-4188" maxZ="-3188">
-				<node x="38487" y="145487" />
-				<node x="39924" y="144720" />
-				<node x="41497" y="146082" />
-				<node x="41197" y="147643" />
-				<node x="38027" y="147567" />
-				<node x="37908" y="146446" />
-			</territory>
-		</territories>
-		<npc id="23241" respawnTime="60sec" chaseRange="2500" /> <!-- Mandragora -->
-		<npc id="23240" respawnTime="60sec" chaseRange="2500" /> <!-- Mandragora -->
-	</spawn>
-	<spawn name="dion05_2122_17m1">
-		<territories>
-			<territory name="dion05_2122_17" minZ="-3979" maxZ="-2979">
-				<node x="37581" y="146212" />
-				<node x="37764" y="145277" />
-				<node x="38169" y="145207" />
-				<node x="37798" y="146248" />
-				<node x="37744" y="147402" />
-				<node x="36750" y="147702" />
-				<node x="37289" y="146786" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="33682" respawnTime="60sec" /> <!-- Executed Maiden's Vengeful Spirit -->
-		<npc id="33683" respawnTime="60sec" /> <!-- Spirit of the Tortured Dwarf -->
-		<npc id="33684" respawnTime="60sec" /> <!-- Spirit of One Burned Alive -->
-	</spawn>
-	<spawn name="dion05_2122_12m1">
-		<territories>
-			<territory name="dion05_2122_12" minZ="-3234" maxZ="-2234">
-				<node x="44117" y="143696" />
-				<node x="44938" y="143359" />
-				<node x="45804" y="142544" />
-				<node x="46253" y="143025" />
-				<node x="44633" y="144550" />
-				<node x="43912" y="144481" />
-				<node x="43404" y="143801" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_11m1">
-		<territories>
-			<territory name="dion05_2122_11" minZ="-3180" maxZ="-2180">
-				<node x="41766" y="144037" />
-				<node x="42663" y="143879" />
-				<node x="43785" y="143678" />
-				<node x="43799" y="144311" />
-				<node x="43214" y="145300" />
-				<node x="42047" y="145333" />
-				<node x="41513" y="144781" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_10m1">
-		<territories>
-			<territory name="dion05_2122_10" minZ="-2968" maxZ="-1968">
-				<node x="55177" y="141052" />
-				<node x="55053" y="140558" />
-				<node x="55467" y="140241" />
-				<node x="55924" y="140523" />
-				<node x="56186" y="142016" />
-				<node x="55841" y="142190" />
-				<node x="55530" y="141829" />
-			</territory>
-		</territories>
-		<npc id="23241" respawnTime="60sec" chaseRange="2500" /> <!-- Mandragora -->
-		<npc id="23240" respawnTime="60sec" chaseRange="2500" /> <!-- Mandragora -->
-	</spawn>
-	<spawn name="dion05_2122_16m1">
-		<territories>
-			<territory name="dion05_2122_16" minZ="-3232" maxZ="-2232">
-				<node x="54266" y="142337" />
-				<node x="55252" y="142498" />
-				<node x="56297" y="142463" />
-				<node x="56066" y="142786" />
-				<node x="54497" y="144067" />
-				<node x="54304" y="144144" />
-				<node x="53591" y="143426" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_15m1">
-		<territories>
-			<territory name="dion05_2122_15" minZ="-2941" maxZ="-1941">
-				<node x="51261" y="142569" />
-				<node x="52247" y="142731" />
-				<node x="53293" y="142695" />
-				<node x="52404" y="142790" />
-				<node x="52222" y="142998" />
-				<node x="51038" y="144759" />
-				<node x="50586" y="143658" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_14m1">
-		<territories>
-			<territory name="dion05_2122_14" minZ="-4048" maxZ="-3048">
-				<node x="47883" y="143053" />
-				<node x="49107" y="142730" />
-				<node x="49332" y="143514" />
-				<node x="49852" y="143711" />
-				<node x="49081" y="144459" />
-				<node x="47844" y="144758" />
-				<node x="48805" y="143837" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-	</spawn>
-	<spawn name="dion05_2122_13m1">
-		<territories>
-			<territory name="dion05_2122_13" minZ="-3988" maxZ="-2988">
-				<node x="46169" y="145034" />
-				<node x="46271" y="143638" />
-				<node x="47317" y="143298" />
-				<node x="47667" y="144828" />
-				<node x="47074" y="145902" />
-				<node x="45554" y="145369" />
-				<node x="44626" y="144933" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-	</spawn>
-	<spawn name="dion05_2122_29m1">
-		<territories>
-			<territory name="dion05_2122_29" minZ="-3866" maxZ="-2866">
-				<node x="37169" y="150171" />
-				<node x="36997" y="148852" />
-				<node x="37194" y="149841" />
-				<node x="37945" y="150827" />
-				<node x="37958" y="151066" />
-				<node x="36833" y="150514" />
-				<node x="36838" y="150232" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-	</spawn>
-	<spawn name="dion05_2122_24m1">
-		<territories>
-			<territory name="dion05_2122_24" minZ="-3464" maxZ="-2464">
-				<node x="54982" y="144623" />
-				<node x="55968" y="144785" />
-				<node x="56092" y="145061" />
-				<node x="56316" y="145244" />
-				<node x="55352" y="146458" />
-				<node x="55020" y="146431" />
-				<node x="54307" y="145712" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_23m1">
-		<territories>
-			<territory name="dion05_2122_23" minZ="-3129" maxZ="-2129">
-				<node x="52244" y="144713" />
-				<node x="53230" y="144874" />
-				<node x="54275" y="144839" />
-				<node x="54290" y="145473" />
-				<node x="53743" y="146704" />
-				<node x="53218" y="145981" />
-				<node x="51569" y="145802" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_22m1">
-		<territories>
-			<territory name="dion05_2122_22" minZ="-3852" maxZ="-2852">
-				<node x="47955" y="144573" />
-				<node x="49226" y="145067" />
-				<node x="50147" y="144700" />
-				<node x="50433" y="145333" />
-				<node x="49391" y="147141" />
-				<node x="48344" y="146920" />
-				<node x="48770" y="145953" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-	</spawn>
-	<spawn name="dion05_2122_21m1">
-		<territories>
-			<territory name="dion05_2122_21" minZ="-3996" maxZ="-2996">
-				<node x="45149" y="146374" />
-				<node x="46787" y="145938" />
-				<node x="47137" y="146062" />
-				<node x="47065" y="146738" />
-				<node x="47271" y="147072" />
-				<node x="45695" y="147250" />
-				<node x="45126" y="146866" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="33682" respawnTime="60sec" /> <!-- Executed Maiden's Vengeful Spirit -->
-		<npc id="33683" respawnTime="60sec" /> <!-- Spirit of the Tortured Dwarf -->
-		<npc id="33684" respawnTime="60sec" /> <!-- Spirit of One Burned Alive -->
-	</spawn>
-	<spawn name="dion05_2122_28m1">
-		<territories>
-			<territory name="dion05_2122_28" minZ="-3229" maxZ="-2229">
-				<node x="54253" y="146499" />
-				<node x="55240" y="146660" />
-				<node x="56285" y="146625" />
-				<node x="56299" y="147259" />
-				<node x="54775" y="147819" />
-				<node x="54291" y="148307" />
-				<node x="53735" y="147476" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_27m1">
-		<territories>
-			<territory name="dion05_2122_27" minZ="-4128" maxZ="-3128">
-				<node x="49638" y="145890" />
-				<node x="50960" y="145556" />
-				<node x="51083" y="147302" />
-				<node x="50431" y="146690" />
-				<node x="49846" y="148495" />
-				<node x="49148" y="148130" />
-				<node x="49507" y="147907" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-	</spawn>
-	<spawn name="dion05_2122_26m1">
-		<territories>
-			<territory name="dion05_2122_26" minZ="-4076" maxZ="-3076">
-				<node x="45235" y="147236" />
-				<node x="46221" y="147398" />
-				<node x="47267" y="147362" />
-				<node x="47281" y="147996" />
-				<node x="46735" y="149228" />
-				<node x="45609" y="148676" />
-				<node x="45281" y="148453" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-	</spawn>
-	<spawn name="dion05_2122_25m1">
-		<territories>
-			<territory name="dion05_2122_25" minZ="-4234" maxZ="-3234">
-				<node x="42929" y="148609" />
-				<node x="42945" y="148742" />
-				<node x="43386" y="148690" />
-				<node x="43573" y="148781" />
-				<node x="43045" y="149851" />
-				<node x="42850" y="149780" />
-				<node x="42690" y="149504" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="33682" respawnTime="60sec" /> <!-- Executed Maiden's Vengeful Spirit -->
-		<npc id="33683" respawnTime="60sec" /> <!-- Spirit of the Tortured Dwarf -->
-		<npc id="33684" respawnTime="60sec" /> <!-- Spirit of One Burned Alive -->
-	</spawn>
-	<spawn name="dion05_2122_20m1">
-		<territories>
-			<territory name="dion05_2122_20" minZ="-3924" maxZ="-2924">
-				<node x="44420" y="146321" />
-				<node x="44510" y="146524" />
-				<node x="44723" y="146880" />
-				<node x="43663" y="146957" />
-				<node x="43605" y="147618" />
-				<node x="42655" y="148015" />
-				<node x="43072" y="146497" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-	</spawn>
-	<spawn name="dion05_2122_59m1">
-		<territories>
-			<territory name="dion05_2122_59" minZ="-4148" maxZ="-3148">
-				<node x="38092" y="148601" />
-				<node x="38086" y="148777" />
-				<node x="38228" y="149328" />
-				<node x="37756" y="149170" />
-				<node x="37695" y="149860" />
-				<node x="37283" y="149555" />
-				<node x="37527" y="148892" />
-				<node x="37763" y="148659" />
-			</territory>
-		</territories>
-		<npc id="23241" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-		<npc id="23240" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-	</spawn>
-	<spawn name="dion05_2122_58m1">
-		<territories>
-			<territory name="dion05_2122_58" minZ="-3348" maxZ="-2348">
-				<node x="52900" y="141132" />
-				<node x="53748" y="141130" />
-				<node x="53505" y="141691" />
-				<node x="53952" y="141984" />
-				<node x="53764" y="142516" />
-				<node x="53291" y="141920" />
-				<node x="53415" y="141591" />
-				<node x="52721" y="141264" />
-			</territory>
-		</territories>
-		<npc id="23241" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-		<npc id="23240" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-	</spawn>
-	<spawn name="dion05_2122_57m1">
-		<territories>
-			<territory name="dion05_2122_57" minZ="-4312" maxZ="-3312">
-				<node x="39272" y="145757" />
-				<node x="40303" y="145783" />
-				<node x="40077" y="146096" />
-				<node x="40811" y="147237" />
-				<node x="39597" y="147278" />
-				<node x="39533" y="146752" />
-				<node x="38914" y="146674" />
-				<node x="39074" y="145853" />
-			</territory>
-		</territories>
-		<npc id="23241" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-		<npc id="23240" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-	</spawn>
-	<spawn name="dion05_2122_52m1">
-		<territories>
-			<territory name="dion05_2122_52" minZ="-2776" maxZ="-1776">
-				<node x="56766" y="142904" />
-				<node x="57496" y="143176" />
-				<node x="57445" y="143842" />
-				<node x="57038" y="144191" />
-				<node x="56468" y="143664" />
-				<node x="56468" y="143664" />
-				<node x="56468" y="143664" />
-			</territory>
-		</territories>
-		<npc id="23207" respawnTime="59sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-	</spawn>
-	<spawn name="dion05_2122_51m1">
-		<territories>
-			<territory name="dion05_2122_51" minZ="-2740" maxZ="-1740">
-				<node x="51448" y="139164" />
-				<node x="52178" y="139436" />
-				<node x="52127" y="140101" />
-				<node x="51720" y="140451" />
-				<node x="51150" y="139924" />
-				<node x="51150" y="139924" />
-				<node x="51150" y="139924" />
-			</territory>
-		</territories>
-		<npc id="23207" respawnTime="59sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-	</spawn>
-	<spawn name="dion05_2122_50m1">
-		<territories>
-			<territory name="dion05_2122_50" minZ="-2636" maxZ="-1636">
-				<node x="52998" y="151853" />
-				<node x="53985" y="152014" />
-				<node x="55030" y="151979" />
-				<node x="55044" y="152613" />
-				<node x="54347" y="152657" />
-				<node x="53036" y="153660" />
-				<node x="52324" y="152942" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23201" respawnTime="60sec" chaseRange="2500" /> <!-- Nagdu the Deformed Merman -->
-		<npc id="23208" respawnTime="60sec" chaseRange="2500" /> <!-- Rosenia's Divine Spirit -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_56m1">
-		<territories>
-			<territory name="dion05_2122_56" minZ="-4336" maxZ="-3336">
-				<node x="39324" y="149232" />
-				<node x="40007" y="149276" />
-				<node x="40601" y="149382" />
-				<node x="40345" y="150156" />
-				<node x="39282" y="149913" />
-				<node x="38794" y="150047" />
-				<node x="38468" y="149460" />
-				<node x="38995" y="149290" />
-			</territory>
-		</territories>
-		<npc id="23241" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-		<npc id="23240" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-	</spawn>
-	<spawn name="dion05_2122_55m1">
-		<territories>
-			<territory name="dion05_2122_55" minZ="-4136" maxZ="1864">
-				<node x="33457" y="135173" />
-				<node x="64073" y="134180" />
-				<node x="64273" y="162271" />
-				<node x="33550" y="161511" />
-			</territory>
-		</territories>
-		<npc id="30631" x="45276" y="148654" z="-3608" heading="9137" respawnTime="1min" /> <!-- Roderik - Guillotine Fortress Watchman -->
-		<npc id="30632" x="44721" y="146557" z="-3680" heading="9808" respawnTime="1min" /> <!-- Endrigo - Guillotine Fortress Watchman -->
-		<npc id="33697" x="45570" y="148460" z="-3616" heading="40015" respawnTime="1min" /> <!-- Dadphyna -->
-		<npc id="33698" x="44066" y="144541" z="-3120" heading="42830" respawnTime="1min" /> <!-- Watchman's Assistant - Guillotine Fortress -->
-		<npc id="33698" x="51459" y="152072" z="-2432" heading="14788" respawnTime="1min" /> <!-- Watchman's Assistant - Guillotine Fortress -->
-		<npc id="33698" x="46841" y="150733" z="-2760" heading="43020" respawnTime="1min" /> <!-- Watchman's Assistant - Guillotine Fortress -->
-		<npc id="23207" x="41646" y="147979" z="-3680" respawnTime="1min" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23207" x="41643" y="148135" z="-3696" respawnTime="1min" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="33718" x="48316" y="147415" z="-3400" heading="35928" respawnTime="1min" /> <!-- Tombstone of Houpon the Warden Overseer -->
-		<npc id="33719" x="43044" y="144730" z="-3120" heading="59999" respawnTime="1min" /> <!-- Tombstone of Crook the Mad -->
-		<npc id="33717" x="47081" y="154635" z="-1928" heading="39028" respawnTime="1min" /> <!-- Tombstone of the Guillotine of Death -->
-		<npc id="23245" x="34622" y="147821" z="-3520" heading="35999" respawnTime="5min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="34754" y="147428" z="-3528" heading="34492" respawnTime="5min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="42297" y="147890" z="-3672" heading="14750" respawnTime="5min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="42554" y="148605" z="-3672" heading="47931" respawnTime="5min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="48245" y="147401" z="-3408" heading="36738" respawnTime="5min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="48941" y="148017" z="-3408" heading="19739" respawnTime="5min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="49510" y="147670" z="-3424" heading="1933" respawnTime="5min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="49165" y="147132" z="-3400" heading="50566" respawnTime="5min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="50796" y="153709" z="-2656" heading="29291" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="49115" y="150851" z="-2656" heading="25729" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="50710" y="139797" z="-2456" heading="40961" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="51199" y="140642" z="-2440" heading="22853" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="52161" y="140651" z="-2456" heading="11382" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="51234" y="139808" z="-2576" heading="32073" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="51453" y="140210" z="-2576" heading="24158" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="51906" y="140208" z="-2576" heading="13606" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="52106" y="139819" z="-2576" heading="416" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="56333" y="142887" z="-2456" heading="40160" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="56105" y="143824" z="-2440" heading="26356" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="56807" y="144479" z="-2456" heading="16383" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="57131" y="143123" z="-2568" heading="53645" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="56708" y="143247" z="-2568" heading="40961" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="56617" y="143671" z="-2568" heading="30212" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="56928" y="143965" z="-2568" heading="22516" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="57333" y="143838" z="-2568" heading="6711" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="57466" y="143408" z="-2568" heading="58610" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="56644" y="147500" z="-2352" heading="52509" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="55707" y="147675" z="-2328" heading="43399" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="56771" y="148312" z="-2464" heading="62181" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="56478" y="147991" z="-2464" heading="52629" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="56056" y="148078" z="-2464" heading="43738" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="55925" y="148483" z="-2464" heading="29654" respawnTime="6min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="50898" y="154584" z="-2624" heading="30945" respawnTime="10min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="48471" y="150225" z="-2616" heading="22272" respawnTime="10min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="45372" y="151146" z="-2632" heading="12082" respawnTime="10min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="43589" y="151563" z="-2624" heading="11547" respawnTime="10min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="42651" y="152992" z="-1840" heading="11716" respawnTime="10min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="46386" y="152277" z="-1808" heading="18749" respawnTime="10min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="47651" y="153717" z="-1840" heading="26508" respawnTime="10min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="43028" y="145534" z="-3024" heading="45898" respawnTime="10min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="45260" y="144354" z="-3024" heading="40412" respawnTime="10min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="46699" y="143225" z="-3016" heading="45487" respawnTime="10min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="50383" y="142950" z="-2640" heading="1039" respawnTime="10min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="51599" y="146329" z="-2672" heading="63869" respawnTime="10min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="42300" y="143564" z="-2376" heading="50949" respawnTime="10min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="23245" x="44080" y="143360" z="-2384" heading="45380" respawnTime="10min" chaseRange="2500" /> <!-- Isaad - Watchman of the Eye of Infinity -->
-		<npc id="33747" x="33848" y="146213" z="-3472" heading="25269" respawnTime="1min" /> <!-- Hermuncus' Minion - Dimension Keeper -->
-		<npc id="33383" x="39202" y="143746" z="-3648" heading="32312" respawnTime="60sec" /> <!-- Guard -->
-		<npc id="33383" x="39205" y="144123" z="-3648" heading="-32672" respawnTime="60sec" /> <!-- Guard -->
-		<npc id="33383" x="39436" y="144346" z="-3648" heading="16572" respawnTime="60sec" /> <!-- Guard -->
-		<npc id="33383" x="39799" y="144345" z="-3648" heading="16732" respawnTime="60sec" /> <!-- Guard -->
-		<npc id="33383" x="40031" y="144123" z="-3648" heading="0" respawnTime="60sec" /> <!-- Guard -->
-		<npc id="33383" x="40029" y="143744" z="-3648" heading="0" respawnTime="60sec" /> <!-- Guard -->
-		<npc id="33383" x="39804" y="143527" z="-3648" heading="-16596" respawnTime="60sec" /> <!-- Guard -->
-		<npc id="33383" x="39421" y="143528" z="-3648" heading="-16532" respawnTime="60sec" /> <!-- Guard -->
-	</spawn>
-	<spawn name="ssq06_npc2122_closedm1">
-		<territories>
-			<territory name="ssq06_npc2122_closed" minZ="-3725" maxZ="-3525">
-				<node x="38839" y="143228" />
-				<node x="40282" y="143226" />
-				<node x="40290" y="144585" />
-				<node x="38833" y="144585" />
-			</territory>
-		</territories>
-		<npc id="33384" x="38917" y="143727" z="-3624" respawnTime="1min" /> <!-- Madman -->
-		<npc id="33379" x="39306" y="143744" z="-3648" respawnTime="1min" /> <!-- Investigator -->
-		<npc id="33379" x="39810" y="144256" z="-3648" heading="-16384" respawnTime="1min" /> <!-- Investigator -->
-		<npc id="33381" x="39161" y="144342" z="-3648" respawnTime="1min" /> <!-- Investigator -->
-		<npc id="33382" x="39163" y="144399" z="-3648" respawnTime="1min" /> <!-- Priest -->
-		<npc id="33036" x="39066" y="143583" z="-3648" heading="-17250" respawnTime="1min" /> <!-- Twilight Searcher -->
-	</spawn>
-	<spawn name="dion05_2122_54m1">
-		<territories>
-			<territory name="dion05_2122_54" minZ="-2740" maxZ="-1740">
-				<node x="52237" y="154924" />
-				<node x="52968" y="155196" />
-				<node x="52916" y="155861" />
-				<node x="52509" y="156211" />
-				<node x="51939" y="155684" />
-				<node x="51939" y="155684" />
-				<node x="51939" y="155684" />
-			</territory>
-		</territories>
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-	</spawn>
-	<spawn name="dion05_2122_53m1">
-		<territories>
-			<territory name="dion05_2122_53" minZ="-2740" maxZ="-1740">
-				<node x="56097" y="147760" />
-				<node x="56827" y="148032" />
-				<node x="56775" y="148697" />
-				<node x="56368" y="149047" />
-				<node x="55799" y="148520" />
-				<node x="55799" y="148520" />
-				<node x="55799" y="148520" />
-			</territory>
-		</territories>
-		<npc id="23199" respawnTime="60sec" chaseRange="2500" /> <!-- Sadiac the Killer -->
-		<npc id="23200" respawnTime="60sec" chaseRange="2500" /> <!-- Turan the Severed Ghost -->
-		<npc id="23202" respawnTime="60sec" chaseRange="2500" /> <!-- Hakal the Butchered -->
-		<npc id="23203" respawnTime="60sec" chaseRange="2500" /> <!-- Centa the Standing Beast -->
-		<npc id="23204" respawnTime="60sec" chaseRange="2500" /> <!-- Adidaiu of the Killer Fangs -->
-		<npc id="23205" respawnTime="60sec" chaseRange="2500" /> <!-- Haskal the Floating Ghost -->
-		<npc id="23206" respawnTime="60sec" chaseRange="2500" /> <!-- Samita the Ex-Torture Expert -->
-		<npc id="23207" respawnTime="30sec" chaseRange="2500" /> <!-- Gazem - Fortress Scout -->
-		<npc id="23209" respawnTime="60sec" chaseRange="2500" /> <!-- Kelbara the Dual Sword Slaughterer -->
-	</spawn>
-	<spawn name="dion05_2122_64m1">
-		<territories>
-			<territory name="dion05_2122_64" minZ="-4260" maxZ="-3260">
-				<node x="38784" y="145371" />
-				<node x="38457" y="145736" />
-				<node x="38920" y="146099" />
-				<node x="38486" y="146054" />
-				<node x="38255" y="146112" />
-				<node x="38004" y="146260" />
-				<node x="38219" y="145662" />
-				<node x="38455" y="145429" />
-			</territory>
-		</territories>
-		<npc id="23241" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-		<npc id="23240" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-	</spawn>
-	<spawn name="dion05_2122_63m1">
-		<territories>
-			<territory name="dion05_2122_63" minZ="-4140" maxZ="-3140">
-				<node x="40933" y="145843" />
-				<node x="41097" y="146000" />
-				<node x="41220" y="146400" />
-				<node x="40748" y="146242" />
-				<node x="40338" y="146064" />
-				<node x="40747" y="145883" />
-				<node x="40331" y="145474" />
-				<node x="40312" y="145231" />
-			</territory>
-		</territories>
-		<npc id="23241" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-		<npc id="23240" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-	</spawn>
-	<spawn name="dion05_2122_62m1">
-		<territories>
-			<territory name="dion05_2122_62" minZ="-4240" maxZ="-3240">
-				<node x="39313" y="150207" />
-				<node x="39716" y="150199" />
-				<node x="39856" y="150505" />
-				<node x="39426" y="150528" />
-				<node x="39454" y="150748" />
-				<node x="39106" y="150839" />
-				<node x="38910" y="150086" />
-				<node x="39167" y="150125" />
-			</territory>
-		</territories>
-		<npc id="23241" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-		<npc id="23240" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-	</spawn>
-	<spawn name="dion05_2122_61m1">
-		<territories>
-			<territory name="dion05_2122_61" minZ="-4192" maxZ="-3192">
-				<node x="40930" y="148668" />
-				<node x="40965" y="148434" />
-				<node x="41559" y="148491" />
-				<node x="40796" y="149467" />
-				<node x="40240" y="149022" />
-				<node x="40212" y="148788" />
-				<node x="40330" y="148723" />
-				<node x="40823" y="148970" />
-			</territory>
-		</territories>
-		<npc id="23241" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-		<npc id="23240" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-	</spawn>
-	<spawn name="dion05_2122_67m1">
-		<territories>
-			<territory name="dion05_2122_67" minZ="-3096" maxZ="-2096">
-				<node x="55820" y="141120" />
-				<node x="56093" y="141343" />
-				<node x="56090" y="141628" />
-				<node x="56291" y="141926" />
-				<node x="56200" y="142049" />
-				<node x="55936" y="142125" />
-				<node x="55951" y="141723" />
-				<node x="55735" y="141100" />
-			</territory>
-		</territories>
-		<npc id="23241" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-		<npc id="23240" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-	</spawn>
-	<spawn name="dion05_2122_66m1">
-		<territories>
-			<territory name="dion05_2122_66" minZ="-3232" maxZ="-2232">
-				<node x="52334" y="141563" />
-				<node x="53135" y="141851" />
-				<node x="53034" y="141909" />
-				<node x="52999" y="141865" />
-				<node x="52569" y="141852" />
-				<node x="52556" y="142337" />
-				<node x="52128" y="142088" />
-				<node x="52141" y="141826" />
-			</territory>
-		</territories>
-		<npc id="23241" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-		<npc id="23240" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-	</spawn>
-	<spawn name="dion05_2122_65m1">
-		<territories>
-			<territory name="dion05_2122_65" minZ="-3076" maxZ="-2076">
-				<node x="55133" y="140648" />
-				<node x="55400" y="140836" />
-				<node x="55415" y="140999" />
-				<node x="55846" y="141927" />
-				<node x="55816" y="142117" />
-				<node x="55588" y="141829" />
-				<node x="55386" y="141558" />
-				<node x="55330" y="141035" />
-			</territory>
-		</territories>
-		<npc id="23241" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-		<npc id="23240" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-	</spawn>
-	<spawn name="dion05_2122_60m1">
-		<territories>
-			<territory name="dion05_2122_60" minZ="-4284" maxZ="-3284">
-				<node x="39331" y="148342" />
-				<node x="40466" y="148428" />
-				<node x="39759" y="148506" />
-				<node x="39691" y="149050" />
-				<node x="38989" y="149030" />
-				<node x="39496" y="148420" />
-				<node x="38474" y="148570" />
-				<node x="39001" y="148400" />
-			</territory>
-		</territories>
-		<npc id="23241" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-		<npc id="23240" respawnTime="30sec" chaseRange="2500" /> <!-- Mandragora -->
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_08m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_08" minZ="-4136" maxZ="-3136">
-					<node x="49874" y="141987" />
-					<node x="50136" y="142013" />
-					<node x="50433" y="142094" />
-					<node x="50564" y="142147" />
-					<node x="49902" y="143188" />
-					<node x="49237" y="142912" />
-					<node x="49471" y="142459" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_07m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_07" minZ="-3300" maxZ="-2300">
-					<node x="45960" y="141503" />
-					<node x="47421" y="141372" />
-					<node x="47552" y="141517" />
-					<node x="48481" y="141970" />
-					<node x="47947" y="142537" />
-					<node x="46473" y="143018" />
-					<node x="45760" y="142300" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_06m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_06" minZ="-2877" maxZ="-1877">
-					<node x="42387" y="142224" />
-					<node x="43290" y="141904" />
-					<node x="45195" y="141401" />
-					<node x="44732" y="143006" />
-					<node x="43777" y="143369" />
-					<node x="42417" y="143415" />
-					<node x="41781" y="143143" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_05m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_05" minZ="-3872" maxZ="-2872">
-					<node x="51071" y="140261" />
-					<node x="51333" y="140287" />
-					<node x="51631" y="140368" />
-					<node x="51761" y="140420" />
-					<node x="51032" y="141585" />
-					<node x="50434" y="141186" />
-					<node x="50669" y="140733" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_04m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_04" minZ="-3275" maxZ="-2275">
-					<node x="48598" y="141291" />
-					<node x="49265" y="140490" />
-					<node x="50215" y="140649" />
-					<node x="49627" y="141058" />
-					<node x="49292" y="142141" />
-					<node x="48429" y="142469" />
-					<node x="47793" y="140801" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_03m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_03" minZ="-3244" maxZ="-2244">
-					<node x="46774" y="141209" />
-					<node x="47154" y="140678" />
-					<node x="47594" y="140836" />
-					<node x="47377" y="141547" />
-					<node x="46556" y="141446" />
-					<node x="45915" y="141595" />
-					<node x="45816" y="140800" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_02m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_02" minZ="-2691" maxZ="-1691">
-					<node x="44127" y="140783" />
-					<node x="44831" y="140147" />
-					<node x="45112" y="140212" />
-					<node x="45126" y="140563" />
-					<node x="45045" y="141280" />
-					<node x="44132" y="141594" />
-					<node x="43984" y="141059" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_01m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_01" minZ="-1726" maxZ="-726">
-					<node x="41717" y="139455" />
-					<node x="43507" y="139616" />
-					<node x="43748" y="139581" />
-					<node x="43763" y="140215" />
-					<node x="43216" y="141446" />
-					<node x="41754" y="141262" />
-					<node x="41042" y="140544" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_36m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_36" minZ="-4016" maxZ="-3016">
-					<node x="42487" y="150223" />
-					<node x="43119" y="151044" />
-					<node x="43608" y="150858" />
-					<node x="43773" y="151097" />
-					<node x="42954" y="151673" />
-					<node x="42387" y="151694" />
-					<node x="42444" y="151488" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_35m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_35" minZ="-4086" maxZ="-3086">
-					<node x="38283" y="151043" />
-					<node x="38949" y="151076" />
-					<node x="39466" y="151073" />
-					<node x="40905" y="151051" />
-					<node x="40810" y="151112" />
-					<node x="39991" y="151254" />
-					<node x="38605" y="151249" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_34m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_34" minZ="-2664" maxZ="-1664">
-					<node x="53726" y="149133" />
-					<node x="54277" y="148513" />
-					<node x="55277" y="148658" />
-					<node x="55562" y="149157" />
-					<node x="55016" y="150389" />
-					<node x="53554" y="150205" />
-					<node x="52842" y="149486" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_33m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_33" minZ="-2596" maxZ="-1596">
-					<node x="51730" y="147642" />
-					<node x="52717" y="147804" />
-					<node x="53041" y="148044" />
-					<node x="53150" y="148631" />
-					<node x="53230" y="149634" />
-					<node x="51768" y="149450" />
-					<node x="51056" y="148732" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_39m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_39" minZ="-4011" maxZ="-3011">
-					<node x="48881" y="149728" />
-					<node x="49307" y="149986" />
-					<node x="49600" y="150639" />
-					<node x="50367" y="151592" />
-					<node x="50733" y="151928" />
-					<node x="50151" y="152288" />
-					<node x="48927" y="150146" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_38m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_38" minZ="-2909" maxZ="-1909">
-					<node x="46767" y="150527" />
-					<node x="47592" y="150184" />
-					<node x="47763" y="151397" />
-					<node x="49176" y="151609" />
-					<node x="48428" y="151792" />
-					<node x="47088" y="152415" />
-					<node x="46093" y="151616" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_37m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_37" minZ="-3117" maxZ="-2117">
-					<node x="43771" y="151628" />
-					<node x="44898" y="151406" />
-					<node x="46306" y="150947" />
-					<node x="45958" y="151541" />
-					<node x="43415" y="152268" />
-					<node x="42760" y="152709" />
-					<node x="42471" y="152253" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_32m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_32" minZ="-3940" maxZ="-2940">
-					<node x="47447" y="149401" />
-					<node x="47783" y="148317" />
-					<node x="48828" y="148282" />
-					<node x="48842" y="148916" />
-					<node x="48312" y="149747" />
-					<node x="46834" y="149963" />
-					<node x="46122" y="149245" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_31m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_31" minZ="-3996" maxZ="-2996">
-					<node x="43724" y="148885" />
-					<node x="44790" y="149030" />
-					<node x="45339" y="149027" />
-					<node x="46010" y="150557" />
-					<node x="45303" y="150860" />
-					<node x="43986" y="150836" />
-					<node x="43049" y="150054" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_48m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_48" minZ="-2997" maxZ="-1997">
-					<node x="48354" y="153957" />
-					<node x="50248" y="153836" />
-					<node x="50541" y="153945" />
-					<node x="51084" y="155330" />
-					<node x="50761" y="155666" />
-					<node x="50285" y="154237" />
-					<node x="48476" y="155123" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_47m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_47" minZ="-2273" maxZ="-1273">
-					<node x="46911" y="153150" />
-					<node x="47500" y="153616" />
-					<node x="47784" y="154101" />
-					<node x="48101" y="155280" />
-					<node x="47717" y="155932" />
-					<node x="47390" y="154573" />
-					<node x="45988" y="154375" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_45m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_45" minZ="-2604" maxZ="-1604">
-					<node x="53585" y="150511" />
-					<node x="54572" y="150673" />
-					<node x="54640" y="150817" />
-					<node x="54970" y="151481" />
-					<node x="55085" y="152503" />
-					<node x="53623" y="152319" />
-					<node x="52911" y="151600" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_49m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_49" minZ="-3764" maxZ="-2764">
-					<node x="51048" y="152504" />
-					<node x="51555" y="153321" />
-					<node x="52008" y="153830" />
-					<node x="52182" y="154192" />
-					<node x="51556" y="155167" />
-					<node x="50942" y="153447" />
-					<node x="50518" y="152889" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_40m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_40" minZ="-2825" maxZ="-1825">
-					<node x="50693" y="148960" />
-					<node x="51679" y="149122" />
-					<node x="52724" y="149086" />
-					<node x="52739" y="149720" />
-					<node x="52192" y="150952" />
-					<node x="50731" y="150768" />
-					<node x="51737" y="149875" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_44m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_44" minZ="-2727" maxZ="-1727">
-					<node x="51825" y="150637" />
-					<node x="52890" y="149726" />
-					<node x="53451" y="150345" />
-					<node x="53086" y="151161" />
-					<node x="52474" y="152432" />
-					<node x="51863" y="152445" />
-					<node x="51150" y="151726" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_43m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_43" minZ="-2982" maxZ="-1982">
-					<node x="48315" y="152834" />
-					<node x="48774" y="151716" />
-					<node x="49254" y="151785" />
-					<node x="50220" y="153710" />
-					<node x="49892" y="153748" />
-					<node x="48068" y="153806" />
-					<node x="47577" y="153027" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_42m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_42" minZ="-2130" maxZ="-1130">
-					<node x="44335" y="152749" />
-					<node x="45337" y="152507" />
-					<node x="46329" y="152380" />
-					<node x="45829" y="153393" />
-					<node x="45837" y="154340" />
-					<node x="44442" y="154012" />
-					<node x="44525" y="153410" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_41m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_41" minZ="-2182" maxZ="-1182">
-					<node x="42249" y="153342" />
-					<node x="42891" y="153235" />
-					<node x="44322" y="153297" />
-					<node x="44308" y="154102" />
-					<node x="43361" y="154587" />
-					<node x="42947" y="154522" />
-					<node x="43815" y="153526" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_19m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_19" minZ="-4172" maxZ="-3172">
-					<node x="42524" y="145745" />
-					<node x="43052" y="145801" />
-					<node x="43675" y="145616" />
-					<node x="43498" y="146118" />
-					<node x="43095" y="147834" />
-					<node x="42539" y="147936" />
-					<node x="42444" y="146998" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_17m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_17" minZ="-3979" maxZ="-2979">
-					<node x="37581" y="146212" />
-					<node x="37764" y="145277" />
-					<node x="38169" y="145207" />
-					<node x="37798" y="146248" />
-					<node x="37744" y="147402" />
-					<node x="36750" y="147702" />
-					<node x="37289" y="146786" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_12m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_12" minZ="-3234" maxZ="-2234">
-					<node x="44117" y="143696" />
-					<node x="44938" y="143359" />
-					<node x="45804" y="142544" />
-					<node x="46253" y="143025" />
-					<node x="44633" y="144550" />
-					<node x="43912" y="144481" />
-					<node x="43404" y="143801" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_11m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_11" minZ="-3180" maxZ="-2180">
-					<node x="41766" y="144037" />
-					<node x="42663" y="143879" />
-					<node x="43785" y="143678" />
-					<node x="43799" y="144311" />
-					<node x="43214" y="145300" />
-					<node x="42047" y="145333" />
-					<node x="41513" y="144781" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_16m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_16" minZ="-3232" maxZ="-2232">
-					<node x="54266" y="142337" />
-					<node x="55252" y="142498" />
-					<node x="56297" y="142463" />
-					<node x="56066" y="142786" />
-					<node x="54497" y="144067" />
-					<node x="54304" y="144144" />
-					<node x="53591" y="143426" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_15m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_15" minZ="-2941" maxZ="-1941">
-					<node x="51261" y="142569" />
-					<node x="52247" y="142731" />
-					<node x="53293" y="142695" />
-					<node x="52404" y="142790" />
-					<node x="52222" y="142998" />
-					<node x="51038" y="144759" />
-					<node x="50586" y="143658" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_14m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_14" minZ="-4048" maxZ="-3048">
-					<node x="47883" y="143053" />
-					<node x="49107" y="142730" />
-					<node x="49332" y="143514" />
-					<node x="49852" y="143711" />
-					<node x="49081" y="144459" />
-					<node x="47844" y="144758" />
-					<node x="48805" y="143837" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_13m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_13" minZ="-3988" maxZ="-2988">
-					<node x="46169" y="145034" />
-					<node x="46271" y="143638" />
-					<node x="47317" y="143298" />
-					<node x="47667" y="144828" />
-					<node x="47074" y="145902" />
-					<node x="45554" y="145369" />
-					<node x="44626" y="144933" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_29m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_29" minZ="-3866" maxZ="-2866">
-					<node x="37169" y="150171" />
-					<node x="36997" y="148852" />
-					<node x="37194" y="149841" />
-					<node x="37945" y="150827" />
-					<node x="37958" y="151066" />
-					<node x="36833" y="150514" />
-					<node x="36838" y="150232" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_24m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_24" minZ="-3464" maxZ="-2464">
-					<node x="54982" y="144623" />
-					<node x="55968" y="144785" />
-					<node x="56092" y="145061" />
-					<node x="56316" y="145244" />
-					<node x="55352" y="146458" />
-					<node x="55020" y="146431" />
-					<node x="54307" y="145712" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_23m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_23" minZ="-3129" maxZ="-2129">
-					<node x="52244" y="144713" />
-					<node x="53230" y="144874" />
-					<node x="54275" y="144839" />
-					<node x="54290" y="145473" />
-					<node x="53743" y="146704" />
-					<node x="53218" y="145981" />
-					<node x="51569" y="145802" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_22m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_22" minZ="-3852" maxZ="-2852">
-					<node x="47955" y="144573" />
-					<node x="49226" y="145067" />
-					<node x="50147" y="144700" />
-					<node x="50433" y="145333" />
-					<node x="49391" y="147141" />
-					<node x="48344" y="146920" />
-					<node x="48770" y="145953" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_21m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_21" minZ="-3996" maxZ="-2996">
-					<node x="45149" y="146374" />
-					<node x="46787" y="145938" />
-					<node x="47137" y="146062" />
-					<node x="47065" y="146738" />
-					<node x="47271" y="147072" />
-					<node x="45695" y="147250" />
-					<node x="45126" y="146866" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_28m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_28" minZ="-3229" maxZ="-2229">
-					<node x="54253" y="146499" />
-					<node x="55240" y="146660" />
-					<node x="56285" y="146625" />
-					<node x="56299" y="147259" />
-					<node x="54775" y="147819" />
-					<node x="54291" y="148307" />
-					<node x="53735" y="147476" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_27m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_27" minZ="-4128" maxZ="-3128">
-					<node x="49638" y="145890" />
-					<node x="50960" y="145556" />
-					<node x="51083" y="147302" />
-					<node x="50431" y="146690" />
-					<node x="49846" y="148495" />
-					<node x="49148" y="148130" />
-					<node x="49507" y="147907" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_26m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_26" minZ="-4076" maxZ="-3076">
-					<node x="45235" y="147236" />
-					<node x="46221" y="147398" />
-					<node x="47267" y="147362" />
-					<node x="47281" y="147996" />
-					<node x="46735" y="149228" />
-					<node x="45609" y="148676" />
-					<node x="45281" y="148453" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_25m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_25" minZ="-4234" maxZ="-3234">
-					<node x="42929" y="148609" />
-					<node x="42945" y="148742" />
-					<node x="43386" y="148690" />
-					<node x="43573" y="148781" />
-					<node x="43045" y="149851" />
-					<node x="42850" y="149780" />
-					<node x="42690" y="149504" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_20m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_20" minZ="-3924" maxZ="-2924">
-					<node x="44420" y="146321" />
-					<node x="44510" y="146524" />
-					<node x="44723" y="146880" />
-					<node x="43663" y="146957" />
-					<node x="43605" y="147618" />
-					<node x="42655" y="148015" />
-					<node x="43072" y="146497" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
-		</group>
-	</spawn>
-	<spawn ai="DayNightSpawns" name="dion05_2122_50m1_n">
-		<group name="nightTime">
-			<territories>
-				<territory name="dion05_2122_50" minZ="-2636" maxZ="-1636">
-					<node x="52998" y="151853" />
-					<node x="53985" y="152014" />
-					<node x="55030" y="151979" />
-					<node x="55044" y="152613" />
-					<node x="54347" y="152657" />
-					<node x="53036" y="153660" />
-					<node x="52324" y="152942" />
-				</territory>
-			</territories>
-			<npc id="23242" respawnTime="60sec" chaseRange="2500" /> <!-- Tallion -->
-			<npc id="23243" respawnTime="60sec" chaseRange="2500" /> <!-- Krutati -->
-			<npc id="23244" respawnTime="60sec" chaseRange="2500" /> <!-- Alluring Irene -->
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="GuillotineFortress">
+		<group> <!-- NPC -->
+			<npc id="33383" x="39202" y="143746" z="-3648" heading="32312" respawnTime="60sec" /> <!-- Guard -->
+			<npc id="33383" x="39205" y="144123" z="-3648" heading="-32672" respawnTime="60sec" /> <!-- Guard -->
+			<npc id="33383" x="39436" y="144346" z="-3648" heading="16572" respawnTime="60sec" /> <!-- Guard -->
+			<npc id="33383" x="39799" y="144345" z="-3648" heading="16732" respawnTime="60sec" /> <!-- Guard -->
+			<npc id="33383" x="40031" y="144123" z="-3648" heading="0" respawnTime="60sec" /> <!-- Guard -->
+			<npc id="33383" x="40029" y="143744" z="-3648" heading="0" respawnTime="60sec" /> <!-- Guard -->
+			<npc id="33383" x="39804" y="143527" z="-3648" heading="-16596" respawnTime="60sec" /> <!-- Guard -->
+			<npc id="33383" x="39421" y="143528" z="-3648" heading="-16532" respawnTime="60sec" /> <!-- Guard -->
 		</group>
 	</spawn>
 </list>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Dion/GuillotineFortressMonsters.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Dion/GuillotineFortressMonsters.xml
new file mode 100644
index 0000000000..32a0c0978a
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Dion/GuillotineFortressMonsters.xml
@@ -0,0 +1,736 @@
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="ExecutionGrounds"> <!-- MOB -->
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="37070" y="147623" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-4000" maxZ="-3500" rad="200">
+				<node x="39637" y="146306" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-4000" maxZ="-3500" rad="200">
+				<node x="39535" y="149571" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="43214" y="147000" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="44892" y="149809" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="46192" y="147460" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="48457" y="149226" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="50740" y="146073" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="47781" y="144600" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2800" maxZ="-2300" rad="200">
+				<node x="47350" y="151381" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2800" maxZ="-2300" rad="200">
+				<node x="49474" y="153922" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2500" maxZ="-2000" rad="200">
+				<node x="51883" y="148024" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2500" maxZ="-2000" rad="200">
+				<node x="51528" y="151154" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2500" maxZ="-2000" rad="200">
+				<node x="54843" y="150725" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2400" maxZ="-1900" rad="200">
+				<node x="53712" y="153312" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2000" maxZ="-1500" rad="200">
+				<node x="52490" y="155571" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2500" maxZ="-2000" rad="200">
+				<node x="56300" y="148396" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="55228" y="144285" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3000" maxZ="-2500" rad="200">
+				<node x="53283" y="146220" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2800" maxZ="-2300" rad="200">
+				<node x="51107" y="143749" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2800" maxZ="-2300" rad="200">
+				<node x="52867" y="141894" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2800" maxZ="-2300" rad="200">
+				<node x="55563" y="141201" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2600" maxZ="-2100" rad="200">
+				<node x="51630" y="139823" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="200">
+				<node x="47796" y="141502" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="45264" y="140387" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="44243" y="143300" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="41070" y="142601" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="40594" y="139393" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="43112" y="138252" />
+			</territory>
+		</territories>
+		<npc id="24673" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Orc -->
+		<npc id="24674" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dark Elf -->
+		<npc id="24675" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Zombie Dwarf -->
+		<npc id="24676" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Stalker -->
+		<npc id="24677" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Hacker -->
+		<npc id="24678" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Doctor -->
+		<npc id="24679" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Anatomist -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="38183" y="144936" />
+			</territory>
+		</territories>
+		<npc id="24681" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="38720" y="148017" />
+			</territory>
+		</territories>
+		<npc id="24681" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="41646" y="150323" />
+			</territory>
+		</territories>
+		<npc id="24681" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="44005" y="148421" />
+			</territory>
+		</territories>
+		<npc id="24681" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="42848" y="149284" />
+			</territory>
+		</territories>
+		<npc id="24681" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="46855" y="149069" />
+			</territory>
+		</territories>
+		<npc id="24681" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="50349" y="148240" />
+			</territory>
+		</territories>
+		<npc id="24681" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="45516" y="145055" />
+			</territory>
+		</territories>
+		<npc id="24681" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="51628" y="154166" />
+			</territory>
+		</territories>
+		<npc id="24681" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2800" maxZ="-2300" rad="200">
+				<node x="44837" y="151532" />
+			</territory>
+		</territories>
+		<npc id="24681" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2500" maxZ="-2000" rad="200">
+				<node x="50832" y="149012" />
+			</territory>
+		</territories>
+		<npc id="24681" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2500" maxZ="-2000" rad="200">
+				<node x="53206" y="149431" />
+			</territory>
+		</territories>
+		<npc id="24681" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="54309" y="145235" />
+			</territory>
+		</territories>
+		<npc id="24681" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2900" maxZ="-2400" rad="200">
+				<node x="54597" y="142354" />
+			</territory>
+		</territories>
+		<npc id="24681" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2700" maxZ="-2200" rad="200">
+				<node x="54611" y="139592" />
+			</territory>
+		</territories>
+		<npc id="24681" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="200">
+				<node x="46433" y="143077" />
+			</territory>
+		</territories>
+		<npc id="24681" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="40405" y="141208" />
+			</territory>
+		</territories>
+		<npc id="24681" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="41204" y="137714" />
+			</territory>
+		</territories>
+		<npc id="24681" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Henker Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="41741" y="145742" />
+			</territory>
+		</territories>
+		<npc id="24680" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="40708" y="148011" />
+			</territory>
+		</territories>
+		<npc id="24680" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="37535" y="150378" />
+			</territory>
+		</territories>
+		<npc id="24680" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="42499" y="151573" />
+			</territory>
+		</territories>
+		<npc id="24680" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="48863" y="145899" />
+			</territory>
+		</territories>
+		<npc id="24680" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="47132" y="146028" />
+			</territory>
+		</territories>
+		<npc id="24680" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="49689" y="143209" />
+			</territory>
+		</territories>
+		<npc id="24680" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="50136" y="151615" />
+			</territory>
+		</territories>
+		<npc id="24680" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2800" maxZ="-2300" rad="200">
+				<node x="48113" y="152913" />
+			</territory>
+		</territories>
+		<npc id="24680" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2500" maxZ="-2000" rad="200">
+				<node x="53216" y="151444" />
+			</territory>
+		</territories>
+		<npc id="24680" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2600" maxZ="-2100" rad="200">
+				<node x="56047" y="152984" />
+			</territory>
+		</territories>
+		<npc id="24680" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="56067" y="146283" />
+			</territory>
+		</territories>
+		<npc id="24680" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2900" maxZ="-2400" rad="200">
+				<node x="51561" y="145515" />
+			</territory>
+		</territories>
+		<npc id="24680" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="53208" y="143834" />
+			</territory>
+		</territories>
+		<npc id="24680" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="44586" y="141747" />
+			</territory>
+		</territories>
+		<npc id="24680" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="200">
+				<node x="42404" y="145264" />
+			</territory>
+		</territories>
+		<npc id="24680" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Schnabel Inspector -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2800" maxZ="-2300" rad="50">
+				<node x="42076" y="155439" />
+			</territory>
+		</territories>
+		<npc id="24682" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frail Zombie -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2800" maxZ="-2300" rad="50">
+				<node x="43118" y="157463" />
+			</territory>
+		</territories>
+		<npc id="24682" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frail Zombie -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2800" maxZ="-2300" rad="50">
+				<node x="45438" y="158063" />
+			</territory>
+		</territories>
+		<npc id="24682" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frail Zombie -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2800" maxZ="-2300" rad="50">
+				<node x="47488" y="155442" />
+			</territory>
+		</territories>
+		<npc id="24682" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frail Zombie -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2800" maxZ="-2300" rad="50">
+				<node x="46039" y="153761" />
+			</territory>
+		</territories>
+		<npc id="24682" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frail Zombie -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-2800" maxZ="-2300" rad="50">
+				<node x="43392" y="153549" />
+			</territory>
+		</territories>
+		<npc id="24682" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frail Zombie -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="execution_grounds" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="50">
+				<node x="42476" y="140371" />
+			</territory>
+		</territories>
+		<npc id="24682" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frail Zombie -->
+	</spawn>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Elven/ShadowOfTheMotherTree.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Elven/ShadowOfTheMotherTree.xml
index 9c89017396..e0361d3060 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Elven/ShadowOfTheMotherTree.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Elven/ShadowOfTheMotherTree.xml
@@ -1,523 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="ShadowOfTheMotherTree">
-		<group>
-			<npc id="24117" x="51336" y="54232" z="-3368" heading="36991" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="51064" y="53928" z="-3376" heading="41756" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24121" x="51176" y="53240" z="-3229" heading="23963" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="51928" y="53272" z="-3252" heading="27452" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="52056" y="52952" z="-3263" heading="32259" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24119" x="51416" y="53048" z="-3254" heading="32073" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24117" x="52184" y="53288" z="-3231" heading="29712" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24117" x="52440" y="53160" z="-3207" heading="26986" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24123" x="52344" y="53688" z="-3176" heading="18412" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24121" x="52472" y="53944" z="-3145" heading="33539" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="52920" y="53336" z="-3165" heading="41792" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="51480" y="52728" z="-3270" heading="18205" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24123" x="51352" y="52584" z="-3266" heading="17009" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24121" x="51784" y="52200" z="-3265" heading="22711" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="52040" y="53352" z="-3237" heading="35624" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24119" x="51864" y="52232" z="-3263" heading="8352" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="52024" y="52200" z="-3253" heading="9113" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="52088" y="51960" z="-3244" heading="13557" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24123" x="52216" y="52136" z="-3237" heading="16383" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24121" x="51736" y="51496" z="-3273" heading="13625" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24117" x="51192" y="51960" z="-3264" heading="8935" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24125" x="51224" y="51688" z="-3259" heading="64904" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="51272" y="51240" z="-3357" heading="59204" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="51112" y="50856" z="-3560" heading="45751" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="51512" y="50664" z="-3536" heading="3942" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24123" x="52200" y="51448" z="-3249" heading="21673" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="52712" y="51912" z="-3184" heading="61898" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24125" x="52920" y="51912" z="-3175" heading="23684" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="52808" y="51672" z="-3175" heading="32767" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="53144" y="51960" z="-3178" heading="14053" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="53256" y="52248" z="-3191" heading="25566" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24119" x="53432" y="51896" z="-3209" heading="30155" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="53480" y="51736" z="-3207" heading="36072" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="53432" y="51400" z="-3184" heading="32635" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24123" x="53656" y="51272" z="-3182" heading="11547" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="53832" y="50856" z="-3150" heading="30625" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24125" x="56056" y="50568" z="-3664" heading="27595" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="56440" y="50712" z="-3640" heading="22983" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="57240" y="51064" z="-3600" heading="65051" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24123" x="56408" y="50936" z="-3640" heading="32820" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="56712" y="51064" z="-3624" heading="17374" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="56840" y="51496" z="-3624" heading="22616" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="56824" y="51688" z="-3624" heading="29865" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24121" x="57160" y="51176" z="-3608" heading="24147" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="56664" y="50488" z="-3640" heading="19029" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="57016" y="50328" z="-3640" heading="16646" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24119" x="56856" y="51304" z="-3616" heading="31804" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24117" x="57208" y="51768" z="-3608" heading="37331" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="57224" y="50808" z="-3608" heading="13606" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24117" x="57208" y="51336" z="-3608" heading="40068" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="53224" y="52280" z="-3186" heading="59204" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24125" x="41224" y="43128" z="-3552" heading="19978" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24123" x="41464" y="42952" z="-3544" heading="19161" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="41576" y="42776" z="-3536" heading="5374" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24125" x="41160" y="42712" z="-3544" heading="62817" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="40984" y="42392" z="-3552" heading="45595" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="41208" y="42280" z="-3536" heading="52253" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24119" x="40936" y="42136" z="-3552" heading="36206" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24117" x="40824" y="42312" z="-3568" heading="65242" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24125" x="42024" y="42008" z="-3488" heading="23095" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="42520" y="42520" z="-3488" heading="31935" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="42648" y="42696" z="-3488" heading="27931" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="42024" y="42280" z="-3488" heading="36760" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="42664" y="43352" z="-3600" heading="16383" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="42808" y="43640" z="-3648" heading="11853" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24117" x="43064" y="43752" z="-3664" heading="53321" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="43080" y="43928" z="-3696" heading="9825" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="42696" y="44024" z="-3688" heading="35715" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24123" x="42936" y="44152" z="-3704" heading="37960" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="43224" y="44520" z="-3704" heading="25774" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24119" x="43512" y="44152" z="-3696" heading="40116" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24121" x="43544" y="43624" z="-3632" heading="32339" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="43720" y="44264" z="-3696" heading="22282" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="43448" y="43336" z="-3576" heading="26008" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="43016" y="42264" z="-3488" heading="10180" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24123" x="42648" y="41992" z="-3488" heading="20883" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="42520" y="41560" z="-3488" heading="2625" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="42264" y="41160" z="-3488" heading="14825" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="41880" y="41064" z="-3488" heading="60291" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="41736" y="41352" z="-3488" heading="12493" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24117" x="40872" y="41192" z="-3520" heading="5344" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="40712" y="41080" z="-3528" heading="63387" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="40728" y="41192" z="-3528" heading="14784" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24121" x="40808" y="41368" z="-3536" heading="11988" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="40824" y="41672" z="-3544" heading="16152" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="41304" y="41528" z="-3504" heading="65215" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24123" x="41160" y="41080" z="-3504" heading="46789" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24125" x="41160" y="40616" z="-3488" heading="24321" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="41576" y="40936" z="-3488" heading="8963" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="41768" y="40472" z="-3488" heading="8274" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="42136" y="40808" z="-3488" heading="5136" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="42456" y="41288" z="-3488" heading="2396" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24119" x="43144" y="41704" z="-3488" heading="36736" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24125" x="43000" y="41496" z="-3496" heading="44358" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="48744" y="43512" z="-3504" heading="47997" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="49448" y="43672" z="-3520" heading="566" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="49576" y="44264" z="-3520" heading="12806" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="48559" y="44531" z="-3511" heading="27297" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24123" x="48280" y="44344" z="-3512" heading="38618" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="47768" y="44360" z="-3568" heading="29484" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="48072" y="44056" z="-3512" heading="53638" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="48040" y="44344" z="-3536" heading="43684" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="47848" y="44120" z="-3536" heading="43727" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24121" x="48600" y="44024" z="-3504" heading="61788" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="49176" y="44040" z="-3512" heading="58816" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24121" x="49288" y="43464" z="-3512" heading="51735" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24117" x="49272" y="44504" z="-3512" heading="10309" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24125" x="49000" y="44840" z="-3504" heading="19067" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="48648" y="45048" z="-3512" heading="28873" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24119" x="49432" y="44792" z="-3512" heading="1592" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="49496" y="44536" z="-3520" heading="52922" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24121" x="50056" y="44568" z="-3512" heading="2847" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="49624" y="45016" z="-3504" heading="23223" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24123" x="49944" y="44872" z="-3504" heading="32907" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="50296" y="44264" z="-3520" heading="56373" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24125" x="51928" y="40664" z="-3488" heading="28580" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="52088" y="40872" z="-3480" heading="28285" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="52152" y="41064" z="-3480" heading="32417" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24119" x="52344" y="41176" z="-3480" heading="30402" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24117" x="52600" y="40760" z="-3504" heading="38727" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="52616" y="40408" z="-3528" heading="29241" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24121" x="53016" y="40600" z="-3536" heading="4911" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="53384" y="40872" z="-3323" heading="8675" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="53608" y="41176" z="-3284" heading="12354" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24117" x="54056" y="41000" z="-3290" heading="59059" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24123" x="53656" y="40568" z="-3306" heading="29738" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="52920" y="41320" z="-3279" heading="51392" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24119" x="52888" y="40888" z="-3504" heading="29052" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24123" x="52392" y="40712" z="-3496" heading="21220" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24125" x="53608" y="42040" z="-3247" heading="40385" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24119" x="53640" y="42360" z="-3237" heading="13527" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24123" x="53944" y="42376" z="-3250" heading="56292" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24119" x="54088" y="41880" z="-3270" heading="42197" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="53880" y="41688" z="-3265" heading="41413" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="54168" y="41480" z="-3270" heading="58838" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24121" x="53960" y="40600" z="-3304" heading="48603" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="53864" y="41384" z="-3266" heading="38635" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="54568" y="41816" z="-3255" heading="26150" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="53720" y="42232" z="-3242" heading="44315" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="52656" y="38423" z="-3514" heading="21943" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24119" x="52920" y="38888" z="-3233" heading="10791" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24117" x="52632" y="38824" z="-3640" heading="33350" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24121" x="52920" y="38520" z="-3220" heading="23603" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="53032" y="37912" z="-3172" heading="33109" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="52376" y="39016" z="-3168" heading="46201" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24119" x="52424" y="38744" z="-3196" heading="38351" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24125" x="51960" y="51112" z="-3297" heading="19218" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24119" x="52888" y="51176" z="-3201" heading="6036" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24123" x="52552" y="51176" z="-3229" heading="12511" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24119" x="52440" y="50472" z="-3285" heading="43916" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24123" x="52296" y="50392" z="-3512" heading="38168" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="51784" y="50840" z="-3340" heading="21384" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24123" x="51864" y="50328" z="-3512" heading="16017" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24125" x="52072" y="49960" z="-3488" heading="54667" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="52712" y="50248" z="-3197" heading="3756" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24119" x="53064" y="50344" z="-3172" heading="16966" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24117" x="52744" y="50568" z="-3212" heading="22185" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24125" x="52296" y="49720" z="-3480" heading="47778" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24117" x="51704" y="49336" z="-3480" heading="9681" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24117" x="51720" y="49544" z="-3480" heading="15873" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24123" x="51176" y="49320" z="-3464" heading="38370" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24121" x="51304" y="48936" z="-3472" heading="10450" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="51592" y="48968" z="-3480" heading="6990" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="52136" y="49768" z="-3480" heading="24575" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="52856" y="49800" z="-3220" heading="18518" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="52744" y="49112" z="-3184" heading="13524" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24119" x="52232" y="48744" z="-3480" heading="49576" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24123" x="52360" y="49096" z="-3272" heading="14207" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24119" x="51848" y="48792" z="-3480" heading="18677" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24125" x="50936" y="48744" z="-3456" heading="27402" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24123" x="51048" y="48248" z="-3448" heading="58998" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="51512" y="48568" z="-3472" heading="28282" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="52152" y="48440" z="-3480" heading="56502" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24125" x="52568" y="48392" z="-3200" heading="9868" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="51960" y="48184" z="-3480" heading="37430" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24117" x="51336" y="48280" z="-3464" heading="53179" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="51640" y="47832" z="-3480" heading="59554" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="51816" y="47976" z="-3480" heading="21993" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24117" x="49848" y="45688" z="-3520" heading="15432" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="50376" y="45240" z="-3496" heading="11330" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24117" x="50072" y="45560" z="-3512" heading="20021" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24121" x="50232" y="45336" z="-3504" heading="12904" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24119" x="49992" y="45192" z="-3504" heading="23437" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24121" x="50456" y="44904" z="-3488" heading="58248" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="50552" y="44600" z="-3496" heading="6950" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="50024" y="45496" z="-3512" heading="17325" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="53448" y="43096" z="-3184" heading="21399" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="53848" y="42984" z="-3217" heading="21333" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24123" x="54200" y="42840" z="-3239" heading="13778" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24121" x="53928" y="42392" z="-3249" heading="22133" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="54008" y="43144" z="-3219" heading="17837" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="53672" y="43160" z="-3207" heading="34656" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24125" x="56472" y="44632" z="-3101" heading="22313" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="55880" y="44584" z="-3105" heading="29727" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24117" x="55752" y="44216" z="-3137" heading="43764" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24123" x="56040" y="44200" z="-3153" heading="9030" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24121" x="55928" y="43688" z="-3164" heading="40467" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24119" x="56360" y="43672" z="-3159" heading="51076" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24121" x="56472" y="44008" z="-3162" heading="23298" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="56296" y="44392" z="-3141" heading="28563" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24123" x="55976" y="44936" z="-3648" heading="32486" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="56360" y="44888" z="-3075" heading="46027" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24121" x="56312" y="45208" z="-3656" heading="32632" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24117" x="57016" y="44488" z="-3141" heading="39555" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24125" x="56728" y="43880" z="-3163" heading="22171" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24117" x="57432" y="41800" z="-3720" heading="28335" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="57016" y="41656" z="-3123" heading="37579" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24117" x="57048" y="41048" z="-3130" heading="47461" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24125" x="56920" y="40760" z="-3720" heading="44875" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="56632" y="41240" z="-3712" heading="17453" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="56888" y="41656" z="-3712" heading="4983" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="57082" y="42013" z="-3650" heading="7043" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="57469" y="42156" z="-3354" heading="65295" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24125" x="58545" y="41570" z="-3663" heading="56275" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="58694" y="41265" z="-3278" heading="46325" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="58344" y="41368" z="-3720" heading="26604" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="58136" y="41400" z="-3720" heading="31139" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24117" x="57944" y="41336" z="-3120" heading="40183" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="57820" y="41617" z="-3376" heading="18223" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="58008" y="41976" z="-3720" heading="6447" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24121" x="58360" y="41912" z="-3110" heading="63528" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="58811" y="40684" z="-3428" heading="41490" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="58750" y="40616" z="-3537" heading="41490" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="58453" y="40313" z="-3051" heading="32563" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="58133" y="40244" z="-3335" heading="34322" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="57684" y="40062" z="-3647" heading="37604" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24125" x="57475" y="39984" z="-3487" heading="36661" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24117" x="56888" y="40184" z="-3136" heading="25043" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24125" x="55640" y="41784" z="-3656" heading="21718" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="55640" y="41784" z="-3656" heading="21718" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="56604" y="39928" z="-3429" heading="33100" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="55976" y="40584" z="-3728" heading="21753" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24123" x="56333" y="40826" z="-3441" heading="63640" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="56552" y="40488" z="-3165" heading="52921" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="56456" y="40392" z="-3174" heading="41394" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24117" x="56152" y="40248" z="-3728" heading="35014" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24125" x="56632" y="39096" z="-3163" heading="63389" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="56472" y="39464" z="-3158" heading="20450" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="56280" y="39384" z="-3150" heading="36959" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24125" x="55768" y="39128" z="-3113" heading="18708" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="55752" y="38840" z="-3728" heading="50859" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24117" x="56040" y="38536" z="-3116" heading="57058" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24125" x="44184" y="38776" z="-3488" heading="41014" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="43480" y="39128" z="-3488" heading="34696" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="43496" y="38824" z="-3488" heading="52429" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="44008" y="39032" z="-3488" heading="6972" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="43800" y="38696" z="-3488" heading="43786" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="43881" y="38452" z="-3488" heading="4889" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24121" x="43768" y="38568" z="-3488" heading="33973" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="43576" y="38568" z="-3488" heading="33042" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="42952" y="42328" z="-3488" heading="5556" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="42808" y="42456" z="-3488" heading="25093" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="43048" y="42648" z="-3488" heading="6991" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24121" x="43224" y="42536" z="-3488" heading="59798" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="43528" y="44728" z="-3704" heading="13684" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="43544" y="44264" z="-3696" heading="41999" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="43928" y="43352" z="-3576" heading="47186" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24141" x="43224" y="55304" z="-3680" heading="54970" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24141" x="43608" y="55672" z="-3632" heading="8551" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24141" x="44152" y="55240" z="-3600" heading="58565" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24141" x="44600" y="55528" z="-3512" heading="53690" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24142" x="44392" y="55656" z="-3544" heading="48840" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24142" x="43832" y="55496" z="-3616" heading="36712" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24142" x="44440" y="56360" z="-3528" heading="45242" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24142" x="43624" y="55880" z="-3624" heading="7116" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24142" x="42888" y="55736" z="-3688" heading="34431" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24140" x="43320" y="55016" z="-3672" heading="60677" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24140" x="43608" y="55224" z="-3656" heading="6517" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24140" x="44152" y="55480" z="-3584" heading="4991" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24140" x="44456" y="55960" z="-3520" heading="7726" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24141" x="43096" y="55768" z="-3680" heading="42753" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24140" x="44328" y="56760" z="-3584" heading="49979" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24139" x="43496" y="54952" z="-3672" heading="45985" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24139" x="43352" y="55752" z="-3656" heading="10376" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24139" x="44072" y="56552" z="-3584" heading="11411" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24141" x="44696" y="56488" z="-3512" heading="35084" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24141" x="42920" y="56088" z="-3680" heading="31513" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24139" x="42536" y="55528" z="-3688" heading="32263" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24140" x="44216" y="56776" z="-3592" heading="54303" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24139" x="43576" y="56760" z="-3672" heading="47644" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24140" x="43528" y="56904" z="-3680" heading="19889" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24140" x="43672" y="56776" z="-3656" heading="42841" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24141" x="44760" y="55928" z="-3488" heading="35323" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24142" x="44632" y="56472" z="-3528" heading="2659" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24139" x="43912" y="56504" z="-3600" heading="54441" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24139" x="43464" y="56648" z="-3664" heading="29425" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24141" x="40488" y="58568" z="-3231" heading="54388" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24141" x="40808" y="58520" z="-3235" heading="11063" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24140" x="40264" y="58776" z="-3214" heading="18708" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24142" x="40520" y="58680" z="-3228" heading="37604" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24140" x="40680" y="58885" z="-3224" heading="47165" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24142" x="40920" y="59240" z="-3221" heading="57797" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24142" x="41464" y="59944" z="-3230" heading="7116" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24139" x="41288" y="59864" z="-3224" heading="57787" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24142" x="40472" y="59496" z="-3206" heading="38938" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24141" x="40232" y="59560" z="-3199" heading="48480" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24141" x="40072" y="59448" z="-3201" heading="61096" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24139" x="40328" y="59112" z="-3212" heading="56812" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24141" x="41032" y="60360" z="-3207" heading="58606" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24141" x="41400" y="60872" z="-3208" heading="7907" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24142" x="41432" y="60536" z="-3211" heading="50209" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24139" x="41112" y="60760" z="-3209" heading="56078" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24140" x="40936" y="60760" z="-3213" heading="56710" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24140" x="41208" y="60920" z="-3201" heading="5826" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24139" x="39992" y="59704" z="-3189" heading="59266" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24140" x="40040" y="59832" z="-3179" heading="44831" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24142" x="39832" y="59432" z="-3600" heading="54465" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24142" x="42024" y="61000" z="-3488" heading="24653" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24142" x="42280" y="60904" z="-3220" heading="35048" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24139" x="42184" y="61240" z="-3225" heading="43080" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24141" x="42024" y="60696" z="-3204" heading="46510" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24139" x="41752" y="60952" z="-3207" heading="56419" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24141" x="42648" y="61016" z="-3233" heading="37679" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24139" x="42200" y="59288" z="-3279" heading="50341" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24140" x="42600" y="61320" z="-3229" heading="44339" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24139" x="42696" y="61192" z="-3230" heading="42382" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24141" x="40968" y="59752" z="-3207" heading="57117" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24142" x="42984" y="59112" z="-3275" heading="26028" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24141" x="43352" y="59256" z="-3267" heading="3814" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24141" x="43832" y="59496" z="-3275" heading="31888" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24139" x="43640" y="59304" z="-3268" heading="32767" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24141" x="43000" y="59304" z="-3277" heading="26999" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24139" x="42984" y="59512" z="-3262" heading="38182" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24140" x="43064" y="59032" z="-3273" heading="22558" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24140" x="43240" y="59096" z="-3272" heading="25107" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24142" x="42680" y="59448" z="-3250" heading="23911" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24140" x="45096" y="60136" z="-3333" heading="34482" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24142" x="44744" y="60360" z="-3316" heading="46191" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24141" x="45048" y="60536" z="-3322" heading="35178" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24140" x="45320" y="59976" z="-3336" heading="24433" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24142" x="45240" y="60008" z="-3335" heading="36555" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24141" x="45592" y="59864" z="-3354" heading="26523" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24139" x="45688" y="60344" z="-3362" heading="29581" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24139" x="45512" y="60504" z="-3345" heading="37031" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24140" x="45976" y="59912" z="-3584" heading="12892" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24140" x="46136" y="60024" z="-3576" heading="24344" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24142" x="46168" y="60296" z="-3560" heading="33346" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24141" x="46328" y="60248" z="-3560" heading="33767" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24142" x="46456" y="60216" z="-3560" heading="31437" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24139" x="46632" y="59784" z="-3568" heading="27518" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24141" x="46808" y="59784" z="-3576" heading="26135" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24142" x="47208" y="59736" z="-3624" heading="27519" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24139" x="47096" y="59064" z="-3624" heading="17370" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24139" x="47160" y="58664" z="-3624" heading="25188" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24140" x="47304" y="58984" z="-3624" heading="17441" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24141" x="47768" y="58712" z="-3752" heading="18616" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24141" x="48350" y="58622" z="-3613" heading="59571" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24142" x="48536" y="58264" z="-3736" heading="13001" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24142" x="48196" y="58350" z="-3614" heading="25244" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24139" x="47736" y="58072" z="-3752" heading="19739" respawnTime="60sec" chaseRange="1500" /> <!-- Reep Child -->
-			<npc id="24140" x="47672" y="58168" z="-3744" heading="29390" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24140" x="47592" y="58040" z="-3720" heading="43411" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24141" x="47752" y="57704" z="-3615" heading="53874" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24141" x="48408" y="57816" z="-3736" heading="26856" respawnTime="60sec" chaseRange="1500" /> <!-- Blossom Child -->
-			<npc id="24142" x="47944" y="59496" z="-3610" heading="35303" respawnTime="60sec" chaseRange="1500" /> <!-- Teasle Child -->
-			<npc id="24140" x="47721" y="59435" z="-3624" heading="35553" respawnTime="60sec" chaseRange="1500" /> <!-- Needle Child -->
-			<npc id="24125" x="41400" y="37208" z="-3568" heading="7579" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24123" x="40776" y="36968" z="-3336" heading="3823" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="40312" y="36920" z="-3291" heading="33897" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="39976" y="37192" z="-3234" heading="25647" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24119" x="40456" y="36648" z="-3326" heading="2242" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24117" x="40296" y="37032" z="-3283" heading="20310" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="40136" y="37128" z="-3259" heading="43991" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24125" x="40040" y="36984" z="-3624" heading="2990" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="39784" y="36744" z="-3238" heading="7276" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="39576" y="36328" z="-3292" heading="59268" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24117" x="39400" y="36696" z="-3280" heading="20607" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24121" x="39400" y="36840" z="-3259" heading="16153" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="39544" y="36904" z="-3248" heading="3726" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="38936" y="37032" z="-3304" heading="25742" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24121" x="38936" y="37032" z="-3304" heading="36549" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="39320" y="37480" z="-3254" heading="53837" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="39240" y="37288" z="-3263" heading="55583" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24123" x="39128" y="37400" z="-3273" heading="60246" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="39256" y="36584" z="-3308" heading="58144" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="39096" y="36520" z="-3326" heading="36909" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24125" x="38760" y="35864" z="-3336" heading="14750" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="38712" y="36008" z="-3336" heading="19783" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="38888" y="36168" z="-3337" heading="62329" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="38680" y="36280" z="-3328" heading="60648" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="38376" y="36264" z="-3303" heading="42643" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="38696" y="36632" z="-3307" heading="6618" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24121" x="38600" y="35992" z="-3330" heading="62389" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="39528" y="35208" z="-3372" heading="10344" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24117" x="39624" y="35608" z="-3390" heading="2944" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24121" x="39400" y="35384" z="-3365" heading="17035" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24119" x="39864" y="35912" z="-3372" heading="24368" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="43608" y="35000" z="-3616" heading="54388" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24117" x="43880" y="34968" z="-3624" heading="51986" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24121" x="44175" y="35120" z="-3624" heading="5203" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="44232" y="35352" z="-3608" heading="28510" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24119" x="44360" y="35160" z="-3640" heading="45498" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24123" x="44440" y="35256" z="-3640" heading="9688" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24125" x="45080" y="35048" z="-3696" heading="53544" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="45208" y="34888" z="-3696" heading="54905" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24117" x="45464" y="35240" z="-3664" heading="1909" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24125" x="45688" y="34616" z="-3672" heading="41572" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24123" x="45752" y="34776" z="-3656" heading="12404" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="45928" y="34712" z="-3648" heading="62162" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24121" x="45848" y="34456" z="-3664" heading="40959" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="46152" y="34392" z="-3664" heading="58901" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24119" x="46136" y="34024" z="-3696" heading="35772" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="45928" y="34136" z="-3696" heading="24135" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24117" x="46296" y="33976" z="-3696" heading="36736" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24125" x="46744" y="34280" z="-3680" heading="14474" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24123" x="46520" y="34696" z="-3648" heading="21622" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24119" x="46728" y="34872" z="-3664" heading="7527" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24125" x="46552" y="35160" z="-3640" heading="21810" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="46824" y="35304" z="-3648" heading="5235" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="47144" y="34968" z="-3688" heading="57248" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="47256" y="34648" z="-3696" heading="52498" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="47624" y="34584" z="-3688" heading="61567" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24123" x="47784" y="34696" z="-3680" heading="4924" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24121" x="47848" y="34408" z="-3704" heading="51356" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="48312" y="35128" z="-3478" heading="13129" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24121" x="48568" y="35320" z="-3448" heading="6617" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="48776" y="35128" z="-3464" heading="57655" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="49080" y="35032" z="-3456" heading="62011" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24117" x="48104" y="35752" z="-3361" heading="55217" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24117" x="48408" y="35768" z="-3373" heading="65131" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="47976" y="35784" z="-3353" heading="32326" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24117" x="48600" y="36328" z="-3260" heading="7272" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24123" x="49192" y="35896" z="-3339" heading="26470" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="49176" y="36232" z="-3309" heading="15896" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24125" x="49000" y="36040" z="-3648" heading="39976" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="48760" y="35976" z="-3354" heading="39326" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="49160" y="35656" z="-3393" heading="15508" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24119" x="49128" y="36456" z="-3285" heading="15146" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="49016" y="36408" z="-3264" heading="36822" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24117" x="50088" y="36776" z="-3207" heading="32655" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24117" x="51000" y="37000" z="-3672" heading="2529" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24117" x="51032" y="36728" z="-3184" heading="51848" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="51080" y="36584" z="-3183" heading="51887" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="50968" y="37064" z="-3672" heading="19358" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24121" x="50824" y="36328" z="-3177" heading="47409" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="50520" y="36344" z="-3194" heading="32204" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24123" x="50536" y="37560" z="-3163" heading="53533" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24125" x="50856" y="37624" z="-3165" heading="5766" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24119" x="51368" y="37368" z="-3184" heading="63367" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24121" x="51608" y="37240" z="-3189" heading="40866" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="51752" y="37320" z="-3197" heading="5468" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24121" x="51688" y="36968" z="-3179" heading="47372" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="51864" y="36984" z="-3174" heading="1027" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24125" x="52232" y="37128" z="-3175" heading="6917" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24117" x="52342" y="37209" z="-3183" heading="6569" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24123" x="52232" y="37528" z="-3712" heading="20998" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24119" x="51976" y="37528" z="-3206" heading="30709" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="52456" y="37784" z="-3202" heading="60216" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24121" x="52232" y="37800" z="-3207" heading="48582" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="52744" y="37816" z="-3182" heading="433" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24117" x="52584" y="41304" z="-3480" heading="39119" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24121" x="53640" y="44456" z="-3245" heading="37705" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24119" x="53576" y="44200" z="-3226" heading="45202" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24125" x="53912" y="44136" z="-3253" heading="62490" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="54120" y="44264" z="-3264" heading="5933" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24117" x="54136" y="43944" z="-3239" heading="46930" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24123" x="54376" y="44088" z="-3217" heading="5870" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24121" x="54456" y="43752" z="-3209" heading="51957" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="54584" y="43992" z="-3197" heading="11547" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24125" x="54248" y="43656" z="-3219" heading="53120" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24117" x="54600" y="43592" z="-3192" heading="63575" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="54392" y="43816" z="-3211" heading="24454" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="54232" y="44296" z="-3255" heading="45740" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="51304" y="44712" z="-3512" heading="61504" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24123" x="52120" y="46584" z="-3496" heading="61836" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="52168" y="46920" z="-3512" heading="61158" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24121" x="52280" y="47256" z="-3536" heading="64228" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="52232" y="47672" z="-3520" heading="18253" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="51256" y="46968" z="-3480" heading="39275" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24117" x="50840" y="46984" z="-3456" heading="32250" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24117" x="50472" y="46760" z="-3472" heading="60815" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24123" x="50680" y="46392" z="-3472" heading="55773" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24121" x="50104" y="46440" z="-3504" heading="24112" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="51496" y="46104" z="-3504" heading="58716" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24117" x="52104" y="46936" z="-3512" heading="56699" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="51784" y="46408" z="-3496" heading="60624" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="50328" y="46616" z="-3488" heading="31116" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24125" x="53096" y="47272" z="-3568" heading="52683" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="53960" y="47560" z="-3640" heading="3876" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24125" x="54472" y="47352" z="-3680" heading="59782" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="54376" y="46984" z="-3656" heading="50056" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="54584" y="46344" z="-3632" heading="49586" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24117" x="54344" y="46504" z="-3608" heading="58067" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="54456" y="46008" z="-3592" heading="51451" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24123" x="53784" y="47192" z="-3616" heading="48588" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="53992" y="46664" z="-3592" heading="58641" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="54328" y="47608" z="-3664" heading="22874" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="54264" y="47752" z="-3648" heading="20788" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24121" x="53384" y="46952" z="-3560" heading="45583" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="53384" y="46440" z="-3528" heading="37089" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="53512" y="45960" z="-3528" heading="35931" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="53352" y="47688" z="-3576" heading="45159" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24117" x="55512" y="47784" z="-3672" heading="49240" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24117" x="55704" y="47336" z="-3680" heading="52762" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24121" x="55944" y="47032" z="-3664" heading="56266" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24125" x="55912" y="47688" z="-3672" heading="16907" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24117" x="56120" y="47670" z="-3656" heading="65101" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24121" x="56152" y="48008" z="-3656" heading="15390" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24117" x="56168" y="48280" z="-3648" heading="15784" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="55672" y="48136" z="-3664" heading="29558" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="55784" y="48488" z="-3656" heading="28576" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24125" x="55960" y="48552" z="-3656" heading="51419" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24121" x="56120" y="48552" z="-3656" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="55656" y="48696" z="-3664" heading="52729" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="55752" y="48232" z="-3664" heading="40537" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24123" x="55736" y="47720" z="-3672" heading="48670" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24121" x="55576" y="49144" z="-3680" heading="41556" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24121" x="56328" y="49224" z="-3672" heading="2367" respawnTime="60sec" chaseRange="1500" /> <!-- Treant Blossom -->
-			<npc id="24123" x="55912" y="49608" z="-3688" heading="32517" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24117" x="56280" y="49528" z="-3680" heading="37306" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24117" x="57112" y="49736" z="-3680" heading="4638" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Reep -->
-			<npc id="24119" x="57176" y="49912" z="-3680" heading="12727" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24119" x="56760" y="49544" z="-3672" heading="40344" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
-			<npc id="24123" x="56696" y="49720" z="-3672" heading="20151" respawnTime="60sec" chaseRange="1500" /> <!-- Flush Teasle -->
-			<npc id="24125" x="57448" y="50424" z="-3624" heading="31773" respawnTime="60sec" chaseRange="1500" /> <!-- Creeper Rampike -->
-			<npc id="24119" x="57256" y="50360" z="-3632" heading="35904" respawnTime="60sec" chaseRange="1500" /> <!-- Crystal Needle -->
+		<group> <!-- NPC -->
+			<!-- <npc id="34240" x="53882" y="45323" z="-3319" heading="21220" respawnTime="60sec" /> Mother Tree Guardians Teleport Device -->
+			<npc id="34241" x="42604" y="35614" z="-3546" heading="8645" respawnTime="60sec" /> <!-- Mother Tree Guardians Teleport Device -->
 		</group>
 	</spawn>
 </list>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Elven/ShadowOfTheMotherTreeMonsters.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Elven/ShadowOfTheMotherTreeMonsters.xml
new file mode 100644
index 0000000000..71d75d061e
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Elven/ShadowOfTheMotherTreeMonsters.xml
@@ -0,0 +1,627 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="ShadowOfTheMotherTree"> <!-- MOB -->
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="46495" y="54525" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="43388" y="55632" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3300" maxZ="-2800" rad="200">
+				<node x="40635" y="56669" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3300" maxZ="-2800" rad="200">
+				<node x="40348" y="59159" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3300" maxZ="-2800" rad="200">
+				<node x="42206" y="60769" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3400" maxZ="-2900" rad="200">
+				<node x="44013" y="59740" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="47725" y="58958" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3400" maxZ="-2900" rad="200">
+				<node x="50110" y="57927" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="51630" y="61243" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="53535" y="59874" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="54232" y="57505" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="52264" y="56239" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="55953" y="54739" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="58254" y="52754" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="55192" y="51770" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="57043" y="50126" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="54240" y="49501" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="55680" y="46992" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="52968" y="46118" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="50862" y="44650" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3500" maxZ="-3000" rad="200">
+				<node x="50372" y="46880" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3400" maxZ="-2900" rad="200">
+				<node x="51569" y="48855" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3300" maxZ="-2800" rad="200">
+				<node x="52162" y="51527" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="50344" y="51603" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3300" maxZ="-2800" rad="200">
+				<node x="51467" y="53721" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3300" maxZ="-2800" rad="200">
+				<node x="53732" y="53580" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3300" maxZ="-2800" rad="200">
+				<node x="54005" y="43583" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="56597" y="45115" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="56311" y="41935" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="200">
+				<node x="58750" y="41532" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="200">
+				<node x="57102" y="39326" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="200">
+				<node x="54565" y="38628" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3400" maxZ="-2900" rad="200">
+				<node x="53010" y="40948" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="200">
+				<node x="54459" y="38732" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3300" maxZ="-2800" rad="200">
+				<node x="52597" y="38116" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3300" maxZ="-2800" rad="200">
+				<node x="50784" y="36558" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3400" maxZ="-2900" rad="200">
+				<node x="48328" y="35965" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="45864" y="34094" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3500" maxZ="-3000" rad="200">
+				<node x="46898" y="37937" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="46898" y="39392" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3500" maxZ="-3000" rad="200">
+				<node x="48767" y="41623" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="48197" y="44003" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="43641" y="44203" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="42906" y="42100" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="40546" y="43096" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="38742" y="40533" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3400" maxZ="-2900" rad="200">
+				<node x="41075" y="39112" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="43714" y="38727" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="200">
+				<node x="43151" y="35509" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="42342" y="33957" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3500" maxZ="-3000" rad="200">
+				<node x="39948" y="35008" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="shadow_of_the_mother_tree" shape="Cylinder" minZ="-3300" maxZ="-2800" rad="200">
+				<node x="39487" y="37544" />
+			</territory>
+		</territories>
+		<npc id="24965" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Creeper Rampike -->
+		<npc id="24966" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Fila Aprias -->
+		<npc id="24967" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Flush Teasle -->
+		<npc id="24968" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Treant Blossom -->
+		<npc id="24969" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Arsos Butterfly -->
+	</spawn>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Giran/BrekasStrongholdMonsters.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Giran/BrekasStrongholdMonsters.xml
index df083b62ae..450259f629 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Giran/BrekasStrongholdMonsters.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Giran/BrekasStrongholdMonsters.xml
@@ -1,1053 +1,373 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn04" minZ="-2972" maxZ="-2272">
-				<node x="76694" y="123129" />
-				<node x="77494" y="123129" />
-				<node x="77494" y="123929" />
-				<node x="76694" y="123929" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn05" minZ="-2972" maxZ="-2272">
-				<node x="78132" y="124531" />
-				<node x="78932" y="124531" />
-				<node x="78932" y="125331" />
-				<node x="78132" y="125331" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn06" minZ="-3648" maxZ="-2948">
-				<node x="77755" y="127342" />
-				<node x="78555" y="127342" />
-				<node x="78555" y="128142" />
-				<node x="77755" y="128142" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn07" minZ="-3767" maxZ="-3067">
-				<node x="79755" y="127910" />
-				<node x="80555" y="127910" />
-				<node x="80555" y="128710" />
-				<node x="79755" y="128710" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn08" minZ="-3793" maxZ="-3093">
-				<node x="77593" y="129199" />
-				<node x="78393" y="129199" />
-				<node x="78393" y="129999" />
-				<node x="77593" y="129999" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn09" minZ="-3101" maxZ="-2401">
-				<node x="80786" y="126051" />
-				<node x="81586" y="126051" />
-				<node x="81586" y="126851" />
-				<node x="80786" y="126851" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn10" minZ="-3844" maxZ="-3144">
-				<node x="79470" y="130108" />
-				<node x="80270" y="130108" />
-				<node x="80270" y="130908" />
-				<node x="79470" y="130908" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn11" minZ="-3767" maxZ="-3067">
-				<node x="81409" y="130598" />
-				<node x="82209" y="130598" />
-				<node x="82209" y="131398" />
-				<node x="81409" y="131398" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn12" minZ="-3767" maxZ="-3067">
-				<node x="81828" y="128735" />
-				<node x="82628" y="128735" />
-				<node x="82628" y="129535" />
-				<node x="81828" y="129535" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn13" minZ="-3767" maxZ="-3067">
-				<node x="83802" y="129021" />
-				<node x="84602" y="129021" />
-				<node x="84602" y="129821" />
-				<node x="83802" y="129821" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn14" minZ="-3051" maxZ="-2351">
-				<node x="84139" y="125645" />
-				<node x="84939" y="125645" />
-				<node x="84939" y="126445" />
-				<node x="84139" y="126445" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn15" minZ="-2798" maxZ="-2098">
-				<node x="87131" y="125712" />
-				<node x="87931" y="125712" />
-				<node x="87931" y="126512" />
-				<node x="87131" y="126512" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn16" minZ="-3875" maxZ="-3175">
-				<node x="83420" y="130840" />
-				<node x="84220" y="130840" />
-				<node x="84220" y="131640" />
-				<node x="83420" y="131640" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn17" minZ="-3793" maxZ="-3093">
-				<node x="86661" y="129943" />
-				<node x="87461" y="129943" />
-				<node x="87461" y="130743" />
-				<node x="86661" y="130743" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn18" minZ="-3793" maxZ="-3093">
-				<node x="87973" y="128474" />
-				<node x="88773" y="128474" />
-				<node x="88773" y="129274" />
-				<node x="87973" y="129274" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn19" minZ="-3793" maxZ="-3093">
-				<node x="89023" y="129790" />
-				<node x="89823" y="129790" />
-				<node x="89823" y="130590" />
-				<node x="89023" y="130590" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn20" minZ="-3793" maxZ="-3093">
-				<node x="90798" y="128699" />
-				<node x="91598" y="128699" />
-				<node x="91598" y="129499" />
-				<node x="90798" y="129499" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn21" minZ="-3793" maxZ="-3093">
-				<node x="91980" y="129945" />
-				<node x="92780" y="129945" />
-				<node x="92780" y="130745" />
-				<node x="91980" y="130745" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn22" minZ="-2590" maxZ="-1890">
-				<node x="89849" y="125051" />
-				<node x="90649" y="125051" />
-				<node x="90649" y="125851" />
-				<node x="89849" y="125851" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn23" minZ="-2778" maxZ="-2078">
-				<node x="91351" y="123804" />
-				<node x="92151" y="123804" />
-				<node x="92151" y="124604" />
-				<node x="91351" y="124604" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn24" minZ="-2811" maxZ="-2111">
-				<node x="92628" y="125269" />
-				<node x="93428" y="125269" />
-				<node x="93428" y="126069" />
-				<node x="92628" y="126069" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn25" minZ="-2778" maxZ="-2078">
-				<node x="93595" y="123465" />
-				<node x="94395" y="123465" />
-				<node x="94395" y="124265" />
-				<node x="93595" y="124265" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn26" minZ="-3418" maxZ="-2718">
-				<node x="91274" y="126671" />
-				<node x="92074" y="126671" />
-				<node x="91790" y="127467" />
-				<node x="91097" y="127476" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn27" minZ="-1937" maxZ="-1237">
-				<node x="93156" y="121452" />
-				<node x="93956" y="121452" />
-				<node x="93956" y="122252" />
-				<node x="93156" y="122252" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn28" minZ="-1835" maxZ="-1135">
-				<node x="96506" y="119892" />
-				<node x="97306" y="119892" />
-				<node x="97306" y="120692" />
-				<node x="96506" y="120692" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn29" minZ="-1793" maxZ="-1093">
-				<node x="95598" y="121941" />
-				<node x="96398" y="121941" />
-				<node x="96398" y="122741" />
-				<node x="95598" y="122741" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn30" minZ="-1760" maxZ="-1060">
-				<node x="95692" y="123755" />
-				<node x="96492" y="123755" />
-				<node x="96492" y="124555" />
-				<node x="95692" y="124555" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn31" minZ="-2032" maxZ="-1332">
-				<node x="96872" y="125258" />
-				<node x="97672" y="125258" />
-				<node x="97672" y="126058" />
-				<node x="96872" y="126058" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2221_bn33" minZ="-3308" maxZ="-2608">
-				<node x="94694" y="128300" />
-				<node x="95494" y="128300" />
-				<node x="95494" y="129100" />
-				<node x="94694" y="129100" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2222_bn01" minZ="-3652" maxZ="-2952">
-				<node x="72017" y="131258" />
-				<node x="72817" y="131258" />
-				<node x="72817" y="132058" />
-				<node x="72017" y="132058" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2222_bn02" minZ="-3676" maxZ="-2976">
-				<node x="73219" y="132861" />
-				<node x="74019" y="132861" />
-				<node x="74019" y="133661" />
-				<node x="73219" y="133661" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2222_bn04" minZ="-3739" maxZ="-3039">
-				<node x="75131" y="131725" />
-				<node x="75931" y="131725" />
-				<node x="75931" y="132525" />
-				<node x="75131" y="132525" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2222_bn05" minZ="-3776" maxZ="-3076">
-				<node x="76993" y="131012" />
-				<node x="77793" y="131012" />
-				<node x="77793" y="131812" />
-				<node x="76993" y="131812" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2222_bn06" minZ="-3776" maxZ="-3076">
-				<node x="88525" y="131482" />
-				<node x="89325" y="131482" />
-				<node x="89325" y="132282" />
-				<node x="88525" y="132282" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2222_bn07" minZ="-3809" maxZ="-3109">
-				<node x="90657" y="131500" />
-				<node x="91457" y="131500" />
-				<node x="91457" y="132300" />
-				<node x="90657" y="132300" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2222_bn08" minZ="-3776" maxZ="-3076">
-				<node x="89089" y="133331" />
-				<node x="89889" y="133331" />
-				<node x="89889" y="134131" />
-				<node x="89089" y="134131" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="h_giran06_2222_bn10" minZ="-3776" maxZ="-3076">
-				<node x="92306" y="132675" />
-				<node x="93106" y="132675" />
-				<node x="93106" y="133475" />
-				<node x="92306" y="133475" />
-			</territory>
-		</territories>
-		<npc id="24415" count="4" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="giran06_2221_bn04" minZ="-2972" maxZ="-2272">
-				<node x="76694" y="123129" />
-				<node x="77494" y="123129" />
-				<node x="77494" y="123929" />
-				<node x="76694" y="123929" />
-			</territory>
-		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="giran06_2221_bn05" minZ="-2972" maxZ="-2272">
-				<node x="78132" y="124531" />
-				<node x="78932" y="124531" />
-				<node x="78932" y="125331" />
-				<node x="78132" y="125331" />
-			</territory>
-		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
-	</spawn>
-	<spawn>
+	<spawn name="BrekasStronghold"> <!-- MOB -->
 		<territories>
-			<territory name="giran06_2221_bn06" minZ="-3648" maxZ="-2948">
-				<node x="77755" y="127342" />
-				<node x="78555" y="127342" />
-				<node x="78555" y="128142" />
-				<node x="77755" y="128142" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="100">
+				<node x="72974" y="132877" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn07" minZ="-3767" maxZ="-3067">
-				<node x="79755" y="127910" />
-				<node x="80555" y="127910" />
-				<node x="80555" y="128710" />
-				<node x="79755" y="128710" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="100">
+				<node x="76491" y="131290" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn08" minZ="-3793" maxZ="-3093">
-				<node x="77593" y="129199" />
-				<node x="78393" y="129199" />
-				<node x="78393" y="129999" />
-				<node x="77593" y="129999" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="100">
+				<node x="80208" y="130881" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn09" minZ="-3101" maxZ="-2401">
-				<node x="80786" y="126051" />
-				<node x="81586" y="126051" />
-				<node x="81586" y="126851" />
-				<node x="80786" y="126851" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="100">
+				<node x="83582" y="129833" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn10" minZ="-3844" maxZ="-3144">
-				<node x="79470" y="130108" />
-				<node x="80270" y="130108" />
-				<node x="80270" y="130908" />
-				<node x="79470" y="130908" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="100">
+				<node x="87193" y="129773" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn11" minZ="-3767" maxZ="-3067">
-				<node x="81409" y="130598" />
-				<node x="82209" y="130598" />
-				<node x="82209" y="131398" />
-				<node x="81409" y="131398" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="100">
+				<node x="90864" y="129822" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn12" minZ="-3767" maxZ="-3067">
-				<node x="81828" y="128735" />
-				<node x="82628" y="128735" />
-				<node x="82628" y="129535" />
-				<node x="81828" y="129535" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="100">
+				<node x="89326" y="133730" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn13" minZ="-3767" maxZ="-3067">
-				<node x="83802" y="129021" />
-				<node x="84602" y="129021" />
-				<node x="84602" y="129821" />
-				<node x="83802" y="129821" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3700" maxZ="-3500" rad="100">
+				<node x="93310" y="132368" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn14" minZ="-3051" maxZ="-2351">
-				<node x="84139" y="125645" />
-				<node x="84939" y="125645" />
-				<node x="84939" y="126445" />
-				<node x="84139" y="126445" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-2900" maxZ="-2400" rad="100">
+				<node x="95123" y="128327" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn15" minZ="-2798" maxZ="-2098">
-				<node x="87131" y="125712" />
-				<node x="87931" y="125712" />
-				<node x="87931" y="126512" />
-				<node x="87131" y="126512" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="100">
+				<node x="97577" y="129748" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn16" minZ="-3875" maxZ="-3175">
-				<node x="83420" y="130840" />
-				<node x="84220" y="130840" />
-				<node x="84220" y="131640" />
-				<node x="83420" y="131640" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-2100" maxZ="-1600" rad="100">
+				<node x="96123" y="126712" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn17" minZ="-3793" maxZ="-3093">
-				<node x="86661" y="129943" />
-				<node x="87461" y="129943" />
-				<node x="87461" y="130743" />
-				<node x="86661" y="130743" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-1700" maxZ="-1200" rad="100">
+				<node x="96588" y="123592" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn18" minZ="-3793" maxZ="-3093">
-				<node x="87973" y="128474" />
-				<node x="88773" y="128474" />
-				<node x="88773" y="129274" />
-				<node x="87973" y="129274" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-1700" maxZ="-1200" rad="100">
+				<node x="96843" y="120279" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn19" minZ="-3793" maxZ="-3093">
-				<node x="89023" y="129790" />
-				<node x="89823" y="129790" />
-				<node x="89823" y="130590" />
-				<node x="89023" y="130590" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-1700" maxZ="-1200" rad="100">
+				<node x="93438" y="121830" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn20" minZ="-3793" maxZ="-3093">
-				<node x="90798" y="128699" />
-				<node x="91598" y="128699" />
-				<node x="91598" y="129499" />
-				<node x="90798" y="129499" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="100">
+				<node x="91401" y="127211" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn21" minZ="-3793" maxZ="-3093">
-				<node x="91980" y="129945" />
-				<node x="92780" y="129945" />
-				<node x="92780" y="130745" />
-				<node x="91980" y="130745" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-2500" maxZ="-2000" rad="100">
+				<node x="93012" y="124047" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn22" minZ="-2590" maxZ="-1890">
-				<node x="89849" y="125051" />
-				<node x="90649" y="125051" />
-				<node x="90649" y="125851" />
-				<node x="89849" y="125851" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="100">
+				<node x="84670" y="127522" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn23" minZ="-2778" maxZ="-2078">
-				<node x="91351" y="123804" />
-				<node x="92151" y="123804" />
-				<node x="92151" y="124604" />
-				<node x="91351" y="124604" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3500" maxZ="-3000" rad="100">
+				<node x="79320" y="128259" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn24" minZ="-2811" maxZ="-2111">
-				<node x="92628" y="125269" />
-				<node x="93428" y="125269" />
-				<node x="93428" y="126069" />
-				<node x="92628" y="126069" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-2800" maxZ="-2300" rad="100">
+				<node x="81707" y="126539" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn25" minZ="-2778" maxZ="-2078">
-				<node x="93595" y="123465" />
-				<node x="94395" y="123465" />
-				<node x="94395" y="124265" />
-				<node x="93595" y="124265" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-2800" maxZ="-2300" rad="100">
+				<node x="79117" y="125182" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn26" minZ="-3418" maxZ="-2718">
-				<node x="91274" y="126671" />
-				<node x="92074" y="126671" />
-				<node x="91790" y="127467" />
-				<node x="91097" y="127476" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-2800" maxZ="-2500" rad="100">
+				<node x="77062" y="123061" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn27" minZ="-1937" maxZ="-1237">
-				<node x="93156" y="121452" />
-				<node x="93956" y="121452" />
-				<node x="93956" y="122252" />
-				<node x="93156" y="122252" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-2300" maxZ="-1800" rad="100">
+				<node x="82703" y="123928" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn28" minZ="-1835" maxZ="-1135">
-				<node x="96506" y="119892" />
-				<node x="97306" y="119892" />
-				<node x="97306" y="120692" />
-				<node x="96506" y="120692" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-2100" maxZ="-1600" rad="100">
+				<node x="86318" y="124809" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn29" minZ="-1793" maxZ="-1093">
-				<node x="95598" y="121941" />
-				<node x="96398" y="121941" />
-				<node x="96398" y="122741" />
-				<node x="95598" y="122741" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-2200" maxZ="-1700" rad="100">
+				<node x="90119" y="125328" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn30" minZ="-1760" maxZ="-1060">
-				<node x="95692" y="123755" />
-				<node x="96492" y="123755" />
-				<node x="96492" y="124555" />
-				<node x="95692" y="124555" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-2500" maxZ="-2000" rad="100">
+				<node x="87428" y="126218" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn31" minZ="-2032" maxZ="-1332">
-				<node x="96872" y="125258" />
-				<node x="97672" y="125258" />
-				<node x="97672" y="126058" />
-				<node x="96872" y="126058" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-2700" maxZ="-2200" rad="100">
+				<node x="84366" y="126057" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24418" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
+		<npc id="24419" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_bn33" minZ="-3308" maxZ="-2608">
-				<node x="94694" y="128300" />
-				<node x="95494" y="128300" />
-				<node x="95494" y="129100" />
-				<node x="94694" y="129100" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3500" maxZ="-3000" rad="100">
+				<node x="74742" y="132307" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24417" count="1" respawnTime="10sec" respawnRandom="0sec" /> <!-- Breka Orc Watchman -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_be02" minZ="-2935" maxZ="-2235">
-				<node x="77181" y="123625" />
-				<node x="77433" y="123621" />
-				<node x="77438" y="123876" />
-				<node x="77173" y="123876" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="100">
+				<node x="78236" y="130075" />
 			</territory>
 		</territories>
-		<npc id="24420" count="1" respawnTime="2hour" chaseRange="1500" /> <!-- Breka Orc Prefect - Lord of Breka's Stronghold -->
+		<npc id="24417" count="1" respawnTime="10sec" respawnRandom="0sec" /> <!-- Breka Orc Watchman -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_be03" minZ="-3707" maxZ="-3007">
-				<node x="80259" y="128032" />
-				<node x="80511" y="128028" />
-				<node x="80517" y="128283" />
-				<node x="80251" y="128283" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3600" maxZ="-3100" rad="100">
+				<node x="82088" y="129230" />
 			</territory>
 		</territories>
-		<npc id="24420" count="1" respawnTime="2hour" chaseRange="1500" /> <!-- Breka Orc Prefect - Lord of Breka's Stronghold -->
+		<npc id="24417" count="1" respawnTime="10sec" respawnRandom="0sec" /> <!-- Breka Orc Watchman -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_be04" minZ="-3755" maxZ="-3055">
-				<node x="82280" y="128986" />
-				<node x="82532" y="128982" />
-				<node x="82537" y="129237" />
-				<node x="82272" y="129237" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3300" maxZ="-2800" rad="100">
+				<node x="83810" y="128225" />
 			</territory>
 		</territories>
-		<npc id="24420" count="1" respawnTime="2hour" chaseRange="1500" /> <!-- Breka Orc Prefect - Lord of Breka's Stronghold -->
+		<npc id="24417" count="1" respawnTime="10sec" respawnRandom="0sec" /> <!-- Breka Orc Watchman -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_be05" minZ="-3822" maxZ="-3122">
-				<node x="88471" y="128994" />
-				<node x="88723" y="128990" />
-				<node x="88729" y="129245" />
-				<node x="88463" y="129245" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="100">
+				<node x="88992" y="129178" />
 			</territory>
 		</territories>
-		<npc id="24420" count="1" respawnTime="2hour" chaseRange="1500" /> <!-- Breka Orc Prefect - Lord of Breka's Stronghold -->
+		<npc id="24417" count="1" respawnTime="10sec" respawnRandom="0sec" /> <!-- Breka Orc Watchman -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_be06" minZ="-3822" maxZ="-3122">
-				<node x="92484" y="129993" />
-				<node x="92736" y="129990" />
-				<node x="92742" y="130244" />
-				<node x="92477" y="130244" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="100">
+				<node x="90767" y="131830" />
 			</territory>
 		</territories>
-		<npc id="24420" count="1" respawnTime="2hour" chaseRange="1500" /> <!-- Breka Orc Prefect - Lord of Breka's Stronghold -->
+		<npc id="24417" count="1" respawnTime="10sec" respawnRandom="0sec" /> <!-- Breka Orc Watchman -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_be07" minZ="-2847" maxZ="-2147">
-				<node x="93124" y="125340" />
-				<node x="93377" y="125337" />
-				<node x="93382" y="125592" />
-				<node x="93117" y="125591" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3500" maxZ="-3200" rad="100">
+				<node x="95254" y="130426" />
 			</territory>
 		</territories>
-		<npc id="24420" count="1" respawnTime="2hour" chaseRange="1500" /> <!-- Breka Orc Prefect - Lord of Breka's Stronghold -->
+		<npc id="24417" count="1" respawnTime="10sec" respawnRandom="0sec" /> <!-- Breka Orc Watchman -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_be08" minZ="-1782" maxZ="-1082">
-				<node x="95653" y="122205" />
-				<node x="95905" y="122201" />
-				<node x="95911" y="122456" />
-				<node x="95645" y="122456" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-2500" maxZ="-2000" rad="100">
+				<node x="98043" y="128135" />
 			</territory>
 		</territories>
-		<npc id="24420" count="1" respawnTime="2hour" chaseRange="1500" /> <!-- Breka Orc Prefect - Lord of Breka's Stronghold -->
+		<npc id="24417" count="1" respawnTime="10sec" respawnRandom="0sec" /> <!-- Breka Orc Watchman -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2221_be10" minZ="-2711" maxZ="-2011">
-				<node x="87631" y="126237" />
-				<node x="87883" y="126233" />
-				<node x="87889" y="126488" />
-				<node x="87623" y="126488" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-1700" maxZ="-1200" rad="100">
+				<node x="97967" y="125110" />
 			</territory>
 		</territories>
-		<npc id="24420" count="1" respawnTime="2hour" chaseRange="1500" /> <!-- Breka Orc Prefect - Lord of Breka's Stronghold -->
+		<npc id="24417" count="1" respawnTime="10sec" respawnRandom="0sec" /> <!-- Breka Orc Watchman -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2222_bn01" minZ="-3652" maxZ="-2952">
-				<node x="72017" y="131258" />
-				<node x="72817" y="131258" />
-				<node x="72817" y="132058" />
-				<node x="72017" y="132058" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-1700" maxZ="-1200" rad="100">
+				<node x="97821" y="121780" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24417" count="1" respawnTime="10sec" respawnRandom="0sec" /> <!-- Breka Orc Watchman -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2222_bn02" minZ="-3676" maxZ="-2976">
-				<node x="73219" y="132861" />
-				<node x="74019" y="132861" />
-				<node x="74019" y="133661" />
-				<node x="73219" y="133661" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-1700" maxZ="-1200" rad="100">
+				<node x="95301" y="121710" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24417" count="1" respawnTime="10sec" respawnRandom="0sec" /> <!-- Breka Orc Watchman -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2222_bn04" minZ="-3739" maxZ="-3039">
-				<node x="75131" y="131725" />
-				<node x="75931" y="131725" />
-				<node x="75931" y="132525" />
-				<node x="75131" y="132525" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-2500" maxZ="-2000" rad="100">
+				<node x="93938" y="125581" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24417" count="1" respawnTime="10sec" respawnRandom="0sec" /> <!-- Breka Orc Watchman -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2222_bn05" minZ="-3776" maxZ="-3076">
-				<node x="76993" y="131012" />
-				<node x="77793" y="131012" />
-				<node x="77793" y="131812" />
-				<node x="76993" y="131812" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-2500" maxZ="-2000" rad="100">
+				<node x="91280" y="123880" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24417" count="1" respawnTime="10sec" respawnRandom="0sec" /> <!-- Breka Orc Watchman -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2222_bn06" minZ="-3776" maxZ="-3076">
-				<node x="88525" y="131482" />
-				<node x="89325" y="131482" />
-				<node x="89325" y="132282" />
-				<node x="88525" y="132282" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3500" maxZ="-3000" rad="100">
+				<node x="81004" y="128505" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24417" count="1" respawnTime="10sec" respawnRandom="0sec" /> <!-- Breka Orc Watchman -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2222_bn07" minZ="-3809" maxZ="-3109">
-				<node x="90657" y="131500" />
-				<node x="91457" y="131500" />
-				<node x="91457" y="132300" />
-				<node x="90657" y="132300" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-3500" maxZ="-3000" rad="100">
+				<node x="76967" y="127953" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24417" count="1" respawnTime="10sec" respawnRandom="0sec" /> <!-- Breka Orc Watchman -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2222_bn08" minZ="-3776" maxZ="-3076">
-				<node x="89089" y="133331" />
-				<node x="89889" y="133331" />
-				<node x="89889" y="134131" />
-				<node x="89089" y="134131" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-2900" maxZ="-2400" rad="100">
+				<node x="77284" y="125039" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24417" count="1" respawnTime="10sec" respawnRandom="0sec" /> <!-- Breka Orc Watchman -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="giran06_2222_bn10" minZ="-3776" maxZ="-3076">
-				<node x="92306" y="132675" />
-				<node x="93106" y="132675" />
-				<node x="93106" y="133475" />
-				<node x="92306" y="133475" />
+			<territory name="brekas_stronghold" shape="Cylinder" minZ="-2500" maxZ="-2000" rad="100">
+				<node x="86181" y="127620" />
 			</territory>
 		</territories>
-		<npc id="24415" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout -->
-		<npc id="24416" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Scout Captain -->
-		<npc id="24417" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Archer -->
-		<npc id="24418" count="2" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Shaman -->
-		<npc id="24419" count="1" respawnTime="18sec" chaseRange="1500" /> <!-- Breka Orc Slaughterer -->
+		<npc id="24417" count="1" respawnTime="10sec" respawnRandom="0sec" /> <!-- Breka Orc Watchman -->
 	</spawn>
 </list>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Giran/DragonValley.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Giran/DragonValley.xml
index 885750fdb2..3ad3e2de78 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Giran/DragonValley.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Giran/DragonValley.xml
@@ -1,766 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="DragonValley" ai="DayNightSpawns">
-		<group>
-			<!-- NPCs -->
-			<npc id="30754" x="72696" y="116472" z="-3726" heading="34248" respawnTime="60sec" /> <!-- Gilmore - Antharas' Watchman -->
-			<npc id="30755" x="72696" y="116536" z="-3726" heading="35486" respawnTime="60sec" /> <!-- Theodric - Antharas' Watchman -->
+	<spawn name="DragonValley">
+		<group> <!-- NPC -->
+			<npc id="30754" x="72696" y="116472" z="-3726" heading="34248" respawnTime="60sec" /> <!-- Gilmore -->
+			<npc id="30755" x="72696" y="116536" z="-3726" heading="35486" respawnTime="60sec" /> <!-- Theodric -->
 		</group>
 	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_1" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="75338" y="117643" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_2" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="80364" y="113857" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_3" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="83106" y="113201" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_4" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="85462" y="112149" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_5" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="85145" y="108599" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_6" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="81847" y="109277" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_7" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="87300" y="112173" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_8" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="90348" y="112912" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_9" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="92533" y="112225" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_10" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="92265" y="115121" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_11" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="101309" y="110855" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_12" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="101800" y="113308" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_13" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="101726" y="117006" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_14" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="101395" y="119362" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_15" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="101315" y="121684" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_16" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="102448" y="123477" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_17" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="104084" y="122181" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_18" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="106583" y="120296" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_19" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="109092" y="122039" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_20" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="110098" y="125317" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_21" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="112841" y="122120" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_22" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="115035" y="120020" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_23" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="117067" y="120169" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_24" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="116486" y="117589" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_25" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="119176" y="116379" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_26" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="121846" y="116537" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_27" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="123423" y="114655" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_28" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="121637" y="113310" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_29" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="120005" y="112918" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_30" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="120276" y="115142" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_31" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="117905" y="118465" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_32" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="113966" y="122013" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_33" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="117018" y="123277" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_34" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="119645" y="122096" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_35" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="120892" y="120324" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_36" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="123047" y="119244" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_37" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="120342" y="114695" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_38" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="125170" y="111148" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_39" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="124087" y="108847" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_40" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="121571" y="108606" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_41" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="119772" y="110131" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_42" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="117547" y="110165" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_43" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="115551" y="109946" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_45" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="113857" y="109996" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_46" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="114051" y="112214" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_47" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="111852" y="112169" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_48" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="108966" y="111434" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_49" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="109410" y="113990" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_50" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="108870" y="116679" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_51" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="103179" y="119387" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_52" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="105897" y="121656" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_53" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="107651" y="122567" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_54" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="110513" y="123302" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_55" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="113885" y="120976" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_56" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="117980" y="118134" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_57" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="122612" y="111283" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_58" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="115310" y="115118" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_59" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="112988" y="115417" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_60" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="113208" y="117668" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_61" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="111530" y="117143" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_62" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="108569" y="117407" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_63" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="84437" y="116919" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_64" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="84933" y="118692" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_65" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="83870" y="120276" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_66" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="86060" y="120795" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_67" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="87788" y="119420" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_68" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="89751" y="120302" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_69" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="90904" y="118171" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_70" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="93511" y="118665" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_71" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="93492" y="113682" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_72" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="77147" y="117216" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_73" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="79375" y="116134" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_74" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="80258" y="115168" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_75" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="80257" y="114229" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_76" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="77147" y="117216" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_77" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="79375" y="116134" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_78" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="81393" y="112245" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_79" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="82046" y="110888" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_80" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="83460" y="111412" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_81" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="84330" y="110507" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_82" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="86018" y="110113" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_83" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="87544" y="111013" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_84" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="88982" y="110877" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="dragon_valley_85" shape="Cylinder" minZ="-3900" maxZ="-2450" rad="400">
-				<node x="91809" y="109757" />
-			</territory>
-		</territories>
-		<npc id="24617" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Peltast -->
-		<npc id="24618" count="4" respawnTime="30sec" respawnRandom="0sec" /> <!-- Dragon Officer -->
-	</spawn>
 </list>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Giran/DragonValleyMonsters.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Giran/DragonValleyMonsters.xml
new file mode 100644
index 0000000000..7dbb414ed9
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Giran/DragonValleyMonsters.xml
@@ -0,0 +1,1066 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DragonValleyWest"> <!-- MOB -->
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="79591" y="115522" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="83128" y="118378" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="84745" y="116521" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3000" maxZ="-2500" rad="200">
+				<node x="84199" y="120463" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="86490" y="120737" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="88926" y="119497" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="90929" y="118266" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3000" maxZ="-2500" rad="200">
+				<node x="91195" y="120308" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="92994" y="119077" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="94924" y="116198" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="200">
+				<node x="92468" y="114995" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="90891" y="113329" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="92766" y="111938" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3300" maxZ="-2800" rad="200">
+				<node x="88374" y="112291" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="85567" y="112128" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="83288" y="113027" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="90031" y="108254" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3300" maxZ="-2800" rad="200">
+				<node x="89737" y="105801" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="200">
+				<node x="87688" y="107141" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3300" maxZ="-2800" rad="200">
+				<node x="85457" y="108284" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="81451" y="109348" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="81675" y="111776" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="111776" y="111776" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="83926" y="110580" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="86763" y="110259" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="90334" y="111208" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3900" maxZ="-3400" rad="200">
+				<node x="91928" y="109497" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="94480" y="109835" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="97401" y="109542" />
+			</territory>
+		</territories>
+		<npc id="24664" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Lich -->
+		<npc id="24665" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Berserker -->
+		<npc id="24666" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Soldier -->
+		<npc id="24667" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Knight -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2700" rad="100">
+				<node x="85207" y="118680" />
+			</territory>
+		</territories>
+		<npc id="24663" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Archer -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="100">
+				<node x="88785" y="120992" />
+			</territory>
+		</territories>
+		<npc id="24663" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Archer -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="100">
+				<node x="90199" y="119457" />
+			</territory>
+		</territories>
+		<npc id="24663" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Archer -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3000" maxZ="-2500" rad="100">
+				<node x="91641" y="119216" />
+			</territory>
+		</territories>
+		<npc id="24663" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Archer -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="100">
+				<node x="94452" y="117888" />
+			</territory>
+		</territories>
+		<npc id="24663" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Archer -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="100">
+				<node x="93976" y="113995" />
+			</territory>
+		</territories>
+		<npc id="24663" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Archer -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="100">
+				<node x="92311" y="113236" />
+			</territory>
+		</territories>
+		<npc id="24663" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Archer -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="100">
+				<node x="91403" y="112019" />
+			</territory>
+		</territories>
+		<npc id="24663" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Archer -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="100">
+				<node x="89795" y="112053" />
+			</territory>
+		</territories>
+		<npc id="24663" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Archer -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3400" maxZ="-2900" rad="100">
+				<node x="87151" y="111434" />
+			</territory>
+		</territories>
+		<npc id="24663" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Archer -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="100">
+				<node x="84084" y="111691" />
+			</territory>
+		</territories>
+		<npc id="24663" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Archer -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="100">
+				<node x="89119" y="107093" />
+			</territory>
+		</territories>
+		<npc id="24663" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Archer -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="100">
+				<node x="87145" y="108624" />
+			</territory>
+		</territories>
+		<npc id="24663" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Archer -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3300" maxZ="-2800" rad="100">
+				<node x="84207" y="109743" />
+			</territory>
+		</territories>
+		<npc id="24663" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Archer -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="100">
+				<node x="82416" y="110606" />
+			</territory>
+		</territories>
+		<npc id="24663" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Archer -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="100">
+				<node x="100525" y="111772" />
+			</territory>
+		</territories>
+		<npc id="24663" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Archer -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="100">
+				<node x="101117" y="112511" />
+			</territory>
+		</territories>
+		<npc id="24663" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Graveyard Death Archer -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="99679" y="110404" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="102087" y="111301" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="101713" y="113857" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="101490" y="121819" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="102442" y="124140" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="104278" y="120442" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="104455" y="122634" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="106753" y="122847" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="106776" y="120510" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="109034" y="121369" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="109927" y="123372" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="110230" y="125797" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="112006" y="122479" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3900" maxZ="-3400" rad="200">
+				<node x="113799" y="120547" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="116256" y="120400" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="117975" y="118773" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="116198" y="117226" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="120672" y="116831" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="200">
+				<node x="122809" y="115622" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="120004" y="114601" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3900" maxZ="-3400" rad="200">
+				<node x="121983" y="113102" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="200">
+				<node x="122643" y="111026" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="120912" y="119934" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="119820" y="122114" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="200">
+				<node x="117238" y="123075" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="109045" y="116384" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="109493" y="113662" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="108778" y="111418" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3000" maxZ="-2500" rad="200">
+				<node x="112527" y="110084" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="200">
+				<node x="114175" y="112200" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-2800" maxZ="-2300" rad="200">
+				<node x="111737" y="112385" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="115070" y="110033" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3000" maxZ="-2500" rad="200">
+				<node x="118198" y="110121" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="120291" y="109726" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="122438" y="108496" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="124691" y="109473" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="200">
+				<node x="125021" y="112061" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="200">
+				<node x="116048" y="114673" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3300" maxZ="-2800" rad="200">
+				<node x="113302" y="115434" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="200">
+				<node x="112336" y="118189" />
+			</territory>
+		</territories>
+		<npc id="24669" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Officer -->
+		<npc id="24670" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Beast -->
+		<npc id="24671" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Centurion -->
+		<npc id="24672" count="3" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Elite Dragon Guard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="100">
+				<node x="102681" y="122761" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="100">
+				<node x="103047" y="121630" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="100">
+				<node x="105494" y="121572" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3700" maxZ="-3500" rad="100">
+				<node x="105547" y="123739" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="100">
+				<node x="107479" y="121593" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="100">
+				<node x="108417" y="122629" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="100">
+				<node x="110305" y="121958" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="100">
+				<node x="111227" y="123929" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="100">
+				<node x="115782" y="118912" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3800" maxZ="-3300" rad="100">
+				<node x="116983" y="116168" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3700" maxZ="-3200" rad="100">
+				<node x="121472" y="115177" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="100">
+				<node x="121126" y="121373" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="100">
+				<node x="108445" y="112541" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="100">
+				<node x="110609" y="110555" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="100">
+				<node x="113734" y="110673" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-2800" maxZ="-2300" rad="100">
+				<node x="112851" y="111494" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="100">
+				<node x="119519" y="111014" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3000" maxZ="-2500" rad="100">
+				<node x="120849" y="108163" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="100">
+				<node x="123937" y="108349" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="100">
+				<node x="125618" y="110804" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="dragon_valley" shape="Cylinder" minZ="-3200" maxZ="-2700" rad="100">
+				<node x="114449" y="114757" />
+			</territory>
+		</territories>
+		<npc id="24668" count="1" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Dragon Peltast -->
+	</spawn>
+</list>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Gludio/SelMahumBaseMonsters.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Gludio/SelMahumBaseMonsters.xml
new file mode 100644
index 0000000000..a5a699d354
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Gludio/SelMahumBaseMonsters.xml
@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="SelMahumBase"> <!-- MOB -->
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-43130" y="141257" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-45203" y="142304" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-47376" y="144551" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-45089" y="144772" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-46110" y="146866" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-49500" y="145678" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-50244" y="148766" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-47823" y="149199" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-48463" y="151444" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-46467" y="152671" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-49802" y="138384" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-51707" y="137049" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-49711" y="140849" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-52506" y="139750" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-52534" y="142032" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-50713" y="143383" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-52099" y="145857" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-54370" y="146204" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-54037" y="144130" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-54297" y="138083" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-55389" y="135935" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-56754" y="138800" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-55015" y="140597" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-56505" y="142710" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-57289" y="140513" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-57734" y="137401" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-60181" y="137827" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-3100" maxZ="-2600" rad="300">
+				<node x="-59288" y="135528" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="sel_mahum_base" shape="Cylinder" minZ="-2700" maxZ="-2200" rad="300">
+				<node x="-57137" y="140296" />
+			</territory>
+		</territories>
+		<npc id="24961" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Footman -->
+		<npc id="24962" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Elite Soldier -->
+		<npc id="24963" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Shaman -->
+		<npc id="24964" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Sel Mahum Wizard -->
+	</spawn>
+</list>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Rune/ForestOfTheDeadMonsters.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Rune/ForestOfTheDeadMonsters.xml
index cba073c8ce..1727034a88 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Rune/ForestOfTheDeadMonsters.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Rune/ForestOfTheDeadMonsters.xml
@@ -425,33 +425,6 @@
 			<npc id="21599" count="1" respawnTime="90sec" /> <!-- Requiem Priest -->
 		</group>
 	</spawn>
-	<spawn name="rune09_2116_15_DayNight" ai="DayNightSpawns">
-		<territories>
-			<territory name="rune09_2116_15" minZ="-3247" maxZ="-2347">
-				<node x="61271" y="-48011" />
-				<node x="62135" y="-44855" />
-				<node x="61207" y="-44065" />
-				<node x="58383" y="-47642" />
-				<node x="59055" y="-49908" />
-			</territory>
-		</territories>
-		<group name="dayTime" spawnByDefault="false">
-			<npc id="21570" count="1" respawnTime="30sec" /> <!-- Ghost of Betrayer -->
-			<npc id="21575" count="1" respawnTime="30sec" /> <!-- Bone Grinder -->
-			<npc id="21578" count="1" respawnTime="30sec" /> <!-- Behemoth Zombie -->
-			<npc id="21580" count="1" respawnTime="30sec" /> <!-- Bone Caster -->
-			<npc id="21581" count="1" respawnTime="30sec" /> <!-- Bone Puppeteer -->
-		</group>
-		<group name="nightTime" spawnByDefault="false">
-			<npc id="21573" count="1" respawnTime="30sec" /> <!-- Atrox -->
-			<npc id="21571" count="1" respawnTime="30sec" /> <!-- Ghost of Rebel Soldier -->
-			<npc id="21576" count="1" respawnTime="30sec" /> <!-- Ghost of Guillotine -->
-			<npc id="21577" count="1" respawnTime="30sec" /> <!-- Ghost of Guillotine -->
-			<npc id="21579" count="1" respawnTime="30sec" /> <!-- Ghost of Rebel Leader -->
-			<npc id="21582" count="1" respawnTime="30sec" /> <!-- Vampire Soldier -->
-			<npc id="21599" count="1" respawnTime="90sec" /> <!-- Requiem Priest -->
-		</group>
-	</spawn>
 	<spawn name="rune09_2116_16_DayNight" ai="DayNightSpawns">
 		<territories>
 			<territory name="rune09_2116_16" minZ="-3465" maxZ="-2165">
@@ -698,24 +671,4 @@
 			<npc id="21588" count="1" respawnTime="30sec" /> <!-- Vampire Wizard -->
 		</group>
 	</spawn>
-	<spawn name="rune09_2116_26_Night" ai="DayNightSpawns">
-		<territories>
-			<territory name="rune09_2116_26" minZ="-3216" maxZ="-2616">
-				<node x="61742" y="-43011" />
-				<node x="61991" y="-41266" />
-				<node x="58288" y="-40739" />
-				<node x="55959" y="-41439" />
-				<node x="58733" y="-43587" />
-				<node x="60332" y="-43914" />
-			</territory>
-		</territories>
-		<group name="nightTime" spawnByDefault="false">
-			<npc id="21586" count="1" respawnTime="30sec" /> <!-- Vampire Adept -->
-			<npc id="21585" count="1" respawnTime="30sec" /> <!-- Vampire Magician -->
-			<npc id="21592" count="1" respawnTime="30sec" /> <!-- Vampire Magister -->
-			<npc id="21595" count="1" respawnTime="30sec" /> <!-- Vampire Warlord -->
-			<npc id="21588" count="1" respawnTime="30sec" /> <!-- Vampire Wizard -->
-			<npc id="21589" count="1" respawnTime="30sec" /> <!-- Vampire Wizard -->
-		</group>
-	</spawn>
 </list>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Rune/SwampOfScreamsMonsters.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Rune/SwampOfScreamsMonsters.xml
index 8fcdecc411..435334304c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Rune/SwampOfScreamsMonsters.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Rune/SwampOfScreamsMonsters.xml
@@ -1,1183 +1,636 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_01" minZ="-2429" maxZ="-1929">
-				<node x="77747" y="-58718" />
-				<node x="77937" y="-58524" />
-				<node x="77937" y="-58267" />
-				<node x="77745" y="-58075" />
-				<node x="77489" y="-58076" />
-				<node x="77297" y="-58270" />
-				<node x="77299" y="-58525" />
-				<node x="77490" y="-58719" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_02" minZ="-2432" maxZ="-1932">
-				<node x="77606" y="-61735" />
-				<node x="77899" y="-61648" />
-				<node x="77827" y="-61312" />
-				<node x="77576" y="-61259" />
-				<node x="77312" y="-61312" />
-				<node x="76979" y="-61398" />
-				<node x="77056" y="-61827" />
-				<node x="77308" y="-61743" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_03" minZ="-2429" maxZ="-1929">
-				<node x="81568" y="-63672" />
-				<node x="81758" y="-63478" />
-				<node x="81758" y="-63221" />
-				<node x="81566" y="-63029" />
-				<node x="81310" y="-63030" />
-				<node x="81117" y="-63224" />
-				<node x="81120" y="-63479" />
-				<node x="81311" y="-63673" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_04" minZ="-2443" maxZ="-1943">
-				<node x="85107" y="-63157" />
-				<node x="85297" y="-62963" />
-				<node x="85298" y="-62707" />
-				<node x="85105" y="-62514" />
-				<node x="84849" y="-62515" />
-				<node x="84657" y="-62709" />
-				<node x="84660" y="-62964" />
-				<node x="84850" y="-63158" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_05" minZ="-2443" maxZ="-1943">
-				<node x="85647" y="-59758" />
-				<node x="85837" y="-59565" />
-				<node x="85838" y="-59308" />
-				<node x="85645" y="-59115" />
-				<node x="85389" y="-59116" />
-				<node x="85197" y="-59310" />
-				<node x="85200" y="-59566" />
-				<node x="85390" y="-59760" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_06" minZ="-2739" maxZ="-2239">
-				<node x="94136" y="-55178" />
-				<node x="94327" y="-54984" />
-				<node x="94327" y="-54727" />
-				<node x="94135" y="-54535" />
-				<node x="93878" y="-54536" />
-				<node x="93686" y="-54730" />
-				<node x="93689" y="-54985" />
-				<node x="93879" y="-55179" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_07" minZ="-2739" maxZ="-2239">
-				<node x="94756" y="-52845" />
-				<node x="94946" y="-52651" />
-				<node x="94946" y="-52395" />
-				<node x="94754" y="-52202" />
-				<node x="94497" y="-52203" />
-				<node x="94305" y="-52397" />
-				<node x="94308" y="-52652" />
-				<node x="94499" y="-52847" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_08" minZ="-2739" maxZ="-2239">
-				<node x="89550" y="-52293" />
-				<node x="89740" y="-52100" />
-				<node x="89741" y="-51843" />
-				<node x="89548" y="-51651" />
-				<node x="89292" y="-51652" />
-				<node x="89100" y="-51846" />
-				<node x="89103" y="-52101" />
-				<node x="89293" y="-52295" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_09" minZ="-2502" maxZ="-2002">
-				<node x="83172" y="-50881" />
-				<node x="83362" y="-50687" />
-				<node x="83362" y="-50431" />
-				<node x="83170" y="-50238" />
-				<node x="82913" y="-50239" />
-				<node x="82721" y="-50433" />
-				<node x="82724" y="-50688" />
-				<node x="82915" y="-50883" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_10" minZ="-2443" maxZ="-1943">
-				<node x="78978" y="-51399" />
-				<node x="79168" y="-51206" />
-				<node x="79169" y="-50949" />
-				<node x="78976" y="-50756" />
-				<node x="78720" y="-50757" />
-				<node x="78528" y="-50951" />
-				<node x="78531" y="-51207" />
-				<node x="78721" y="-51401" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_11" minZ="-3246" maxZ="-2746">
-				<node x="73884" y="-51613" />
-				<node x="74074" y="-51420" />
-				<node x="74074" y="-51163" />
-				<node x="73882" y="-50970" />
-				<node x="73626" y="-50971" />
-				<node x="73434" y="-51165" />
-				<node x="73436" y="-51421" />
-				<node x="73627" y="-51615" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_12" minZ="-3287" maxZ="-2787">
-				<node x="75808" y="-54864" />
-				<node x="75998" y="-54670" />
-				<node x="75999" y="-54414" />
-				<node x="75806" y="-54221" />
-				<node x="75550" y="-54222" />
-				<node x="75358" y="-54416" />
-				<node x="75361" y="-54671" />
-				<node x="75551" y="-54866" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_13" minZ="-2454" maxZ="-1954">
-				<node x="85479" y="-55083" />
-				<node x="85669" y="-54890" />
-				<node x="85669" y="-54633" />
-				<node x="85477" y="-54440" />
-				<node x="85221" y="-54442" />
-				<node x="85029" y="-54635" />
-				<node x="85031" y="-54891" />
-				<node x="85222" y="-55085" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_14" minZ="-2429" maxZ="-1929">
-				<node x="76441" y="-60418" />
-				<node x="76631" y="-60224" />
-				<node x="76631" y="-59967" />
-				<node x="76439" y="-59775" />
-				<node x="76183" y="-59776" />
-				<node x="75991" y="-59970" />
-				<node x="75993" y="-60225" />
-				<node x="76184" y="-60419" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_15" minZ="-2429" maxZ="-1929">
-				<node x="84161" y="-61281" />
-				<node x="84351" y="-61087" />
-				<node x="84351" y="-60830" />
-				<node x="84159" y="-60638" />
-				<node x="83903" y="-60639" />
-				<node x="83711" y="-60833" />
-				<node x="83713" y="-61088" />
-				<node x="83904" y="-61282" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_16" minZ="-2429" maxZ="-1929">
-				<node x="84299" y="-58492" />
-				<node x="84489" y="-58298" />
-				<node x="84489" y="-58041" />
-				<node x="84297" y="-57849" />
-				<node x="84041" y="-57850" />
-				<node x="83849" y="-58044" />
-				<node x="83851" y="-58299" />
-				<node x="84042" y="-58493" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_17" minZ="-2429" maxZ="-1929">
-				<node x="88437" y="-57690" />
-				<node x="88627" y="-57496" />
-				<node x="88627" y="-57239" />
-				<node x="88435" y="-57047" />
-				<node x="88179" y="-57048" />
-				<node x="87987" y="-57242" />
-				<node x="87989" y="-57497" />
-				<node x="88180" y="-57691" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_18" minZ="-2739" maxZ="-2239">
-				<node x="91401" y="-51521" />
-				<node x="91591" y="-51328" />
-				<node x="91592" y="-51071" />
-				<node x="91399" y="-50879" />
-				<node x="91143" y="-50880" />
-				<node x="90951" y="-51074" />
-				<node x="90954" y="-51329" />
-				<node x="91144" y="-51523" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_19" minZ="-3361" maxZ="-2861">
-				<node x="83708" y="-45975" />
-				<node x="83898" y="-45781" />
-				<node x="83898" y="-45524" />
-				<node x="83706" y="-45332" />
-				<node x="83450" y="-45333" />
-				<node x="83258" y="-45527" />
-				<node x="83260" y="-45782" />
-				<node x="83451" y="-45976" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_20" minZ="-3361" maxZ="-2861">
-				<node x="79937" y="-45735" />
-				<node x="80127" y="-45541" />
-				<node x="80127" y="-45284" />
-				<node x="79935" y="-45092" />
-				<node x="79679" y="-45093" />
-				<node x="79487" y="-45287" />
-				<node x="79489" y="-45542" />
-				<node x="79680" y="-45736" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_21" minZ="-3361" maxZ="-2861">
-				<node x="75126" y="-46888" />
-				<node x="75316" y="-46694" />
-				<node x="75316" y="-46437" />
-				<node x="75124" y="-46245" />
-				<node x="74868" y="-46246" />
-				<node x="74676" y="-46440" />
-				<node x="74678" y="-46695" />
-				<node x="74869" y="-46889" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_sml_22" minZ="-3361" maxZ="-2861">
-				<node x="71139" y="-41611" />
-				<node x="71329" y="-41417" />
-				<node x="71329" y="-41160" />
-				<node x="71137" y="-40968" />
-				<node x="70881" y="-40969" />
-				<node x="70689" y="-41163" />
-				<node x="70691" y="-41418" />
-				<node x="70882" y="-41612" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_01" minZ="-3361" maxZ="-2861">
-				<node x="73183" y="-42690" />
-				<node x="73373" y="-42496" />
-				<node x="73374" y="-42240" />
-				<node x="73181" y="-42047" />
-				<node x="72925" y="-42048" />
-				<node x="72733" y="-42242" />
-				<node x="72736" y="-42497" />
-				<node x="72926" y="-42691" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_02" minZ="-3361" maxZ="-2861">
-				<node x="73707" y="-42673" />
-				<node x="73897" y="-42480" />
-				<node x="73897" y="-42223" />
-				<node x="73705" y="-42030" />
-				<node x="73449" y="-42031" />
-				<node x="73257" y="-42225" />
-				<node x="73259" y="-42481" />
-				<node x="73450" y="-42675" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_03" minZ="-3361" maxZ="-2861">
-				<node x="79440" y="-42583" />
-				<node x="79630" y="-42390" />
-				<node x="79630" y="-42133" />
-				<node x="79438" y="-41940" />
-				<node x="79181" y="-41942" />
-				<node x="78989" y="-42136" />
-				<node x="78992" y="-42391" />
-				<node x="79182" y="-42585" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_04" minZ="-3361" maxZ="-2861">
-				<node x="79860" y="-42263" />
-				<node x="80050" y="-42070" />
-				<node x="80051" y="-41813" />
-				<node x="79858" y="-41620" />
-				<node x="79602" y="-41621" />
-				<node x="79410" y="-41815" />
-				<node x="79413" y="-42071" />
-				<node x="79603" y="-42265" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_05" minZ="-3361" maxZ="-2861">
-				<node x="82408" y="-42131" />
-				<node x="82598" y="-41938" />
-				<node x="82599" y="-41681" />
-				<node x="82406" y="-41488" />
-				<node x="82150" y="-41489" />
-				<node x="81958" y="-41683" />
-				<node x="81961" y="-41939" />
-				<node x="82151" y="-42133" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_06" minZ="-3361" maxZ="-2861">
-				<node x="82466" y="-41657" />
-				<node x="82656" y="-41463" />
-				<node x="82656" y="-41207" />
-				<node x="82464" y="-41014" />
-				<node x="82207" y="-41015" />
-				<node x="82015" y="-41209" />
-				<node x="82018" y="-41464" />
-				<node x="82208" y="-41659" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_07" minZ="-3361" maxZ="-2861">
-				<node x="81585" y="-44731" />
-				<node x="81775" y="-44538" />
-				<node x="81775" y="-44281" />
-				<node x="81583" y="-44088" />
-				<node x="81327" y="-44090" />
-				<node x="81135" y="-44283" />
-				<node x="81137" y="-44539" />
-				<node x="81328" y="-44733" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_08" minZ="-3361" maxZ="-2861">
-				<node x="81779" y="-45175" />
-				<node x="81969" y="-44981" />
-				<node x="81969" y="-44724" />
-				<node x="81777" y="-44532" />
-				<node x="81521" y="-44533" />
-				<node x="81329" y="-44727" />
-				<node x="81331" y="-44982" />
-				<node x="81522" y="-45176" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_09" minZ="-2717" maxZ="-2217">
-				<node x="92140" y="-53133" />
-				<node x="92330" y="-52939" />
-				<node x="92330" y="-52682" />
-				<node x="92138" y="-52490" />
-				<node x="91882" y="-52491" />
-				<node x="91690" y="-52685" />
-				<node x="91692" y="-52940" />
-				<node x="91883" y="-53134" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_10" minZ="-2717" maxZ="-2217">
-				<node x="92422" y="-53473" />
-				<node x="92612" y="-53279" />
-				<node x="92613" y="-53022" />
-				<node x="92420" y="-52830" />
-				<node x="92164" y="-52831" />
-				<node x="91972" y="-53025" />
-				<node x="91975" y="-53280" />
-				<node x="92165" y="-53474" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_11" minZ="-2439" maxZ="-1939">
-				<node x="88687" y="-60732" />
-				<node x="88877" y="-60539" />
-				<node x="88877" y="-60282" />
-				<node x="88685" y="-60089" />
-				<node x="88429" y="-60090" />
-				<node x="88237" y="-60284" />
-				<node x="88239" y="-60539" />
-				<node x="88430" y="-60734" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_12" minZ="-2439" maxZ="-1939">
-				<node x="89026" y="-60332" />
-				<node x="89216" y="-60138" />
-				<node x="89216" y="-59881" />
-				<node x="89024" y="-59689" />
-				<node x="88768" y="-59690" />
-				<node x="88576" y="-59884" />
-				<node x="88578" y="-60139" />
-				<node x="88769" y="-60333" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_13" minZ="-2439" maxZ="-1939">
-				<node x="81670" y="-60519" />
-				<node x="81860" y="-60326" />
-				<node x="81860" y="-60069" />
-				<node x="81668" y="-59876" />
-				<node x="81411" y="-59877" />
-				<node x="81219" y="-60071" />
-				<node x="81222" y="-60327" />
-				<node x="81413" y="-60521" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_mid_14" minZ="-2439" maxZ="-1939">
-				<node x="81200" y="-60287" />
-				<node x="81390" y="-60094" />
-				<node x="81390" y="-59837" />
-				<node x="81198" y="-59645" />
-				<node x="80942" y="-59646" />
-				<node x="80749" y="-59840" />
-				<node x="80752" y="-60095" />
-				<node x="80943" y="-60289" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_01" minZ="-3246" maxZ="-2746">
-				<node x="70882" y="-55719" />
-				<node x="71072" y="-55526" />
-				<node x="71072" y="-55269" />
-				<node x="70880" y="-55076" />
-				<node x="70624" y="-55077" />
-				<node x="70432" y="-55271" />
-				<node x="70434" y="-55526" />
-				<node x="70625" y="-55721" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_02" minZ="-3246" maxZ="-2746">
-				<node x="71413" y="-55723" />
-				<node x="71603" y="-55530" />
-				<node x="71603" y="-55273" />
-				<node x="71411" y="-55080" />
-				<node x="71155" y="-55081" />
-				<node x="70963" y="-55275" />
-				<node x="70965" y="-55531" />
-				<node x="71156" y="-55725" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_05" minZ="-3331" maxZ="-2831">
-				<node x="72249" y="-45372" />
-				<node x="72439" y="-45178" />
-				<node x="72439" y="-44922" />
-				<node x="72247" y="-44729" />
-				<node x="71990" y="-44730" />
-				<node x="71798" y="-44924" />
-				<node x="71801" y="-45179" />
-				<node x="71992" y="-45373" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_06" minZ="-3331" maxZ="-2831">
-				<node x="72490" y="-45872" />
-				<node x="72680" y="-45679" />
-				<node x="72681" y="-45422" />
-				<node x="72488" y="-45230" />
-				<node x="72232" y="-45231" />
-				<node x="72040" y="-45425" />
-				<node x="72043" y="-45680" />
-				<node x="72233" y="-45874" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_09" minZ="-3331" maxZ="-2831">
-				<node x="76533" y="-43664" />
-				<node x="76723" y="-43470" />
-				<node x="76724" y="-43214" />
-				<node x="76531" y="-43021" />
-				<node x="76275" y="-43022" />
-				<node x="76083" y="-43216" />
-				<node x="76086" y="-43471" />
-				<node x="76276" y="-43666" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_10" minZ="-3331" maxZ="-2831">
-				<node x="75923" y="-43666" />
-				<node x="76113" y="-43473" />
-				<node x="76114" y="-43216" />
-				<node x="75921" y="-43023" />
-				<node x="75665" y="-43024" />
-				<node x="75473" y="-43218" />
-				<node x="75476" y="-43474" />
-				<node x="75666" y="-43668" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_15" minZ="-2415" maxZ="-1915">
-				<node x="82373" y="-54914" />
-				<node x="82563" y="-54720" />
-				<node x="82563" y="-54464" />
-				<node x="82371" y="-54271" />
-				<node x="82115" y="-54272" />
-				<node x="81923" y="-54466" />
-				<node x="81925" y="-54721" />
-				<node x="82116" y="-54916" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_16" minZ="-2415" maxZ="-1915">
-				<node x="82174" y="-54464" />
-				<node x="82364" y="-54270" />
-				<node x="82364" y="-54014" />
-				<node x="82172" y="-53821" />
-				<node x="81916" y="-53822" />
-				<node x="81724" y="-54016" />
-				<node x="81726" y="-54271" />
-				<node x="81917" y="-54465" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_17" minZ="-2415" maxZ="-1915">
-				<node x="80147" y="-56452" />
-				<node x="80337" y="-56258" />
-				<node x="80337" y="-56002" />
-				<node x="80145" y="-55809" />
-				<node x="79889" y="-55810" />
-				<node x="79697" y="-56004" />
-				<node x="79699" y="-56259" />
-				<node x="79890" y="-56453" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_big_18" minZ="-2415" maxZ="-1915">
-				<node x="80616" y="-56636" />
-				<node x="80806" y="-56442" />
-				<node x="80806" y="-56186" />
-				<node x="80614" y="-55993" />
-				<node x="80358" y="-55994" />
-				<node x="80166" y="-56188" />
-				<node x="80168" y="-56443" />
-				<node x="80359" y="-56637" />
-			</territory>
-		</territories>
-		<npc id="24570" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24571" count="2" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
-		<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-		<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_01" minZ="-3246" maxZ="-2746">
-				<node x="71204" y="-52062" />
-				<node x="71394" y="-51869" />
-				<node x="71394" y="-51612" />
-				<node x="71202" y="-51419" />
-				<node x="70946" y="-51420" />
-				<node x="70754" y="-51614" />
-				<node x="70756" y="-51870" />
-				<node x="70947" y="-52064" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_02" minZ="-3246" maxZ="-2746">
-				<node x="72483" y="-53428" />
-				<node x="72673" y="-53235" />
-				<node x="72673" y="-52978" />
-				<node x="72481" y="-52785" />
-				<node x="72225" y="-52786" />
-				<node x="72033" y="-52980" />
-				<node x="72035" y="-53236" />
-				<node x="72226" y="-53430" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_03" minZ="-2440" maxZ="-1940">
-				<node x="78929" y="-60301" />
-				<node x="79119" y="-60108" />
-				<node x="79119" y="-59851" />
-				<node x="78927" y="-59658" />
-				<node x="78671" y="-59659" />
-				<node x="78479" y="-59853" />
-				<node x="78481" y="-60109" />
-				<node x="78672" y="-60303" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_04" minZ="-2440" maxZ="-1940">
-				<node x="82123" y="-62242" />
-				<node x="82313" y="-62049" />
-				<node x="82313" y="-61792" />
-				<node x="82121" y="-61599" />
-				<node x="81865" y="-61600" />
-				<node x="81673" y="-61794" />
-				<node x="81675" y="-62050" />
-				<node x="81866" y="-62244" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_05" minZ="-2440" maxZ="-1940">
-				<node x="86121" y="-57915" />
-				<node x="86311" y="-57722" />
-				<node x="86311" y="-57465" />
-				<node x="86119" y="-57272" />
-				<node x="85863" y="-57273" />
-				<node x="85671" y="-57467" />
-				<node x="85673" y="-57723" />
-				<node x="85864" y="-57917" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_06" minZ="-2440" maxZ="-1940">
-				<node x="89958" y="-62046" />
-				<node x="90148" y="-61853" />
-				<node x="90148" y="-61596" />
-				<node x="89956" y="-61403" />
-				<node x="89700" y="-61404" />
-				<node x="89508" y="-61598" />
-				<node x="89510" y="-61854" />
-				<node x="89701" y="-62048" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_07" minZ="-2736" maxZ="-2236">
-				<node x="90140" y="-54352" />
-				<node x="90330" y="-54159" />
-				<node x="90330" y="-53902" />
-				<node x="90138" y="-53709" />
-				<node x="89882" y="-53710" />
-				<node x="89690" y="-53904" />
-				<node x="89692" y="-54160" />
-				<node x="89883" y="-54354" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_08" minZ="-2705" maxZ="-2205">
-				<node x="92683" y="-56045" />
-				<node x="92873" y="-55852" />
-				<node x="92873" y="-55595" />
-				<node x="92681" y="-55402" />
-				<node x="92425" y="-55403" />
-				<node x="92233" y="-55597" />
-				<node x="92235" y="-55853" />
-				<node x="92426" y="-56047" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_09" minZ="-2750" maxZ="-2250">
-				<node x="96012" y="-53727" />
-				<node x="96202" y="-53534" />
-				<node x="96202" y="-53277" />
-				<node x="96010" y="-53084" />
-				<node x="95754" y="-53085" />
-				<node x="95562" y="-53279" />
-				<node x="95564" y="-53535" />
-				<node x="95755" y="-53729" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_10" minZ="-2750" maxZ="-2250">
-				<node x="93282" y="-51573" />
-				<node x="93472" y="-51380" />
-				<node x="93472" y="-51123" />
-				<node x="93280" y="-50930" />
-				<node x="93024" y="-50931" />
-				<node x="92832" y="-51125" />
-				<node x="92834" y="-51381" />
-				<node x="93025" y="-51575" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_11" minZ="-3333" maxZ="-2833">
-				<node x="70688" y="-43454" />
-				<node x="70878" y="-43261" />
-				<node x="70878" y="-43004" />
-				<node x="70686" y="-42811" />
-				<node x="70430" y="-42812" />
-				<node x="70238" y="-43006" />
-				<node x="70240" y="-43262" />
-				<node x="70431" y="-43456" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_12" minZ="-3333" maxZ="-2833">
-				<node x="74411" y="-40685" />
-				<node x="74601" y="-40492" />
-				<node x="74601" y="-40235" />
-				<node x="74409" y="-40042" />
-				<node x="74153" y="-40043" />
-				<node x="73961" y="-40237" />
-				<node x="73963" y="-40493" />
-				<node x="74154" y="-40687" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_13" minZ="-3333" maxZ="-2833">
-				<node x="83421" y="-44199" />
-				<node x="83611" y="-44006" />
-				<node x="83611" y="-43749" />
-				<node x="83419" y="-43556" />
-				<node x="83163" y="-43557" />
-				<node x="82971" y="-43751" />
-				<node x="82973" y="-44007" />
-				<node x="83164" y="-44201" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_14" minZ="-3333" maxZ="-2833">
-				<node x="79555" y="-40295" />
-				<node x="79745" y="-40102" />
-				<node x="79745" y="-39845" />
-				<node x="79553" y="-39652" />
-				<node x="79297" y="-39653" />
-				<node x="79105" y="-39847" />
-				<node x="79107" y="-40103" />
-				<node x="79298" y="-40297" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_15" minZ="-3333" maxZ="-2833">
-				<node x="77294" y="-46771" />
-				<node x="77484" y="-46578" />
-				<node x="77484" y="-46321" />
-				<node x="77292" y="-46128" />
-				<node x="77036" y="-46129" />
-				<node x="76844" y="-46323" />
-				<node x="76846" y="-46579" />
-				<node x="77037" y="-46773" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_16" minZ="-3333" maxZ="-2833">
-				<node x="78371" y="-45107" />
-				<node x="78561" y="-44914" />
-				<node x="78561" y="-44657" />
-				<node x="78369" y="-44464" />
-				<node x="78113" y="-44465" />
-				<node x="77921" y="-44659" />
-				<node x="77923" y="-44915" />
-				<node x="78114" y="-45109" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_17" minZ="-3378" maxZ="-2878">
-				<node x="81874" y="-47352" />
-				<node x="82064" y="-47159" />
-				<node x="82064" y="-46902" />
-				<node x="81872" y="-46709" />
-				<node x="81616" y="-46710" />
-				<node x="81424" y="-46904" />
-				<node x="81426" y="-47160" />
-				<node x="81617" y="-47354" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_18" minZ="-2480" maxZ="-1980">
-				<node x="81508" y="-52237" />
-				<node x="81698" y="-52044" />
-				<node x="81698" y="-51787" />
-				<node x="81506" y="-51594" />
-				<node x="81250" y="-51595" />
-				<node x="81058" y="-51789" />
-				<node x="81060" y="-52045" />
-				<node x="81251" y="-52239" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_19" minZ="-2480" maxZ="-1980">
-				<node x="84405" y="-56499" />
-				<node x="84595" y="-56306" />
-				<node x="84595" y="-56049" />
-				<node x="84403" y="-55856" />
-				<node x="84147" y="-55857" />
-				<node x="83955" y="-56051" />
-				<node x="83957" y="-56307" />
-				<node x="84148" y="-56501" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_20" minZ="-3208" maxZ="-2708">
-				<node x="74731" y="-53288" />
-				<node x="74921" y="-53095" />
-				<node x="74921" y="-52838" />
-				<node x="74729" y="-52645" />
-				<node x="74473" y="-52646" />
-				<node x="74281" y="-52840" />
-				<node x="74283" y="-53096" />
-				<node x="74474" y="-53290" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_21" minZ="-2438" maxZ="-1938">
-				<node x="81685" y="-58517" />
-				<node x="81875" y="-58324" />
-				<node x="81875" y="-58067" />
-				<node x="81683" y="-57874" />
-				<node x="81427" y="-57875" />
-				<node x="81235" y="-58069" />
-				<node x="81237" y="-58325" />
-				<node x="81428" y="-58519" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
-	</spawn>
-	<spawn>
-		<territories>
-			<territory name="rune12_2216_out_22" minZ="-3333" maxZ="-2833">
-				<node x="73225" y="-48582" />
-				<node x="73415" y="-48389" />
-				<node x="73415" y="-48132" />
-				<node x="73223" y="-47939" />
-				<node x="72967" y="-47940" />
-				<node x="72775" y="-48134" />
-				<node x="72777" y="-48390" />
-				<node x="72968" y="-48584" />
-			</territory>
-		</territories>
-		<npc id="24570" count="3" respawnTime="20sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
-		<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+	<spawn name="SwampOfScreamsMonsters" spawnByDefault="false">
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="71230" y="-55358" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="73720" y="-51399" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="75748" y="-54618" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="74944" y="-46657" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="72152" y="-45067" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="72493" y="-45785" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="73107" y="-42346" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="73658" y="-42294" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="75769" y="-43267" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="76476" y="-43476" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="75190" y="-46502" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="79854" y="-45317" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="81260" y="-44377" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="81514" y="-44686" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="79750" y="-41915" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="79360" y="-42003" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="82186" y="-41268" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="82309" y="-41754" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="83692" y="-45626" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="85447" y="-59413" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="84015" y="-61074" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="85054" y="-62837" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="81603" y="-63297" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="81520" y="-60501" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="80915" y="-59934" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="84041" y="-58004" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="77671" y="-58313" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="76374" y="-59894" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="77383" y="-61554" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="80507" y="-56412" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="80002" y="-56009" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="82322" y="-54655" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="82048" y="-54271" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="78923" y="-51121" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="82975" y="-50598" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="85425" y="-54729" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="89321" y="-52011" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="91211" y="-51262" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="92122" y="-52894" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="93944" y="-54742" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="94636" y="-52583" />
+				</territory>
+			</territories>
+			<npc id="24570" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24571" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Berserker -->
+			<npc id="24572" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+			<npc id="24573" count="2" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Witch -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="71070" y="-51755" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="72408" y="-53084" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="74533" y="-52994" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="73291" y="-48206" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="77190" y="-46396" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="78206" y="-44800" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="81789" y="-47150" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="83180" y="-43975" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3200" maxZ="-3000" rad="200">
+					<node x="79448" y="-40030" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3100" maxZ="-2900" rad="200">
+					<node x="74175" y="-40332" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-3300" maxZ="-3100" rad="200">
+					<node x="70651" y="-42916" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="81383" y="-51898" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="78704" y="-59856" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="82024" y="-62041" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="85912" y="-57582" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+					<node x="89927" y="-61696" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+					<node x="93143" y="-51220" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+					<node x="95950" y="-53341" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+					<node x="92635" y="-55669" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
+		<group>
+			<territories>
+				<territory name="swamp_of_scream" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+					<node x="89976" y="-53911" />
+				</territory>
+			</territories>
+			<npc id="24570" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Drone -->
+			<npc id="24572" count="3" respawnTime="10sec" chaseRange="1500" /> <!-- Dire Stakato Shaman -->
+		</group>
 	</spawn>
 </list>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Schuttgart/FrozenLabyrinth.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Schuttgart/FrozenLabyrinth.xml
new file mode 100644
index 0000000000..fffeeebe62
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Schuttgart/FrozenLabyrinth.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="IceMerchantCabin" ai="DayNightSpawns">
+		<group> <!-- NPC -->
+			<npc id="32020" x="113808" y="-109344" z="-840" heading="8192" respawnTime="60sec" /> <!-- Rafforty -->
+			<npc id="32022" x="104512" y="-107648" z="-3688" heading="28672" respawnTime="60sec" /> <!-- Kier -->
+			<npc id="32023" x="113760" y="-109264" z="-840" respawnTime="60sec" /> <!-- Ice Shelf -->
+			<npc id="32029" x="115451" y="-125706" z="-3448" respawnTime="60sec" /> <!-- Freya's Steward -->
+			<npc id="32030" x="111769" y="-126274" z="-2994" respawnTime="60sec" /> <!-- Garden Sculpture -->
+			<npc id="32031" x="102384" y="-125696" z="-2840" respawnTime="60sec" /> <!-- Ice Fairy Sculpture -->
+			<npc id="32761" x="102512" y="-124416" z="-2776" respawnTime="60sec" /> <!-- Kegor -->
+			<npc id="32777" x="102306" y="-124361" z="-2752" respawnTime="60sec" /> <!-- Battalion Leader -->
+			<npc id="32778" x="102462" y="-124237" z="-2768" respawnTime="60sec" /> <!-- Legionnaire -->
+			<npc id="32781" x="102402" y="-124491" z="-2776" respawnTime="60sec" /> <!-- Jinia -->
+		</group>
+		<group name="nightTime" spawnByDefault="false"> <!-- NPC -->
+			<npc id="32018" x="107888" y="-120464" z="-3744" heading="24576" respawnTime="60sec" /> <!-- Misa -->
+		</group>
+	</spawn>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Schuttgart/FrozenLabyrinthMonsters.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Schuttgart/FrozenLabyrinthMonsters.xml
new file mode 100644
index 0000000000..e1b07b47dd
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/spawns/Schuttgart/FrozenLabyrinthMonsters.xml
@@ -0,0 +1,735 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="FrozenLabyrinth"> <!-- MOB -->
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-3700" maxZ="-3500" rad="200">
+				<node x="101082" y="-114737" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-3700" maxZ="-3500" rad="200">
+				<node x="101747" y="-118836" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-3700" maxZ="-3500" rad="200">
+				<node x="103911" y="-120393" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-3700" maxZ="-3500" rad="200">
+				<node x="106491" y="-121552" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-3700" maxZ="-3500" rad="200">
+				<node x="109095" y="-122990" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2900" maxZ="-2700" rad="200">
+				<node x="110098" y="-116451" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2800" maxZ="-2600" rad="200">
+				<node x="107716" y="-116783" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2800" maxZ="-2600" rad="200">
+				<node x="105302" y="-115085" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2800" maxZ="-2600" rad="200">
+				<node x="103599" y="-116681" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2800" maxZ="-2600" rad="200">
+				<node x="105724" y="-118585" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2800" maxZ="-2600" rad="200">
+				<node x="112913" y="-120356" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2800" maxZ="-2600" rad="200">
+				<node x="113658" y="-118098" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2800" maxZ="-2600" rad="200">
+				<node x="116016" y="-119481" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+				<node x="117433" y="-122459" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+				<node x="120206" y="-122217" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2900" maxZ="-2700" rad="200">
+				<node x="121986" y="-120668" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+				<node x="120159" y="-126976" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+				<node x="117337" y="-126666" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2200" maxZ="-2000" rad="200">
+				<node x="118654" y="-124697" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+				<node x="123157" y="-122565" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+				<node x="123354" y="-124760" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+				<node x="123814" y="-127184" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+				<node x="125851" y="-126428" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2300" maxZ="-2100" rad="200">
+				<node x="128171" y="-127026" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2300" maxZ="-2100" rad="200">
+				<node x="127440" y="-124324" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+				<node x="128664" y="-122845" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2300" maxZ="-2100" rad="200">
+				<node x="126133" y="-122588" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+				<node x="123258" y="-122507" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+				<node x="123580" y="-116532" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+				<node x="125747" y="-117618" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+				<node x="124612" y="-119147" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+				<node x="128308" y="-118748" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+				<node x="127598" y="-116551" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+				<node x="124855" y="-114436" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+				<node x="124022" y="-110587" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2800" maxZ="-2600" rad="200">
+				<node x="126178" y="-111720" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2800" maxZ="-2600" rad="200">
+				<node x="128317" y="-110826" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+				<node x="121111" y="-111720" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2200" maxZ="-2000" rad="200">
+				<node x="119317" y="-114279" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2300" maxZ="-2100" rad="200">
+				<node x="121705" y="-114583" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2500" maxZ="-2300" rad="200">
+				<node x="120256" y="-117670" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2300" maxZ="-2100" rad="200">
+				<node x="118930" y="-119450" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-1400" maxZ="-1200" rad="200">
+				<node x="118537" y="-105238" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2200" maxZ="-2000" rad="200">
+				<node x="121488" y="-106735" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2800" maxZ="-2600" rad="200">
+				<node x="122816" y="-104282" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+				<node x="125160" y="-104320" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+				<node x="126867" y="-102275" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2800" maxZ="-2600" rad="200">
+				<node x="127944" y="-104169" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2600" maxZ="-2400" rad="200">
+				<node x="126936" y="-106972" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2700" maxZ="-2500" rad="200">
+				<node x="124062" y="-110418" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2800" maxZ="-2600" rad="200">
+				<node x="126123" y="-111625" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2800" maxZ="-2600" rad="200">
+				<node x="128394" y="-110841" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2400" maxZ="-2200" rad="200">
+				<node x="121095" y="-111715" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2200" maxZ="-2000" rad="200">
+				<node x="119163" y="-114402" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-2300" maxZ="-2100" rad="200">
+				<node x="121730" y="-114539" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-3700" maxZ="-3500" rad="200">
+				<node x="111934" y="-102328" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-3700" maxZ="-3500" rad="200">
+				<node x="116400" y="-100890" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-3500" maxZ="-3300" rad="200">
+				<node x="120652" y="-102148" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-3700" maxZ="-3500" rad="200">
+				<node x="104626" y="-103200" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-3700" maxZ="-3500" rad="200">
+				<node x="106427" y="-104957" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+	<spawn>
+		<territories>
+			<territory name="frozen_labyrinth" shape="Cylinder" minZ="-3700" maxZ="-3500" rad="200">
+				<node x="104805" y="-107585" />
+			</territory>
+		</territories>
+		<npc id="24934" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Soldier -->
+		<npc id="24935" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Frozen Defender -->
+		<npc id="24936" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Knight -->
+		<npc id="24937" count="2" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Glacier Golem -->
+		<npc id="24938" count="4" respawnTime="10sec" respawnRandom="0sec" chaseRange="1200" /> <!-- Ice Fairy -->
+	</spawn>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/armorsets/Visual_Sets.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/armorsets/Visual_Sets.xml
index 0f2bd15610..3b09c6985b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/armorsets/Visual_Sets.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/armorsets/Visual_Sets.xml
@@ -47,4 +47,85 @@
 			<skill id="22918" level="4" minimumPieces="4" /> <!-- Resurrection Device -->
 		</skills>
 	</set>
+	<!-- Sigil of Light -->
+	<set id="501" visual="true" minimumPieces="1">
+		<requiredItems>
+			<item id="60575" /> <!-- Sigil of Light Lv. 1 -->
+		</requiredItems>
+		<skills>
+			<skill id="29562" level="1" minimumPieces="1" /> <!-- Sigil of Light Lv. 1 -->
+		</skills>
+	</set>
+	<set id="502" visual="true" minimumPieces="1">
+		<requiredItems>
+			<item id="60576" /> <!-- Sigil of Light Lv. 2 -->
+		</requiredItems>
+		<skills>
+			<skill id="29563" level="1" minimumPieces="1" /> <!-- Sigil of Light Lv. 2 -->
+		</skills>
+	</set>
+	<set id="503" visual="true" minimumPieces="1">
+		<requiredItems>
+			<item id="60577" /> <!-- Sigil of Light Lv. 3 -->
+		</requiredItems>
+		<skills>
+			<skill id="29564" level="1" minimumPieces="1" /> <!-- Sigil of Light Lv. 3 -->
+		</skills>
+	</set>
+	<set id="504" visual="true" minimumPieces="1">
+		<requiredItems>
+			<item id="60578" /> <!-- Sigil of Light Lv. 4 -->
+		</requiredItems>
+		<skills>
+			<skill id="29565" level="1" minimumPieces="1" /> <!-- Sigil of Light Lv. 4 -->
+		</skills>
+	</set>
+	<set id="505" visual="true" minimumPieces="1">
+		<requiredItems>
+			<item id="60579" /> <!-- Sigil of Light Lv. 5 -->
+		</requiredItems>
+		<skills>
+			<skill id="29566" level="1" minimumPieces="1" /> <!-- Sigil of Light Lv. 5 -->
+		</skills>
+	</set>
+	<set id="506" visual="true" minimumPieces="1">
+		<requiredItems>
+			<item id="60580" /> <!-- Sigil of Light Lv. 6 -->
+		</requiredItems>
+		<skills>
+			<skill id="29567" level="1" minimumPieces="1" /> <!-- Sigil of Light Lv. 6 -->
+		</skills>
+	</set>
+	<set id="507" visual="true" minimumPieces="1">
+		<requiredItems>
+			<item id="60581" /> <!-- Sigil of Light Lv. 7 -->
+		</requiredItems>
+		<skills>
+			<skill id="29568" level="1" minimumPieces="1" /> <!-- Sigil of Light Lv. 7 -->
+		</skills>
+	</set>
+	<set id="508" visual="true" minimumPieces="1">
+		<requiredItems>
+			<item id="60582" /> <!-- Sigil of Light Lv. 8 -->
+		</requiredItems>
+		<skills>
+			<skill id="29569" level="1" minimumPieces="1" /> <!-- Sigil of Light Lv. 8 -->
+		</skills>
+	</set>
+	<set id="509" visual="true" minimumPieces="1">
+		<requiredItems>
+			<item id="60583" /> <!-- Sigil of Light Lv. 9 -->
+		</requiredItems>
+		<skills>
+			<skill id="29570" level="1" minimumPieces="1" /> <!-- Sigil of Light Lv. 9 -->
+		</skills>
+	</set>
+	<set id="510" visual="true" minimumPieces="1">
+		<requiredItems>
+			<item id="60584" /> <!-- Sigil of Light Lv. 10 -->
+		</requiredItems>
+		<skills>
+			<skill id="29571" level="1" minimumPieces="1" /> <!-- Sigil of Light Lv. 10 -->
+		</skills>
+	</set>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/initialEquipment.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/initialEquipment.xml
index ca7de06da8..5aaea52f69 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/initialEquipment.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/initialEquipment.xml
@@ -170,8 +170,5 @@
 		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
-		<item id="80683" count="1" /> <!-- Sword Breaker - For Apprentice Adventurer -->
-		<item id="80687" count="1" /> <!-- Compound Bow - For Apprentice Adventurer -->
-		<item id="17" count="1500" /> <!-- Wooden Arrow -->
 	</equipment>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/initialEquipmentEvent.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/initialEquipmentEvent.xml
index 08750def50..7e5b5aa231 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/initialEquipmentEvent.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/initialEquipmentEvent.xml
@@ -2,9 +2,12 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/initialEquipment.xsd">
 	<!-- Human Fighter -->
 	<equipment classId="0">
-		<item id="2369" count="1" equipped="true" /> <!-- Squire's Sword -->
-		<item id="1146" count="1" equipped="true" /> <!-- Squire's Shirt -->
-		<item id="1147" count="1" equipped="true" /> <!-- Squire's Pants -->
+		<item id="80684" count="1" equipped="true" /> <!-- Falchion - For Apprentice Adventurer -->
+		<item id="80690" count="1" equipped="true" /> <!-- Durable Leather Helmet - Apprentice Adventurer -->
+		<item id="80691" count="1" equipped="true" /> <!-- Bronze Breastplate - Apprentice Adventurer -->
+		<item id="80692" count="1" equipped="true" /> <!-- Bronze Gaiters - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
@@ -12,183 +15,218 @@
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
 		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
-		<item id="10" count="1" /> <!-- Dagger -->
+		<item id="80683" count="1" /> <!-- Sword Breaker - For Apprentice Adventurer -->
+		<item id="80687" count="1" /> <!-- Compound Bow - For Apprentice Adventurer -->
+		<item id="17" count="1500" /> <!-- Wooden Arrow -->
 	</equipment>
 	<!-- Human Mystic -->
 	<equipment classId="10">
-		<item id="6" count="1" equipped="true" /> <!-- Apprentice's Wand -->
-		<item id="425" count="1" equipped="true" /> <!-- Apprentice's Tunic -->
-		<item id="461" count="1" equipped="true" /> <!-- Apprentice's Stockings -->
+		<item id="80686" count="1" equipped="true" /> <!-- Mage Staff - For Apprentice Adventurer -->
+		<item id="80695" count="1" equipped="true" /> <!-- Leather Helmet - Apprentice Adventurer -->
+		<item id="80696" count="1" equipped="true" /> <!-- Tunic of Devotion - Apprentice Adventurer -->
+		<item id="80697" count="1" equipped="true" /> <!-- Stockings of Devotion - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
+		<item id="80689" count="1" /> <!-- Flanged Mace - For Apprentice Adventurer -->
 	</equipment>
 	<!-- Elven Fighter -->
 	<equipment classId="18">
-		<item id="2369" count="1" equipped="true" /> <!-- Squire's Sword -->
-		<item id="1146" count="1" equipped="true" /> <!-- Squire's Shirt -->
-		<item id="1147" count="1" equipped="true" /> <!-- Squire's Pants -->
+		<item id="80684" count="1" equipped="true" /> <!-- Falchion - For Apprentice Adventurer -->
+		<item id="80690" count="1" equipped="true" /> <!-- Durable Leather Helmet - Apprentice Adventurer -->
+		<item id="80691" count="1" equipped="true" /> <!-- Bronze Breastplate - Apprentice Adventurer -->
+		<item id="80692" count="1" equipped="true" /> <!-- Bronze Gaiters - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
-		<item id="10" count="1" /> <!-- Dagger -->
+		<item id="80683" count="1" /> <!-- Sword Breaker - For Apprentice Adventurer -->
+		<item id="80687" count="1" /> <!-- Compound Bow - For Apprentice Adventurer -->
+		<item id="17" count="1500" /> <!-- Wooden Arrow -->
 	</equipment>
 	<!-- Elven Mystic -->
 	<equipment classId="25">
-		<item id="6" count="1" equipped="true" /> <!-- Apprentice's Wand -->
-		<item id="425" count="1" equipped="true" /> <!-- Apprentice's Tunic -->
-		<item id="461" count="1" equipped="true" /> <!-- Apprentice's Stockings -->
+		<item id="80686" count="1" equipped="true" /> <!-- Mage Staff - For Apprentice Adventurer -->
+		<item id="80695" count="1" equipped="true" /> <!-- Leather Helmet - Apprentice Adventurer -->
+		<item id="80696" count="1" equipped="true" /> <!-- Tunic of Devotion - Apprentice Adventurer -->
+		<item id="80697" count="1" equipped="true" /> <!-- Stockings of Devotion - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
+		<item id="80689" count="1" /> <!-- Flanged Mace - For Apprentice Adventurer -->
 	</equipment>
 	<!-- Dark Fighter -->
 	<equipment classId="31">
-		<item id="2369" count="1" equipped="true" /> <!-- Squire's Sword -->
-		<item id="1146" count="1" equipped="true" /> <!-- Squire's Shirt -->
-		<item id="1147" count="1" equipped="true" /> <!-- Squire's Pants -->
+		<item id="80684" count="1" equipped="true" /> <!-- Falchion - For Apprentice Adventurer -->
+		<item id="80690" count="1" equipped="true" /> <!-- Durable Leather Helmet - Apprentice Adventurer -->
+		<item id="80691" count="1" equipped="true" /> <!-- Bronze Breastplate - Apprentice Adventurer -->
+		<item id="80692" count="1" equipped="true" /> <!-- Bronze Gaiters - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
-		<item id="10" count="1" /> <!-- Dagger -->
+		<item id="80683" count="1" /> <!-- Sword Breaker - For Apprentice Adventurer -->
+		<item id="80687" count="1" /> <!-- Compound Bow - For Apprentice Adventurer -->
+		<item id="17" count="1500" /> <!-- Wooden Arrow -->
 	</equipment>
 	<!-- Dark Mystic -->
 	<equipment classId="38">
-		<item id="6" count="1" equipped="true" /> <!-- Apprentice's Wand -->
-		<item id="425" count="1" equipped="true" /> <!-- Apprentice's Tunic -->
-		<item id="461" count="1" equipped="true" /> <!-- Apprentice's Stockings -->
+		<item id="80686" count="1" equipped="true" /> <!-- Mage Staff - For Apprentice Adventurer -->
+		<item id="80695" count="1" equipped="true" /> <!-- Leather Helmet - Apprentice Adventurer -->
+		<item id="80696" count="1" equipped="true" /> <!-- Tunic of Devotion - Apprentice Adventurer -->
+		<item id="80697" count="1" equipped="true" /> <!-- Stockings of Devotion - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
+		<item id="80689" count="1" /> <!-- Flanged Mace - For Apprentice Adventurer -->
 	</equipment>
 	<!-- Orc Fighter -->
 	<equipment classId="44">
-		<item id="2369" count="1" equipped="true" /> <!-- Squire's Sword -->
-		<item id="1146" count="1" equipped="true" /> <!-- Squire's Shirt -->
-		<item id="1147" count="1" equipped="true" /> <!-- Squire's Pants -->
+		<item id="80685" count="1" equipped="true" /> <!-- Zweihander - For Apprentice Adventurer -->
+		<item id="80690" count="1" equipped="true" /> <!-- Durable Leather Helmet - Apprentice Adventurer -->
+		<item id="80691" count="1" equipped="true" /> <!-- Bronze Breastplate - Apprentice Adventurer -->
+		<item id="80692" count="1" equipped="true" /> <!-- Bronze Gaiters - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
-		<item id="2368" count="1" /> <!-- Training Gloves -->
+		<item id="80688" count="1" /> <!-- Viper Fang - Apprentice Adventurer -->
 	</equipment>
 	<!-- Orc Mystic -->
 	<!-- NOTE: This is orc_mage (orc_shaman is retail typo) -->
 	<equipment classId="49">
-		<item id="2368" count="1" equipped="true" /> <!-- Training Gloves -->
-		<item id="425" count="1" equipped="true" /> <!-- Apprentice's Tunic -->
-		<item id="461" count="1" equipped="true" /> <!-- Apprentice's Stockings -->
+		<item id="80686" count="1" equipped="true" /> <!-- Mage Staff - For Apprentice Adventurer -->
+		<item id="80695" count="1" equipped="true" /> <!-- Leather Helmet - Apprentice Adventurer -->
+		<item id="80696" count="1" equipped="true" /> <!-- Tunic of Devotion - Apprentice Adventurer -->
+		<item id="80697" count="1" equipped="true" /> <!-- Stockings of Devotion - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
+		<item id="80689" count="1" /> <!-- Flanged Mace - For Apprentice Adventurer -->
 	</equipment>
 	<!-- Dwarf Fighter -->
 	<equipment classId="53">
-		<item id="2370" count="1" equipped="true" /> <!-- Guild Member's Club -->
-		<item id="10" count="1" /> <!-- Dagger -->
-		<item id="1146" count="1" equipped="true" /> <!-- Squire's Shirt -->
-		<item id="1147" count="1" equipped="true" /> <!-- Squire's Pants -->
+		<item id="80689" count="1" equipped="true" /> <!-- Flanged Mace - Apprentice Adventurer -->
+		<item id="80690" count="1" equipped="true" /> <!-- Durable Leather Helmet - Apprentice Adventurer -->
+		<item id="80691" count="1" equipped="true" /> <!-- Bronze Breastplate - Apprentice Adventurer -->
+		<item id="80692" count="1" equipped="true" /> <!-- Bronze Gaiters - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
+		<item id="80683" count="1" /> <!-- Sword Breaker - For Apprentice Adventurer -->
 	</equipment>
 	<!-- Male Kamael Soldier -->
 	<equipment classId="123">
-		<item id="2369" count="1" equipped="true" /> <!-- Squire's Sword -->
-		<item id="1146" count="1" equipped="true" /> <!-- Squire's Shirt -->
-		<item id="1147" count="1" equipped="true" /> <!-- Squire's Pants -->
+		<item id="80684" count="1" equipped="true" /> <!-- Falchion - For Apprentice Adventurer -->
+		<item id="80690" count="1" equipped="true" /> <!-- Durable Leather Helmet - Apprentice Adventurer -->
+		<item id="80691" count="1" equipped="true" /> <!-- Bronze Breastplate - Apprentice Adventurer -->
+		<item id="80692" count="1" equipped="true" /> <!-- Bronze Gaiters - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
-		<item id="10" count="1" /> <!-- Dagger -->
+		<item id="80683" count="1" /> <!-- Sword Breaker - For Apprentice Adventurer -->
 	</equipment>
 	<!-- Female Kamael Soldier -->
 	<equipment classId="124">
-		<item id="2369" count="1" equipped="true" /> <!-- Squire's Sword -->
-		<item id="1146" count="1" equipped="true" /> <!-- Squire's Shirt -->
-		<item id="1147" count="1" equipped="true" /> <!-- Squire's Pants -->
+		<item id="80684" count="1" equipped="true" /> <!-- Falchion - For Apprentice Adventurer -->
+		<item id="80690" count="1" equipped="true" /> <!-- Durable Leather Helmet - Apprentice Adventurer -->
+		<item id="80691" count="1" equipped="true" /> <!-- Bronze Breastplate - Apprentice Adventurer -->
+		<item id="80692" count="1" equipped="true" /> <!-- Bronze Gaiters - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
-		<item id="10" count="1" /> <!-- Dagger -->
+		<item id="80686" count="1" /> <!-- Mage Staff - For Apprentice Adventurer -->
 	</equipment>
 	<!-- Ertheia Fighter -->
 	<equipment classId="182">
-		<item id="2368" count="1" equipped="true" /> <!-- Training Gloves -->
-		<item id="1146" count="1" equipped="true" /> <!-- Squire's Shirt -->
-		<item id="1147" count="1" equipped="true" /> <!-- Squire's Pants -->
+		<item id="80688" count="1" equipped="true" /> <!-- Viper Fang - Apprentice Adventurer -->
+		<item id="80690" count="1" equipped="true" /> <!-- Durable Leather Helmet - Apprentice Adventurer -->
+		<item id="80691" count="1" equipped="true" /> <!-- Bronze Breastplate - Apprentice Adventurer -->
+		<item id="80692" count="1" equipped="true" /> <!-- Bronze Gaiters - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="40195" count="10" /> <!-- Scroll of Escape: Faeron Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
 	</equipment>
 	<!-- Ertheia Wizard -->
 	<equipment classId="183">
-		<item id="40061" count="1" equipped="true" /> <!-- Apprentice's Staff -->
-		<item id="425" count="1" equipped="true" /> <!-- Apprentice's Tunic -->
-		<item id="461" count="1" equipped="true" /> <!-- Apprentice's Stockings -->
+		<item id="80686" count="1" equipped="true" /> <!-- Mage Staff - For Apprentice Adventurer -->
+		<item id="80695" count="1" equipped="true" /> <!-- Leather Helmet - Apprentice Adventurer -->
+		<item id="80696" count="1" equipped="true" /> <!-- Tunic of Devotion - Apprentice Adventurer -->
+		<item id="80697" count="1" equipped="true" /> <!-- Stockings of Devotion - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="40195" count="10" /> <!-- Scroll of Escape: Faeron Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
 	</equipment>
 	<!-- Death Soldier -->
 	<equipment classId="212">
-		<item id="2369" count="1" equipped="true" /> <!-- Squire's Sword -->
-		<item id="1146" count="1" equipped="true" /> <!-- Squire's Shirt -->
-		<item id="1147" count="1" equipped="true" /> <!-- Squire's Pants -->
+		<item id="80684" count="1" equipped="true" /> <!-- Falchion - For Apprentice Adventurer -->
+		<item id="80690" count="1" equipped="true" /> <!-- Durable Leather Helmet - Apprentice Adventurer -->
+		<item id="80691" count="1" equipped="true" /> <!-- Bronze Breastplate - Apprentice Adventurer -->
+		<item id="80692" count="1" equipped="true" /> <!-- Bronze Gaiters - Apprentice Adventurer -->
+		<item id="80693" count="1" equipped="true" /> <!-- Bracer - Apprentice Adventurer -->
+		<item id="80694" count="1" equipped="true" /> <!-- Boots - Apprentice Adventurer -->
 		<item id="20922" count="1" equipped="true" /> <!-- Adventurer Hat -->
 		<item id="22193" count="1" equipped="true" /> <!-- Mount - Rocking Horse -->
 		<item id="37314" count="1" /> <!-- Fated Support Box -->
 		<item id="33801" count="1" /> <!-- Mentoring Guidebook -->
 		<item id="32226" count="10" /> <!-- Scroll of Escape: Talking Island Village -->
 		<item id="10650" count="5" /> <!-- Adventurer's Scroll of Escape -->
-		<item id="36950" count="1" /> <!-- Toma's Living Guide -->
-		<item id="10" count="1" /> <!-- Dagger -->
 	</equipment>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/46200-46299.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/46200-46299.xml
index 971a62a4c1..87358a65ed 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/46200-46299.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/46200-46299.xml
@@ -796,14 +796,19 @@
 	<item id="46254" name="Dandy's Golden Ball" type="EtcItem">
 		<!-- For 1 h., acquired XP/ SP +100%. Changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or Nevit's Hourglass. -->
 		<set name="icon" val="BranchIcon.icon.g_ev_goldenball" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_stackable" val="true" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="is_freightable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="18471" level="1" /> <!-- Dandy's Golden Ball -->
+		</skills>
 	</item>
 	<item id="46255" name="Halloween Outfit" type="EtcItem">
 		<!-- Changes the appearance of upper armor into that of a Halloween Outfit. Works on one-pieces too. -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/48600-48699.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/48600-48699.xml
index 2a46c772c3..43140f9b1b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/48600-48699.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/48600-48699.xml
@@ -919,7 +919,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">202</stat>
 		</stats>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/48800-48899.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/48800-48899.xml
index f80c5077c9..b6e2bd25f1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/48800-48899.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/48800-48899.xml
@@ -562,7 +562,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">151</stat>
 		</stats>
@@ -911,7 +911,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<set name="enchant_enabled" val="true" />
 		<stats>
 			<stat type="mDef">101</stat>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/60300-60399.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/60300-60399.xml
index 7e97cbc051..72c79ce86d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/60300-60399.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/60300-60399.xml
@@ -333,6 +333,7 @@
 		<set name="material" val="LIQUID" />
 		<set name="weight" val="10" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60320" name="Forgotten Lord's Shining Crystal of Dyes" type="EtcItem">
 		<!-- Required for creating Forgotten Lord's dyes. Can be compounded with a dye of Lv. 7+. In case of failure, the dye does not disappear, but its level drops to 7. -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/60400-60499.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/60400-60499.xml
index 6e031ef443..a91b4a6106 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/60400-60499.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/60400-60499.xml
@@ -1141,9 +1141,18 @@
 		<set name="icon" val="icon.bm_dragon_posion_special" />
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="material" val="LIQUID" />
 		<set name="weight" val="1" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="is_event_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="reuse_delay" val="300000" />
+		<skills>
+			<skill id="39205" level="2" /> <!-- Glowing Dragon's Attribute Potion -->
+		</skills>
 	</item>
 	<item id="60460" name="Shining Royal Nevit's Gold Hourglass" type="EtcItem">
 		<!-- During hunting, for 30 min., acquired XP/ SP +120%, damage +5%, received damage -7%. Cannot stack with the Shining Nevit's Gold Hourglass, Fall of the Dragon, or Dandy's Home Run Ball. The effect is removed after entering the Olympiad or the Ceremony of Chaos. Cooldown: 10 sec. -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/60500-60599.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/60500-60599.xml
index 70ade91c3e..9e34330e7d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/60500-60599.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/60500-60599.xml
@@ -120,6 +120,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60504" name="Top-grade Weapon Coupon" type="EtcItem">
 		<!-- Can be exchanged for any top-grade weapon. -->
@@ -130,6 +131,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60505" name="Bloodstained Zariche Weapon Coupon" type="EtcItem">
 		<!-- Can be exchanged for any Bloodstained Zariche weapon. -->
@@ -140,6 +142,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60506" name="Lv. 5 Greater Jewel Coupon" type="EtcItem">
 		<!-- Can be exchanged for a Lv. 5 greater jewel. -->
@@ -150,6 +153,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60507" name="Lv. 1 Greater Jewel Coupon" type="EtcItem">
 		<!-- Can be exchanged for a Lv. 1 greater jewel. -->
@@ -160,6 +164,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60508" name="Mysterious Pack Lv. 1" type="EtcItem">
 		<!-- Double-click to obtain various items. Compound it with Mysterious Crystal to obtain Mysterious Pack Lv. 2. -->
@@ -230,6 +235,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60510" name="Mysterious Pack Lv. 3" type="EtcItem">
 		<!-- Compound it with Mysterious Crystal to obtain Mysterious Pack Lv. 4. <Craft>. Greater Zodiac Agathion's Book of Growth (1 pc.) -->
@@ -238,6 +244,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60511" name="Mysterious Pack Lv. 4" type="EtcItem">
 		<!-- Compound it with Mysterious Crystal to obtain Mysterious Pack Lv. 5. <Craft>. Gran Kain's Scroll: Enchant R-grade Armor (1 pc.) -->
@@ -246,6 +253,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60512" name="Mysterious Pack Lv. 5" type="EtcItem">
 		<!-- Compound it with Mysterious Crystal to obtain Mysterious Pack Lv. 6. <Craft>. Gran Kain's Scroll: Enchant R-grade Weapon (1 pc.) -->
@@ -254,6 +262,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60513" name="Mysterious Pack Lv. 6" type="EtcItem">
 		<!-- Compound it with Mysterious Crystal to obtain Mysterious Pack Lv. 7. <Craft>. Tersi's Soul Crystal Lv. 6 (1 pc.) -->
@@ -262,6 +271,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60514" name="Mysterious Pack Lv. 7" type="EtcItem">
 		<!-- Compound it with Mysterious Crystal to obtain Mysterious Pack Lv. 8. <Craft>. Sayha's Shining Energy (1 pc.) -->
@@ -270,6 +280,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60515" name="Mysterious Pack Lv. 8" type="EtcItem">
 		<!-- Compound it with Mysterious Crystal to obtain Mysterious Pack Lv. 9. <Craft>. Greater Jewelry Box Lv. 1 (1 pc.) -->
@@ -278,6 +289,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60516" name="Mysterious Pack Lv. 9" type="EtcItem">
 		<!-- Compound it with Mysterious Crystal to obtain Mysterious Pack Lv. 10. <Craft>. Greater Zodiac Agathion Cube (1 pc.) -->
@@ -286,6 +298,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60517" name="Mysterious Pack Lv. 10" type="EtcItem">
 		<!-- Compound it with Mysterious Crystal to obtain Mysterious Pack Lv. 11. <Craft>. +8 Artifact Pack Coupon. <Limited craft>. Pa'agrio's Earring Lv. 3 (1 pc.). Eva's Earring Lv. 3 (1 pc.). Sayha's Ring Lv. 3 (1 pc.). Maphr's Ring Lv. 3 (1 pc.) -->
@@ -294,6 +307,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60518" name="Mysterious Pack Lv. 11" type="EtcItem">
 		<!-- Compound it with Mysterious Crystal to obtain Mysterious Pack Lv. 12. <Craft>. Venir's Talisman Lv. 22 (1 pc.). <Limited craft>. Gran Kain's Necklace Lv. 3 (1 pc.). Einhasad's Necklace Lv. 3 (1 pc.) -->
@@ -302,6 +316,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60519" name="Mysterious Pack Lv. 12" type="EtcItem">
 		<!-- Compound it with Mysterious Crystal to obtain Mysterious Pack Lv. 13. <Craft>. +20 Supreme Krishna Weapon Pack (1 pc.) -->
@@ -310,6 +325,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60520" name="Mysterious Pack Lv. 13" type="EtcItem">
 		<!-- Compound it with Mysterious Crystal to obtain Mysterious Pack Lv. 14. <Craft>. Enhanced Talisman of Protection Lv. 7 (1 pc.) -->
@@ -318,6 +334,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60521" name="Mysterious Pack Lv. 14" type="EtcItem">
 		<!-- <Craft>. High-grade Dragon Weapon Pack (1 pc.). Enhanced Sayha's Talisman Lv. 10 (1 pc.) -->
@@ -326,6 +343,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60522" name="Mysterious Crystal" type="EtcItem">
 		<!-- A crystal that looks very valuable. Can be used for increasing a Mysterious Pack's level through compounding. -->
@@ -375,6 +393,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60526" name="Package: +10 Heavenly Talisman" type="EtcItem">
 		<!-- Double-click to obtain various items. -->
@@ -448,6 +467,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="LEATHER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60532" name="Trade Certificate" type="EtcItem">
 		<!-- A certificate for a safe traded in secret in the Mystic Tavern. You can get Suspicious Safe during the World Ranking Festival. -->
@@ -459,6 +479,7 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60533" name="New Year Resolution" additionalName="Event" type="EtcItem">
 		<!-- Can be exchanged for various useful items through the Santa Claus. -->
@@ -469,6 +490,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60534" name="Christmas Token" additionalName="Event" type="EtcItem">
 		<!-- A memento of your encounter with Santa Claus. Bonuses will become available after you add it to a collection. -->
@@ -479,6 +501,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60535" name="New Year Snow Globe" additionalName="Event" type="EtcItem">
 		<!-- A snow globe filled with joyful energy of the New Year. Bonuses will become available after you add it to a collection. -->
@@ -489,6 +512,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60536" name="Holiday Rabbit's Jewel" additionalName="Event" type="EtcItem">
 		<!-- A special gift from Holiday Rabbit for celebrating the New Year of 2023. Bonuses will become available after you add it to a collection. -->
@@ -499,6 +523,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60537" name="Divine Coupon" type="EtcItem">
 		<!-- Can be exchanged for one of Gran Kain's enchant scrolls that are famous for their safe enchanting feature. Talk to the Game Assistant to make the exchange. -->
@@ -510,6 +535,7 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60538" name="Shining Coupon" type="EtcItem">
 		<!-- Can be exchanged for rare shining supplies required for some equipment upgrades. Talk to the Game Assistant to make the exchange. -->
@@ -521,6 +547,7 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60539" name="Coupon of Ancient Kingdoms" type="EtcItem">
 		<!-- Can be exchanged for a cloak of Ancient Kingdoms enchanted to +18 through the Game Assistant. -->
@@ -533,6 +560,7 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60540" name="+18 Legendary Ferios Cloak Box" type="EtcItem">
 		<!-- Double-click to obtain Legendary Ferios Cloak enchanted to +18. -->
@@ -544,6 +572,7 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60541" name="+18 Legendary Elmore Cloak Box" type="EtcItem">
 		<!-- Double-click to obtain Legendary Elmore Cloak enchanted to +18. -->
@@ -555,6 +584,7 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60542" name="+18 Legendary Aden Cloak Box" type="EtcItem">
 		<!-- Double-click to obtain Legendary Aden Cloak enchanted to +18. -->
@@ -566,6 +596,7 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60543" name="+18 Legendary Elmoreden Cloak Box" type="EtcItem">
 		<!-- Double-click to obtain Legendary Elmoreden Cloak enchanted to +18. -->
@@ -577,6 +608,7 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60544" name="Superior Jewelry Box Lv. 5" type="EtcItem">
 		<!-- Double-click to obtain a Superior jewel Lv. 5. -->
@@ -670,6 +702,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60547" name="Magic Lamp Lv. 3" type="EtcItem">
 		<!-- An elegant lamp that emanates mystical energy. Can be upgraded to a higher level through compounding with Ice Crystal. -->
@@ -678,6 +711,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60548" name="Magic Lamp Lv. 4" type="EtcItem">
 		<!-- An elegant lamp that emanates mystical energy. Can be upgraded to a higher level through compounding with Ice Crystal. -->
@@ -686,6 +720,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60549" name="Magic Lamp Lv. 5" type="EtcItem">
 		<!-- An elegant lamp that emanates mystical energy. Can be upgraded to a higher level through compounding with Ice Crystal. -->
@@ -694,6 +729,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60550" name="Magic Lamp Lv. 6" type="EtcItem">
 		<!-- An elegant lamp that emanates mystical energy. Can be upgraded to a higher level through compounding with Ice Crystal. -->
@@ -702,6 +738,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60551" name="Magic Lamp Lv. 7" type="EtcItem">
 		<!-- An elegant lamp that emanates mystical energy. Can be upgraded to a higher level through compounding with Ice Crystal. -->
@@ -710,6 +747,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60552" name="Magic Lamp Lv. 8" type="EtcItem">
 		<!-- An elegant lamp that emanates mystical energy. Can be upgraded to a higher level through compounding with Ice Crystal. -->
@@ -718,6 +756,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60553" name="Magic Lamp Lv. 9" type="EtcItem">
 		<!-- An elegant lamp that emanates mystical energy. Can be upgraded to a higher level through compounding with Ice Crystal. -->
@@ -726,6 +765,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60554" name="Magic Lamp Lv. 10" type="EtcItem">
 		<!-- An elegant lamp that emanates mystical energy. Can be upgraded to a higher level through compounding with Ice Crystal. -->
@@ -734,6 +774,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60555" name="Magic Lamp Lv. 11" type="EtcItem">
 		<!-- An elegant lamp that emanates mystical energy. Can be upgraded to a higher level through compounding with Ice Crystal. -->
@@ -742,6 +783,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60556" name="Magic Lamp Lv. 12" type="EtcItem">
 		<!-- An elegant lamp that emanates mystical energy. Can be upgraded to a higher level through compounding with Ice Crystal. -->
@@ -750,6 +792,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60557" name="Magic Lamp Lv. 13" type="EtcItem">
 		<!-- An elegant lamp that emanates mystical energy. Can be upgraded to a higher level through compounding with Ice Crystal. -->
@@ -758,6 +801,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60558" name="Magic Lamp Lv. 14" type="EtcItem">
 		<!-- An elegant lamp that emanates mystical energy. -->
@@ -766,6 +810,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60559" name="Christmas Gift Box" type="EtcItem">
 		<!-- Double-click to obtain a useful item. -->
@@ -1451,82 +1496,152 @@
 	<item id="60585" name="Appearance Stone: Sigil of Light Lv. 1" type="EtcItem">
 		<!-- Changes the appearance of your sigil to that of Sigil of Light. Grants additional effects to the modified sigil depending on the appearance stone level. <Upgrading>. Compounding with Sigil of Light Shard. -->
 		<set name="icon" val="BranchSys3.Icon.g_shape_shifting_sigil" />
-		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
-		<set name="material" val="STEEL" />
+		<set name="handler" val="Appearance" />
 		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="SHAPE_SHIFTING_AM_FIXED" />
+		<set name="is_stackable" val="true" />
+		<set name="material" val="PAPER" />
+		<skills>
+			<skill id="29572" level="1" /> <!-- Appearance Stone: Sigil of Light Lv. 1 -->
+		</skills>
 	</item>
 	<item id="60586" name="Appearance Stone: Sigil of Light Lv. 2" type="EtcItem">
 		<!-- Changes the appearance of your sigil to that of Sigil of Light. Grants additional effects to the modified sigil depending on the appearance stone level. <Upgrading>. Compounding with Sigil of Light Shard. <Additional Lv. 2 effect>. MEN +1 -->
 		<set name="icon" val="BranchSys3.Icon.g_shape_shifting_sigil" />
-		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
-		<set name="material" val="STEEL" />
+		<set name="handler" val="Appearance" />
 		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="SHAPE_SHIFTING_AM_FIXED" />
+		<set name="is_stackable" val="true" />
+		<set name="material" val="PAPER" />
+		<skills>
+			<skill id="29573" level="1" /> <!-- Appearance Stone: Sigil of Light Lv. 2 -->
+		</skills>
 	</item>
 	<item id="60587" name="Appearance Stone: Sigil of Light Lv. 3" type="EtcItem">
 		<!-- Changes the appearance of your sigil to that of Sigil of Light. Grants additional effects to the modified sigil depending on the appearance stone level. <Upgrading>. Compounding with Sigil of Light Shard. <Additional Lv. 3 effect>. MEN +1. CON +1 -->
 		<set name="icon" val="BranchSys3.Icon.g_shape_shifting_sigil" />
-		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
-		<set name="material" val="STEEL" />
+		<set name="handler" val="Appearance" />
 		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="SHAPE_SHIFTING_AM_FIXED" />
+		<set name="is_stackable" val="true" />
+		<set name="material" val="PAPER" />
+		<skills>
+			<skill id="29574" level="1" /> <!-- Appearance Stone: Sigil of Light Lv. 3 -->
+		</skills>
 	</item>
 	<item id="60588" name="Appearance Stone: Sigil of Light Lv. 4" type="EtcItem">
 		<!-- Changes the appearance of your sigil to that of Sigil of Light. Grants additional effects to the modified sigil depending on the appearance stone level. <Upgrading>. Compounding with Sigil of Light Shard. <Additional Lv. 4 effect>. MEN +1. CON +1. WIT +1 -->
 		<set name="icon" val="BranchSys3.Icon.g_shape_shifting_sigil" />
-		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
-		<set name="material" val="STEEL" />
+		<set name="handler" val="Appearance" />
 		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="SHAPE_SHIFTING_AM_FIXED" />
+		<set name="is_stackable" val="true" />
+		<set name="material" val="PAPER" />
+		<skills>
+			<skill id="29575" level="1" /> <!-- Appearance Stone: Sigil of Light Lv. 4 -->
+		</skills>
 	</item>
 	<item id="60589" name="Appearance Stone: Sigil of Light Lv. 5" type="EtcItem">
 		<!-- Changes the appearance of your sigil to that of Sigil of Light. Grants additional effects to the modified sigil depending on the appearance stone level. <Upgrading>. Compounding with Sigil of Light Shard. <Additional Lv. 5 effect>. MEN +1. CON +1. WIT +1. DEX +1 -->
 		<set name="icon" val="BranchSys3.Icon.g_shape_shifting_sigil" />
-		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
-		<set name="material" val="STEEL" />
+		<set name="handler" val="Appearance" />
 		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="SHAPE_SHIFTING_AM_FIXED" />
+		<set name="is_stackable" val="true" />
+		<set name="material" val="PAPER" />
+		<skills>
+			<skill id="29576" level="1" /> <!-- Appearance Stone: Sigil of Light Lv. 5 -->
+		</skills>
 	</item>
 	<item id="60590" name="Appearance Stone: Sigil of Light Lv. 6" type="EtcItem">
 		<!-- Changes the appearance of your sigil to that of Sigil of Light. Grants additional effects to the modified sigil depending on the appearance stone level. <Upgrading>. Compounding with Sigil of Light Shard. <Additional Lv. 6 effect>. MEN +1. CON +1. WIT +1. DEX +1. INT +1. STR +1 -->
 		<set name="icon" val="BranchSys3.Icon.g_shape_shifting_sigil" />
-		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
-		<set name="material" val="STEEL" />
+		<set name="handler" val="Appearance" />
 		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="SHAPE_SHIFTING_AM_FIXED" />
+		<set name="is_stackable" val="true" />
+		<set name="material" val="PAPER" />
+		<skills>
+			<skill id="29577" level="1" /> <!-- Appearance Stone: Sigil of Light Lv. 6 -->
+		</skills>
 	</item>
 	<item id="60591" name="Appearance Stone: Sigil of Light Lv. 7" type="EtcItem">
 		<!-- Changes the appearance of your sigil to that of Sigil of Light. Grants additional effects to the modified sigil depending on the appearance stone level. <Upgrading>. Compounding with Sigil of Light Shard. <Additional Lv. 7 effect>. MEN +1. CON +1. WIT +1. DEX +1. INT +1. STR +1. CHA +1. LUC +1 -->
 		<set name="icon" val="BranchSys3.Icon.g_shape_shifting_sigil" />
-		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
-		<set name="material" val="STEEL" />
+		<set name="handler" val="Appearance" />
 		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="SHAPE_SHIFTING_AM_FIXED" />
+		<set name="is_stackable" val="true" />
+		<set name="material" val="PAPER" />
+		<skills>
+			<skill id="29578" level="1" /> <!-- Appearance Stone: Sigil of Light Lv. 7 -->
+		</skills>
 	</item>
 	<item id="60592" name="Appearance Stone: Sigil of Light Lv. 8" type="EtcItem">
 		<!-- Changes the appearance of your sigil to that of Sigil of Light. Grants additional effects to the modified sigil depending on the appearance stone level. <Upgrading>. Compounding with Sigil of Light Shard. <Additional Lv. 8 effect>. MEN +1. CON +1. WIT +1. DEX +1. INT +1. STR +1. CHA +1. LUC +1. Attribute Resistance +50. Weapon P./ M. Atk. +50 -->
 		<set name="icon" val="BranchSys3.Icon.g_shape_shifting_sigil" />
-		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
-		<set name="material" val="STEEL" />
+		<set name="handler" val="Appearance" />
 		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="SHAPE_SHIFTING_AM_FIXED" />
+		<set name="is_stackable" val="true" />
+		<set name="material" val="PAPER" />
+		<skills>
+			<skill id="29579" level="1" /> <!-- Appearance Stone: Sigil of Light Lv. 8 -->
+		</skills>
 	</item>
 	<item id="60593" name="Appearance Stone: Sigil of Light Lv. 9" type="EtcItem">
 		<!-- Changes the appearance of your sigil to that of Sigil of Light. Grants additional effects to the modified sigil depending on the appearance stone level. <Upgrading>. Compounding with Sigil of Light Shard. <Additional Lv. 9 effect>. MEN +1. CON +1. WIT +1. DEX +1. INT +1. STR +1. CHA +1. LUC +1. Attribute Resistance +70. Weapon P./ M. Atk. +80 -->
 		<set name="icon" val="BranchSys3.Icon.g_shape_shifting_sigil" />
-		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
-		<set name="material" val="STEEL" />
+		<set name="handler" val="Appearance" />
 		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="SHAPE_SHIFTING_AM_FIXED" />
+		<set name="is_stackable" val="true" />
+		<set name="material" val="PAPER" />
+		<skills>
+			<skill id="29580" level="1" /> <!-- Appearance Stone: Sigil of Light Lv. 9 -->
+		</skills>
 	</item>
 	<item id="60594" name="Appearance Stone: Sigil of Light Lv. 10" type="EtcItem">
 		<!-- Changes the appearance of your sigil to that of Sigil of Light. Grants additional effects to the modified sigil depending on the appearance stone level. <Additional Lv. 10 effect>. MEN +1. CON +1. WIT +1. DEX +1. INT +1. STR +1. CHA +1. LUC +1. Attribute Resistance +100. Weapon P./ M. Atk. +120 -->
 		<set name="icon" val="BranchSys3.Icon.g_shape_shifting_sigil" />
-		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
-		<set name="material" val="STEEL" />
+		<set name="handler" val="Appearance" />
 		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="SHAPE_SHIFTING_AM_FIXED" />
+		<set name="is_stackable" val="true" />
+		<set name="material" val="PAPER" />
+		<skills>
+			<skill id="29581" level="1" /> <!-- Appearance Stone: Sigil of Light Lv. 10 -->
+		</skills>
 	</item>
 	<item id="60595" name="Sigil of Light Shard" type="EtcItem">
 		<!-- Increases the level of Appearance Stone: Sigil of Light, when compounded with it. In case of failure, Appearance Stone disappears. -->
@@ -1535,6 +1650,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="LIQUID" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="60596" name="Appearance Stone Pack: Sigil of Light" type="EtcItem">
 		<!-- Double-click to obtain Appearance Stone: Sigil of Light Lv. 1 (1 pc.) and Sigil of Light Shard (10 pcs.). -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/80300-80399.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/80300-80399.xml
index 8ddbb9184a..1a69e3fd63 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/80300-80399.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/80300-80399.xml
@@ -482,7 +482,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">292</stat>
 		</stats>
@@ -498,7 +498,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">219</stat>
 		</stats>
@@ -514,7 +514,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">146</stat>
 		</stats>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/80500-80599.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/80500-80599.xml
index 1ac3725071..aa5400d1a7 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/80500-80599.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/80500-80599.xml
@@ -382,6 +382,13 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="time" val="360" />
+		<skills>
+			<skill id="35363" level="1" /> <!-- Freya's Bloody Rune -->
+		</skills>
 	</item>
 	<item id="80544" name="Snow's Plea for Help - Altar of Evil" type="EtcItem">
 		<!-- A purifying mission requested by Snow for the 15th Anniversary. Snow wishes to celebrate the 15th Anniversary of Lineage by eradicating monsters in the Altar of Evil and Bloody Swampland. Characters of level 85-95 can receive the request by double-clicking the item. Can be played once a day. -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/80800-80899.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/80800-80899.xml
index 740195d340..321b01ab13 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/80800-80899.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/80800-80899.xml
@@ -242,6 +242,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<skills>
+			<skill id="39520" level="1" /> <!-- Emperor's Special Cocktail -->
 			<skill id="39766" level="1" /> <!-- Musician's Melody - Emperor's Special Cocktail -->
 			<skill id="39771" level="1" /> <!-- Drum Concert - Emperor's Special Cocktail -->
 			<skill id="39772" level="1" /> <!-- United Resistance - Emperor's Special Cocktail -->
@@ -263,6 +264,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<skills>
+			<skill id="39520" level="2" /> <!-- Emperor's Special Cocktail -->
 			<skill id="39766" level="2" /> <!-- Musician's Melody - Emperor's Special Cocktail -->
 			<skill id="39771" level="2" /> <!-- Drum Concert - Emperor's Special Cocktail -->
 			<skill id="39772" level="2" /> <!-- United Resistance - Emperor's Special Cocktail -->
@@ -284,6 +286,7 @@
 		<set name="is_freightable" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<skills>
+			<skill id="39520" level="3" /> <!-- Emperor's Special Cocktail -->
 			<skill id="39766" level="3" /> <!-- Musician's Melody - Emperor's Special Cocktail -->
 			<skill id="39771" level="3" /> <!-- Drum Concert - Emperor's Special Cocktail -->
 			<skill id="39772" level="3" /> <!-- United Resistance - Emperor's Special Cocktail -->
@@ -299,6 +302,7 @@
 		<set name="reuse_delay" val="300000" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
@@ -307,6 +311,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<skills>
+			<skill id="39521" level="1" /> <!-- PA Emperor's Special Cocktail -->
 			<skill id="39766" level="1" /> <!-- Musician's Melody - Emperor's Special Cocktail -->
 			<skill id="39771" level="1" /> <!-- Drum Concert - Emperor's Special Cocktail -->
 			<skill id="39772" level="1" /> <!-- United Resistance - Emperor's Special Cocktail -->
@@ -323,7 +328,24 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="reuse_delay" val="1000" />
+		<set name="shared_reuse_group" val="7" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ELIXIR" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<cond addName="1" msgId="113">
+			<player instanceId="224,225,226,227" />
+		</cond>
+		<skills>
+			<skill id="9545" level="1" /> <!-- Horn Melody - Chaos Arena -->
+			<skill id="9546" level="1" /> <!-- Drum Melody - Chaos Arena -->
+			<skill id="9547" level="1" /> <!-- Pipe Organ Melody - Chaos Arena -->
+			<skill id="9548" level="1" /> <!-- Guitar Melody - Chaos Arena -->
+			<skill id="39515" level="1" /> <!-- Fantasia Harmony - Chaos Arena -->
+		</skills>
 	</item>
 	<item id="80822" name="Elixir of Harmony" type="EtcItem">
 		<!-- For 30 minutes, provides the effect of Fantasia Harmony. Can be used only by characters above level 85. Cooldown is 2 min. -->
@@ -439,25 +461,21 @@
 		<set name="reuse_delay" val="300000" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="reuse_delay" val="300000" />
 		<set name="is_oly_restricted" val="true" />
 		<set name="is_event_restricted" val="true" />
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<skills>
-			<skill id="39407" level="1" /> <!-- Horn Melody - Emperor's Special Cocktail -->
-			<skill id="39408" level="1" /> <!-- Drum Melody - Emperor's Special Cocktail -->
-			<skill id="39409" level="1" /> <!-- Pipe Organ Melody - Emperor's Special Cocktail -->
-			<skill id="39410" level="1" /> <!-- Guitar Melody - Emperor's Special Cocktail -->
-			<skill id="39414" level="1" /> <!-- War Drum - Emperor's Special Cocktail -->
-			<skill id="39415" level="1" /> <!-- Marching Drum - Emperor's Special Cocktail -->
-			<skill id="39416" level="1" /> <!-- Soothing Drum - Emperor's Special Cocktail -->
-			<skill id="39413" level="1" /> <!-- Mental Attack Resistance - Emperor's Special Cocktail -->
-			<skill id="39412" level="1" /> <!-- Resistance Debuff - Emperor's Special Cocktail -->
-			<skill id="39411" level="1" /> <!-- Elemental Resistance - Emperor's Special Cocktail -->
+			<skill id="39520" level="1" /> <!-- Emperor's Special Cocktail -->
 			<skill id="39514" level="1" /> <!-- Fantasia Harmony - Emperor's Special Cocktail -->
 			<skill id="39517" level="1" /> <!-- Fantasia Melody - Emperor's Special Cocktail -->
+			<skill id="39766" level="1" /> <!-- Musician's Melody - Emperor's Special Cocktail -->
+			<skill id="39771" level="1" /> <!-- Drum Concert - Emperor's Special Cocktail -->
+			<skill id="39772" level="1" /> <!-- United Resistance - Emperor's Special Cocktail -->
 		</skills>
 	</item>
 	<item id="80833" name="Golden Pig's Medium Vitality Tonic" type="EtcItem">
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81000-81099.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81000-81099.xml
index 7c0be03d25..643b84c687 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81000-81099.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81000-81099.xml
@@ -260,8 +260,15 @@
 		<!-- Changes the armor appearance to that of Red Archer Garment for 24 h. -->
 		<set name="icon" val="icon.dragon_dye_i01" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_stackable" val="true" />
+		<set name="is_sellable" val="false" />
+		<set name="handler" val="ItemSkills" />
+		<set name="etcitem_type" val="POTION" />
+		<skills>
+			<skill id="39580" level="1" /> <!-- Pink's Style Potion - Red Archer -->
+		</skills>
 	</item>
 	<item id="81017" name="Pink's Style Potion - Green Archer" type="EtcItem">
 		<!-- Changes the armor appearance to that of Green Archer Garment for 24 h. -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81200-81299.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81200-81299.xml
index e140317d9c..7491a1901f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81200-81299.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81200-81299.xml
@@ -218,7 +218,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">202</stat>
 		</stats>
@@ -237,7 +237,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">151</stat>
 		</stats>
@@ -255,7 +255,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<set name="enchant_enabled" val="true" />
 		<skills>
 			<skill id="35612" level="1" /> <!-- Enchantment Effect: Angel's Ring -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81300-81399.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81300-81399.xml
index d2c47e7586..5b59e7733a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81300-81399.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81300-81399.xml
@@ -799,7 +799,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<set name="enchant_enabled" val="true" />
 		<!-- Skills handled by enchantItemOptions -->
 		<stats>
@@ -1024,7 +1024,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<set name="enchant_enabled" val="true" />
 		<skills>
 			<skill id="39620" level="1" /> <!-- Craft Effect - Charisma Lv. 1 -->
@@ -1045,7 +1045,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<set name="enchant_enabled" val="true" />
 		<skills>
 			<skill id="39620" level="2" /> <!-- Craft Effect - Charisma Lv. 2 -->
@@ -1066,7 +1066,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<set name="enchant_enabled" val="true" />
 		<skills>
 			<skill id="39620" level="3" /> <!-- Craft Effect - Charisma Lv. 3 -->
@@ -1127,7 +1127,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39626" level="1" /> <!-- Craft Effect - Assault Lv. 1 -->
 		</skills>
@@ -1146,7 +1146,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39626" level="2" /> <!-- Craft Effect - Assault Lv. 2 -->
 		</skills>
@@ -1165,7 +1165,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39626" level="3" /> <!-- Craft Effect - Assault Lv. 3 -->
 		</skills>
@@ -1184,7 +1184,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39627" level="1" /> <!-- Craft Effect - Security Lv. 1 -->
 		</skills>
@@ -1203,7 +1203,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39627" level="2" /> <!-- Craft Effect - Security Lv. 2 -->
 		</skills>
@@ -1222,7 +1222,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39627" level="3" /> <!-- Craft Effect - Security Lv. 3 -->
 		</skills>
@@ -1241,7 +1241,7 @@
 		<set name="material" val="SILVER" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39628" level="1" /> <!-- Craft Effect - Elements Lv. 1 -->
 		</skills>
@@ -1260,7 +1260,7 @@
 		<set name="material" val="SILVER" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39628" level="2" /> <!-- Craft Effect - Elements Lv. 2 -->
 		</skills>
@@ -1279,7 +1279,7 @@
 		<set name="material" val="SILVER" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39628" level="3" /> <!-- Craft Effect - Elements Lv. 3 -->
 		</skills>
@@ -1298,7 +1298,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39623" level="1" /> <!-- Craft Effect - Battle Lv. 1 -->
 		</skills>
@@ -1317,7 +1317,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39623" level="2" /> <!-- Craft Effect - Battle Lv. 2 -->
 		</skills>
@@ -1336,7 +1336,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39623" level="3" /> <!-- Craft Effect - Battle Lv. 3 -->
 		</skills>
@@ -1355,7 +1355,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39624" level="1" /> <!-- Craft Effect - Guardian Lv. 1 -->
 		</skills>
@@ -1374,7 +1374,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39624" level="2" /> <!-- Craft Effect - Guardian Lv. 2 -->
 		</skills>
@@ -1393,7 +1393,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39624" level="3" /> <!-- Craft Effect - Guardian Lv. 3 -->
 		</skills>
@@ -1412,7 +1412,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39625" level="1" /> <!-- Craft Effect - Potential Lv. 1 -->
 		</skills>
@@ -1431,7 +1431,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39625" level="2" /> <!-- Craft Effect - Potential Lv. 2 -->
 		</skills>
@@ -1450,7 +1450,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39625" level="3" /> <!-- Craft Effect - Potential Lv. 3 -->
 		</skills>
@@ -1472,7 +1472,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39626" level="1" /> <!-- Craft Effect - Assault Lv. 1 -->
 		</skills>
@@ -1494,7 +1494,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39626" level="2" /> <!-- Craft Effect - Assault Lv. 2 -->
 		</skills>
@@ -1516,7 +1516,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39626" level="3" /> <!-- Craft Effect - Assault Lv. 3 -->
 		</skills>
@@ -1538,7 +1538,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39627" level="1" /> <!-- Craft Effect - Security Lv. 1 -->
 		</skills>
@@ -1560,7 +1560,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39627" level="2" /> <!-- Craft Effect - Security Lv. 2 -->
 		</skills>
@@ -1582,7 +1582,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39627" level="3" /> <!-- Craft Effect - Security Lv. 3 -->
 		</skills>
@@ -1604,7 +1604,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">101</stat>
 		</stats>
@@ -1623,7 +1623,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">101</stat>
 		</stats>
@@ -1642,7 +1642,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">101</stat>
 		</stats>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81600-81699.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81600-81699.xml
index 5440382601..b92e2877b7 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81600-81699.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81600-81699.xml
@@ -1080,6 +1080,28 @@
 		<set name="material" val="LEATHER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="is_commissionable" val="false" />
+		<set name="handler" val="ExtractableItems" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<capsuled_items>
+			<item id="29458" min="1" max="1" chance="6.25" /> <!-- Greater Cat's Eye Lv. 5 -->
+			<item id="29462" min="1" max="1" chance="6.25" /> <!-- Greater Amethyst Lv. 5 -->
+			<item id="48770" min="1" max="1" chance="6.25" /> <!-- Greater Topaz Lv. 5 -->
+			<item id="48774" min="1" max="1" chance="6.25" /> <!-- Greater Ruby Lv. 5 -->
+			<item id="48778" min="1" max="1" chance="6.25" /> <!-- Greater Sapphire Lv. 5 -->
+			<item id="48782" min="1" max="1" chance="6.25" /> <!-- Greater Obsidian Lv. 5 -->
+			<item id="48786" min="1" max="1" chance="6.25" /> <!-- Greater Opal Lv. 5 -->
+			<item id="48790" min="1" max="1" chance="6.25" /> <!-- Greater Emerald Lv. 5 -->
+			<item id="48794" min="1" max="1" chance="6.25" /> <!-- Greater Aquamarine Lv. 5 -->
+			<item id="48798" min="1" max="1" chance="6.25" /> <!-- Greater Diamond Lv. 5 -->
+			<item id="48802" min="1" max="1" chance="6.25" /> <!-- Greater Pearl Lv. 5 -->
+			<item id="48806" min="1" max="1" chance="6.25" /> <!-- Greater Vital Stone Lv. 5 -->
+			<item id="48810" min="1" max="1" chance="6.25" /> <!-- Greater Garnet Lv. 5 -->
+			<item id="48814" min="1" max="1" chance="6.25" /> <!-- Greater Tanzanite Lv. 5 -->
+			<item id="48818" min="1" max="1" chance="6.25" /> <!-- Greater Red Cat's Eye Lv. 5 -->
+			<item id="48822" min="1" max="1" chance="6.25" /> <!-- Greater Blue Cat's Eye Lv. 5 -->
+		</capsuled_items>
 	</item>
 	<item id="81673" name="Essence of Time" type="EtcItem">
 		<!-- Concentrated energy of time. When used, decreases time of homunculus creation for 1 h. -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81700-81799.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81700-81799.xml
index 638ea349a9..82374199a0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81700-81799.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81700-81799.xml
@@ -1257,7 +1257,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">202</stat>
 		</stats>
@@ -1273,7 +1273,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39626" level="1" /> <!-- Craft Effect - Assault Lv. 1 -->
 		</skills>
@@ -1292,7 +1292,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39626" level="2" /> <!-- Craft Effect - Assault Lv. 2 -->
 		</skills>
@@ -1311,7 +1311,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39626" level="3" /> <!-- Craft Effect - Assault Lv. 3 -->
 		</skills>
@@ -1330,7 +1330,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">151</stat>
 		</stats>
@@ -1346,7 +1346,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39627" level="1" /> <!-- Craft Effect - Security Lv. 1 -->
 		</skills>
@@ -1365,7 +1365,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39627" level="2" /> <!-- Craft Effect - Security Lv. 2 -->
 		</skills>
@@ -1384,7 +1384,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39627" level="3" /> <!-- Craft Effect - Security Lv. 3 -->
 		</skills>
@@ -1403,7 +1403,7 @@
 		<set name="material" val="SILVER" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">101</stat>
 		</stats>
@@ -1419,7 +1419,7 @@
 		<set name="material" val="SILVER" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39628" level="1" /> <!-- Craft Effect - Elements Lv. 1 -->
 		</skills>
@@ -1438,7 +1438,7 @@
 		<set name="material" val="SILVER" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39628" level="2" /> <!-- Craft Effect - Elements Lv. 2 -->
 		</skills>
@@ -1457,7 +1457,7 @@
 		<set name="material" val="SILVER" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39628" level="3" /> <!-- Craft Effect - Elements Lv. 3 -->
 		</skills>
@@ -1479,7 +1479,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">202</stat>
 		</stats>
@@ -1498,7 +1498,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39626" level="1" /> <!-- Craft Effect - Assault Lv. 1 -->
 		</skills>
@@ -1520,7 +1520,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39626" level="2" /> <!-- Craft Effect - Assault Lv. 2 -->
 		</skills>
@@ -1542,7 +1542,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39626" level="3" /> <!-- Craft Effect - Assault Lv. 3 -->
 		</skills>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81800-81899.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81800-81899.xml
index 0223862096..012b1c16cf 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81800-81899.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81800-81899.xml
@@ -14,7 +14,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">151</stat>
 		</stats>
@@ -33,7 +33,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39627" level="1" /> <!-- Craft Effect - Security Lv. 1 -->
 		</skills>
@@ -55,7 +55,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39627" level="2" /> <!-- Craft Effect - Security Lv. 2 -->
 		</skills>
@@ -77,7 +77,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39627" level="3" /> <!-- Craft Effect - Security Lv. 3 -->
 		</skills>
@@ -99,7 +99,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">101</stat>
 		</stats>
@@ -118,7 +118,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39628" level="1" /> <!-- Craft Effect - Elements Lv. 1 -->
 		</skills>
@@ -140,7 +140,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39628" level="2" /> <!-- Craft Effect - Elements Lv. 2 -->
 		</skills>
@@ -162,7 +162,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39628" level="3" /> <!-- Craft Effect - Elements Lv. 3 -->
 		</skills>
@@ -879,7 +879,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">205</stat>
 		</stats>
@@ -896,7 +896,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39655" level="1" /> <!-- Craft Effect - Life Lv. 1 -->
 		</skills>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81900-81999.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81900-81999.xml
index 339035ac6d..b944007004 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81900-81999.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/81900-81999.xml
@@ -266,7 +266,7 @@
 		<set name="material" val="SILVER" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">114</stat>
 		</stats>
@@ -281,7 +281,7 @@
 		<set name="material" val="SILVER" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39620" level="1" /> <!-- Craft Effect - Charisma Lv. 1 -->
 		</skills>
@@ -298,7 +298,7 @@
 		<set name="material" val="SILVER" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39620" level="2" /> <!-- Craft Effect - Charisma Lv. 2 -->
 		</skills>
@@ -316,7 +316,7 @@
 		<set name="material" val="SILVER" />
 		<set name="weight" val="150" />
 		<set name="enchant_enabled" val="true" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39620" level="3" /> <!-- Craft Effect - Charisma Lv. 3 -->
 		</skills>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82000-82099.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82000-82099.xml
index d40a5382ed..fecd69837c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82000-82099.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82000-82099.xml
@@ -701,7 +701,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">226</stat>
 			<stat type="maxMp">79</stat>
@@ -719,7 +719,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">170</stat>
 			<stat type="maxMp">59</stat>
@@ -737,7 +737,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">170</stat>
 			<stat type="maxMp">59</stat>
@@ -755,7 +755,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">114</stat>
 			<stat type="maxMp">46</stat>
@@ -773,7 +773,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">114</stat>
 			<stat type="maxMp">46</stat>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82100-82199.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82100-82199.xml
index 566fcb4bc8..c860e47f98 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82100-82199.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82100-82199.xml
@@ -840,34 +840,63 @@
 	<item id="82164" name="Collection Item Box - All as One" additionalName="Event" type="EtcItem">
 		<!-- Double-click to obtain Orb of Abyss Lv. 1, Orb of Abyss Lv. 3, Orb of Abyss Lv. 7 (1 of each). -->
 		<set name="icon" val="icon.event_six_party_box_i00" />
-		<set name="default_action" val="PEEL" />
+		<set name="default_action" val="CAPSULE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="81848" min="1" max="1" chance="100" /> <!-- Orb of Abyss Lv. 1 -->
+			<item id="81850" min="1" max="1" chance="100" /> <!-- Orb of Abyss Lv. 3 -->
+			<item id="81854" min="1" max="1" chance="100" /> <!-- Orb of Abyss Lv. 7 -->
+		</capsuled_items>
 	</item>
 	<item id="82165" name="Collection Item Box - Last Chance!" additionalName="Event" type="EtcItem">
 		<!-- Double-click to obtain Orb of Darkness Lv. 2, Orb of Darkness Lv. 3, Orb of Darkness Lv. 6, Orb of Darkness Lv. 7 (1 of each). -->
 		<set name="icon" val="icon.event_six_party_box_i00" />
-		<set name="default_action" val="PEEL" />
+		<set name="default_action" val="CAPSULE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="81860" min="1" max="1" chance="100" /> <!-- Orb of Darkness Lv. 2 -->
+			<item id="81861" min="1" max="1" chance="100" /> <!-- Orb of Darkness Lv. 3 -->
+			<item id="81864" min="1" max="1" chance="100" /> <!-- Orb of Darkness Lv. 6 -->
+			<item id="81865" min="1" max="1" chance="100" /> <!-- Orb of Darkness Lv. 7 -->
+		</capsuled_items>
 	</item>
 	<item id="82166" name="Collection Item Box - Adventurer" additionalName="Event" type="EtcItem">
 		<!-- Double-click to obtain Orb of Bloody Soul Lv. 3, Orb of Bloody Soul Lv. 5, Orb of Bloody Soul Lv. 8, Orb of Bloody Soul Lv. 10 (1 of each). -->
 		<set name="icon" val="icon.event_six_party_box_i00" />
-		<set name="default_action" val="PEEL" />
+		<set name="default_action" val="CAPSULE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="81839" min="1" max="1" chance="100" /> <!-- Orb of Bloody Soul Lv. 3 -->
+			<item id="81841" min="1" max="1" chance="100" /> <!-- Orb of Bloody Soul Lv. 5 -->
+			<item id="81844" min="1" max="1" chance="100" /> <!-- Orb of Bloody Soul Lv. 8 -->
+			<item id="81846" min="1" max="1" chance="100" /> <!-- Orb of Bloody Soul Lv. 10 -->
+		</capsuled_items>
 	</item>
 	<item id="82167" name="Collection Item Box - Empiric" additionalName="Event" type="EtcItem">
 		<!-- Double-click to obtain Orb of Bloody Soul Lv. 8, Orb of Bloody Soul Lv. 9 (1 of each). -->
 		<set name="icon" val="icon.event_six_party_box_i00" />
-		<set name="default_action" val="PEEL" />
+		<set name="default_action" val="CAPSULE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="81844" min="1" max="1" chance="100" /> <!-- Orb of Bloody Soul Lv. 8 -->
+			<item id="81845" min="1" max="1" chance="100" /> <!-- Orb of Bloody Soul Lv. 9 -->
+		</capsuled_items>
 	</item>
 	<item id="82168" name="Sayha's Blessing Potion" type="EtcItem">
 		<!-- For 30 min., Attribute Attack/ Resistance +70, acquired XP/ SP +30%. Cooldown: 5 min. The effect remains after death. Cannot be used in the Olympiad. -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82200-82299.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82200-82299.xml
index 55fd947693..d8fd4e6da1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82200-82299.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82200-82299.xml
@@ -1460,7 +1460,7 @@
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ExtractableItems" />
 		<capsuled_items>
-			<item id="82288" min="1" max="1" chance="100" /> <!-- Tersi's Soul Crystal Pack -->
+			<item id="82288" min="100" max="100" chance="100" /> <!-- Tersi's Soul Crystal Pack -->
 			<item id="82289" min="1" max="1" chance="100" /> <!-- Tersi's Seal -->
 		</capsuled_items>
 	</item>
@@ -1475,7 +1475,7 @@
 		<set name="handler" val="ExtractableItems" />
 		<capsuled_items>
 			<item id="82265" min="1" max="1" chance="100" /> <!-- Tersi's Soul Crystal Lv. 1 - Armor -->
-			<item id="82275" min="1" max="1" chance="100" /> <!-- Light's Soul -->
+			<item id="82275" min="10" max="10" chance="100" /> <!-- Light's Soul -->
 		</capsuled_items>
 	</item>
 	<item id="82289" name="Tersi's Seal" type="EtcItem">
@@ -1655,8 +1655,15 @@
 		<set name="icon" val="icon.bless_scroll" />
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="reuse_delay" val="300000" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39794" level="1" /> <!-- Freya's Scroll of Blessing -->
+		</skills>
 	</item>
 	<item id="82296" name="Artifact - Received Damage" additionalName="Balance" type="Armor">
 		<!-- An artifact that decreases received damage. Can be equipped in a balance artifact slot. Received damage -11%, when in the slot. Cannot be upgraded. -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82500-82599.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82500-82599.xml
index 800ce41de9..7d21906074 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82500-82599.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82500-82599.xml
@@ -344,7 +344,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">114</stat>
 		</stats>
@@ -363,7 +363,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39620" level="1" /> <!-- Craft Effect - Charisma Lv. 1 -->
 		</skills>
@@ -385,7 +385,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39620" level="2" /> <!-- Craft Effect - Charisma Lv. 2 -->
 		</skills>
@@ -407,7 +407,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39620" level="3" /> <!-- Craft Effect - Charisma Lv. 3 -->
 		</skills>
@@ -429,7 +429,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<stats>
 			<stat type="mDef">114</stat>
 		</stats>
@@ -448,7 +448,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39620" level="1" /> <!-- Craft Effect - Charisma Lv. 1 -->
 		</skills>
@@ -470,7 +470,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39620" level="2" /> <!-- Craft Effect - Charisma Lv. 2 -->
 		</skills>
@@ -492,7 +492,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39620" level="3" /> <!-- Craft Effect - Charisma Lv. 3 -->
 		</skills>
@@ -514,7 +514,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="36184" level="1" /> <!-- Fallen Angel's Earring -->
 			<skill id="36184" level="2" type="ON_ENCHANT" type_value="1" /> <!-- Fallen Angel's Earring -->
@@ -546,7 +546,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39777" level="1" /> <!-- Craft Effect - Cooldown Decrease Lv. 1 -->
 			<skill id="36184" level="1" /> <!-- Fallen Angel's Earring -->
@@ -579,7 +579,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39777" level="2" /> <!-- Craft Effect - Cooldown Decrease Lv. 2 -->
 			<skill id="36184" level="1" /> <!-- Fallen Angel's Earring -->
@@ -612,7 +612,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39777" level="3" /> <!-- Craft Effect - Cooldown Decrease Lv. 3 -->
 			<skill id="36184" level="1" /> <!-- Fallen Angel's Earring -->
@@ -645,7 +645,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="36184" level="2" /> <!-- Fallen Angel's Earring -->
 			<skill id="36184" level="3" type="ON_ENCHANT" type_value="1" /> <!-- Fallen Angel's Earring -->
@@ -677,7 +677,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39777" level="1" /> <!-- Craft Effect - Cooldown Decrease Lv. 1 -->
 			<skill id="36184" level="2" /> <!-- Fallen Angel's Earring -->
@@ -710,7 +710,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39777" level="2" /> <!-- Craft Effect - Cooldown Decrease Lv. 2 -->
 			<skill id="36184" level="2" /> <!-- Fallen Angel's Earring -->
@@ -743,7 +743,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="ensoulNormalSlots" val="1" />
+		<set name="ensoulSpecialSlots" val="1" />
 		<skills>
 			<skill id="39777" level="3" /> <!-- Craft Effect - Cooldown Decrease Lv. 3 -->
 			<skill id="36184" level="2" /> <!-- Fallen Angel's Earring -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82600-82699.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82600-82699.xml
index 2080daeb22..f15682b796 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82600-82699.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/items/82600-82699.xml
@@ -888,17 +888,17 @@
 	<item id="82658" name="Sealed Fire Source" type="EtcItem">
 		<!-- This flickering flame is emanating the power of the Primordial Fire. Double-click to obtain Fire Source points. Fire Source points are required for enhancing the <Fire Source> ability of the Primordial Fire Source. -->
 		<set name="icon" val="icon.dethrone_fire_source" />
-		<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
+		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="CRYSTAL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="handler" val="ExtractableItems" />
-		<capsuled_items>
-			<item id="82609" min="1" max="1" chance="100" /> <!-- Fire Source -->
-		</capsuled_items>
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39824" level="1" /> <!-- Sealed Fire Source -->
+		</skills>
 	</item>
 	<item id="82659" name="Server Conquest points" type="EtcItem">
 		<!-- Points accumulated by characters from one server for their actions in the Conquest world: monster hunting, PvP, missions and the Sacred Fire summoning. The server that gets the most points per cycle becomes the Conqueror server. Characters from this server are rewarded with various bonuses. -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/19800-19899.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/19800-19899.xml
index 03e00b772f..9d3544c4f1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/19800-19899.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/19800-19899.xml
@@ -279,7 +279,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2.31214" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
 			<speed>
@@ -316,9 +316,14 @@
 		<sex>FEMALE</sex>
 		<acquire exp="367802" sp="349" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="20.80925" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<vitals hp="485013" hpRegen="10.5" mp="2862" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1300" water="1250" wind="1300" earth="1300" holy="1300" dark="1300" />
+				<attack type="WATER" value="1150" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -348,9 +353,14 @@
 		<sex>FEMALE</sex>
 		<acquire exp="467802" sp="449" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="20.80925" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -380,9 +390,14 @@
 		<sex>FEMALE</sex>
 		<acquire exp="15739942" sp="14166" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5.20231" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -461,7 +476,7 @@
 		<sex>FEMALE</sex>
 		<acquire exp="28541390" sp="25687" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5.20231" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
 			<speed>
@@ -543,8 +558,13 @@
 		<acquire exp="52007369" sp="46807" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="5.20231" hpRegen="10.5" mp="3190" mpRegen="3.6" />
-			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2050" earth="2000" holy="2050" dark="2050" />
+				<attack type="EARTH" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -623,9 +643,14 @@
 		<sex>FEMALE</sex>
 		<acquire exp="15739942" sp="14166" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5.20231" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -704,7 +729,7 @@
 		<sex>FEMALE</sex>
 		<acquire exp="28541390" sp="25687" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5.20231" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
 			<speed>
@@ -786,8 +811,13 @@
 		<acquire exp="52007369" sp="46807" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="5.20231" hpRegen="10.5" mp="3190" mpRegen="3.6" />
-			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2050" earth="2000" holy="2050" dark="2050" />
+				<attack type="EARTH" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -866,9 +896,14 @@
 		<sex>FEMALE</sex>
 		<acquire exp="15739942" sp="14166" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5.20231" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -947,7 +982,7 @@
 		<sex>FEMALE</sex>
 		<acquire exp="28541390" sp="25687" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5.20231" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
 			<speed>
@@ -1028,9 +1063,14 @@
 		<sex>FEMALE</sex>
 		<acquire exp="52007369" sp="46807" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5.20231" hpRegen="10.5" mp="3190" mpRegen="3.6" />
-			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2050" earth="2000" holy="2050" dark="2050" />
+				<attack type="EARTH" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1116,9 +1156,14 @@
 		<sex>FEMALE</sex>
 		<acquire exp="46354393" sp="41719" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1143.353" hpRegen="10.5" mp="3190" mpRegen="3.6" />
-			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2050" earth="2000" holy="2050" dark="2050" />
+				<attack type="EARTH" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1156,9 +1201,14 @@
 		<sex>FEMALE</sex>
 		<acquire exp="46354393" sp="41719" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1143.353" hpRegen="10.5" mp="3190" mpRegen="3.6" />
-			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2050" earth="2000" holy="2050" dark="2050" />
+				<attack type="EARTH" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1196,9 +1246,14 @@
 		<sex>FEMALE</sex>
 		<acquire exp="46354393" sp="41719" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1143.353" hpRegen="10.5" mp="3190" mpRegen="3.6" />
-			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2050" earth="2000" holy="2050" dark="2050" />
+				<attack type="EARTH" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1229,9 +1284,14 @@
 		<sex>FEMALE</sex>
 		<acquire exp="23609912" sp="21249" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="52.60115" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -1261,9 +1321,14 @@
 		<sex>FEMALE</sex>
 		<acquire exp="23609912" sp="21249" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="52.60115" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -1293,9 +1358,14 @@
 		<sex>FEMALE</sex>
 		<acquire exp="23609912" sp="21249" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="52.60115" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -1461,9 +1531,14 @@
 		<sex>FEMALE</sex>
 		<acquire exp="52007369" sp="46807" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5.20231" hpRegen="10.5" mp="3190" mpRegen="3.6" />
-			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2050" earth="2000" holy="2050" dark="2050" />
+				<attack type="EARTH" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1542,9 +1617,14 @@
 		<sex>FEMALE</sex>
 		<acquire exp="52007369" sp="46807" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5.20231" hpRegen="10.5" mp="3190" mpRegen="3.6" />
-			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<vitals hp="4364492" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<attack physical="800929.716245079" magical="1600.02433727455" random="50" critical="4.75" accuracy="9" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="6050.61278538813" magical="2350.57302469973" />
+			<attribute>
+				<defence fire="2100" water="2150" wind="2150" earth="2150" holy="2150" dark="2150" />
+				<attack type="FIRE" value="2100" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1630,9 +1710,14 @@
 		<sex>FEMALE</sex>
 		<acquire exp="46354393" sp="41719" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1143.353" hpRegen="10.5" mp="3190" mpRegen="3.6" />
-			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2050" earth="2000" holy="2050" dark="2050" />
+				<attack type="EARTH" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="1" />
 				<run ground="180" />
@@ -1670,9 +1755,14 @@
 		<sex>FEMALE</sex>
 		<acquire exp="46354393" sp="41719" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1143.353" hpRegen="10.5" mp="3190" mpRegen="3.6" />
-			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<vitals hp="4364492" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<attack physical="800929.716245079" magical="1600.02433727455" random="50" critical="4.75" accuracy="9" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="6050.61278538813" magical="2350.57302469973" />
+			<attribute>
+				<defence fire="2100" water="2150" wind="2150" earth="2150" holy="2150" dark="2150" />
+				<attack type="FIRE" value="2100" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="1" />
 				<run ground="180" />
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/24600-24699.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/24600-24699.xml
index 8d6db6734e..8922c5fe82 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/24600-24699.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/24600-24699.xml
@@ -3101,391 +3101,1958 @@
 			<height normal="73" />
 		</collision>
 	</npc>
-	<npc id="24663" level="85" type="Folk" name="Graveyard Death Archer" title="Dragon Valley Protector">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24663" level="120" type="Monster" name="Graveyard Death Archer" title="Dragon Valley Protector">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
 		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2012329" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="2012329" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
+			<defence physical="753240" magical="364523" />
+			<attribute>
+				<defence fire="1200" water="1200" wind="1200" earth="1200" holy="1200" dark="1200" />
+				<attack type="DARK" value="1250" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="70" />
 				<run ground="150" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
+		<ai type="FIGHTER" aggroRange="300" isAggressive="true" />
 		<collision>
 			<radius normal="16.9" />
 			<height normal="54.2" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="33123" level="2" /> <!-- Gloomy Night of Valley -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
+		</skillList>
 	</npc>
-	<npc id="24664" level="85" type="Folk" name="Graveyard Death Lich">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24664" level="120" type="Monster" name="Graveyard Death Lich">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="538517" sp="485" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2012329" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="2012329" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1200" water="1200" wind="1200" earth="1200" holy="1200" dark="1200" />
+				<attack type="DARK" value="1250" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="70" />
 				<run ground="170" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="28.6" />
 			<height normal="67.2" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="33123" level="2" /> <!-- Gloomy Night of Valley -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="100000" max="200000" chance="0.159" /> <!-- Adena -->
+				<item id="47494" min="1" max="1" chance="0.0005" /> <!-- Selenite -->
+				<item id="48065" min="1" max="1" chance="0.029" /> <!-- Zodiac Cube Fragment -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="35566" min="1" max="1" chance="0.00001" /> <!-- Dark Weapon Upgrade Stone -->
+				<item id="35567" min="1" max="1" chance="0.00001" /> <!-- Dark Armor Upgrade Stone -->
+				<item id="35568" min="1" max="1" chance="0.00001" /> <!-- Bloody Weapon Upgrade Stone -->
+				<item id="35569" min="1" max="1" chance="0.00001" /> <!-- Bloody Armor Upgrade Stone -->
+				<item id="81216" min="1" max="1" chance="2.583" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="4.13" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="4.13" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="4.13" /> <!-- Angel's Feather -->
+				<item id="48669" min="1" max="1" chance="0.00010" /> <!-- Angel's Necklace -->
+				<item id="48841" min="1" max="1" chance="0.00010" /> <!-- Angel's Earring -->
+				<item id="81154" min="1" max="1" chance="0.00010" /> <!-- Angel's Ring -->
+				<item id="17416" min="1" max="1" chance="0.00001" /> <!-- Helios Shaper -->
+				<item id="17417" min="1" max="1" chance="0.00001" /> <!-- Helios Cutter -->
+				<item id="17418" min="1" max="1" chance="0.00001" /> <!-- Helios Slasher -->
+				<item id="17419" min="1" max="1" chance="0.00001" /> <!-- Helios Avenger -->
+				<item id="17420" min="1" max="1" chance="0.00001" /> <!-- Helios Fighter -->
+				<item id="17421" min="1" max="1" chance="0.00001" /> <!-- Helios Stormer -->
+				<item id="17422" min="1" max="1" chance="0.00001" /> <!-- Helios Thrower -->
+				<item id="17423" min="1" max="1" chance="0.00001" /> <!-- Helios Guardian -->
+				<item id="17424" min="1" max="1" chance="0.00001" /> <!-- Helios Buster -->
+				<item id="17425" min="1" max="1" chance="0.00001" /> <!-- Helios Caster -->
+				<item id="17426" min="1" max="1" chance="0.00001" /> <!-- Helios Retributer -->
+				<item id="17427" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Swords -->
+				<item id="17428" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Daggers -->
+				<item id="17429" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Blunt Weapons -->
+				<item id="17430" min="1" max="1" chance="0.00006" /> <!-- Eternal Helmet - Heavy armor -->
+				<item id="17431" min="1" max="1" chance="0.00002" /> <!-- Eternal Breastplate - Heavy armor -->
+				<item id="17432" min="1" max="1" chance="0.00004" /> <!-- Eternal Gaiters - Heavy armor -->
+				<item id="17433" min="1" max="1" chance="0.00009" /> <!-- Eternal Gauntlets - Heavy armor -->
+				<item id="17434" min="1" max="1" chance="0.00009" /> <!-- Eternal Boots - Heavy armor -->
+				<item id="17435" min="1" max="1" chance="0.00009" /> <!-- Eternal Shield -->
+				<item id="17436" min="1" max="1" chance="0.00006" /> <!-- Eternal Leather Helmet - Light armor -->
+				<item id="17437" min="1" max="1" chance="0.00002" /> <!-- Eternal Leather Armor - Light armor -->
+				<item id="17438" min="1" max="1" chance="0.00004" /> <!-- Eternal Leather Leggings - Light armor -->
+				<item id="17439" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Gloves - Light armor -->
+				<item id="17440" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Boots - Light armor -->
+				<item id="17441" min="1" max="1" chance="0.00006" /> <!-- Eternal Circlet - Robe -->
+				<item id="17442" min="1" max="1" chance="0.00002" /> <!-- Eternal Tunic - Robe -->
+				<item id="17443" min="1" max="1" chance="0.00004" /> <!-- Eternal Stockings - Robe -->
+				<item id="17444" min="1" max="1" chance="0.00009" /> <!-- Eternal Gloves - Robe -->
+				<item id="17445" min="1" max="1" chance="0.00009" /> <!-- Eternal Shoes - Robe -->
+				<item id="17446" min="1" max="1" chance="0.00009" /> <!-- Eternal Sigil -->
+				<item id="80090" min="1" max="1" chance="0.00001" /> <!-- Krishna Shaper -->
+				<item id="80091" min="1" max="1" chance="0.00001" /> <!-- Krishna Cutter -->
+				<item id="80092" min="1" max="1" chance="0.00001" /> <!-- Krishna Slasher -->
+				<item id="80093" min="1" max="1" chance="0.00001" /> <!-- Krishna Avenger -->
+				<item id="80094" min="1" max="1" chance="0.00001" /> <!-- Krishna Fighter -->
+				<item id="80095" min="1" max="1" chance="0.00001" /> <!-- Krishna Stormer -->
+				<item id="80096" min="1" max="1" chance="0.00001" /> <!-- Krishna Thrower -->
+				<item id="80097" min="1" max="1" chance="0.00001" /> <!-- Krishna Guardian -->
+				<item id="80098" min="1" max="1" chance="0.00001" /> <!-- Krishna Buster -->
+				<item id="80099" min="1" max="1" chance="0.00001" /> <!-- Krishna Caster -->
+				<item id="80100" min="1" max="1" chance="0.00001" /> <!-- Krishna Retributer -->
+				<item id="80101" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="1" max="1" chance="0.00002" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="1" max="1" chance="0.00001" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="1" max="1" chance="0.00001" /> <!-- Leviathan Gaiters - Heavy armor -->
+				<item id="80107" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gauntlets - Heavy armor -->
+				<item id="80108" min="1" max="1" chance="0.00004" /> <!-- Leviathan Boots - Heavy armor -->
+				<item id="80109" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shield -->
+				<item id="80110" min="1" max="1" chance="0.00002" /> <!-- Leviathan Leather Helmet - Light armor -->
+				<item id="80111" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Armor - Light armor -->
+				<item id="80112" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Leggings - Light armor -->
+				<item id="80113" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Gloves - Light armor -->
+				<item id="80114" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Boots - Light armor -->
+				<item id="80115" min="1" max="1" chance="0.00002" /> <!-- Leviathan Circlet - Robe -->
+				<item id="80116" min="1" max="1" chance="0.00001" /> <!-- Leviathan Tunic - Robe -->
+				<item id="80117" min="1" max="1" chance="0.00001" /> <!-- Leviathan Stockings - Robe -->
+				<item id="80118" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gloves - Robe -->
+				<item id="80119" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shoes - Robe -->
+				<item id="80120" min="1" max="1" chance="0.00004" /> <!-- Leviathan Sigil -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="10.727" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24665" level="85" type="Folk" name="Graveyard Death Berserker">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24665" level="120" type="Monster" name="Graveyard Death Berserker">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="538517" sp="485" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2012329" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="2012329" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1200" water="1200" wind="1200" earth="1200" holy="1200" dark="1200" />
+				<attack type="DARK" value="1250" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="65" />
 				<run ground="110" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="49.5" />
 			<height normal="78" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="33123" level="2" /> <!-- Gloomy Night of Valley -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="100000" max="200000" chance="0.159" /> <!-- Adena -->
+				<item id="47494" min="1" max="1" chance="0.0005" /> <!-- Selenite -->
+				<item id="48065" min="1" max="1" chance="0.029" /> <!-- Zodiac Cube Fragment -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="35566" min="1" max="1" chance="0.00001" /> <!-- Dark Weapon Upgrade Stone -->
+				<item id="35567" min="1" max="1" chance="0.00001" /> <!-- Dark Armor Upgrade Stone -->
+				<item id="35568" min="1" max="1" chance="0.00001" /> <!-- Bloody Weapon Upgrade Stone -->
+				<item id="35569" min="1" max="1" chance="0.00001" /> <!-- Bloody Armor Upgrade Stone -->
+				<item id="81216" min="1" max="1" chance="2.583" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="4.13" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="4.13" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="4.13" /> <!-- Angel's Feather -->
+				<item id="48669" min="1" max="1" chance="0.00010" /> <!-- Angel's Necklace -->
+				<item id="48841" min="1" max="1" chance="0.00010" /> <!-- Angel's Earring -->
+				<item id="81154" min="1" max="1" chance="0.00010" /> <!-- Angel's Ring -->
+				<item id="17416" min="1" max="1" chance="0.00001" /> <!-- Helios Shaper -->
+				<item id="17417" min="1" max="1" chance="0.00001" /> <!-- Helios Cutter -->
+				<item id="17418" min="1" max="1" chance="0.00001" /> <!-- Helios Slasher -->
+				<item id="17419" min="1" max="1" chance="0.00001" /> <!-- Helios Avenger -->
+				<item id="17420" min="1" max="1" chance="0.00001" /> <!-- Helios Fighter -->
+				<item id="17421" min="1" max="1" chance="0.00001" /> <!-- Helios Stormer -->
+				<item id="17422" min="1" max="1" chance="0.00001" /> <!-- Helios Thrower -->
+				<item id="17423" min="1" max="1" chance="0.00001" /> <!-- Helios Guardian -->
+				<item id="17424" min="1" max="1" chance="0.00001" /> <!-- Helios Buster -->
+				<item id="17425" min="1" max="1" chance="0.00001" /> <!-- Helios Caster -->
+				<item id="17426" min="1" max="1" chance="0.00001" /> <!-- Helios Retributer -->
+				<item id="17427" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Swords -->
+				<item id="17428" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Daggers -->
+				<item id="17429" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Blunt Weapons -->
+				<item id="17430" min="1" max="1" chance="0.00006" /> <!-- Eternal Helmet - Heavy armor -->
+				<item id="17431" min="1" max="1" chance="0.00002" /> <!-- Eternal Breastplate - Heavy armor -->
+				<item id="17432" min="1" max="1" chance="0.00004" /> <!-- Eternal Gaiters - Heavy armor -->
+				<item id="17433" min="1" max="1" chance="0.00009" /> <!-- Eternal Gauntlets - Heavy armor -->
+				<item id="17434" min="1" max="1" chance="0.00009" /> <!-- Eternal Boots - Heavy armor -->
+				<item id="17435" min="1" max="1" chance="0.00009" /> <!-- Eternal Shield -->
+				<item id="17436" min="1" max="1" chance="0.00006" /> <!-- Eternal Leather Helmet - Light armor -->
+				<item id="17437" min="1" max="1" chance="0.00002" /> <!-- Eternal Leather Armor - Light armor -->
+				<item id="17438" min="1" max="1" chance="0.00004" /> <!-- Eternal Leather Leggings - Light armor -->
+				<item id="17439" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Gloves - Light armor -->
+				<item id="17440" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Boots - Light armor -->
+				<item id="17441" min="1" max="1" chance="0.00006" /> <!-- Eternal Circlet - Robe -->
+				<item id="17442" min="1" max="1" chance="0.00002" /> <!-- Eternal Tunic - Robe -->
+				<item id="17443" min="1" max="1" chance="0.00004" /> <!-- Eternal Stockings - Robe -->
+				<item id="17444" min="1" max="1" chance="0.00009" /> <!-- Eternal Gloves - Robe -->
+				<item id="17445" min="1" max="1" chance="0.00009" /> <!-- Eternal Shoes - Robe -->
+				<item id="17446" min="1" max="1" chance="0.00009" /> <!-- Eternal Sigil -->
+				<item id="80090" min="1" max="1" chance="0.00001" /> <!-- Krishna Shaper -->
+				<item id="80091" min="1" max="1" chance="0.00001" /> <!-- Krishna Cutter -->
+				<item id="80092" min="1" max="1" chance="0.00001" /> <!-- Krishna Slasher -->
+				<item id="80093" min="1" max="1" chance="0.00001" /> <!-- Krishna Avenger -->
+				<item id="80094" min="1" max="1" chance="0.00001" /> <!-- Krishna Fighter -->
+				<item id="80095" min="1" max="1" chance="0.00001" /> <!-- Krishna Stormer -->
+				<item id="80096" min="1" max="1" chance="0.00001" /> <!-- Krishna Thrower -->
+				<item id="80097" min="1" max="1" chance="0.00001" /> <!-- Krishna Guardian -->
+				<item id="80098" min="1" max="1" chance="0.00001" /> <!-- Krishna Buster -->
+				<item id="80099" min="1" max="1" chance="0.00001" /> <!-- Krishna Caster -->
+				<item id="80100" min="1" max="1" chance="0.00001" /> <!-- Krishna Retributer -->
+				<item id="80101" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="1" max="1" chance="0.00002" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="1" max="1" chance="0.00001" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="1" max="1" chance="0.00001" /> <!-- Leviathan Gaiters - Heavy armor -->
+				<item id="80107" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gauntlets - Heavy armor -->
+				<item id="80108" min="1" max="1" chance="0.00004" /> <!-- Leviathan Boots - Heavy armor -->
+				<item id="80109" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shield -->
+				<item id="80110" min="1" max="1" chance="0.00002" /> <!-- Leviathan Leather Helmet - Light armor -->
+				<item id="80111" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Armor - Light armor -->
+				<item id="80112" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Leggings - Light armor -->
+				<item id="80113" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Gloves - Light armor -->
+				<item id="80114" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Boots - Light armor -->
+				<item id="80115" min="1" max="1" chance="0.00002" /> <!-- Leviathan Circlet - Robe -->
+				<item id="80116" min="1" max="1" chance="0.00001" /> <!-- Leviathan Tunic - Robe -->
+				<item id="80117" min="1" max="1" chance="0.00001" /> <!-- Leviathan Stockings - Robe -->
+				<item id="80118" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gloves - Robe -->
+				<item id="80119" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shoes - Robe -->
+				<item id="80120" min="1" max="1" chance="0.00004" /> <!-- Leviathan Sigil -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="10.727" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24666" level="85" type="Folk" name="Graveyard Death Soldier">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24666" level="120" type="Monster" name="Graveyard Death Soldier">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="538517" sp="485" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2012329" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="2012329" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1200" water="1200" wind="1200" earth="1200" holy="1200" dark="1200" />
+				<attack type="DARK" value="1250" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="70" />
 				<run ground="150" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="16.9" />
 			<height normal="54.2" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="33123" level="2" /> <!-- Gloomy Night of Valley -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="100000" max="200000" chance="0.159" /> <!-- Adena -->
+				<item id="47494" min="1" max="1" chance="0.0005" /> <!-- Selenite -->
+				<item id="48065" min="1" max="1" chance="0.029" /> <!-- Zodiac Cube Fragment -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="35566" min="1" max="1" chance="0.00001" /> <!-- Dark Weapon Upgrade Stone -->
+				<item id="35567" min="1" max="1" chance="0.00001" /> <!-- Dark Armor Upgrade Stone -->
+				<item id="35568" min="1" max="1" chance="0.00001" /> <!-- Bloody Weapon Upgrade Stone -->
+				<item id="35569" min="1" max="1" chance="0.00001" /> <!-- Bloody Armor Upgrade Stone -->
+				<item id="81216" min="1" max="1" chance="2.583" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="4.13" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="4.13" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="4.13" /> <!-- Angel's Feather -->
+				<item id="48669" min="1" max="1" chance="0.00010" /> <!-- Angel's Necklace -->
+				<item id="48841" min="1" max="1" chance="0.00010" /> <!-- Angel's Earring -->
+				<item id="81154" min="1" max="1" chance="0.00010" /> <!-- Angel's Ring -->
+				<item id="17416" min="1" max="1" chance="0.00001" /> <!-- Helios Shaper -->
+				<item id="17417" min="1" max="1" chance="0.00001" /> <!-- Helios Cutter -->
+				<item id="17418" min="1" max="1" chance="0.00001" /> <!-- Helios Slasher -->
+				<item id="17419" min="1" max="1" chance="0.00001" /> <!-- Helios Avenger -->
+				<item id="17420" min="1" max="1" chance="0.00001" /> <!-- Helios Fighter -->
+				<item id="17421" min="1" max="1" chance="0.00001" /> <!-- Helios Stormer -->
+				<item id="17422" min="1" max="1" chance="0.00001" /> <!-- Helios Thrower -->
+				<item id="17423" min="1" max="1" chance="0.00001" /> <!-- Helios Guardian -->
+				<item id="17424" min="1" max="1" chance="0.00001" /> <!-- Helios Buster -->
+				<item id="17425" min="1" max="1" chance="0.00001" /> <!-- Helios Caster -->
+				<item id="17426" min="1" max="1" chance="0.00001" /> <!-- Helios Retributer -->
+				<item id="17427" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Swords -->
+				<item id="17428" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Daggers -->
+				<item id="17429" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Blunt Weapons -->
+				<item id="17430" min="1" max="1" chance="0.00006" /> <!-- Eternal Helmet - Heavy armor -->
+				<item id="17431" min="1" max="1" chance="0.00002" /> <!-- Eternal Breastplate - Heavy armor -->
+				<item id="17432" min="1" max="1" chance="0.00004" /> <!-- Eternal Gaiters - Heavy armor -->
+				<item id="17433" min="1" max="1" chance="0.00009" /> <!-- Eternal Gauntlets - Heavy armor -->
+				<item id="17434" min="1" max="1" chance="0.00009" /> <!-- Eternal Boots - Heavy armor -->
+				<item id="17435" min="1" max="1" chance="0.00009" /> <!-- Eternal Shield -->
+				<item id="17436" min="1" max="1" chance="0.00006" /> <!-- Eternal Leather Helmet - Light armor -->
+				<item id="17437" min="1" max="1" chance="0.00002" /> <!-- Eternal Leather Armor - Light armor -->
+				<item id="17438" min="1" max="1" chance="0.00004" /> <!-- Eternal Leather Leggings - Light armor -->
+				<item id="17439" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Gloves - Light armor -->
+				<item id="17440" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Boots - Light armor -->
+				<item id="17441" min="1" max="1" chance="0.00006" /> <!-- Eternal Circlet - Robe -->
+				<item id="17442" min="1" max="1" chance="0.00002" /> <!-- Eternal Tunic - Robe -->
+				<item id="17443" min="1" max="1" chance="0.00004" /> <!-- Eternal Stockings - Robe -->
+				<item id="17444" min="1" max="1" chance="0.00009" /> <!-- Eternal Gloves - Robe -->
+				<item id="17445" min="1" max="1" chance="0.00009" /> <!-- Eternal Shoes - Robe -->
+				<item id="17446" min="1" max="1" chance="0.00009" /> <!-- Eternal Sigil -->
+				<item id="80090" min="1" max="1" chance="0.00001" /> <!-- Krishna Shaper -->
+				<item id="80091" min="1" max="1" chance="0.00001" /> <!-- Krishna Cutter -->
+				<item id="80092" min="1" max="1" chance="0.00001" /> <!-- Krishna Slasher -->
+				<item id="80093" min="1" max="1" chance="0.00001" /> <!-- Krishna Avenger -->
+				<item id="80094" min="1" max="1" chance="0.00001" /> <!-- Krishna Fighter -->
+				<item id="80095" min="1" max="1" chance="0.00001" /> <!-- Krishna Stormer -->
+				<item id="80096" min="1" max="1" chance="0.00001" /> <!-- Krishna Thrower -->
+				<item id="80097" min="1" max="1" chance="0.00001" /> <!-- Krishna Guardian -->
+				<item id="80098" min="1" max="1" chance="0.00001" /> <!-- Krishna Buster -->
+				<item id="80099" min="1" max="1" chance="0.00001" /> <!-- Krishna Caster -->
+				<item id="80100" min="1" max="1" chance="0.00001" /> <!-- Krishna Retributer -->
+				<item id="80101" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="1" max="1" chance="0.00002" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="1" max="1" chance="0.00001" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="1" max="1" chance="0.00001" /> <!-- Leviathan Gaiters - Heavy armor -->
+				<item id="80107" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gauntlets - Heavy armor -->
+				<item id="80108" min="1" max="1" chance="0.00004" /> <!-- Leviathan Boots - Heavy armor -->
+				<item id="80109" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shield -->
+				<item id="80110" min="1" max="1" chance="0.00002" /> <!-- Leviathan Leather Helmet - Light armor -->
+				<item id="80111" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Armor - Light armor -->
+				<item id="80112" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Leggings - Light armor -->
+				<item id="80113" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Gloves - Light armor -->
+				<item id="80114" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Boots - Light armor -->
+				<item id="80115" min="1" max="1" chance="0.00002" /> <!-- Leviathan Circlet - Robe -->
+				<item id="80116" min="1" max="1" chance="0.00001" /> <!-- Leviathan Tunic - Robe -->
+				<item id="80117" min="1" max="1" chance="0.00001" /> <!-- Leviathan Stockings - Robe -->
+				<item id="80118" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gloves - Robe -->
+				<item id="80119" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shoes - Robe -->
+				<item id="80120" min="1" max="1" chance="0.00004" /> <!-- Leviathan Sigil -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="10.727" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24667" level="85" type="Folk" name="Graveyard Death Knight">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24667" level="120" type="Monster" name="Graveyard Death Knight">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
 		<equipment rhand="35639" /> <!-- Two-handed Sword of Protection -->
+		<acquire exp="538517" sp="485" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2012329" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="2012329" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1200" water="1200" wind="1200" earth="1200" holy="1200" dark="1200" />
+				<attack type="DARK" value="1250" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="90" />
 				<run ground="220" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
-			<radius normal="27.3" />
-			<height normal="41.2" />
+			<radius normal="27.3" grown="31.2" />
+			<height normal="41.2" grown="50.3" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="33123" level="2" /> <!-- Gloomy Night of Valley -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="100000" max="200000" chance="0.159" /> <!-- Adena -->
+				<item id="47494" min="1" max="1" chance="0.0005" /> <!-- Selenite -->
+				<item id="48065" min="1" max="1" chance="0.029" /> <!-- Zodiac Cube Fragment -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="35566" min="1" max="1" chance="0.00001" /> <!-- Dark Weapon Upgrade Stone -->
+				<item id="35567" min="1" max="1" chance="0.00001" /> <!-- Dark Armor Upgrade Stone -->
+				<item id="35568" min="1" max="1" chance="0.00001" /> <!-- Bloody Weapon Upgrade Stone -->
+				<item id="35569" min="1" max="1" chance="0.00001" /> <!-- Bloody Armor Upgrade Stone -->
+				<item id="81216" min="1" max="1" chance="2.583" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="4.13" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="4.13" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="4.13" /> <!-- Angel's Feather -->
+				<item id="48669" min="1" max="1" chance="0.00010" /> <!-- Angel's Necklace -->
+				<item id="48841" min="1" max="1" chance="0.00010" /> <!-- Angel's Earring -->
+				<item id="81154" min="1" max="1" chance="0.00010" /> <!-- Angel's Ring -->
+				<item id="17416" min="1" max="1" chance="0.00001" /> <!-- Helios Shaper -->
+				<item id="17417" min="1" max="1" chance="0.00001" /> <!-- Helios Cutter -->
+				<item id="17418" min="1" max="1" chance="0.00001" /> <!-- Helios Slasher -->
+				<item id="17419" min="1" max="1" chance="0.00001" /> <!-- Helios Avenger -->
+				<item id="17420" min="1" max="1" chance="0.00001" /> <!-- Helios Fighter -->
+				<item id="17421" min="1" max="1" chance="0.00001" /> <!-- Helios Stormer -->
+				<item id="17422" min="1" max="1" chance="0.00001" /> <!-- Helios Thrower -->
+				<item id="17423" min="1" max="1" chance="0.00001" /> <!-- Helios Guardian -->
+				<item id="17424" min="1" max="1" chance="0.00001" /> <!-- Helios Buster -->
+				<item id="17425" min="1" max="1" chance="0.00001" /> <!-- Helios Caster -->
+				<item id="17426" min="1" max="1" chance="0.00001" /> <!-- Helios Retributer -->
+				<item id="17427" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Swords -->
+				<item id="17428" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Daggers -->
+				<item id="17429" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Blunt Weapons -->
+				<item id="17430" min="1" max="1" chance="0.00006" /> <!-- Eternal Helmet - Heavy armor -->
+				<item id="17431" min="1" max="1" chance="0.00002" /> <!-- Eternal Breastplate - Heavy armor -->
+				<item id="17432" min="1" max="1" chance="0.00004" /> <!-- Eternal Gaiters - Heavy armor -->
+				<item id="17433" min="1" max="1" chance="0.00009" /> <!-- Eternal Gauntlets - Heavy armor -->
+				<item id="17434" min="1" max="1" chance="0.00009" /> <!-- Eternal Boots - Heavy armor -->
+				<item id="17435" min="1" max="1" chance="0.00009" /> <!-- Eternal Shield -->
+				<item id="17436" min="1" max="1" chance="0.00006" /> <!-- Eternal Leather Helmet - Light armor -->
+				<item id="17437" min="1" max="1" chance="0.00002" /> <!-- Eternal Leather Armor - Light armor -->
+				<item id="17438" min="1" max="1" chance="0.00004" /> <!-- Eternal Leather Leggings - Light armor -->
+				<item id="17439" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Gloves - Light armor -->
+				<item id="17440" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Boots - Light armor -->
+				<item id="17441" min="1" max="1" chance="0.00006" /> <!-- Eternal Circlet - Robe -->
+				<item id="17442" min="1" max="1" chance="0.00002" /> <!-- Eternal Tunic - Robe -->
+				<item id="17443" min="1" max="1" chance="0.00004" /> <!-- Eternal Stockings - Robe -->
+				<item id="17444" min="1" max="1" chance="0.00009" /> <!-- Eternal Gloves - Robe -->
+				<item id="17445" min="1" max="1" chance="0.00009" /> <!-- Eternal Shoes - Robe -->
+				<item id="17446" min="1" max="1" chance="0.00009" /> <!-- Eternal Sigil -->
+				<item id="80090" min="1" max="1" chance="0.00001" /> <!-- Krishna Shaper -->
+				<item id="80091" min="1" max="1" chance="0.00001" /> <!-- Krishna Cutter -->
+				<item id="80092" min="1" max="1" chance="0.00001" /> <!-- Krishna Slasher -->
+				<item id="80093" min="1" max="1" chance="0.00001" /> <!-- Krishna Avenger -->
+				<item id="80094" min="1" max="1" chance="0.00001" /> <!-- Krishna Fighter -->
+				<item id="80095" min="1" max="1" chance="0.00001" /> <!-- Krishna Stormer -->
+				<item id="80096" min="1" max="1" chance="0.00001" /> <!-- Krishna Thrower -->
+				<item id="80097" min="1" max="1" chance="0.00001" /> <!-- Krishna Guardian -->
+				<item id="80098" min="1" max="1" chance="0.00001" /> <!-- Krishna Buster -->
+				<item id="80099" min="1" max="1" chance="0.00001" /> <!-- Krishna Caster -->
+				<item id="80100" min="1" max="1" chance="0.00001" /> <!-- Krishna Retributer -->
+				<item id="80101" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="1" max="1" chance="0.00002" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="1" max="1" chance="0.00001" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="1" max="1" chance="0.00001" /> <!-- Leviathan Gaiters - Heavy armor -->
+				<item id="80107" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gauntlets - Heavy armor -->
+				<item id="80108" min="1" max="1" chance="0.00004" /> <!-- Leviathan Boots - Heavy armor -->
+				<item id="80109" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shield -->
+				<item id="80110" min="1" max="1" chance="0.00002" /> <!-- Leviathan Leather Helmet - Light armor -->
+				<item id="80111" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Armor - Light armor -->
+				<item id="80112" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Leggings - Light armor -->
+				<item id="80113" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Gloves - Light armor -->
+				<item id="80114" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Boots - Light armor -->
+				<item id="80115" min="1" max="1" chance="0.00002" /> <!-- Leviathan Circlet - Robe -->
+				<item id="80116" min="1" max="1" chance="0.00001" /> <!-- Leviathan Tunic - Robe -->
+				<item id="80117" min="1" max="1" chance="0.00001" /> <!-- Leviathan Stockings - Robe -->
+				<item id="80118" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gloves - Robe -->
+				<item id="80119" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shoes - Robe -->
+				<item id="80120" min="1" max="1" chance="0.00004" /> <!-- Leviathan Sigil -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="10.727" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24668" level="85" type="Folk" name="Dragon Peltast" title="Earth Dragon's Guardian">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24668" level="122" type="Monster" name="Dragon Peltast" title="Earth Dragon's Guardian">
+		<race>DRAGON</race>
+		<sex>MALE</sex>
 		<equipment rhand="13843" /> <!-- Dragon Peltast's Weapon -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2524268" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="2524268" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
+			<attribute>
+				<defence fire="1220" water="1220" wind="1220" earth="1220" holy="1220" dark="1220" />
+				<attack type="EARTH" value="1270" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="89" />
 				<run ground="220" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
+		<ai type="FIGHTER" aggroRange="300" isAggressive="true" />
 		<collision>
 			<radius normal="32.5" />
 			<height normal="61.35" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="33123" level="3" /> <!-- Darkest Night of Valley -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
+		</skillList>
 	</npc>
-	<npc id="24669" level="85" type="Folk" name="Dragon Officer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24669" level="122" type="Monster" name="Dragon Officer">
+		<race>DRAGON</race>
+		<sex>MALE</sex>
+		<acquire exp="637272" sp="574" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2524268" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="2524268" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="665659.901743584" magical="1444.35390697649" random="40" critical="4.75" accuracy="8" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5338.77216096896" magical="2047.72727463440" />
+			<attribute>
+				<defence fire="1220" water="1220" wind="1220" earth="1220" holy="1220" dark="1220" />
+				<attack type="EARTH" value="1270" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="92" />
 				<run ground="170" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="36.4" />
 			<height normal="69.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="33123" level="3" /> <!-- Darkest Night of Valley -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="100000" max="200000" chance="0.159" /> <!-- Adena -->
+				<item id="47494" min="1" max="1" chance="0.0005" /> <!-- Selenite -->
+				<item id="48065" min="1" max="1" chance="0.029" /> <!-- Zodiac Cube Fragment -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="35566" min="1" max="1" chance="0.00001" /> <!-- Dark Weapon Upgrade Stone -->
+				<item id="35567" min="1" max="1" chance="0.00001" /> <!-- Dark Armor Upgrade Stone -->
+				<item id="35568" min="1" max="1" chance="0.00001" /> <!-- Bloody Weapon Upgrade Stone -->
+				<item id="35569" min="1" max="1" chance="0.00001" /> <!-- Bloody Armor Upgrade Stone -->
+				<item id="81216" min="1" max="1" chance="2.857" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="4.568" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="4.568" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="4.568" /> <!-- Angel's Feather -->
+				<item id="48669" min="1" max="1" chance="0.00010" /> <!-- Angel's Necklace -->
+				<item id="48841" min="1" max="1" chance="0.00010" /> <!-- Angel's Earring -->
+				<item id="81154" min="1" max="1" chance="0.00010" /> <!-- Angel's Ring -->
+				<item id="17416" min="1" max="1" chance="0.00001" /> <!-- Helios Shaper -->
+				<item id="17417" min="1" max="1" chance="0.00001" /> <!-- Helios Cutter -->
+				<item id="17418" min="1" max="1" chance="0.00001" /> <!-- Helios Slasher -->
+				<item id="17419" min="1" max="1" chance="0.00001" /> <!-- Helios Avenger -->
+				<item id="17420" min="1" max="1" chance="0.00001" /> <!-- Helios Fighter -->
+				<item id="17421" min="1" max="1" chance="0.00001" /> <!-- Helios Stormer -->
+				<item id="17422" min="1" max="1" chance="0.00001" /> <!-- Helios Thrower -->
+				<item id="17423" min="1" max="1" chance="0.00001" /> <!-- Helios Guardian -->
+				<item id="17424" min="1" max="1" chance="0.00001" /> <!-- Helios Buster -->
+				<item id="17425" min="1" max="1" chance="0.00001" /> <!-- Helios Caster -->
+				<item id="17426" min="1" max="1" chance="0.00001" /> <!-- Helios Retributer -->
+				<item id="17427" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Swords -->
+				<item id="17428" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Daggers -->
+				<item id="17429" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Blunt Weapons -->
+				<item id="17430" min="1" max="1" chance="0.00006" /> <!-- Eternal Helmet - Heavy armor -->
+				<item id="17431" min="1" max="1" chance="0.00002" /> <!-- Eternal Breastplate - Heavy armor -->
+				<item id="17432" min="1" max="1" chance="0.00004" /> <!-- Eternal Gaiters - Heavy armor -->
+				<item id="17433" min="1" max="1" chance="0.00009" /> <!-- Eternal Gauntlets - Heavy armor -->
+				<item id="17434" min="1" max="1" chance="0.00009" /> <!-- Eternal Boots - Heavy armor -->
+				<item id="17435" min="1" max="1" chance="0.00009" /> <!-- Eternal Shield -->
+				<item id="17436" min="1" max="1" chance="0.00006" /> <!-- Eternal Leather Helmet - Light armor -->
+				<item id="17437" min="1" max="1" chance="0.00002" /> <!-- Eternal Leather Armor - Light armor -->
+				<item id="17438" min="1" max="1" chance="0.00004" /> <!-- Eternal Leather Leggings - Light armor -->
+				<item id="17439" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Gloves - Light armor -->
+				<item id="17440" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Boots - Light armor -->
+				<item id="17441" min="1" max="1" chance="0.00006" /> <!-- Eternal Circlet - Robe -->
+				<item id="17442" min="1" max="1" chance="0.00002" /> <!-- Eternal Tunic - Robe -->
+				<item id="17443" min="1" max="1" chance="0.00004" /> <!-- Eternal Stockings - Robe -->
+				<item id="17444" min="1" max="1" chance="0.00009" /> <!-- Eternal Gloves - Robe -->
+				<item id="17445" min="1" max="1" chance="0.00009" /> <!-- Eternal Shoes - Robe -->
+				<item id="17446" min="1" max="1" chance="0.00009" /> <!-- Eternal Sigil -->
+				<item id="80090" min="1" max="1" chance="0.00001" /> <!-- Krishna Shaper -->
+				<item id="80091" min="1" max="1" chance="0.00001" /> <!-- Krishna Cutter -->
+				<item id="80092" min="1" max="1" chance="0.00001" /> <!-- Krishna Slasher -->
+				<item id="80093" min="1" max="1" chance="0.00001" /> <!-- Krishna Avenger -->
+				<item id="80094" min="1" max="1" chance="0.00001" /> <!-- Krishna Fighter -->
+				<item id="80095" min="1" max="1" chance="0.00001" /> <!-- Krishna Stormer -->
+				<item id="80096" min="1" max="1" chance="0.00001" /> <!-- Krishna Thrower -->
+				<item id="80097" min="1" max="1" chance="0.00001" /> <!-- Krishna Guardian -->
+				<item id="80098" min="1" max="1" chance="0.00001" /> <!-- Krishna Buster -->
+				<item id="80099" min="1" max="1" chance="0.00001" /> <!-- Krishna Caster -->
+				<item id="80100" min="1" max="1" chance="0.00001" /> <!-- Krishna Retributer -->
+				<item id="80101" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="1" max="1" chance="0.00002" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="1" max="1" chance="0.00001" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="1" max="1" chance="0.00001" /> <!-- Leviathan Gaiters - Heavy armor -->
+				<item id="80107" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gauntlets - Heavy armor -->
+				<item id="80108" min="1" max="1" chance="0.00004" /> <!-- Leviathan Boots - Heavy armor -->
+				<item id="80109" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shield -->
+				<item id="80110" min="1" max="1" chance="0.00002" /> <!-- Leviathan Leather Helmet - Light armor -->
+				<item id="80111" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Armor - Light armor -->
+				<item id="80112" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Leggings - Light armor -->
+				<item id="80113" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Gloves - Light armor -->
+				<item id="80114" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Boots - Light armor -->
+				<item id="80115" min="1" max="1" chance="0.00002" /> <!-- Leviathan Circlet - Robe -->
+				<item id="80116" min="1" max="1" chance="0.00001" /> <!-- Leviathan Tunic - Robe -->
+				<item id="80117" min="1" max="1" chance="0.00001" /> <!-- Leviathan Stockings - Robe -->
+				<item id="80118" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gloves - Robe -->
+				<item id="80119" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shoes - Robe -->
+				<item id="80120" min="1" max="1" chance="0.00004" /> <!-- Leviathan Sigil -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="11.865" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24670" level="85" type="Folk" name="Dragon Beast">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24670" level="122" type="Monster" name="Dragon Beast">
+		<race>DRAGON</race>
+		<sex>MALE</sex>
+		<acquire exp="637272" sp="574" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2524268" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="2524268" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="665659.901743584" magical="1444.35390697649" random="40" critical="4.75" accuracy="8" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5338.77216096896" magical="2047.72727463440" />
+			<attribute>
+				<defence fire="1220" water="1220" wind="1220" earth="1220" holy="1220" dark="1220" />
+				<attack type="EARTH" value="1270" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="75.6" />
 			<height normal="65.4" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="33123" level="3" /> <!-- Darkest Night of Valley -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="100000" max="200000" chance="0.159" /> <!-- Adena -->
+				<item id="47494" min="1" max="1" chance="0.0005" /> <!-- Selenite -->
+				<item id="48065" min="1" max="1" chance="0.029" /> <!-- Zodiac Cube Fragment -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="35566" min="1" max="1" chance="0.00001" /> <!-- Dark Weapon Upgrade Stone -->
+				<item id="35567" min="1" max="1" chance="0.00001" /> <!-- Dark Armor Upgrade Stone -->
+				<item id="35568" min="1" max="1" chance="0.00001" /> <!-- Bloody Weapon Upgrade Stone -->
+				<item id="35569" min="1" max="1" chance="0.00001" /> <!-- Bloody Armor Upgrade Stone -->
+				<item id="81216" min="1" max="1" chance="2.857" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="4.568" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="4.568" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="4.568" /> <!-- Angel's Feather -->
+				<item id="48669" min="1" max="1" chance="0.00010" /> <!-- Angel's Necklace -->
+				<item id="48841" min="1" max="1" chance="0.00010" /> <!-- Angel's Earring -->
+				<item id="81154" min="1" max="1" chance="0.00010" /> <!-- Angel's Ring -->
+				<item id="17416" min="1" max="1" chance="0.00001" /> <!-- Helios Shaper -->
+				<item id="17417" min="1" max="1" chance="0.00001" /> <!-- Helios Cutter -->
+				<item id="17418" min="1" max="1" chance="0.00001" /> <!-- Helios Slasher -->
+				<item id="17419" min="1" max="1" chance="0.00001" /> <!-- Helios Avenger -->
+				<item id="17420" min="1" max="1" chance="0.00001" /> <!-- Helios Fighter -->
+				<item id="17421" min="1" max="1" chance="0.00001" /> <!-- Helios Stormer -->
+				<item id="17422" min="1" max="1" chance="0.00001" /> <!-- Helios Thrower -->
+				<item id="17423" min="1" max="1" chance="0.00001" /> <!-- Helios Guardian -->
+				<item id="17424" min="1" max="1" chance="0.00001" /> <!-- Helios Buster -->
+				<item id="17425" min="1" max="1" chance="0.00001" /> <!-- Helios Caster -->
+				<item id="17426" min="1" max="1" chance="0.00001" /> <!-- Helios Retributer -->
+				<item id="17427" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Swords -->
+				<item id="17428" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Daggers -->
+				<item id="17429" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Blunt Weapons -->
+				<item id="17430" min="1" max="1" chance="0.00006" /> <!-- Eternal Helmet - Heavy armor -->
+				<item id="17431" min="1" max="1" chance="0.00002" /> <!-- Eternal Breastplate - Heavy armor -->
+				<item id="17432" min="1" max="1" chance="0.00004" /> <!-- Eternal Gaiters - Heavy armor -->
+				<item id="17433" min="1" max="1" chance="0.00009" /> <!-- Eternal Gauntlets - Heavy armor -->
+				<item id="17434" min="1" max="1" chance="0.00009" /> <!-- Eternal Boots - Heavy armor -->
+				<item id="17435" min="1" max="1" chance="0.00009" /> <!-- Eternal Shield -->
+				<item id="17436" min="1" max="1" chance="0.00006" /> <!-- Eternal Leather Helmet - Light armor -->
+				<item id="17437" min="1" max="1" chance="0.00002" /> <!-- Eternal Leather Armor - Light armor -->
+				<item id="17438" min="1" max="1" chance="0.00004" /> <!-- Eternal Leather Leggings - Light armor -->
+				<item id="17439" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Gloves - Light armor -->
+				<item id="17440" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Boots - Light armor -->
+				<item id="17441" min="1" max="1" chance="0.00006" /> <!-- Eternal Circlet - Robe -->
+				<item id="17442" min="1" max="1" chance="0.00002" /> <!-- Eternal Tunic - Robe -->
+				<item id="17443" min="1" max="1" chance="0.00004" /> <!-- Eternal Stockings - Robe -->
+				<item id="17444" min="1" max="1" chance="0.00009" /> <!-- Eternal Gloves - Robe -->
+				<item id="17445" min="1" max="1" chance="0.00009" /> <!-- Eternal Shoes - Robe -->
+				<item id="17446" min="1" max="1" chance="0.00009" /> <!-- Eternal Sigil -->
+				<item id="80090" min="1" max="1" chance="0.00001" /> <!-- Krishna Shaper -->
+				<item id="80091" min="1" max="1" chance="0.00001" /> <!-- Krishna Cutter -->
+				<item id="80092" min="1" max="1" chance="0.00001" /> <!-- Krishna Slasher -->
+				<item id="80093" min="1" max="1" chance="0.00001" /> <!-- Krishna Avenger -->
+				<item id="80094" min="1" max="1" chance="0.00001" /> <!-- Krishna Fighter -->
+				<item id="80095" min="1" max="1" chance="0.00001" /> <!-- Krishna Stormer -->
+				<item id="80096" min="1" max="1" chance="0.00001" /> <!-- Krishna Thrower -->
+				<item id="80097" min="1" max="1" chance="0.00001" /> <!-- Krishna Guardian -->
+				<item id="80098" min="1" max="1" chance="0.00001" /> <!-- Krishna Buster -->
+				<item id="80099" min="1" max="1" chance="0.00001" /> <!-- Krishna Caster -->
+				<item id="80100" min="1" max="1" chance="0.00001" /> <!-- Krishna Retributer -->
+				<item id="80101" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="1" max="1" chance="0.00002" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="1" max="1" chance="0.00001" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="1" max="1" chance="0.00001" /> <!-- Leviathan Gaiters - Heavy armor -->
+				<item id="80107" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gauntlets - Heavy armor -->
+				<item id="80108" min="1" max="1" chance="0.00004" /> <!-- Leviathan Boots - Heavy armor -->
+				<item id="80109" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shield -->
+				<item id="80110" min="1" max="1" chance="0.00002" /> <!-- Leviathan Leather Helmet - Light armor -->
+				<item id="80111" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Armor - Light armor -->
+				<item id="80112" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Leggings - Light armor -->
+				<item id="80113" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Gloves - Light armor -->
+				<item id="80114" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Boots - Light armor -->
+				<item id="80115" min="1" max="1" chance="0.00002" /> <!-- Leviathan Circlet - Robe -->
+				<item id="80116" min="1" max="1" chance="0.00001" /> <!-- Leviathan Tunic - Robe -->
+				<item id="80117" min="1" max="1" chance="0.00001" /> <!-- Leviathan Stockings - Robe -->
+				<item id="80118" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gloves - Robe -->
+				<item id="80119" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shoes - Robe -->
+				<item id="80120" min="1" max="1" chance="0.00004" /> <!-- Leviathan Sigil -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="11.865" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24671" level="85" type="Folk" name="Dragon Centurion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24671" level="122" type="Monster" name="Dragon Centurion">
+		<race>DRAGON</race>
+		<sex>MALE</sex>
 		<equipment rhand="13978" /> <!-- Monster Only (Dragontroop Commander) -->
+		<acquire exp="637272" sp="574" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2524268" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="2524268" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="665659.901743584" magical="1444.35390697649" random="40" critical="4.75" accuracy="8" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5338.77216096896" magical="2047.72727463440" />
+			<attribute>
+				<defence fire="1220" water="1220" wind="1220" earth="1220" holy="1220" dark="1220" />
+				<attack type="EARTH" value="1270" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="55" />
 				<run ground="210" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="51" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="33123" level="3" /> <!-- Darkest Night of Valley -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="100000" max="200000" chance="0.159" /> <!-- Adena -->
+				<item id="47494" min="1" max="1" chance="0.0005" /> <!-- Selenite -->
+				<item id="48065" min="1" max="1" chance="0.029" /> <!-- Zodiac Cube Fragment -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="35566" min="1" max="1" chance="0.00001" /> <!-- Dark Weapon Upgrade Stone -->
+				<item id="35567" min="1" max="1" chance="0.00001" /> <!-- Dark Armor Upgrade Stone -->
+				<item id="35568" min="1" max="1" chance="0.00001" /> <!-- Bloody Weapon Upgrade Stone -->
+				<item id="35569" min="1" max="1" chance="0.00001" /> <!-- Bloody Armor Upgrade Stone -->
+				<item id="81216" min="1" max="1" chance="2.857" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="4.568" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="4.568" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="4.568" /> <!-- Angel's Feather -->
+				<item id="48669" min="1" max="1" chance="0.00010" /> <!-- Angel's Necklace -->
+				<item id="48841" min="1" max="1" chance="0.00010" /> <!-- Angel's Earring -->
+				<item id="81154" min="1" max="1" chance="0.00010" /> <!-- Angel's Ring -->
+				<item id="17416" min="1" max="1" chance="0.00001" /> <!-- Helios Shaper -->
+				<item id="17417" min="1" max="1" chance="0.00001" /> <!-- Helios Cutter -->
+				<item id="17418" min="1" max="1" chance="0.00001" /> <!-- Helios Slasher -->
+				<item id="17419" min="1" max="1" chance="0.00001" /> <!-- Helios Avenger -->
+				<item id="17420" min="1" max="1" chance="0.00001" /> <!-- Helios Fighter -->
+				<item id="17421" min="1" max="1" chance="0.00001" /> <!-- Helios Stormer -->
+				<item id="17422" min="1" max="1" chance="0.00001" /> <!-- Helios Thrower -->
+				<item id="17423" min="1" max="1" chance="0.00001" /> <!-- Helios Guardian -->
+				<item id="17424" min="1" max="1" chance="0.00001" /> <!-- Helios Buster -->
+				<item id="17425" min="1" max="1" chance="0.00001" /> <!-- Helios Caster -->
+				<item id="17426" min="1" max="1" chance="0.00001" /> <!-- Helios Retributer -->
+				<item id="17427" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Swords -->
+				<item id="17428" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Daggers -->
+				<item id="17429" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Blunt Weapons -->
+				<item id="17430" min="1" max="1" chance="0.00006" /> <!-- Eternal Helmet - Heavy armor -->
+				<item id="17431" min="1" max="1" chance="0.00002" /> <!-- Eternal Breastplate - Heavy armor -->
+				<item id="17432" min="1" max="1" chance="0.00004" /> <!-- Eternal Gaiters - Heavy armor -->
+				<item id="17433" min="1" max="1" chance="0.00009" /> <!-- Eternal Gauntlets - Heavy armor -->
+				<item id="17434" min="1" max="1" chance="0.00009" /> <!-- Eternal Boots - Heavy armor -->
+				<item id="17435" min="1" max="1" chance="0.00009" /> <!-- Eternal Shield -->
+				<item id="17436" min="1" max="1" chance="0.00006" /> <!-- Eternal Leather Helmet - Light armor -->
+				<item id="17437" min="1" max="1" chance="0.00002" /> <!-- Eternal Leather Armor - Light armor -->
+				<item id="17438" min="1" max="1" chance="0.00004" /> <!-- Eternal Leather Leggings - Light armor -->
+				<item id="17439" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Gloves - Light armor -->
+				<item id="17440" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Boots - Light armor -->
+				<item id="17441" min="1" max="1" chance="0.00006" /> <!-- Eternal Circlet - Robe -->
+				<item id="17442" min="1" max="1" chance="0.00002" /> <!-- Eternal Tunic - Robe -->
+				<item id="17443" min="1" max="1" chance="0.00004" /> <!-- Eternal Stockings - Robe -->
+				<item id="17444" min="1" max="1" chance="0.00009" /> <!-- Eternal Gloves - Robe -->
+				<item id="17445" min="1" max="1" chance="0.00009" /> <!-- Eternal Shoes - Robe -->
+				<item id="17446" min="1" max="1" chance="0.00009" /> <!-- Eternal Sigil -->
+				<item id="80090" min="1" max="1" chance="0.00001" /> <!-- Krishna Shaper -->
+				<item id="80091" min="1" max="1" chance="0.00001" /> <!-- Krishna Cutter -->
+				<item id="80092" min="1" max="1" chance="0.00001" /> <!-- Krishna Slasher -->
+				<item id="80093" min="1" max="1" chance="0.00001" /> <!-- Krishna Avenger -->
+				<item id="80094" min="1" max="1" chance="0.00001" /> <!-- Krishna Fighter -->
+				<item id="80095" min="1" max="1" chance="0.00001" /> <!-- Krishna Stormer -->
+				<item id="80096" min="1" max="1" chance="0.00001" /> <!-- Krishna Thrower -->
+				<item id="80097" min="1" max="1" chance="0.00001" /> <!-- Krishna Guardian -->
+				<item id="80098" min="1" max="1" chance="0.00001" /> <!-- Krishna Buster -->
+				<item id="80099" min="1" max="1" chance="0.00001" /> <!-- Krishna Caster -->
+				<item id="80100" min="1" max="1" chance="0.00001" /> <!-- Krishna Retributer -->
+				<item id="80101" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="1" max="1" chance="0.00002" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="1" max="1" chance="0.00001" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="1" max="1" chance="0.00001" /> <!-- Leviathan Gaiters - Heavy armor -->
+				<item id="80107" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gauntlets - Heavy armor -->
+				<item id="80108" min="1" max="1" chance="0.00004" /> <!-- Leviathan Boots - Heavy armor -->
+				<item id="80109" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shield -->
+				<item id="80110" min="1" max="1" chance="0.00002" /> <!-- Leviathan Leather Helmet - Light armor -->
+				<item id="80111" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Armor - Light armor -->
+				<item id="80112" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Leggings - Light armor -->
+				<item id="80113" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Gloves - Light armor -->
+				<item id="80114" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Boots - Light armor -->
+				<item id="80115" min="1" max="1" chance="0.00002" /> <!-- Leviathan Circlet - Robe -->
+				<item id="80116" min="1" max="1" chance="0.00001" /> <!-- Leviathan Tunic - Robe -->
+				<item id="80117" min="1" max="1" chance="0.00001" /> <!-- Leviathan Stockings - Robe -->
+				<item id="80118" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gloves - Robe -->
+				<item id="80119" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shoes - Robe -->
+				<item id="80120" min="1" max="1" chance="0.00004" /> <!-- Leviathan Sigil -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="11.865" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24672" level="85" type="Folk" name="Elite Dragon Guard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24672" level="122" type="Monster" name="Elite Dragon Guard">
+		<race>DRAGON</race>
+		<sex>MALE</sex>
+		<acquire exp="637272" sp="574" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2524268" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="2524268" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="665659.901743584" magical="1444.35390697649" random="40" critical="4.75" accuracy="8" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5338.77216096896" magical="2047.72727463440" />
+			<attribute>
+				<defence fire="1220" water="1220" wind="1220" earth="1220" holy="1220" dark="1220" />
+				<attack type="EARTH" value="1270" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="100" />
 				<run ground="200" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="40" />
 			<height normal="55" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="33123" level="3" /> <!-- Darkest Night of Valley -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="100000" max="200000" chance="0.159" /> <!-- Adena -->
+				<item id="47494" min="1" max="1" chance="0.0005" /> <!-- Selenite -->
+				<item id="48065" min="1" max="1" chance="0.029" /> <!-- Zodiac Cube Fragment -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="35566" min="1" max="1" chance="0.00001" /> <!-- Dark Weapon Upgrade Stone -->
+				<item id="35567" min="1" max="1" chance="0.00001" /> <!-- Dark Armor Upgrade Stone -->
+				<item id="35568" min="1" max="1" chance="0.00001" /> <!-- Bloody Weapon Upgrade Stone -->
+				<item id="35569" min="1" max="1" chance="0.00001" /> <!-- Bloody Armor Upgrade Stone -->
+				<item id="81216" min="1" max="1" chance="2.857" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="4.568" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="4.568" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="4.568" /> <!-- Angel's Feather -->
+				<item id="48669" min="1" max="1" chance="0.00010" /> <!-- Angel's Necklace -->
+				<item id="48841" min="1" max="1" chance="0.00010" /> <!-- Angel's Earring -->
+				<item id="81154" min="1" max="1" chance="0.00010" /> <!-- Angel's Ring -->
+				<item id="17416" min="1" max="1" chance="0.00001" /> <!-- Helios Shaper -->
+				<item id="17417" min="1" max="1" chance="0.00001" /> <!-- Helios Cutter -->
+				<item id="17418" min="1" max="1" chance="0.00001" /> <!-- Helios Slasher -->
+				<item id="17419" min="1" max="1" chance="0.00001" /> <!-- Helios Avenger -->
+				<item id="17420" min="1" max="1" chance="0.00001" /> <!-- Helios Fighter -->
+				<item id="17421" min="1" max="1" chance="0.00001" /> <!-- Helios Stormer -->
+				<item id="17422" min="1" max="1" chance="0.00001" /> <!-- Helios Thrower -->
+				<item id="17423" min="1" max="1" chance="0.00001" /> <!-- Helios Guardian -->
+				<item id="17424" min="1" max="1" chance="0.00001" /> <!-- Helios Buster -->
+				<item id="17425" min="1" max="1" chance="0.00001" /> <!-- Helios Caster -->
+				<item id="17426" min="1" max="1" chance="0.00001" /> <!-- Helios Retributer -->
+				<item id="17427" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Swords -->
+				<item id="17428" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Daggers -->
+				<item id="17429" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Blunt Weapons -->
+				<item id="17430" min="1" max="1" chance="0.00006" /> <!-- Eternal Helmet - Heavy armor -->
+				<item id="17431" min="1" max="1" chance="0.00002" /> <!-- Eternal Breastplate - Heavy armor -->
+				<item id="17432" min="1" max="1" chance="0.00004" /> <!-- Eternal Gaiters - Heavy armor -->
+				<item id="17433" min="1" max="1" chance="0.00009" /> <!-- Eternal Gauntlets - Heavy armor -->
+				<item id="17434" min="1" max="1" chance="0.00009" /> <!-- Eternal Boots - Heavy armor -->
+				<item id="17435" min="1" max="1" chance="0.00009" /> <!-- Eternal Shield -->
+				<item id="17436" min="1" max="1" chance="0.00006" /> <!-- Eternal Leather Helmet - Light armor -->
+				<item id="17437" min="1" max="1" chance="0.00002" /> <!-- Eternal Leather Armor - Light armor -->
+				<item id="17438" min="1" max="1" chance="0.00004" /> <!-- Eternal Leather Leggings - Light armor -->
+				<item id="17439" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Gloves - Light armor -->
+				<item id="17440" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Boots - Light armor -->
+				<item id="17441" min="1" max="1" chance="0.00006" /> <!-- Eternal Circlet - Robe -->
+				<item id="17442" min="1" max="1" chance="0.00002" /> <!-- Eternal Tunic - Robe -->
+				<item id="17443" min="1" max="1" chance="0.00004" /> <!-- Eternal Stockings - Robe -->
+				<item id="17444" min="1" max="1" chance="0.00009" /> <!-- Eternal Gloves - Robe -->
+				<item id="17445" min="1" max="1" chance="0.00009" /> <!-- Eternal Shoes - Robe -->
+				<item id="17446" min="1" max="1" chance="0.00009" /> <!-- Eternal Sigil -->
+				<item id="80090" min="1" max="1" chance="0.00001" /> <!-- Krishna Shaper -->
+				<item id="80091" min="1" max="1" chance="0.00001" /> <!-- Krishna Cutter -->
+				<item id="80092" min="1" max="1" chance="0.00001" /> <!-- Krishna Slasher -->
+				<item id="80093" min="1" max="1" chance="0.00001" /> <!-- Krishna Avenger -->
+				<item id="80094" min="1" max="1" chance="0.00001" /> <!-- Krishna Fighter -->
+				<item id="80095" min="1" max="1" chance="0.00001" /> <!-- Krishna Stormer -->
+				<item id="80096" min="1" max="1" chance="0.00001" /> <!-- Krishna Thrower -->
+				<item id="80097" min="1" max="1" chance="0.00001" /> <!-- Krishna Guardian -->
+				<item id="80098" min="1" max="1" chance="0.00001" /> <!-- Krishna Buster -->
+				<item id="80099" min="1" max="1" chance="0.00001" /> <!-- Krishna Caster -->
+				<item id="80100" min="1" max="1" chance="0.00001" /> <!-- Krishna Retributer -->
+				<item id="80101" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="1" max="1" chance="0.00002" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="1" max="1" chance="0.00001" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="1" max="1" chance="0.00001" /> <!-- Leviathan Gaiters - Heavy armor -->
+				<item id="80107" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gauntlets - Heavy armor -->
+				<item id="80108" min="1" max="1" chance="0.00004" /> <!-- Leviathan Boots - Heavy armor -->
+				<item id="80109" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shield -->
+				<item id="80110" min="1" max="1" chance="0.00002" /> <!-- Leviathan Leather Helmet - Light armor -->
+				<item id="80111" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Armor - Light armor -->
+				<item id="80112" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Leggings - Light armor -->
+				<item id="80113" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Gloves - Light armor -->
+				<item id="80114" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Boots - Light armor -->
+				<item id="80115" min="1" max="1" chance="0.00002" /> <!-- Leviathan Circlet - Robe -->
+				<item id="80116" min="1" max="1" chance="0.00001" /> <!-- Leviathan Tunic - Robe -->
+				<item id="80117" min="1" max="1" chance="0.00001" /> <!-- Leviathan Stockings - Robe -->
+				<item id="80118" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gloves - Robe -->
+				<item id="80119" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shoes - Robe -->
+				<item id="80120" min="1" max="1" chance="0.00004" /> <!-- Leviathan Sigil -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="11.865" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24673" level="85" type="Folk" name="Zombie Orc">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24673" level="126" type="Monster" name="Zombie Orc">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="891007" sp="802" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5838786" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="5838786" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="753514.268097518" magical="1743.76790583647" random="50" critical="4.75" accuracy="9" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="6057.47663551402" magical="2350.44514357978" />
+			<attribute>
+				<defence fire="1260" water="1260" wind="1260" earth="1260" holy="1260" dark="1260" />
+				<attack type="DARK" value="1310" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="35" />
 				<run ground="220" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="22" />
 			<height normal="53" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="34475" level="1" /> <!-- Night in the Execution Grounds -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="100000" max="200000" chance="0.159" /> <!-- Adena -->
+				<item id="47494" min="1" max="1" chance="0.0005" /> <!-- Selenite -->
+				<item id="48065" min="1" max="1" chance="0.029" /> <!-- Zodiac Cube Fragment -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="35566" min="1" max="1" chance="0.00001" /> <!-- Dark Weapon Upgrade Stone -->
+				<item id="35567" min="1" max="1" chance="0.00001" /> <!-- Dark Armor Upgrade Stone -->
+				<item id="35568" min="1" max="1" chance="0.00001" /> <!-- Bloody Weapon Upgrade Stone -->
+				<item id="35569" min="1" max="1" chance="0.00001" /> <!-- Bloody Armor Upgrade Stone -->
+				<item id="81216" min="1" max="1" chance="3.322" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="5.31" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="5.31" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="5.31" /> <!-- Angel's Feather -->
+				<item id="48669" min="1" max="1" chance="0.00010" /> <!-- Angel's Necklace -->
+				<item id="48841" min="1" max="1" chance="0.00010" /> <!-- Angel's Earring -->
+				<item id="81154" min="1" max="1" chance="0.00010" /> <!-- Angel's Ring -->
+				<item id="17416" min="1" max="1" chance="0.00001" /> <!-- Helios Shaper -->
+				<item id="17417" min="1" max="1" chance="0.00001" /> <!-- Helios Cutter -->
+				<item id="17418" min="1" max="1" chance="0.00001" /> <!-- Helios Slasher -->
+				<item id="17419" min="1" max="1" chance="0.00001" /> <!-- Helios Avenger -->
+				<item id="17420" min="1" max="1" chance="0.00001" /> <!-- Helios Fighter -->
+				<item id="17421" min="1" max="1" chance="0.00001" /> <!-- Helios Stormer -->
+				<item id="17422" min="1" max="1" chance="0.00001" /> <!-- Helios Thrower -->
+				<item id="17423" min="1" max="1" chance="0.00001" /> <!-- Helios Guardian -->
+				<item id="17424" min="1" max="1" chance="0.00001" /> <!-- Helios Buster -->
+				<item id="17425" min="1" max="1" chance="0.00001" /> <!-- Helios Caster -->
+				<item id="17426" min="1" max="1" chance="0.00001" /> <!-- Helios Retributer -->
+				<item id="17427" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Swords -->
+				<item id="17428" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Daggers -->
+				<item id="17429" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Blunt Weapons -->
+				<item id="17430" min="1" max="1" chance="0.00006" /> <!-- Eternal Helmet - Heavy armor -->
+				<item id="17431" min="1" max="1" chance="0.00002" /> <!-- Eternal Breastplate - Heavy armor -->
+				<item id="17432" min="1" max="1" chance="0.00004" /> <!-- Eternal Gaiters - Heavy armor -->
+				<item id="17433" min="1" max="1" chance="0.00009" /> <!-- Eternal Gauntlets - Heavy armor -->
+				<item id="17434" min="1" max="1" chance="0.00009" /> <!-- Eternal Boots - Heavy armor -->
+				<item id="17435" min="1" max="1" chance="0.00009" /> <!-- Eternal Shield -->
+				<item id="17436" min="1" max="1" chance="0.00006" /> <!-- Eternal Leather Helmet - Light armor -->
+				<item id="17437" min="1" max="1" chance="0.00002" /> <!-- Eternal Leather Armor - Light armor -->
+				<item id="17438" min="1" max="1" chance="0.00004" /> <!-- Eternal Leather Leggings - Light armor -->
+				<item id="17439" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Gloves - Light armor -->
+				<item id="17440" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Boots - Light armor -->
+				<item id="17441" min="1" max="1" chance="0.00006" /> <!-- Eternal Circlet - Robe -->
+				<item id="17442" min="1" max="1" chance="0.00002" /> <!-- Eternal Tunic - Robe -->
+				<item id="17443" min="1" max="1" chance="0.00004" /> <!-- Eternal Stockings - Robe -->
+				<item id="17444" min="1" max="1" chance="0.00009" /> <!-- Eternal Gloves - Robe -->
+				<item id="17445" min="1" max="1" chance="0.00009" /> <!-- Eternal Shoes - Robe -->
+				<item id="17446" min="1" max="1" chance="0.00009" /> <!-- Eternal Sigil -->
+				<item id="80090" min="1" max="1" chance="0.00001" /> <!-- Krishna Shaper -->
+				<item id="80091" min="1" max="1" chance="0.00001" /> <!-- Krishna Cutter -->
+				<item id="80092" min="1" max="1" chance="0.00001" /> <!-- Krishna Slasher -->
+				<item id="80093" min="1" max="1" chance="0.00001" /> <!-- Krishna Avenger -->
+				<item id="80094" min="1" max="1" chance="0.00001" /> <!-- Krishna Fighter -->
+				<item id="80095" min="1" max="1" chance="0.00001" /> <!-- Krishna Stormer -->
+				<item id="80096" min="1" max="1" chance="0.00001" /> <!-- Krishna Thrower -->
+				<item id="80097" min="1" max="1" chance="0.00001" /> <!-- Krishna Guardian -->
+				<item id="80098" min="1" max="1" chance="0.00001" /> <!-- Krishna Buster -->
+				<item id="80099" min="1" max="1" chance="0.00001" /> <!-- Krishna Caster -->
+				<item id="80100" min="1" max="1" chance="0.00001" /> <!-- Krishna Retributer -->
+				<item id="80101" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="1" max="1" chance="0.00002" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="1" max="1" chance="0.00001" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="1" max="1" chance="0.00001" /> <!-- Leviathan Gaiters - Heavy armor -->
+				<item id="80107" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gauntlets - Heavy armor -->
+				<item id="80108" min="1" max="1" chance="0.00004" /> <!-- Leviathan Boots - Heavy armor -->
+				<item id="80109" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shield -->
+				<item id="80110" min="1" max="1" chance="0.00002" /> <!-- Leviathan Leather Helmet - Light armor -->
+				<item id="80111" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Armor - Light armor -->
+				<item id="80112" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Leggings - Light armor -->
+				<item id="80113" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Gloves - Light armor -->
+				<item id="80114" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Boots - Light armor -->
+				<item id="80115" min="1" max="1" chance="0.00002" /> <!-- Leviathan Circlet - Robe -->
+				<item id="80116" min="1" max="1" chance="0.00001" /> <!-- Leviathan Tunic - Robe -->
+				<item id="80117" min="1" max="1" chance="0.00001" /> <!-- Leviathan Stockings - Robe -->
+				<item id="80118" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gloves - Robe -->
+				<item id="80119" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shoes - Robe -->
+				<item id="80120" min="1" max="1" chance="0.00004" /> <!-- Leviathan Sigil -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="13.794" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24674" level="85" type="Folk" name="Zombie Dark Elf">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24674" level="126" type="Monster" name="Zombie Dark Elf">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="891007" sp="802" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5838786" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="5838786" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="753514.268097518" magical="1743.76790583647" random="50" critical="4.75" accuracy="9" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="6057.47663551402" magical="2350.44514357978" />
+			<attribute>
+				<defence fire="1260" water="1260" wind="1260" earth="1260" holy="1260" dark="1260" />
+				<attack type="DARK" value="1310" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="45" />
 				<run ground="160" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="43" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="34475" level="1" /> <!-- Night in the Execution Grounds -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="100000" max="200000" chance="0.159" /> <!-- Adena -->
+				<item id="47494" min="1" max="1" chance="0.0005" /> <!-- Selenite -->
+				<item id="48065" min="1" max="1" chance="0.029" /> <!-- Zodiac Cube Fragment -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="35566" min="1" max="1" chance="0.00001" /> <!-- Dark Weapon Upgrade Stone -->
+				<item id="35567" min="1" max="1" chance="0.00001" /> <!-- Dark Armor Upgrade Stone -->
+				<item id="35568" min="1" max="1" chance="0.00001" /> <!-- Bloody Weapon Upgrade Stone -->
+				<item id="35569" min="1" max="1" chance="0.00001" /> <!-- Bloody Armor Upgrade Stone -->
+				<item id="81216" min="1" max="1" chance="3.322" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="5.31" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="5.31" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="5.31" /> <!-- Angel's Feather -->
+				<item id="48669" min="1" max="1" chance="0.00010" /> <!-- Angel's Necklace -->
+				<item id="48841" min="1" max="1" chance="0.00010" /> <!-- Angel's Earring -->
+				<item id="81154" min="1" max="1" chance="0.00010" /> <!-- Angel's Ring -->
+				<item id="17416" min="1" max="1" chance="0.00001" /> <!-- Helios Shaper -->
+				<item id="17417" min="1" max="1" chance="0.00001" /> <!-- Helios Cutter -->
+				<item id="17418" min="1" max="1" chance="0.00001" /> <!-- Helios Slasher -->
+				<item id="17419" min="1" max="1" chance="0.00001" /> <!-- Helios Avenger -->
+				<item id="17420" min="1" max="1" chance="0.00001" /> <!-- Helios Fighter -->
+				<item id="17421" min="1" max="1" chance="0.00001" /> <!-- Helios Stormer -->
+				<item id="17422" min="1" max="1" chance="0.00001" /> <!-- Helios Thrower -->
+				<item id="17423" min="1" max="1" chance="0.00001" /> <!-- Helios Guardian -->
+				<item id="17424" min="1" max="1" chance="0.00001" /> <!-- Helios Buster -->
+				<item id="17425" min="1" max="1" chance="0.00001" /> <!-- Helios Caster -->
+				<item id="17426" min="1" max="1" chance="0.00001" /> <!-- Helios Retributer -->
+				<item id="17427" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Swords -->
+				<item id="17428" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Daggers -->
+				<item id="17429" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Blunt Weapons -->
+				<item id="17430" min="1" max="1" chance="0.00006" /> <!-- Eternal Helmet - Heavy armor -->
+				<item id="17431" min="1" max="1" chance="0.00002" /> <!-- Eternal Breastplate - Heavy armor -->
+				<item id="17432" min="1" max="1" chance="0.00004" /> <!-- Eternal Gaiters - Heavy armor -->
+				<item id="17433" min="1" max="1" chance="0.00009" /> <!-- Eternal Gauntlets - Heavy armor -->
+				<item id="17434" min="1" max="1" chance="0.00009" /> <!-- Eternal Boots - Heavy armor -->
+				<item id="17435" min="1" max="1" chance="0.00009" /> <!-- Eternal Shield -->
+				<item id="17436" min="1" max="1" chance="0.00006" /> <!-- Eternal Leather Helmet - Light armor -->
+				<item id="17437" min="1" max="1" chance="0.00002" /> <!-- Eternal Leather Armor - Light armor -->
+				<item id="17438" min="1" max="1" chance="0.00004" /> <!-- Eternal Leather Leggings - Light armor -->
+				<item id="17439" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Gloves - Light armor -->
+				<item id="17440" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Boots - Light armor -->
+				<item id="17441" min="1" max="1" chance="0.00006" /> <!-- Eternal Circlet - Robe -->
+				<item id="17442" min="1" max="1" chance="0.00002" /> <!-- Eternal Tunic - Robe -->
+				<item id="17443" min="1" max="1" chance="0.00004" /> <!-- Eternal Stockings - Robe -->
+				<item id="17444" min="1" max="1" chance="0.00009" /> <!-- Eternal Gloves - Robe -->
+				<item id="17445" min="1" max="1" chance="0.00009" /> <!-- Eternal Shoes - Robe -->
+				<item id="17446" min="1" max="1" chance="0.00009" /> <!-- Eternal Sigil -->
+				<item id="80090" min="1" max="1" chance="0.00001" /> <!-- Krishna Shaper -->
+				<item id="80091" min="1" max="1" chance="0.00001" /> <!-- Krishna Cutter -->
+				<item id="80092" min="1" max="1" chance="0.00001" /> <!-- Krishna Slasher -->
+				<item id="80093" min="1" max="1" chance="0.00001" /> <!-- Krishna Avenger -->
+				<item id="80094" min="1" max="1" chance="0.00001" /> <!-- Krishna Fighter -->
+				<item id="80095" min="1" max="1" chance="0.00001" /> <!-- Krishna Stormer -->
+				<item id="80096" min="1" max="1" chance="0.00001" /> <!-- Krishna Thrower -->
+				<item id="80097" min="1" max="1" chance="0.00001" /> <!-- Krishna Guardian -->
+				<item id="80098" min="1" max="1" chance="0.00001" /> <!-- Krishna Buster -->
+				<item id="80099" min="1" max="1" chance="0.00001" /> <!-- Krishna Caster -->
+				<item id="80100" min="1" max="1" chance="0.00001" /> <!-- Krishna Retributer -->
+				<item id="80101" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="1" max="1" chance="0.00002" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="1" max="1" chance="0.00001" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="1" max="1" chance="0.00001" /> <!-- Leviathan Gaiters - Heavy armor -->
+				<item id="80107" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gauntlets - Heavy armor -->
+				<item id="80108" min="1" max="1" chance="0.00004" /> <!-- Leviathan Boots - Heavy armor -->
+				<item id="80109" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shield -->
+				<item id="80110" min="1" max="1" chance="0.00002" /> <!-- Leviathan Leather Helmet - Light armor -->
+				<item id="80111" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Armor - Light armor -->
+				<item id="80112" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Leggings - Light armor -->
+				<item id="80113" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Gloves - Light armor -->
+				<item id="80114" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Boots - Light armor -->
+				<item id="80115" min="1" max="1" chance="0.00002" /> <!-- Leviathan Circlet - Robe -->
+				<item id="80116" min="1" max="1" chance="0.00001" /> <!-- Leviathan Tunic - Robe -->
+				<item id="80117" min="1" max="1" chance="0.00001" /> <!-- Leviathan Stockings - Robe -->
+				<item id="80118" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gloves - Robe -->
+				<item id="80119" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shoes - Robe -->
+				<item id="80120" min="1" max="1" chance="0.00004" /> <!-- Leviathan Sigil -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="13.794" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24675" level="85" type="Folk" name="Zombie Dwarf">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24675" level="126" type="Monster" name="Zombie Dwarf">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="891007" sp="802" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5838786" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="5838786" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="753514.268097518" magical="1743.76790583647" random="50" critical="4.75" accuracy="9" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="6057.47663551402" magical="2350.44514357978" />
+			<attribute>
+				<defence fire="1260" water="1260" wind="1260" earth="1260" holy="1260" dark="1260" />
+				<attack type="DARK" value="1310" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="35" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="16" />
 			<height normal="35" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="34475" level="1" /> <!-- Night in the Execution Grounds -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="100000" max="200000" chance="0.159" /> <!-- Adena -->
+				<item id="47494" min="1" max="1" chance="0.0005" /> <!-- Selenite -->
+				<item id="48065" min="1" max="1" chance="0.029" /> <!-- Zodiac Cube Fragment -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="35566" min="1" max="1" chance="0.00001" /> <!-- Dark Weapon Upgrade Stone -->
+				<item id="35567" min="1" max="1" chance="0.00001" /> <!-- Dark Armor Upgrade Stone -->
+				<item id="35568" min="1" max="1" chance="0.00001" /> <!-- Bloody Weapon Upgrade Stone -->
+				<item id="35569" min="1" max="1" chance="0.00001" /> <!-- Bloody Armor Upgrade Stone -->
+				<item id="81216" min="1" max="1" chance="3.322" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="5.31" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="5.31" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="5.31" /> <!-- Angel's Feather -->
+				<item id="48669" min="1" max="1" chance="0.00010" /> <!-- Angel's Necklace -->
+				<item id="48841" min="1" max="1" chance="0.00010" /> <!-- Angel's Earring -->
+				<item id="81154" min="1" max="1" chance="0.00010" /> <!-- Angel's Ring -->
+				<item id="17416" min="1" max="1" chance="0.00001" /> <!-- Helios Shaper -->
+				<item id="17417" min="1" max="1" chance="0.00001" /> <!-- Helios Cutter -->
+				<item id="17418" min="1" max="1" chance="0.00001" /> <!-- Helios Slasher -->
+				<item id="17419" min="1" max="1" chance="0.00001" /> <!-- Helios Avenger -->
+				<item id="17420" min="1" max="1" chance="0.00001" /> <!-- Helios Fighter -->
+				<item id="17421" min="1" max="1" chance="0.00001" /> <!-- Helios Stormer -->
+				<item id="17422" min="1" max="1" chance="0.00001" /> <!-- Helios Thrower -->
+				<item id="17423" min="1" max="1" chance="0.00001" /> <!-- Helios Guardian -->
+				<item id="17424" min="1" max="1" chance="0.00001" /> <!-- Helios Buster -->
+				<item id="17425" min="1" max="1" chance="0.00001" /> <!-- Helios Caster -->
+				<item id="17426" min="1" max="1" chance="0.00001" /> <!-- Helios Retributer -->
+				<item id="17427" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Swords -->
+				<item id="17428" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Daggers -->
+				<item id="17429" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Blunt Weapons -->
+				<item id="17430" min="1" max="1" chance="0.00006" /> <!-- Eternal Helmet - Heavy armor -->
+				<item id="17431" min="1" max="1" chance="0.00002" /> <!-- Eternal Breastplate - Heavy armor -->
+				<item id="17432" min="1" max="1" chance="0.00004" /> <!-- Eternal Gaiters - Heavy armor -->
+				<item id="17433" min="1" max="1" chance="0.00009" /> <!-- Eternal Gauntlets - Heavy armor -->
+				<item id="17434" min="1" max="1" chance="0.00009" /> <!-- Eternal Boots - Heavy armor -->
+				<item id="17435" min="1" max="1" chance="0.00009" /> <!-- Eternal Shield -->
+				<item id="17436" min="1" max="1" chance="0.00006" /> <!-- Eternal Leather Helmet - Light armor -->
+				<item id="17437" min="1" max="1" chance="0.00002" /> <!-- Eternal Leather Armor - Light armor -->
+				<item id="17438" min="1" max="1" chance="0.00004" /> <!-- Eternal Leather Leggings - Light armor -->
+				<item id="17439" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Gloves - Light armor -->
+				<item id="17440" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Boots - Light armor -->
+				<item id="17441" min="1" max="1" chance="0.00006" /> <!-- Eternal Circlet - Robe -->
+				<item id="17442" min="1" max="1" chance="0.00002" /> <!-- Eternal Tunic - Robe -->
+				<item id="17443" min="1" max="1" chance="0.00004" /> <!-- Eternal Stockings - Robe -->
+				<item id="17444" min="1" max="1" chance="0.00009" /> <!-- Eternal Gloves - Robe -->
+				<item id="17445" min="1" max="1" chance="0.00009" /> <!-- Eternal Shoes - Robe -->
+				<item id="17446" min="1" max="1" chance="0.00009" /> <!-- Eternal Sigil -->
+				<item id="80090" min="1" max="1" chance="0.00001" /> <!-- Krishna Shaper -->
+				<item id="80091" min="1" max="1" chance="0.00001" /> <!-- Krishna Cutter -->
+				<item id="80092" min="1" max="1" chance="0.00001" /> <!-- Krishna Slasher -->
+				<item id="80093" min="1" max="1" chance="0.00001" /> <!-- Krishna Avenger -->
+				<item id="80094" min="1" max="1" chance="0.00001" /> <!-- Krishna Fighter -->
+				<item id="80095" min="1" max="1" chance="0.00001" /> <!-- Krishna Stormer -->
+				<item id="80096" min="1" max="1" chance="0.00001" /> <!-- Krishna Thrower -->
+				<item id="80097" min="1" max="1" chance="0.00001" /> <!-- Krishna Guardian -->
+				<item id="80098" min="1" max="1" chance="0.00001" /> <!-- Krishna Buster -->
+				<item id="80099" min="1" max="1" chance="0.00001" /> <!-- Krishna Caster -->
+				<item id="80100" min="1" max="1" chance="0.00001" /> <!-- Krishna Retributer -->
+				<item id="80101" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="1" max="1" chance="0.00002" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="1" max="1" chance="0.00001" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="1" max="1" chance="0.00001" /> <!-- Leviathan Gaiters - Heavy armor -->
+				<item id="80107" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gauntlets - Heavy armor -->
+				<item id="80108" min="1" max="1" chance="0.00004" /> <!-- Leviathan Boots - Heavy armor -->
+				<item id="80109" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shield -->
+				<item id="80110" min="1" max="1" chance="0.00002" /> <!-- Leviathan Leather Helmet - Light armor -->
+				<item id="80111" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Armor - Light armor -->
+				<item id="80112" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Leggings - Light armor -->
+				<item id="80113" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Gloves - Light armor -->
+				<item id="80114" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Boots - Light armor -->
+				<item id="80115" min="1" max="1" chance="0.00002" /> <!-- Leviathan Circlet - Robe -->
+				<item id="80116" min="1" max="1" chance="0.00001" /> <!-- Leviathan Tunic - Robe -->
+				<item id="80117" min="1" max="1" chance="0.00001" /> <!-- Leviathan Stockings - Robe -->
+				<item id="80118" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gloves - Robe -->
+				<item id="80119" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shoes - Robe -->
+				<item id="80120" min="1" max="1" chance="0.00004" /> <!-- Leviathan Sigil -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="13.794" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24676" level="85" type="Folk" name="Schnabel Stalker">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24676" level="126" type="Monster" name="Schnabel Stalker">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="891007" sp="802" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5838786" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="5838786" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="753514.268097518" magical="1743.76790583647" random="50" critical="4.75" accuracy="9" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="6057.47663551402" magical="2350.44514357978" />
+			<attribute>
+				<defence fire="1260" water="1260" wind="1260" earth="1260" holy="1260" dark="1260" />
+				<attack type="DARK" value="1310" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="75" />
 				<run ground="210" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="18" />
 			<height normal="60" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="34475" level="1" /> <!-- Night in the Execution Grounds -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="100000" max="200000" chance="0.159" /> <!-- Adena -->
+				<item id="47494" min="1" max="1" chance="0.0005" /> <!-- Selenite -->
+				<item id="48065" min="1" max="1" chance="0.029" /> <!-- Zodiac Cube Fragment -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="35566" min="1" max="1" chance="0.00001" /> <!-- Dark Weapon Upgrade Stone -->
+				<item id="35567" min="1" max="1" chance="0.00001" /> <!-- Dark Armor Upgrade Stone -->
+				<item id="35568" min="1" max="1" chance="0.00001" /> <!-- Bloody Weapon Upgrade Stone -->
+				<item id="35569" min="1" max="1" chance="0.00001" /> <!-- Bloody Armor Upgrade Stone -->
+				<item id="81216" min="1" max="1" chance="3.322" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="5.31" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="5.31" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="5.31" /> <!-- Angel's Feather -->
+				<item id="48669" min="1" max="1" chance="0.00010" /> <!-- Angel's Necklace -->
+				<item id="48841" min="1" max="1" chance="0.00010" /> <!-- Angel's Earring -->
+				<item id="81154" min="1" max="1" chance="0.00010" /> <!-- Angel's Ring -->
+				<item id="17416" min="1" max="1" chance="0.00001" /> <!-- Helios Shaper -->
+				<item id="17417" min="1" max="1" chance="0.00001" /> <!-- Helios Cutter -->
+				<item id="17418" min="1" max="1" chance="0.00001" /> <!-- Helios Slasher -->
+				<item id="17419" min="1" max="1" chance="0.00001" /> <!-- Helios Avenger -->
+				<item id="17420" min="1" max="1" chance="0.00001" /> <!-- Helios Fighter -->
+				<item id="17421" min="1" max="1" chance="0.00001" /> <!-- Helios Stormer -->
+				<item id="17422" min="1" max="1" chance="0.00001" /> <!-- Helios Thrower -->
+				<item id="17423" min="1" max="1" chance="0.00001" /> <!-- Helios Guardian -->
+				<item id="17424" min="1" max="1" chance="0.00001" /> <!-- Helios Buster -->
+				<item id="17425" min="1" max="1" chance="0.00001" /> <!-- Helios Caster -->
+				<item id="17426" min="1" max="1" chance="0.00001" /> <!-- Helios Retributer -->
+				<item id="17427" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Swords -->
+				<item id="17428" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Daggers -->
+				<item id="17429" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Blunt Weapons -->
+				<item id="17430" min="1" max="1" chance="0.00006" /> <!-- Eternal Helmet - Heavy armor -->
+				<item id="17431" min="1" max="1" chance="0.00002" /> <!-- Eternal Breastplate - Heavy armor -->
+				<item id="17432" min="1" max="1" chance="0.00004" /> <!-- Eternal Gaiters - Heavy armor -->
+				<item id="17433" min="1" max="1" chance="0.00009" /> <!-- Eternal Gauntlets - Heavy armor -->
+				<item id="17434" min="1" max="1" chance="0.00009" /> <!-- Eternal Boots - Heavy armor -->
+				<item id="17435" min="1" max="1" chance="0.00009" /> <!-- Eternal Shield -->
+				<item id="17436" min="1" max="1" chance="0.00006" /> <!-- Eternal Leather Helmet - Light armor -->
+				<item id="17437" min="1" max="1" chance="0.00002" /> <!-- Eternal Leather Armor - Light armor -->
+				<item id="17438" min="1" max="1" chance="0.00004" /> <!-- Eternal Leather Leggings - Light armor -->
+				<item id="17439" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Gloves - Light armor -->
+				<item id="17440" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Boots - Light armor -->
+				<item id="17441" min="1" max="1" chance="0.00006" /> <!-- Eternal Circlet - Robe -->
+				<item id="17442" min="1" max="1" chance="0.00002" /> <!-- Eternal Tunic - Robe -->
+				<item id="17443" min="1" max="1" chance="0.00004" /> <!-- Eternal Stockings - Robe -->
+				<item id="17444" min="1" max="1" chance="0.00009" /> <!-- Eternal Gloves - Robe -->
+				<item id="17445" min="1" max="1" chance="0.00009" /> <!-- Eternal Shoes - Robe -->
+				<item id="17446" min="1" max="1" chance="0.00009" /> <!-- Eternal Sigil -->
+				<item id="80090" min="1" max="1" chance="0.00001" /> <!-- Krishna Shaper -->
+				<item id="80091" min="1" max="1" chance="0.00001" /> <!-- Krishna Cutter -->
+				<item id="80092" min="1" max="1" chance="0.00001" /> <!-- Krishna Slasher -->
+				<item id="80093" min="1" max="1" chance="0.00001" /> <!-- Krishna Avenger -->
+				<item id="80094" min="1" max="1" chance="0.00001" /> <!-- Krishna Fighter -->
+				<item id="80095" min="1" max="1" chance="0.00001" /> <!-- Krishna Stormer -->
+				<item id="80096" min="1" max="1" chance="0.00001" /> <!-- Krishna Thrower -->
+				<item id="80097" min="1" max="1" chance="0.00001" /> <!-- Krishna Guardian -->
+				<item id="80098" min="1" max="1" chance="0.00001" /> <!-- Krishna Buster -->
+				<item id="80099" min="1" max="1" chance="0.00001" /> <!-- Krishna Caster -->
+				<item id="80100" min="1" max="1" chance="0.00001" /> <!-- Krishna Retributer -->
+				<item id="80101" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="1" max="1" chance="0.00002" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="1" max="1" chance="0.00001" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="1" max="1" chance="0.00001" /> <!-- Leviathan Gaiters - Heavy armor -->
+				<item id="80107" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gauntlets - Heavy armor -->
+				<item id="80108" min="1" max="1" chance="0.00004" /> <!-- Leviathan Boots - Heavy armor -->
+				<item id="80109" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shield -->
+				<item id="80110" min="1" max="1" chance="0.00002" /> <!-- Leviathan Leather Helmet - Light armor -->
+				<item id="80111" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Armor - Light armor -->
+				<item id="80112" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Leggings - Light armor -->
+				<item id="80113" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Gloves - Light armor -->
+				<item id="80114" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Boots - Light armor -->
+				<item id="80115" min="1" max="1" chance="0.00002" /> <!-- Leviathan Circlet - Robe -->
+				<item id="80116" min="1" max="1" chance="0.00001" /> <!-- Leviathan Tunic - Robe -->
+				<item id="80117" min="1" max="1" chance="0.00001" /> <!-- Leviathan Stockings - Robe -->
+				<item id="80118" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gloves - Robe -->
+				<item id="80119" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shoes - Robe -->
+				<item id="80120" min="1" max="1" chance="0.00004" /> <!-- Leviathan Sigil -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="13.794" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24677" level="85" type="Folk" name="Henker Hacker">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24677" level="126" type="Monster" name="Henker Hacker">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
 		<equipment rhand="82622" /> <!-- Only_NPC_Execution_Grounds -->
+		<acquire exp="891007" sp="802" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5838786" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="5838786" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="753514.268097518" magical="1743.76790583647" random="50" critical="4.75" accuracy="9" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="6057.47663551402" magical="2350.44514357978" />
+			<attribute>
+				<defence fire="1260" water="1260" wind="1260" earth="1260" holy="1260" dark="1260" />
+				<attack type="DARK" value="1310" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="85" />
 				<run ground="234" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="29.9" />
 			<height normal="75" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="34475" level="1" /> <!-- Night in the Execution Grounds -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="100000" max="200000" chance="0.159" /> <!-- Adena -->
+				<item id="47494" min="1" max="1" chance="0.0005" /> <!-- Selenite -->
+				<item id="48065" min="1" max="1" chance="0.029" /> <!-- Zodiac Cube Fragment -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="35566" min="1" max="1" chance="0.00001" /> <!-- Dark Weapon Upgrade Stone -->
+				<item id="35567" min="1" max="1" chance="0.00001" /> <!-- Dark Armor Upgrade Stone -->
+				<item id="35568" min="1" max="1" chance="0.00001" /> <!-- Bloody Weapon Upgrade Stone -->
+				<item id="35569" min="1" max="1" chance="0.00001" /> <!-- Bloody Armor Upgrade Stone -->
+				<item id="81216" min="1" max="1" chance="3.322" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="5.31" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="5.31" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="5.31" /> <!-- Angel's Feather -->
+				<item id="48669" min="1" max="1" chance="0.00010" /> <!-- Angel's Necklace -->
+				<item id="48841" min="1" max="1" chance="0.00010" /> <!-- Angel's Earring -->
+				<item id="81154" min="1" max="1" chance="0.00010" /> <!-- Angel's Ring -->
+				<item id="17416" min="1" max="1" chance="0.00001" /> <!-- Helios Shaper -->
+				<item id="17417" min="1" max="1" chance="0.00001" /> <!-- Helios Cutter -->
+				<item id="17418" min="1" max="1" chance="0.00001" /> <!-- Helios Slasher -->
+				<item id="17419" min="1" max="1" chance="0.00001" /> <!-- Helios Avenger -->
+				<item id="17420" min="1" max="1" chance="0.00001" /> <!-- Helios Fighter -->
+				<item id="17421" min="1" max="1" chance="0.00001" /> <!-- Helios Stormer -->
+				<item id="17422" min="1" max="1" chance="0.00001" /> <!-- Helios Thrower -->
+				<item id="17423" min="1" max="1" chance="0.00001" /> <!-- Helios Guardian -->
+				<item id="17424" min="1" max="1" chance="0.00001" /> <!-- Helios Buster -->
+				<item id="17425" min="1" max="1" chance="0.00001" /> <!-- Helios Caster -->
+				<item id="17426" min="1" max="1" chance="0.00001" /> <!-- Helios Retributer -->
+				<item id="17427" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Swords -->
+				<item id="17428" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Daggers -->
+				<item id="17429" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Blunt Weapons -->
+				<item id="17430" min="1" max="1" chance="0.00006" /> <!-- Eternal Helmet - Heavy armor -->
+				<item id="17431" min="1" max="1" chance="0.00002" /> <!-- Eternal Breastplate - Heavy armor -->
+				<item id="17432" min="1" max="1" chance="0.00004" /> <!-- Eternal Gaiters - Heavy armor -->
+				<item id="17433" min="1" max="1" chance="0.00009" /> <!-- Eternal Gauntlets - Heavy armor -->
+				<item id="17434" min="1" max="1" chance="0.00009" /> <!-- Eternal Boots - Heavy armor -->
+				<item id="17435" min="1" max="1" chance="0.00009" /> <!-- Eternal Shield -->
+				<item id="17436" min="1" max="1" chance="0.00006" /> <!-- Eternal Leather Helmet - Light armor -->
+				<item id="17437" min="1" max="1" chance="0.00002" /> <!-- Eternal Leather Armor - Light armor -->
+				<item id="17438" min="1" max="1" chance="0.00004" /> <!-- Eternal Leather Leggings - Light armor -->
+				<item id="17439" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Gloves - Light armor -->
+				<item id="17440" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Boots - Light armor -->
+				<item id="17441" min="1" max="1" chance="0.00006" /> <!-- Eternal Circlet - Robe -->
+				<item id="17442" min="1" max="1" chance="0.00002" /> <!-- Eternal Tunic - Robe -->
+				<item id="17443" min="1" max="1" chance="0.00004" /> <!-- Eternal Stockings - Robe -->
+				<item id="17444" min="1" max="1" chance="0.00009" /> <!-- Eternal Gloves - Robe -->
+				<item id="17445" min="1" max="1" chance="0.00009" /> <!-- Eternal Shoes - Robe -->
+				<item id="17446" min="1" max="1" chance="0.00009" /> <!-- Eternal Sigil -->
+				<item id="80090" min="1" max="1" chance="0.00001" /> <!-- Krishna Shaper -->
+				<item id="80091" min="1" max="1" chance="0.00001" /> <!-- Krishna Cutter -->
+				<item id="80092" min="1" max="1" chance="0.00001" /> <!-- Krishna Slasher -->
+				<item id="80093" min="1" max="1" chance="0.00001" /> <!-- Krishna Avenger -->
+				<item id="80094" min="1" max="1" chance="0.00001" /> <!-- Krishna Fighter -->
+				<item id="80095" min="1" max="1" chance="0.00001" /> <!-- Krishna Stormer -->
+				<item id="80096" min="1" max="1" chance="0.00001" /> <!-- Krishna Thrower -->
+				<item id="80097" min="1" max="1" chance="0.00001" /> <!-- Krishna Guardian -->
+				<item id="80098" min="1" max="1" chance="0.00001" /> <!-- Krishna Buster -->
+				<item id="80099" min="1" max="1" chance="0.00001" /> <!-- Krishna Caster -->
+				<item id="80100" min="1" max="1" chance="0.00001" /> <!-- Krishna Retributer -->
+				<item id="80101" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="1" max="1" chance="0.00002" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="1" max="1" chance="0.00001" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="1" max="1" chance="0.00001" /> <!-- Leviathan Gaiters - Heavy armor -->
+				<item id="80107" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gauntlets - Heavy armor -->
+				<item id="80108" min="1" max="1" chance="0.00004" /> <!-- Leviathan Boots - Heavy armor -->
+				<item id="80109" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shield -->
+				<item id="80110" min="1" max="1" chance="0.00002" /> <!-- Leviathan Leather Helmet - Light armor -->
+				<item id="80111" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Armor - Light armor -->
+				<item id="80112" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Leggings - Light armor -->
+				<item id="80113" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Gloves - Light armor -->
+				<item id="80114" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Boots - Light armor -->
+				<item id="80115" min="1" max="1" chance="0.00002" /> <!-- Leviathan Circlet - Robe -->
+				<item id="80116" min="1" max="1" chance="0.00001" /> <!-- Leviathan Tunic - Robe -->
+				<item id="80117" min="1" max="1" chance="0.00001" /> <!-- Leviathan Stockings - Robe -->
+				<item id="80118" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gloves - Robe -->
+				<item id="80119" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shoes - Robe -->
+				<item id="80120" min="1" max="1" chance="0.00004" /> <!-- Leviathan Sigil -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="13.794" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24678" level="85" type="Folk" name="Schnabel Doctor">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24678" level="126" type="Monster" name="Schnabel Doctor">
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<acquire exp="891007" sp="802" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5838786" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="5838786" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="753514.268097518" magical="1743.76790583647" random="50" critical="4.75" accuracy="9" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="6057.47663551402" magical="2350.44514357978" />
+			<attribute>
+				<defence fire="1260" water="1260" wind="1260" earth="1260" holy="1260" dark="1260" />
+				<attack type="DARK" value="1310" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="31" />
 				<run ground="64" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="51" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="34475" level="1" /> <!-- Night in the Execution Grounds -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="100000" max="200000" chance="0.159" /> <!-- Adena -->
+				<item id="47494" min="1" max="1" chance="0.0005" /> <!-- Selenite -->
+				<item id="48065" min="1" max="1" chance="0.029" /> <!-- Zodiac Cube Fragment -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="35566" min="1" max="1" chance="0.00001" /> <!-- Dark Weapon Upgrade Stone -->
+				<item id="35567" min="1" max="1" chance="0.00001" /> <!-- Dark Armor Upgrade Stone -->
+				<item id="35568" min="1" max="1" chance="0.00001" /> <!-- Bloody Weapon Upgrade Stone -->
+				<item id="35569" min="1" max="1" chance="0.00001" /> <!-- Bloody Armor Upgrade Stone -->
+				<item id="81216" min="1" max="1" chance="3.322" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="5.31" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="5.31" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="5.31" /> <!-- Angel's Feather -->
+				<item id="48669" min="1" max="1" chance="0.00010" /> <!-- Angel's Necklace -->
+				<item id="48841" min="1" max="1" chance="0.00010" /> <!-- Angel's Earring -->
+				<item id="81154" min="1" max="1" chance="0.00010" /> <!-- Angel's Ring -->
+				<item id="17416" min="1" max="1" chance="0.00001" /> <!-- Helios Shaper -->
+				<item id="17417" min="1" max="1" chance="0.00001" /> <!-- Helios Cutter -->
+				<item id="17418" min="1" max="1" chance="0.00001" /> <!-- Helios Slasher -->
+				<item id="17419" min="1" max="1" chance="0.00001" /> <!-- Helios Avenger -->
+				<item id="17420" min="1" max="1" chance="0.00001" /> <!-- Helios Fighter -->
+				<item id="17421" min="1" max="1" chance="0.00001" /> <!-- Helios Stormer -->
+				<item id="17422" min="1" max="1" chance="0.00001" /> <!-- Helios Thrower -->
+				<item id="17423" min="1" max="1" chance="0.00001" /> <!-- Helios Guardian -->
+				<item id="17424" min="1" max="1" chance="0.00001" /> <!-- Helios Buster -->
+				<item id="17425" min="1" max="1" chance="0.00001" /> <!-- Helios Caster -->
+				<item id="17426" min="1" max="1" chance="0.00001" /> <!-- Helios Retributer -->
+				<item id="17427" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Swords -->
+				<item id="17428" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Daggers -->
+				<item id="17429" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Blunt Weapons -->
+				<item id="17430" min="1" max="1" chance="0.00006" /> <!-- Eternal Helmet - Heavy armor -->
+				<item id="17431" min="1" max="1" chance="0.00002" /> <!-- Eternal Breastplate - Heavy armor -->
+				<item id="17432" min="1" max="1" chance="0.00004" /> <!-- Eternal Gaiters - Heavy armor -->
+				<item id="17433" min="1" max="1" chance="0.00009" /> <!-- Eternal Gauntlets - Heavy armor -->
+				<item id="17434" min="1" max="1" chance="0.00009" /> <!-- Eternal Boots - Heavy armor -->
+				<item id="17435" min="1" max="1" chance="0.00009" /> <!-- Eternal Shield -->
+				<item id="17436" min="1" max="1" chance="0.00006" /> <!-- Eternal Leather Helmet - Light armor -->
+				<item id="17437" min="1" max="1" chance="0.00002" /> <!-- Eternal Leather Armor - Light armor -->
+				<item id="17438" min="1" max="1" chance="0.00004" /> <!-- Eternal Leather Leggings - Light armor -->
+				<item id="17439" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Gloves - Light armor -->
+				<item id="17440" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Boots - Light armor -->
+				<item id="17441" min="1" max="1" chance="0.00006" /> <!-- Eternal Circlet - Robe -->
+				<item id="17442" min="1" max="1" chance="0.00002" /> <!-- Eternal Tunic - Robe -->
+				<item id="17443" min="1" max="1" chance="0.00004" /> <!-- Eternal Stockings - Robe -->
+				<item id="17444" min="1" max="1" chance="0.00009" /> <!-- Eternal Gloves - Robe -->
+				<item id="17445" min="1" max="1" chance="0.00009" /> <!-- Eternal Shoes - Robe -->
+				<item id="17446" min="1" max="1" chance="0.00009" /> <!-- Eternal Sigil -->
+				<item id="80090" min="1" max="1" chance="0.00001" /> <!-- Krishna Shaper -->
+				<item id="80091" min="1" max="1" chance="0.00001" /> <!-- Krishna Cutter -->
+				<item id="80092" min="1" max="1" chance="0.00001" /> <!-- Krishna Slasher -->
+				<item id="80093" min="1" max="1" chance="0.00001" /> <!-- Krishna Avenger -->
+				<item id="80094" min="1" max="1" chance="0.00001" /> <!-- Krishna Fighter -->
+				<item id="80095" min="1" max="1" chance="0.00001" /> <!-- Krishna Stormer -->
+				<item id="80096" min="1" max="1" chance="0.00001" /> <!-- Krishna Thrower -->
+				<item id="80097" min="1" max="1" chance="0.00001" /> <!-- Krishna Guardian -->
+				<item id="80098" min="1" max="1" chance="0.00001" /> <!-- Krishna Buster -->
+				<item id="80099" min="1" max="1" chance="0.00001" /> <!-- Krishna Caster -->
+				<item id="80100" min="1" max="1" chance="0.00001" /> <!-- Krishna Retributer -->
+				<item id="80101" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="1" max="1" chance="0.00002" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="1" max="1" chance="0.00001" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="1" max="1" chance="0.00001" /> <!-- Leviathan Gaiters - Heavy armor -->
+				<item id="80107" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gauntlets - Heavy armor -->
+				<item id="80108" min="1" max="1" chance="0.00004" /> <!-- Leviathan Boots - Heavy armor -->
+				<item id="80109" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shield -->
+				<item id="80110" min="1" max="1" chance="0.00002" /> <!-- Leviathan Leather Helmet - Light armor -->
+				<item id="80111" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Armor - Light armor -->
+				<item id="80112" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Leggings - Light armor -->
+				<item id="80113" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Gloves - Light armor -->
+				<item id="80114" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Boots - Light armor -->
+				<item id="80115" min="1" max="1" chance="0.00002" /> <!-- Leviathan Circlet - Robe -->
+				<item id="80116" min="1" max="1" chance="0.00001" /> <!-- Leviathan Tunic - Robe -->
+				<item id="80117" min="1" max="1" chance="0.00001" /> <!-- Leviathan Stockings - Robe -->
+				<item id="80118" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gloves - Robe -->
+				<item id="80119" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shoes - Robe -->
+				<item id="80120" min="1" max="1" chance="0.00004" /> <!-- Leviathan Sigil -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="13.794" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24679" level="85" type="Folk" name="Henker Anatomist">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24679" level="126" type="Monster" name="Henker Anatomist">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<acquire exp="891007" sp="802" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5838786" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="5838786" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="753514.268097518" magical="1743.76790583647" random="50" critical="4.75" accuracy="9" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="6057.47663551402" magical="2350.44514357978" />
+			<attribute>
+				<defence fire="1260" water="1260" wind="1260" earth="1260" holy="1260" dark="1260" />
+				<attack type="DARK" value="1310" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="90" />
 				<run ground="160" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="20" />
 			<height normal="53" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="34475" level="1" /> <!-- Night in the Execution Grounds -->
+			<skill id="14818" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="100000" max="200000" chance="0.159" /> <!-- Adena -->
+				<item id="47494" min="1" max="1" chance="0.0005" /> <!-- Selenite -->
+				<item id="48065" min="1" max="1" chance="0.029" /> <!-- Zodiac Cube Fragment -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="35566" min="1" max="1" chance="0.00001" /> <!-- Dark Weapon Upgrade Stone -->
+				<item id="35567" min="1" max="1" chance="0.00001" /> <!-- Dark Armor Upgrade Stone -->
+				<item id="35568" min="1" max="1" chance="0.00001" /> <!-- Bloody Weapon Upgrade Stone -->
+				<item id="35569" min="1" max="1" chance="0.00001" /> <!-- Bloody Armor Upgrade Stone -->
+				<item id="81216" min="1" max="1" chance="3.322" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="5.31" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="5.31" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="5.31" /> <!-- Angel's Feather -->
+				<item id="48669" min="1" max="1" chance="0.00010" /> <!-- Angel's Necklace -->
+				<item id="48841" min="1" max="1" chance="0.00010" /> <!-- Angel's Earring -->
+				<item id="81154" min="1" max="1" chance="0.00010" /> <!-- Angel's Ring -->
+				<item id="17416" min="1" max="1" chance="0.00001" /> <!-- Helios Shaper -->
+				<item id="17417" min="1" max="1" chance="0.00001" /> <!-- Helios Cutter -->
+				<item id="17418" min="1" max="1" chance="0.00001" /> <!-- Helios Slasher -->
+				<item id="17419" min="1" max="1" chance="0.00001" /> <!-- Helios Avenger -->
+				<item id="17420" min="1" max="1" chance="0.00001" /> <!-- Helios Fighter -->
+				<item id="17421" min="1" max="1" chance="0.00001" /> <!-- Helios Stormer -->
+				<item id="17422" min="1" max="1" chance="0.00001" /> <!-- Helios Thrower -->
+				<item id="17423" min="1" max="1" chance="0.00001" /> <!-- Helios Guardian -->
+				<item id="17424" min="1" max="1" chance="0.00001" /> <!-- Helios Buster -->
+				<item id="17425" min="1" max="1" chance="0.00001" /> <!-- Helios Caster -->
+				<item id="17426" min="1" max="1" chance="0.00001" /> <!-- Helios Retributer -->
+				<item id="17427" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Swords -->
+				<item id="17428" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Daggers -->
+				<item id="17429" min="1" max="1" chance="0.00001" /> <!-- Helios Dual Blunt Weapons -->
+				<item id="17430" min="1" max="1" chance="0.00006" /> <!-- Eternal Helmet - Heavy armor -->
+				<item id="17431" min="1" max="1" chance="0.00002" /> <!-- Eternal Breastplate - Heavy armor -->
+				<item id="17432" min="1" max="1" chance="0.00004" /> <!-- Eternal Gaiters - Heavy armor -->
+				<item id="17433" min="1" max="1" chance="0.00009" /> <!-- Eternal Gauntlets - Heavy armor -->
+				<item id="17434" min="1" max="1" chance="0.00009" /> <!-- Eternal Boots - Heavy armor -->
+				<item id="17435" min="1" max="1" chance="0.00009" /> <!-- Eternal Shield -->
+				<item id="17436" min="1" max="1" chance="0.00006" /> <!-- Eternal Leather Helmet - Light armor -->
+				<item id="17437" min="1" max="1" chance="0.00002" /> <!-- Eternal Leather Armor - Light armor -->
+				<item id="17438" min="1" max="1" chance="0.00004" /> <!-- Eternal Leather Leggings - Light armor -->
+				<item id="17439" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Gloves - Light armor -->
+				<item id="17440" min="1" max="1" chance="0.00009" /> <!-- Eternal Leather Boots - Light armor -->
+				<item id="17441" min="1" max="1" chance="0.00006" /> <!-- Eternal Circlet - Robe -->
+				<item id="17442" min="1" max="1" chance="0.00002" /> <!-- Eternal Tunic - Robe -->
+				<item id="17443" min="1" max="1" chance="0.00004" /> <!-- Eternal Stockings - Robe -->
+				<item id="17444" min="1" max="1" chance="0.00009" /> <!-- Eternal Gloves - Robe -->
+				<item id="17445" min="1" max="1" chance="0.00009" /> <!-- Eternal Shoes - Robe -->
+				<item id="17446" min="1" max="1" chance="0.00009" /> <!-- Eternal Sigil -->
+				<item id="80090" min="1" max="1" chance="0.00001" /> <!-- Krishna Shaper -->
+				<item id="80091" min="1" max="1" chance="0.00001" /> <!-- Krishna Cutter -->
+				<item id="80092" min="1" max="1" chance="0.00001" /> <!-- Krishna Slasher -->
+				<item id="80093" min="1" max="1" chance="0.00001" /> <!-- Krishna Avenger -->
+				<item id="80094" min="1" max="1" chance="0.00001" /> <!-- Krishna Fighter -->
+				<item id="80095" min="1" max="1" chance="0.00001" /> <!-- Krishna Stormer -->
+				<item id="80096" min="1" max="1" chance="0.00001" /> <!-- Krishna Thrower -->
+				<item id="80097" min="1" max="1" chance="0.00001" /> <!-- Krishna Guardian -->
+				<item id="80098" min="1" max="1" chance="0.00001" /> <!-- Krishna Buster -->
+				<item id="80099" min="1" max="1" chance="0.00001" /> <!-- Krishna Caster -->
+				<item id="80100" min="1" max="1" chance="0.00001" /> <!-- Krishna Retributer -->
+				<item id="80101" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Swords -->
+				<item id="80102" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Daggers -->
+				<item id="80103" min="1" max="1" chance="0.00001" /> <!-- Krishna Dual Blunt Weapons -->
+				<item id="80104" min="1" max="1" chance="0.00002" /> <!-- Leviathan Helmet - Heavy armor -->
+				<item id="80105" min="1" max="1" chance="0.00001" /> <!-- Leviathan Breastplate - Heavy armor -->
+				<item id="80106" min="1" max="1" chance="0.00001" /> <!-- Leviathan Gaiters - Heavy armor -->
+				<item id="80107" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gauntlets - Heavy armor -->
+				<item id="80108" min="1" max="1" chance="0.00004" /> <!-- Leviathan Boots - Heavy armor -->
+				<item id="80109" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shield -->
+				<item id="80110" min="1" max="1" chance="0.00002" /> <!-- Leviathan Leather Helmet - Light armor -->
+				<item id="80111" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Armor - Light armor -->
+				<item id="80112" min="1" max="1" chance="0.00001" /> <!-- Leviathan Leather Leggings - Light armor -->
+				<item id="80113" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Gloves - Light armor -->
+				<item id="80114" min="1" max="1" chance="0.00004" /> <!-- Leviathan Leather Boots - Light armor -->
+				<item id="80115" min="1" max="1" chance="0.00002" /> <!-- Leviathan Circlet - Robe -->
+				<item id="80116" min="1" max="1" chance="0.00001" /> <!-- Leviathan Tunic - Robe -->
+				<item id="80117" min="1" max="1" chance="0.00001" /> <!-- Leviathan Stockings - Robe -->
+				<item id="80118" min="1" max="1" chance="0.00004" /> <!-- Leviathan Gloves - Robe -->
+				<item id="80119" min="1" max="1" chance="0.00004" /> <!-- Leviathan Shoes - Robe -->
+				<item id="80120" min="1" max="1" chance="0.00004" /> <!-- Leviathan Sigil -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="13.794" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24680" level="85" type="Folk" name="Schnabel Inspector" title="Execution Grounds Defender">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24680" level="126" type="Monster" name="Schnabel Inspector" title="Execution Grounds Defender">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
 		<equipment rhand="15304" /> <!-- Transparent Crossbow (NPC) -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5838786" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="5838786" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="5" critical="8" accuracy="0" attackSpeed="253" type="BOW" range="1100" distance="10" width="0" />
+			<defence physical="753240" magical="364523" />
+			<attribute>
+				<defence fire="1260" water="1260" wind="1260" earth="1260" holy="1260" dark="1260" />
+				<attack type="DARK" value="1310" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="90" />
 				<run ground="270" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
+		<ai type="FIGHTER" aggroRange="300" isAggressive="true" />
 		<collision>
 			<radius normal="20" />
 			<height normal="67" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34475" level="1" /> <!-- Night in the Execution Grounds -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
+		</skillList>
 	</npc>
-	<npc id="24681" level="85" type="Folk" name="Henker Inspector" title="Execution Grounds Defender">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24681" level="126" type="Monster" name="Henker Inspector" title="Execution Grounds Defender">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
 		<equipment rhand="82656" /> <!-- Only_for_NPC_Execution_Grounds_Range -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5838786" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="5838786" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
+			<attribute>
+				<defence fire="1260" water="1260" wind="1260" earth="1260" holy="1260" dark="1260" />
+				<attack type="DARK" value="1310" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="62" />
 				<run ground="240" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
+		<ai type="FIGHTER" aggroRange="300" isAggressive="true" />
 		<collision>
 			<radius normal="28" />
 			<height normal="65" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34475" level="1" /> <!-- Night in the Execution Grounds -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
+		</skillList>
 	</npc>
-	<npc id="24682" level="85" type="Folk" name="Frail Zombie" title="Execution Grounds Defender">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24682" level="126" type="Monster" name="Frail Zombie" title="Execution Grounds Defender">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5838786" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="5838786" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="753240" magical="364523" />
 			<speed>
 				<walk ground="10" />
 				<run ground="10" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
+		<ai type="FIGHTER" aggroRange="300" isAggressive="true" />
 		<collision>
 			<radius normal="30" />
 			<height normal="97" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="5467" level="1" /> <!-- Dark Attribute -->
+			<skill id="14765" level="5" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34475" level="1" /> <!-- Night in the Execution Grounds -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
+		</skillList>
 	</npc>
 </list>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/24900-24999.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/24900-24999.xml
index b5a7b36305..f45c803604 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/24900-24999.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/24900-24999.xml
@@ -1150,14 +1150,18 @@
 		</skillList>
 	</npc>
 	<npc id="24930" level="122" type="Monster" name="Black Demon Knight">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="637272" sp="574" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="1097508" hpRegen="13.4" mp="3190" mpRegen="30" />
-			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="753240" magical="364523" />
+			<attack physical="665659.901743584" magical="1444.35390697649" random="40" critical="4.75" accuracy="8" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5338.77216096896" magical="2047.72727463440" />
+			<attribute>
+				<defence fire="1220" water="1220" wind="1220" earth="1220" holy="1220" dark="1220" />
+				<attack type="DARK" value="1270" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1191,14 +1195,18 @@
 		</dropLists>
 	</npc>
 	<npc id="24931" level="122" type="Monster" name="Black Demon Warrior">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="637272" sp="574" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="1097508" hpRegen="13.4" mp="3190" mpRegen="30" />
-			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="753240" magical="364523" />
+			<attack physical="665659.901743584" magical="1444.35390697649" random="40" critical="4.75" accuracy="8" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5338.77216096896" magical="2047.72727463440" />
+			<attribute>
+				<defence fire="1220" water="1220" wind="1220" earth="1220" holy="1220" dark="1220" />
+				<attack type="DARK" value="1270" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1232,15 +1240,19 @@
 		</dropLists>
 	</npc>
 	<npc id="24932" level="122" type="Monster" name="Black Demon Scout">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<equipment rhand="48232" /> <!-- Devil Spearshooter -->
 		<acquire exp="637272" sp="574" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="1097508" hpRegen="13.4" mp="3190" mpRegen="30" />
-			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="753240" magical="364523" />
+			<attack physical="665659.901743584" magical="1444.35390697649" random="40" critical="4.75" accuracy="8" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5338.77216096896" magical="2047.72727463440" />
+			<attribute>
+				<defence fire="1220" water="1220" wind="1220" earth="1220" holy="1220" dark="1220" />
+				<attack type="DARK" value="1270" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1274,14 +1286,18 @@
 		</dropLists>
 	</npc>
 	<npc id="24933" level="122" type="Monster" name="Black Demon Wizard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="637272" sp="574" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="1097508" hpRegen="13.4" mp="3190" mpRegen="30" />
-			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="753240" magical="364523" />
+			<attack physical="665659.901743584" magical="1444.35390697649" random="40" critical="4.75" accuracy="8" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5338.77216096896" magical="2047.72727463440" />
+			<attribute>
+				<defence fire="1220" water="1220" wind="1220" earth="1220" holy="1220" dark="1220" />
+				<attack type="DARK" value="1270" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1315,14 +1331,18 @@
 		</dropLists>
 	</npc>
 	<npc id="24934" level="122" type="Monster" name="Frozen Soldier">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<acquire exp="700998" sp="631" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="1097508" hpRegen="13.4" mp="3190" mpRegen="30" />
-			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="753240" magical="364523" />
+			<attack physical="665659.901743584" magical="1444.35390697649" random="40" critical="4.75" accuracy="8" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5338.77216096896" magical="2047.72727463440" />
+			<attribute>
+				<defence fire="1220" water="1220" wind="1220" earth="1220" holy="1220" dark="1220" />
+				<attack type="WATER" value="1270" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="36" />
 				<run ground="160" />
@@ -1330,6 +1350,11 @@
 			<hitTime>600</hitTime>
 		</stats>
 		<status attackable="true" />
+		<ai type="FIGHTER" aggroRange="300" clanHelpRange="400" isAggressive="true">
+			<clanList>
+				<clan>FROZEN_LAB</clan>
+			</clanList>
+		</ai>
 		<collision>
 			<radius normal="12" />
 			<height normal="25" />
@@ -1356,14 +1381,18 @@
 		</dropLists>
 	</npc>
 	<npc id="24935" level="122" type="Monster" name="Frozen Defender">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<acquire exp="700998" sp="631" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="1097508" hpRegen="13.4" mp="3190" mpRegen="30" />
-			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="753240" magical="364523" />
+			<attack physical="665659.901743584" magical="1444.35390697649" random="40" critical="4.75" accuracy="8" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5338.77216096896" magical="2047.72727463440" />
+			<attribute>
+				<defence fire="1220" water="1220" wind="1220" earth="1220" holy="1220" dark="1220" />
+				<attack type="WATER" value="1270" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="70" />
 				<run ground="150" />
@@ -1371,6 +1400,11 @@
 			<hitTime>600</hitTime>
 		</stats>
 		<status attackable="true" />
+		<ai type="FIGHTER" aggroRange="300" clanHelpRange="400" isAggressive="true">
+			<clanList>
+				<clan>FROZEN_LAB</clan>
+			</clanList>
+		</ai>
 		<collision>
 			<radius normal="15" />
 			<height normal="31" />
@@ -1397,14 +1431,18 @@
 		</dropLists>
 	</npc>
 	<npc id="24936" level="122" type="Monster" name="Ice Knight">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<acquire exp="700998" sp="631" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="1097508" hpRegen="13.4" mp="3190" mpRegen="30" />
-			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="753240" magical="364523" />
+			<attack physical="665659.901743584" magical="1444.35390697649" random="40" critical="4.75" accuracy="8" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5338.77216096896" magical="2047.72727463440" />
+			<attribute>
+				<defence fire="1220" water="1220" wind="1220" earth="1220" holy="1220" dark="1220" />
+				<attack type="WATER" value="1270" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="70" />
 				<run ground="150" />
@@ -1412,6 +1450,11 @@
 			<hitTime>600</hitTime>
 		</stats>
 		<status attackable="true" />
+		<ai type="FIGHTER" aggroRange="300" clanHelpRange="400" isAggressive="true">
+			<clanList>
+				<clan>FROZEN_LAB</clan>
+			</clanList>
+		</ai>
 		<collision>
 			<radius normal="15" />
 			<height normal="31" />
@@ -1438,14 +1481,18 @@
 		</dropLists>
 	</npc>
 	<npc id="24937" level="122" type="Monster" name="Glacier Golem">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ELEMENTAL</race>
 		<sex>MALE</sex>
 		<acquire exp="700998" sp="631" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="1097508" hpRegen="13.4" mp="3190" mpRegen="30" />
-			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="753240" magical="364523" />
+			<attack physical="665659.901743584" magical="1444.35390697649" random="40" critical="4.75" accuracy="8" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5338.77216096896" magical="2047.72727463440" />
+			<attribute>
+				<defence fire="1220" water="1220" wind="1220" earth="1220" holy="1220" dark="1220" />
+				<attack type="WATER" value="1270" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1453,6 +1500,11 @@
 			<hitTime>600</hitTime>
 		</stats>
 		<status attackable="true" />
+		<ai type="FIGHTER" aggroRange="300" clanHelpRange="400" isAggressive="true">
+			<clanList>
+				<clan>FROZEN_LAB</clan>
+			</clanList>
+		</ai>
 		<collision>
 			<radius normal="50" />
 			<height normal="47.5" />
@@ -1479,14 +1531,18 @@
 		</dropLists>
 	</npc>
 	<npc id="24938" level="122" type="Monster" name="Ice Fairy">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ELEMENTAL</race>
 		<sex>MALE</sex>
 		<acquire exp="700998" sp="631" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="1097508" hpRegen="13.4" mp="3190" mpRegen="30" />
-			<attack physical="1599215" magical="145753" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="753240" magical="364523" />
+			<attack physical="665659.901743584" magical="1444.35390697649" random="40" critical="4.75" accuracy="8" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5338.77216096896" magical="2047.72727463440" />
+			<attribute>
+				<defence fire="1220" water="1220" wind="1220" earth="1220" holy="1220" dark="1220" />
+				<attack type="WATER" value="1270" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="30" />
 				<run ground="250" />
@@ -1494,6 +1550,11 @@
 			<hitTime>600</hitTime>
 		</stats>
 		<status attackable="true" />
+		<ai type="FIGHTER" aggroRange="300" clanHelpRange="400" isAggressive="true">
+			<clanList>
+				<clan>FROZEN_LAB</clan>
+			</clanList>
+		</ai>
 		<collision>
 			<radius normal="16" />
 			<height normal="35.6" />
@@ -2327,99 +2388,254 @@
 			<height normal="51.75" />
 		</collision>
 	</npc>
-	<npc id="24965" level="85" type="Folk" name="Creeper Rampike">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24965" level="126" type="Monster" name="Creeper Rampike">
+		<race>PLANT</race>
+		<sex>MALE</sex>
+		<acquire exp="980106" sp="882" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1919548" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="1919548" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="753514.268097518" magical="1743.76790583647" random="50" critical="4.75" accuracy="9" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="6057.47663551402" magical="2350.44514357978" />
+			<attribute>
+				<defence fire="1260" water="1260" wind="1260" earth="1260" holy="1260" dark="1260" />
+				<attack type="EARTH" value="1310" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="45.5" />
 			<height normal="61.35" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="5465" level="1" /> <!-- Earth Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="34285" level="1" /> <!-- Hard Hunting Zone -->
+		</skillList>
+		<ai aggroRange="300" clanHelpRange="400" isAggressive="true">
+			<clanList>
+				<clan>MOTHER_TREE</clan>
+			</clanList>
+		</ai>
+		<dropLists>
+			<drop>
+				<item id="57" min="9845" max="23035" chance="70" /> <!-- Adena -->
+				<item id="81343" min="1" max="1" chance="0.19" /> <!-- Aden's Shining Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="81216" min="1" max="1" chance="1.821" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="2.912" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="2.912" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="2.912" /> <!-- Angel's Feather -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="7.564" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24966" level="85" type="Folk" name="Fila Aprias">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24966" level="126" type="Monster" name="Fila Aprias">
+		<race>PLANT</race>
+		<sex>MALE</sex>
+		<acquire exp="980106" sp="882" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1919548" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="1919548" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="753514.268097518" magical="1743.76790583647" random="50" critical="4.75" accuracy="9" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="6057.47663551402" magical="2350.44514357978" />
+			<attribute>
+				<defence fire="1260" water="1260" wind="1260" earth="1260" holy="1260" dark="1260" />
+				<attack type="EARTH" value="1310" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="40" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="39" />
 			<height normal="99.7" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="5465" level="1" /> <!-- Earth Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="34285" level="1" /> <!-- Hard Hunting Zone -->
+		</skillList>
+		<ai aggroRange="300" clanHelpRange="400" isAggressive="true">
+			<clanList>
+				<clan>MOTHER_TREE</clan>
+			</clanList>
+		</ai>
+		<dropLists>
+			<drop>
+				<item id="57" min="9845" max="23035" chance="70" /> <!-- Adena -->
+				<item id="81343" min="1" max="1" chance="0.19" /> <!-- Aden's Shining Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="81216" min="1" max="1" chance="1.821" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="2.912" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="2.912" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="2.912" /> <!-- Angel's Feather -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="7.564" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24967" level="85" type="Folk" name="Flush Teasle">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24967" level="126" type="Monster" name="Flush Teasle">
+		<race>PLANT</race>
+		<sex>MALE</sex>
+		<acquire exp="980106" sp="882" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1919548" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="1919548" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="753514.268097518" magical="1743.76790583647" random="50" critical="4.75" accuracy="9" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="6057.47663551402" magical="2350.44514357978" />
+			<attribute>
+				<defence fire="1260" water="1260" wind="1260" earth="1260" holy="1260" dark="1260" />
+				<attack type="EARTH" value="1310" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="36" />
 				<run ground="200" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="45" />
 			<height normal="54" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="5465" level="1" /> <!-- Earth Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="34285" level="1" /> <!-- Hard Hunting Zone -->
+		</skillList>
+		<ai aggroRange="300" clanHelpRange="400" isAggressive="true">
+			<clanList>
+				<clan>MOTHER_TREE</clan>
+			</clanList>
+		</ai>
+		<dropLists>
+			<drop>
+				<item id="57" min="9845" max="23035" chance="70" /> <!-- Adena -->
+				<item id="81343" min="1" max="1" chance="0.19" /> <!-- Aden's Shining Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="81216" min="1" max="1" chance="1.821" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="2.912" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="2.912" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="2.912" /> <!-- Angel's Feather -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="7.564" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24968" level="85" type="Folk" name="Treant Blossom">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24968" level="126" type="Monster" name="Treant Blossom">
+		<race>BEAST</race>
+		<sex>MALE</sex>
+		<acquire exp="980106" sp="882" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1919548" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="1919548" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="753514.268097518" magical="1743.76790583647" random="50" critical="4.75" accuracy="9" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="6057.47663551402" magical="2350.44514357978" />
+			<attribute>
+				<defence fire="1260" water="1260" wind="1260" earth="1260" holy="1260" dark="1260" />
+				<attack type="EARTH" value="1310" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="23" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="68.9" />
 			<height normal="60.05" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="3" /> <!-- Beasts -->
+			<skill id="5465" level="1" /> <!-- Earth Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="34285" level="1" /> <!-- Hard Hunting Zone -->
+		</skillList>
+		<ai aggroRange="300" clanHelpRange="400" isAggressive="true">
+			<clanList>
+				<clan>MOTHER_TREE</clan>
+			</clanList>
+		</ai>
+		<dropLists>
+			<drop>
+				<item id="57" min="9845" max="23035" chance="70" /> <!-- Adena -->
+				<item id="81343" min="1" max="1" chance="0.19" /> <!-- Aden's Shining Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="81216" min="1" max="1" chance="1.821" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="2.912" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="2.912" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="2.912" /> <!-- Angel's Feather -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="7.564" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
-	<npc id="24969" level="85" type="Folk" name="Arsos Butterfly">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+	<npc id="24969" level="126" type="Monster" name="Arsos Butterfly">
+		<race>BUG</race>
+		<sex>MALE</sex>
+		<acquire exp="980106" sp="882" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1919548" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="1919548" hpRegen="13.4" mp="3190" mpRegen="30" />
+			<attack physical="753514.268097518" magical="1743.76790583647" random="50" critical="4.75" accuracy="9" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="6057.47663551402" magical="2350.44514357978" />
+			<attribute>
+				<defence fire="1260" water="1260" wind="1260" earth="1260" holy="1260" dark="1260" />
+				<attack type="EARTH" value="1310" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="45" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="45" />
 			<height normal="65.25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="12" /> <!-- Insects -->
+			<skill id="5465" level="1" /> <!-- Earth Attribute -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="34285" level="1" /> <!-- Hard Hunting Zone -->
+		</skillList>
+		<ai aggroRange="300" clanHelpRange="400" isAggressive="true">
+			<clanList>
+				<clan>MOTHER_TREE</clan>
+			</clanList>
+		</ai>
+		<dropLists>
+			<drop>
+				<item id="57" min="9845" max="23035" chance="70" /> <!-- Adena -->
+				<item id="81343" min="1" max="1" chance="0.19" /> <!-- Aden's Shining Treasure Chest -->
+				<item id="81836" min="1" max="1" chance="0.035" /> <!-- Orb of Bloody Soul -->
+				<item id="81216" min="1" max="1" chance="1.821" /> <!-- Black Mithril -->
+				<item id="81217" min="1" max="1" chance="2.912" /> <!-- Oriharukon Ore -->
+				<item id="81218" min="1" max="1" chance="2.912" /> <!-- Dragon Scale -->
+				<item id="81219" min="1" max="1" chance="2.912" /> <!-- Angel's Feather -->
+			</drop>
+			<spoil>
+				<item id="81344" min="1" max="1" chance="7.564" /> <!-- Augmenting Stone Crystal -->
+			</spoil>
+		</dropLists>
 	</npc>
 </list>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/26500-26599.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/26500-26599.xml
index ef60487a6b..8f9f4fc7d9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/26500-26599.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/26500-26599.xml
@@ -209,12 +209,54 @@
 			<height normal="26.9" />
 		</collision>
 	</npc>
-	<npc id="26511" level="85" type="Folk" name="Freya" title="Ice Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="26511" level="120" type="Monster" name="Freya" title="Ice Queen">
+		<parameters>
+			<skill name="Skill01_ID" id="34437" level="1" />
+			<skill name="Skill02_ID" id="34438" level="1" />
+		</parameters>
+		<race>HUMANOID</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="260400446" hpRegen="10.5" mp="66584" mpRegen="3.6" />
+			<attack physical="2324485" magical="168452" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="132745" magical="68665" />
+			<speed>
+				<walk ground="45" />
+				<run ground="150" />
+			</speed>
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
+				<attack type="WATER" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="true" />
+		<collision>
+			<radius normal="65" />
+			<height normal="128.95" />
+		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5463" level="1" /> <!-- Water Attribute -->
+			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="4494" level="1" /> <!-- Raid Boss -->
+			<skill id="6644" level="1" /> <!-- Ice Queen Freya -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Resistance -->
+			<skill id="4071" level="1" /> <!-- Bow /Crossbow Resistance -->
+			<skill id="4116" level="10" /> <!-- Magic Damage Resistance -->
+			<skill id="34453" level="1" /> <!-- Ice Queen's Authority -->
+			<skill id="34437" level="1" /> <!-- Queen's Ice Bolt -->
+			<skill id="34438" level="1" /> <!-- Queen's Ice Storm -->
+		</skillList>
+		<ai type="MAGE" isAggressive="false" />
+	</npc>
+	<npc id="26512" level="120" type="Folk" name="Freya" title="Ice Queen">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="109365750" hpRegen="10.5" mp="66584" mpRegen="3.6" />
+			<vitals hp="336849594" hpRegen="10.5" mp="66584" mpRegen="3.6" />
 			<speed>
 				<walk ground="45" />
 				<run ground="150" />
@@ -222,75 +264,108 @@
 			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
 			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" targetable="false" />
 		<collision>
 			<radius normal="65" />
 			<height normal="128.95" />
 		</collision>
 	</npc>
-	<npc id="26512" level="85" type="Folk" name="Freya" title="Ice Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="26513" level="120" type="RaidBoss" name="Freya" title="Ice Queen">
+		<parameters>
+			<skill name="Skill01_ID" id="34437" level="2" />
+			<skill name="Skill02_ID" id="34438" level="2" />
+			<skill name="Skill03_ID" id="34441" level="1" />
+		</parameters>
+		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
+		<acquire exp="5923684800" sp="5331316" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="141473764" hpRegen="10.5" mp="66584" mpRegen="3.6" />
+			<vitals hp="260400446" hpRegen="10.5" mp="66584" mpRegen="3.6" />
+			<attack physical="2324485" magical="168452" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="132745" magical="68665" />
 			<speed>
 				<walk ground="45" />
 				<run ground="150" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
+				<attack type="WATER" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="65" />
-			<height normal="128.95" />
-		</collision>
-	</npc>
-	<npc id="26513" level="85" type="Folk" name="Freya" title="Ice Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="52495560" hpRegen="10.5" mp="66584" mpRegen="3.6" />
-			<speed>
-				<walk ground="54" />
-				<run ground="180" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="28.6" />
 			<height normal="72.4" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5463" level="1" /> <!-- Water Attribute -->
+			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="4494" level="1" /> <!-- Raid Boss -->
+			<skill id="6644" level="1" /> <!-- Ice Queen Freya -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Resistance -->
+			<skill id="4071" level="1" /> <!-- Bow /Crossbow Resistance -->
+			<skill id="4116" level="10" /> <!-- Magic Damage Resistance -->
+			<skill id="34453" level="1" /> <!-- Ice Queen's Authority -->
+			<skill id="34437" level="2" /> <!-- Queen's Freezing Bolt -->
+			<skill id="34438" level="2" /> <!-- Queen's Freezing Storm -->
+			<skill id="34441" level="1" /> <!-- Queen's Freezing Wave -->
+		</skillList>
+		<ai type="MAGE" aggroRange="2000" isAggressive="true" />
 	</npc>
-	<npc id="26514" level="85" type="Folk" name="Glakias" title="Frozen Labyrinth' Knight Captain">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="26247780" hpRegen="10.5" mp="66584" mpRegen="3.6" />
+	<npc id="26514" level="120" type="Monster" name="Glakias" title="Frozen Labyrinth' Knight Captain">
+		<parameters>
+			<skill name="Skill01_ID" id="34443" level="1" />
+			<skill name="Skill02_ID" id="34449" level="2" />
+			<skill name="Skill03_ID" id="34445" level="1" />
+			<skill name="Skill04_ID" id="34444" level="1" />
+		</parameters>
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="62496012" hpRegen="12.4" mp="55529" mpRegen="30" />
+			<attack physical="2324485" magical="105651" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="132745" magical="68665" />
 			<speed>
-				<walk ground="40" />
-				<run ground="120" />
+				<walk ground="50" />
+				<run ground="230" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
+				<attack type="WATER" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="28" />
 			<height normal="67.5" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5463" level="1" /> <!-- Water Attribute -->
+			<skill id="14765" level="4" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Resistance -->
+			<skill id="4071" level="1" /> <!-- Bow /Crossbow Resistance -->
+			<skill id="4116" level="10" /> <!-- Magic Damage Resistance -->
+			<skill id="34453" level="1" /> <!-- Ice Queen's Authority -->
+			<skill id="34443" level="1" /> <!-- Freezing Strike -->
+			<skill id="34444" level="1" /> <!-- Freezing Smash -->
+			<skill id="34449" level="2" /> <!-- Mass Freezing Chain -->
+			<skill id="34445" level="1" /> <!-- Freezing Wave -->
+		</skillList>
+		<ai type="FIGHTER" aggroRange="2000" isAggressive="true" />
 	</npc>
-	<npc id="26515" level="85" type="Folk" name="Frozen Labyrinth' Knight">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="26515" level="120" type="Monster" name="Frozen Labyrinth' Knight">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="141473764" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="244750020" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="70" />
 				<run ground="150" />
@@ -304,12 +379,11 @@
 			<height normal="65" />
 		</collision>
 	</npc>
-	<npc id="26516" level="85" type="Folk" name="Frozen Labyrinth' Mage">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="26516" level="120" type="MONSTER" name="Frozen Labyrinth' Mage">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="141473764" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="244750020" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="250" />
@@ -323,13 +397,12 @@
 			<height normal="74.2" />
 		</collision>
 	</npc>
-	<npc id="26517" level="85" type="Folk" name="Frozen Labyrinth' Shooter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="26517" level="120" type="Monster" name="Frozen Labyrinth' Shooter">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="141473764" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="244750020" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="40" />
 				<run ground="120" />
@@ -343,69 +416,84 @@
 			<height normal="50" />
 		</collision>
 	</npc>
-	<npc id="26518" level="85" type="Folk" name="Winter Crystal">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="26518" level="120" type="Monster" name="Winter Crystal">
+		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="2624778" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="4540869" hpRegen="11.4" mp="25848" mpRegen="30" />
+			<attack physical="852665" magical="99852" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="118745" magical="65332" />
 			<speed>
-				<walk ground="30" />
-				<run ground="120" />
+				<walk ground="50" />
+				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>600</hitTime>
+			<attribute>
+				<defence fire="2450" water="2500" wind="2500" earth="2500" holy="2500" dark="2500" />
+				<attack type="WATER" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" canMove="false" />
+		<exCrtEffect>true</exCrtEffect>
 		<collision>
 			<radius normal="40" />
 			<height normal="103" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+			<skill id="5463" level="1" /> <!-- Water Attribute -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="14804" level="10" /> <!-- Damage Reflection Resistance -->
+			<skill id="14823" level="1" /> <!-- Instant Kill Resistance -->
+			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
+			<skill id="33195" level="10" /> <!-- Direct Hit Resistance -->
+			<skill id="34453" level="1" /> <!-- Ice Queen's Authority -->
+		</skillList>
 	</npc>
-	<npc id="26519" level="85" type="Folk" name="Ice Wall">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="26519" level="120" type="Monster" name="Ice Wall">
+		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1669172" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="3974294" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="2324485" magical="105651" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="132745" magical="68665" />
 		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="0.001" />
-			<height normal="0.001" />
-		</collision>
-	</npc>
-	<npc id="26520" level="85" type="Folk" name="Huge Icicle">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1669172" hpRegen="10.5" mp="3190" mpRegen="3.6" />
-			<speed>
-				<walk ground="1" />
-				<run ground="1" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
+		<status attackable="false" targetable="false" undying="true" showName="false" canMove="false" />
+		<exCrtEffect>true</exCrtEffect>
 		<collision>
 			<radius normal="40" />
 			<height normal="52" />
 		</collision>
 	</npc>
-	<npc id="26521" level="85" type="Folk" name="Adrini" title="Kanna's Knight">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="26520" level="120" type="Monster" name="Huge Icicle">
+		<race>CONSTRUCT</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="3974294" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="1" />
+			</speed>
+			<attack physical="2324485" magical="105651" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="132745" magical="68665" />
+		</stats>
+		<status attackable="false" targetable="false" undying="true" showName="false" canMove="false" />
+		<exCrtEffect>true</exCrtEffect>
+		<collision>
+			<radius normal="0.01" />
+			<height normal="0.01" />
+		</collision>
+	</npc>
+	<npc id="26521" level="120" type="Folk" name="Adrini" title="Kanna's Knight">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1669172" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="2887664" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -413,18 +501,17 @@
 			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
 			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" targetable="false" />
 		<collision>
 			<radius normal="32" />
 			<height normal="44" />
 		</collision>
 	</npc>
-	<npc id="26522" level="85" type="Folk" name="Belkshin" title="Kanna's Knight">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="26522" level="120" type="Folk" name="Belkshin" title="Kanna's Knight">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1669172" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="2887664" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -432,18 +519,17 @@
 			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
 			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" targetable="false" />
 		<collision>
 			<radius normal="24" />
 			<height normal="51" />
 		</collision>
 	</npc>
-	<npc id="26523" level="85" type="Folk" name="Kamel" title="Kanna's Knight">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="26523" level="120" type="Folk" name="Kamel" title="Kanna's Knight">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1669172" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="2887664" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -451,18 +537,17 @@
 			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
 			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" targetable="false" />
 		<collision>
 			<radius normal="32" />
 			<height normal="44" />
 		</collision>
 	</npc>
-	<npc id="26524" level="85" type="Folk" name="Diastin" title="Kanna's Knight">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="26524" level="120" type="Folk" name="Diastin" title="Kanna's Knight">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1669172" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="2887664" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -470,7 +555,7 @@
 			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
 			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" targetable="false" />
 		<collision>
 			<radius normal="24" />
 			<height normal="51" />
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/27700-27799.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/27700-27799.xml
index 27b742e3d3..8793e16e72 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/27700-27799.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/27700-27799.xml
@@ -8,6 +8,11 @@
 			<vitals hp="485013" hpRegen="10.5" mp="2862" mpRegen="3.6" />
 			<attack physical="420724.767563222" magical="1040.79519617782" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="DUAL" range="40" distance="80" width="120" />
 			<defence physical="3827.3631840796" magical="1467.57959378027" />
+			<attribute>
+				<defence fire="1300" water="1250" wind="1300" earth="1300" holy="1300" dark="1300" />
+				<attack type="WATER" value="1150" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="13" />
 				<run ground="140" />
@@ -92,6 +97,11 @@
 			<vitals hp="485013" hpRegen="10.5" mp="2862" mpRegen="3.6" />
 			<attack physical="420724.767563222" magical="1040.79519617782" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="DUAL" range="40" distance="80" width="120" />
 			<defence physical="3827.3631840796" magical="1467.57959378027" />
+			<attribute>
+				<defence fire="1300" water="1250" wind="1300" earth="1300" holy="1300" dark="1300" />
+				<attack type="WATER" value="1150" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="25" />
 				<run ground="140" />
@@ -176,6 +186,11 @@
 			<vitals hp="485013" hpRegen="10.5" mp="2862" mpRegen="3.6" />
 			<attack physical="420724.767563222" magical="1040.79519617782" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="DUAL" range="40" distance="80" width="120" />
 			<defence physical="3827.3631840796" magical="1467.57959378027" />
+			<attribute>
+				<defence fire="1300" water="1250" wind="1300" earth="1300" holy="1300" dark="1300" />
+				<attack type="WATER" value="1150" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="30" />
 				<run ground="170" />
@@ -260,6 +275,11 @@
 			<vitals hp="485013" hpRegen="10.5" mp="2862" mpRegen="3.6" />
 			<attack physical="420724.767563222" magical="1040.79519617782" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="DUAL" range="40" distance="80" width="120" />
 			<defence physical="3827.3631840796" magical="1467.57959378027" />
+			<attribute>
+				<defence fire="1300" water="1250" wind="1300" earth="1300" holy="1300" dark="1300" />
+				<attack type="WATER" value="1150" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="35" />
 				<run ground="170" />
@@ -344,6 +364,11 @@
 			<vitals hp="485013" hpRegen="10.5" mp="2862" mpRegen="3.6" />
 			<attack physical="420724.767563222" magical="1040.79519617782" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="DUAL" range="40" distance="80" width="120" />
 			<defence physical="3827.3631840796" magical="1467.57959378027" />
+			<attribute>
+				<defence fire="1300" water="1250" wind="1300" earth="1300" holy="1300" dark="1300" />
+				<attack type="WATER" value="1150" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -428,6 +453,11 @@
 			<vitals hp="485013" hpRegen="10.5" mp="2862" mpRegen="3.6" />
 			<attack physical="420724.767563222" magical="1040.79519617782" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="DUAL" range="40" distance="80" width="120" />
 			<defence physical="3827.3631840796" magical="1467.57959378027" />
+			<attribute>
+				<defence fire="1300" water="1250" wind="1300" earth="1300" holy="1300" dark="1300" />
+				<attack type="WATER" value="1150" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -512,6 +542,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1700" wind="1750" earth="1750" holy="1750" dark="1750" />
+				<attack type="WATER" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="13" />
 				<run ground="140" />
@@ -596,6 +631,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1700" wind="1750" earth="1750" holy="1750" dark="1750" />
+				<attack type="WATER" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="25" />
 				<run ground="140" />
@@ -680,6 +720,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1700" wind="1750" earth="1750" holy="1750" dark="1750" />
+				<attack type="WATER" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="30" />
 				<run ground="170" />
@@ -764,6 +809,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1700" wind="1750" earth="1750" holy="1750" dark="1750" />
+				<attack type="WATER" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="35" />
 				<run ground="170" />
@@ -848,6 +898,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1700" wind="1750" earth="1750" holy="1750" dark="1750" />
+				<attack type="WATER" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -932,6 +987,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1700" wind="1750" earth="1750" holy="1750" dark="1750" />
+				<attack type="WATER" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -1016,6 +1076,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="13" />
 				<run ground="140" />
@@ -1100,6 +1165,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="30" />
 				<run ground="170" />
@@ -1184,6 +1254,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -1269,6 +1344,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -1353,6 +1433,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1437,6 +1522,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -1521,6 +1611,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="25" />
 				<run ground="140" />
@@ -1605,6 +1700,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="35" />
 				<run ground="170" />
@@ -1689,6 +1789,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1774,6 +1879,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -1858,6 +1968,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1942,6 +2057,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -2026,6 +2146,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -2110,6 +2235,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="25" />
 				<run ground="140" />
@@ -2194,6 +2324,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="35" />
 				<run ground="170" />
@@ -2278,6 +2413,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="18" />
 				<run ground="190" />
@@ -2363,6 +2503,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -2447,6 +2592,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -2531,6 +2681,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -2615,6 +2770,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -2699,6 +2859,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -2783,6 +2948,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="13" />
 				<run ground="140" />
@@ -2867,6 +3037,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="30" />
 				<run ground="170" />
@@ -2951,6 +3126,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -3036,6 +3216,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -3120,6 +3305,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -3204,6 +3394,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -3288,6 +3483,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="25" />
 				<run ground="140" />
@@ -3372,6 +3572,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="35" />
 				<run ground="170" />
@@ -3456,6 +3661,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -3541,6 +3751,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -3625,6 +3840,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -3709,6 +3929,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -3793,6 +4018,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -3877,6 +4107,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="25" />
 				<run ground="140" />
@@ -3961,6 +4196,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="35" />
 				<run ground="170" />
@@ -4045,6 +4285,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="18" />
 				<run ground="190" />
@@ -4130,6 +4375,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -4214,6 +4464,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -4298,6 +4553,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -4382,6 +4642,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -4466,6 +4731,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -4550,6 +4820,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="13" />
 				<run ground="140" />
@@ -4634,6 +4909,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="30" />
 				<run ground="170" />
@@ -4718,6 +4998,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -4803,6 +5088,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -4887,6 +5177,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -4971,6 +5266,11 @@
 			<vitals hp="722840" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="4447.31707317073" magical="1705.54616437254" />
+			<attribute>
+				<defence fire="1750" water="1750" wind="1700" earth="1750" holy="1750" dark="1750" />
+				<attack type="WIND" value="1600" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -5055,6 +5355,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="25" />
 				<run ground="140" />
@@ -5139,6 +5444,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="35" />
 				<run ground="170" />
@@ -5223,6 +5533,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -5308,6 +5623,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -5392,6 +5712,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -5476,6 +5801,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -5559,6 +5889,11 @@
 			<vitals hp="1137403" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<defence fire="1950" water="1950" wind="1900" earth="1950" holy="1950" dark="1950" />
+				<attack type="WIND" value="1900" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -5643,6 +5978,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="25" />
 				<run ground="140" />
@@ -5727,6 +6067,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="35" />
 				<run ground="170" />
@@ -5811,6 +6156,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="18" />
 				<run ground="190" />
@@ -5895,6 +6245,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -5979,6 +6334,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -6063,6 +6423,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -6147,6 +6512,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -6231,6 +6601,11 @@
 			<vitals hp="1886890" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -6314,6 +6689,11 @@
 			<vitals hp="1143.353" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="35" />
 				<run ground="80" />
@@ -6338,6 +6718,11 @@
 			<vitals hp="1143.353" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2120" water="2150" wind="2100" earth="2150" holy="2150" dark="2150" />
+				<attack type="WIND" value="2100" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="19" />
 				<run ground="80" />
@@ -6362,6 +6747,11 @@
 			<vitals hp="1143.353" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="20" />
 				<run ground="100" />
@@ -6387,6 +6777,11 @@
 			<vitals hp="1143.353" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="35" />
 				<run ground="80" />
@@ -6411,6 +6806,11 @@
 			<vitals hp="1143.353" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="19" />
 				<run ground="80" />
@@ -6434,6 +6834,11 @@
 			<vitals hp="1143.353" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="20" />
 				<run ground="100" />
@@ -6458,6 +6863,11 @@
 			<vitals hp="1143.353" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="35" />
 				<run ground="80" />
@@ -6482,6 +6892,11 @@
 			<vitals hp="1143.353" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="19" />
 				<run ground="80" />
@@ -6506,6 +6921,11 @@
 			<vitals hp="1143.353" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="5757.47663551402" magical="2208.44514357978" />
+			<attribute>
+				<defence fire="2050" water="2050" wind="2000" earth="2050" holy="2050" dark="2050" />
+				<attack type="WIND" value="2000" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 			<speed>
 				<walk ground="20" />
 				<run ground="100" />
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/33900-33999.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/33900-33999.xml
index ba116a57c5..3c332485f9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/33900-33999.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/33900-33999.xml
@@ -3776,9 +3776,9 @@
 		<equipment rhand="36218" />
 		<mpReward value="20" type="PER" ticks="10" affects="PARTY" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="4234.06312688557" hpRegen="8.5" mp="1846.8" mpRegen="3" />
-			<attack physical="13000" magical="811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="430" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="1085.36442" magical="264.74086" />
+			<vitals hp="42340.06312688557" hpRegen="8.5" mp="18046.8" mpRegen="3" />
+			<attack physical="25000" magical="2811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="430" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="10085.36442" magical="2064.74086" />
 			<speed>
 				<walk ground="64" />
 				<run ground="190" />
@@ -3789,7 +3789,7 @@
 			</attribute>
 			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" undying="true" />
+		<status attackable="false" talkable="false" undying="true" />
 		<skillList>
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/34000-34099.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/34000-34099.xml
index ade07cb46a..b136067478 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/34000-34099.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/34000-34099.xml
@@ -39,7 +39,7 @@
 			<skill id="15207" level="1" /> <!-- Debuff Immunity -->
 		</skillList>
 	</npc>
-	<npc id="34001" level="85" type="Folk" name="Ferin">
+	<npc id="34001" level="85" type="FriendlyNpc" name="Ferin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>FRIEND</race>
 		<sex>FEMALE</sex>
@@ -58,7 +58,7 @@
 			</attribute>
 			<abnormalResist physical="0" magical="0" />
 		</stats>
-		<status attackable="false" undying="true" />
+		<status attackable="false" talkable="false" undying="true" />
 		<collision>
 			<radius normal="8" />
 			<height normal="16" />
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/34600-34699.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/34600-34699.xml
index 99a9a8a59a..d72b4c5e44 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/34600-34699.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/npcs/34600-34699.xml
@@ -359,7 +359,7 @@
 			<height normal="80" />
 		</collision>
 	</npc>
-	<npc id="34618" level="85" type="Folk" name="Researchers' Teleporter" title="Isle of Prayer's Researcher">
+	<npc id="34618" level="85" type="Teleporter" name="Researchers' Teleporter" title="Isle of Prayer's Researcher">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -474,7 +474,7 @@
 			<height normal="19.5" />
 		</collision>
 	</npc>
-	<npc id="34624" level="85" type="Folk" name="Researchers' Teleporter" title="Alligator Island's Researcher">
+	<npc id="34624" level="85" type="Teleporter" name="Researchers' Teleporter" title="Alligator Island's Researcher">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -513,7 +513,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="34626" level="85" type="Folk" name="Expedition Teleporter" title="Swamp of Screams Expedition">
+	<npc id="34626" level="85" type="Teleporter" name="Expedition Teleporter" title="Swamp of Screams Expedition">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -552,7 +552,7 @@
 			<height normal="28.5" />
 		</collision>
 	</npc>
-	<npc id="34628" level="85" type="Folk" name="Expedition Teleporter" title="Blazing Swamp Expedition">
+	<npc id="34628" level="85" type="Teleporter" name="Expedition Teleporter" title="Blazing Swamp Expedition">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -591,7 +591,7 @@
 			<height normal="28.5" />
 		</collision>
 	</npc>
-	<npc id="34630" level="85" type="Folk" name="Overseer Teleporter" title="Isle of Souls Overseers">
+	<npc id="34630" level="85" type="Teleporter" name="Overseer Teleporter" title="Isle of Souls Overseers">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -631,7 +631,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="34632" level="85" type="Folk" name="Overseer Teleporter" title="Plunderous Plains Overseers">
+	<npc id="34632" level="85" type="Teleporter" name="Overseer Teleporter" title="Plunderous Plains Overseers">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -900,7 +900,7 @@
 			<height normal="24.2" />
 		</collision>
 	</npc>
-	<npc id="34646" level="85" type="Folk" name="Lionel Hunter" title="Eva's Knight">
+	<npc id="34646" level="85" type="Teleporter" name="Lionel Hunter" title="Eva's Knight">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -920,7 +920,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="34647" level="85" type="Folk" name="Patrol Teleporter" title="Alligator Beach">
+	<npc id="34647" level="85" type="Teleporter" name="Patrol Teleporter" title="Alligator Beach">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/06200-06299.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/06200-06299.xml
index eed79a70f9..cb3bb32416 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/06200-06299.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/06200-06299.xml
@@ -1546,11 +1546,9 @@
 		<effectPoint>-1000</effectPoint>
 		<attributeType>WATER</attributeType>
 		<attributeValue>180</attributeValue>
-		<hitTime>10000</hitTime>
+		<hitTime>100</hitTime>
 		<magicLevel>85</magicLevel>
 		<operateType>A1</operateType>
-		<reuseDelay>10000</reuseDelay>
-		<abnormalResists>TURN_FLEE;KNOCKDOWN;DEPORT;SILENCE;PARALYZE;ABSORB;DISARM;SILENCE_PHYSICAL;SILENCE_ALL;CHANGEBODY;TURN_STONE;DERANGEMENT;AIRBIND;SLEEP;OBLIVION;MIRAGE;MIRAGE_TRAP;ROOT_MAGICALLY;ROOT_PHYSICALLY;STUN;PUBLIC_SLOT</abnormalResists>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<isDebuff>true</isDebuff>
 		<targetType>SELF</targetType>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/10500-10599.xml
index 2cebaf4b28..d2a456d658 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/10500-10599.xml
@@ -848,6 +848,8 @@
 					<value level="11">9832</value>
 					<value level="12">10268</value>
 					<value level="13">10704</value>
+					<value level="14">10704</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="15">10704</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 				</abnormalPower>
 				<chanceBoost>365</chanceBoost>
 				<overHit>true</overHit>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/12800-12899.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/12800-12899.xml
index e278cf1583..792b52aafd 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/12800-12899.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/12800-12899.xml
@@ -17,7 +17,6 @@
 			<effect name="RestorationRandom">
 				<items>
 					<item chance="100">
-						<item id="30310" count="1" /> <!-- Abelius Cloak - Sigel Knight -->
 						<item id="80320" count="1" /> <!-- Paulina Twilight Bracelet -->
 						<item id="46782" count="1" /> <!-- Aden Warrior Box -->
 					</item>
@@ -42,7 +41,6 @@
 			<effect name="RestorationRandom">
 				<items>
 					<item chance="100">
-						<item id="30311" count="1" /> <!-- Sapyros Cloak - Tyrr Warrior -->
 						<item id="80320" count="1" /> <!-- Paulina Twilight Bracelet -->
 						<item id="46782" count="1" /> <!-- Aden Warrior Box -->
 					</item>
@@ -67,7 +65,6 @@
 			<effect name="RestorationRandom">
 				<items>
 					<item chance="100">
-						<item id="30312" count="1" /> <!-- Ashagen Cloak - Othell Rogue -->
 						<item id="80320" count="1" /> <!-- Paulina Twilight Bracelet -->
 						<item id="46782" count="1" /> <!-- Aden Warrior Box -->
 					</item>
@@ -92,7 +89,6 @@
 			<effect name="RestorationRandom">
 				<items>
 					<item chance="100">
-						<item id="30313" count="1" /> <!-- Cranigg Cloak - Yul Archer -->
 						<item id="80320" count="1" /> <!-- Paulina Twilight Bracelet -->
 						<item id="46782" count="1" /> <!-- Aden Warrior Box -->
 					</item>
@@ -117,7 +113,6 @@
 			<effect name="RestorationRandom">
 				<items>
 					<item chance="100">
-						<item id="30314" count="1" /> <!-- Soltkreig Cloak - Feoh Wizard -->
 						<item id="80320" count="1" /> <!-- Paulina Twilight Bracelet -->
 						<item id="46782" count="1" /> <!-- Aden Warrior Box -->
 					</item>
@@ -142,7 +137,6 @@
 			<effect name="RestorationRandom">
 				<items>
 					<item chance="100">
-						<item id="30315" count="1" /> <!-- Naviarope Cloak - Wynn Summoner -->
 						<item id="80320" count="1" /> <!-- Paulina Twilight Bracelet -->
 						<item id="46782" count="1" /> <!-- Aden Warrior Box -->
 					</item>
@@ -167,7 +161,6 @@
 			<effect name="RestorationRandom">
 				<items>
 					<item chance="100">
-						<item id="30316" count="1" /> <!-- Leister Cloak - Iss Enchanter -->
 						<item id="80320" count="1" /> <!-- Paulina Twilight Bracelet -->
 						<item id="46782" count="1" /> <!-- Aden Warrior Box -->
 					</item>
@@ -192,7 +185,6 @@
 			<effect name="RestorationRandom">
 				<items>
 					<item chance="100">
-						<item id="30317" count="1" /> <!-- Lakcis Cloak - Aeore Healer -->
 						<item id="80320" count="1" /> <!-- Paulina Twilight Bracelet -->
 						<item id="46782" count="1" /> <!-- Aden Warrior Box -->
 					</item>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/13900-13999.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/13900-13999.xml
index 0743659057..83a244d5dc 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/13900-13999.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/13900-13999.xml
@@ -2891,14 +2891,6 @@
 		<operateType>P</operateType>
 		<targetType>SELF</targetType>
 		<effects>
-			<effect name="DamageByAttack">
-				<amount>-10</amount>
-				<type>PK</type>
-			</effect>
-			<effect name="DamageByAttack">
-				<amount>-10</amount>
-				<type>ENEMY_ALL</type>
-			</effect>
 			<effect name="StatUp">
 				<amount>3</amount>
 				<stat>STR</stat>
@@ -2931,6 +2923,17 @@
 				<amount>3</amount>
 				<stat>CHA</stat>
 			</effect>
+			<effect name="VitalityExpRate">
+				<amount>5</amount>
+			</effect>
+			<effect name="DamageByAttack">
+				<amount>-10</amount>
+				<type>PK</type>
+			</effect>
+			<effect name="DamageByAttack">
+				<amount>-10</amount>
+				<type>ENEMY_ALL</type>
+			</effect>
 			<effect name="DefenceAttribute">
 				<amount>10</amount>
 				<attribute>FIRE</attribute>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/16300-16399.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/16300-16399.xml
index 16b0528f51..5d65fce993 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/16300-16399.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/16300-16399.xml
@@ -801,6 +801,22 @@
 		<reuseDelay>5000</reuseDelay>
 		<effectPoint>-150</effectPoint>
 		<isDebuff>true</isDebuff>
+		<activateRate>80</activateRate>
+		<affectRange>900</affectRange>
+		<basicProperty>PHYSICAL</basicProperty>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<trait>PULL</trait>
+		<effects>
+			<effect name="AirBind" />
+			<effect name="Bluff">
+				<chance>100</chance>
+			</effect>
+			<effect name="PullBack">
+				<speed>600</speed>
+				<delay>600</delay>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="16388" toLevel="1" name="Kain's Wrath">
 		<!-- Consumed by vengeful fury toward all who harm Giselle. -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/18400-18499.xml
index f8a59c8c96..515ab275b1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/18400-18499.xml
@@ -885,8 +885,30 @@
 		<!-- For 1 h., acquired XP/ SP +100%, recovers Vitality to the maximum. Changes the appearance of your armor into that of an NC Dinos Uniform. Cannot be stacked with the Fall of the Dragon or Nevit's Hourglass. -->
 		<icon>BranchIcon.icon.g_ev_goldenball</icon>
 		<operateType>A2</operateType>
+		<effectPoint>1</effectPoint>
+		<abnormalType>CHANGEBODY</abnormalType>
+		<abnormalVisualEffect>CHANGE_DINOS</abnormalVisualEffect>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>46254</itemConsumeId> <!-- Dandy's Home Run Ball -->
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>-3</magicLevel>
+		<abnormalLevel>2</abnormalLevel>
+		<abnormalTime>3600</abnormalTime>
 		<reuseDelay>15000</reuseDelay>
+		<irreplacableBuff>true</irreplacableBuff>
+		<stayAfterDeath>true</stayAfterDeath>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="ExpModify">
+				<amount>100</amount>
+			</effect>
+			<effect name="SpModify">
+				<amount>100</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18472" toLevel="6" name="Giveaway Number 1">
 		<icon>icon.skill0000</icon>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/18500-18599.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/18500-18599.xml
index 76a5c79136..ce37cc4e3c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/18500-18599.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/18500-18599.xml
@@ -803,10 +803,12 @@
 		<abnormalType>
 			<value level="1">SKILL_IGNORE</value>
 			<value level="2">ABNORMAL_INVINCIBILITY</value>
+			<value level="3">ABNORMAL_INVINCIBILITY</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalType>
 		<abnormalLevel>
 			<value level="1">2</value>
 			<value level="2">3</value>
+			<value level="3">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalLevel>
 		<abnormalTime>7</abnormalTime>
 		<hitTime>1000</hitTime>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/22500-22599.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/22500-22599.xml
index 568df94b3b..dff2b09ea8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/22500-22599.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/22500-22599.xml
@@ -1578,7 +1578,7 @@
 		<itemConsumeId>
 			<value level="1">22883</value>
 			<value level="2">22884</value>
-			<value level="2">22885</value>
+			<value level="3">22885</value>
 		</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<reuseDelay>3600000</reuseDelay>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/22700-22799.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/22700-22799.xml
index 8762c2da22..0d58b56f20 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/22700-22799.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/22700-22799.xml
@@ -297,7 +297,7 @@
 		<itemConsumeId>
 			<value level="1">23338</value>
 			<value level="2">23339</value>
-			<value level="2">23340</value>
+			<value level="3">23340</value>
 		</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<reuseDelay>3600000</reuseDelay>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/27500-27599.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/27500-27599.xml
index 5ae51341a2..dd36622d95 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/27500-27599.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/27500-27599.xml
@@ -2735,10 +2735,12 @@
 		<abnormalType>
 			<value level="1">SKILL_IGNORE</value>
 			<value level="2">ABNORMAL_INVINCIBILITY</value>
+			<value level="3">ABNORMAL_INVINCIBILITY</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalType>
 		<abnormalLevel>
 			<value level="1">2</value>
 			<value level="2">3</value>
+			<value level="3">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalLevel>
 		<abnormalTime>7</abnormalTime>
 		<hitTime>1000</hitTime>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/29500-29599.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/29500-29599.xml
index 67754aab4a..3f062045a0 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/29500-29599.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/29500-29599.xml
@@ -546,92 +546,236 @@
 	<skill id="29562" toLevel="1" name="Sigil of Light Lv. 1">
 		<!-- Applies additional effects with the level increase. -->
 		<icon>icon.sigil_of_protection</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
 	</skill>
 	<skill id="29563" toLevel="1" name="Sigil of Light Lv. 2">
 		<!-- MEN +1 -->
 		<icon>icon.sigil_of_protection</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>MEN</stat>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29564" toLevel="1" name="Sigil of Light Lv. 3">
 		<!-- MEN +1/ CON +1 -->
 		<icon>icon.sigil_of_protection</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>MEN,CON</stat>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29565" toLevel="1" name="Sigil of Light Lv. 4">
 		<!-- MEN +1/ CON +1/ WIT +1 -->
 		<icon>icon.sigil_of_protection</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>MEN,CON,WIT</stat>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29566" toLevel="1" name="Sigil of Light Lv. 5">
 		<!-- MEN +1/ CON +1/ WIT +1/ DEX +1 -->
 		<icon>icon.sigil_of_protection</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>MEN,CON,WIT,DEX</stat>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29567" toLevel="1" name="Sigil of Light Lv. 6">
 		<!-- MEN +1/ CON +1/ WIT +1/ DEX +1/ INT +1/ STR +1 -->
 		<icon>icon.sigil_of_protection</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>MEN,CON,WIT,DEX,INT,STR</stat>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29568" toLevel="1" name="Sigil of Light Lv. 7">
 		<!-- MEN +1/ CON +1/ WIT +1/ DEX +1/ INT +1/ STR +1/ CHA +1/ LUC +1 -->
 		<icon>icon.sigil_of_protection</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>MEN,CON,WIT,DEX,INT,STR,CHA,LUC</stat>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29569" toLevel="1" name="Sigil of Light Lv. 8">
 		<!-- MEN +1/ CON +1/ WIT +1/ DEX +1/ INT +1/ STR +1/ CHA +1/ LUC +1, Attribute Resistance +50, Weapon P./ M. Atk. +50 -->
 		<icon>icon.sigil_of_protection</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>MEN,CON,WIT,DEX,INT,STR,CHA,LUC</stat>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>50</amount>
+				<attribute>FIRE,WATER,WIND,EARTH,HOLY,DARK</attribute>
+			</effect>
+			<effect name="WeaponBonusPAtk">
+				<amount>50</amount>
+			</effect>
+			<effect name="WeaponBonusMAtk">
+				<amount>50</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29570" toLevel="1" name="Sigil of Light Lv. 9">
 		<!-- MEN +1/ CON +1/ WIT +1/ DEX +1/ INT +1/ STR +1/ CHA +1/ LUC +1, Attribute Resistance +70, Weapon P./ M. Atk. +80 -->
 		<icon>icon.sigil_of_protection</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>MEN,CON,WIT,DEX,INT,STR,CHA,LUC</stat>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>70</amount>
+				<attribute>FIRE,WATER,WIND,EARTH,HOLY,DARK</attribute>
+			</effect>
+			<effect name="WeaponBonusPAtk">
+				<amount>80</amount>
+			</effect>
+			<effect name="WeaponBonusMAtk">
+				<amount>80</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29571" toLevel="1" name="Sigil of Light Lv. 10">
 		<!-- MEN +1/ CON +1/ WIT +1/ DEX +1/ INT +1/ STR +1/ CHA +1/ LUC +1, Attribute Resistance +100, Weapon P./ M. Atk. +120 -->
 		<icon>icon.sigil_of_protection</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>1</amount>
+				<stat>MEN,CON,WIT,DEX,INT,STR,CHA,LUC</stat>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>100</amount>
+				<attribute>FIRE,WATER,WIND,EARTH,HOLY,DARK</attribute>
+			</effect>
+			<effect name="WeaponBonusPAtk">
+				<amount>120</amount>
+			</effect>
+			<effect name="WeaponBonusMAtk">
+				<amount>120</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="29572" toLevel="1" name="Appearance Stone: Sigil of Light Lv. 1">
 		<icon>BranchSys3.Icon.g_shape_shifting_sigil</icon>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLevel>1</magicLevel>
+		<isMagic>2</isMagic>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="29573" toLevel="1" name="Appearance Stone: Sigil of Light Lv. 2">
 		<icon>BranchSys3.Icon.g_shape_shifting_sigil</icon>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLevel>1</magicLevel>
+		<isMagic>2</isMagic>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="29574" toLevel="1" name="Appearance Stone: Sigil of Light Lv. 3">
 		<icon>BranchSys3.Icon.g_shape_shifting_sigil</icon>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLevel>1</magicLevel>
+		<isMagic>2</isMagic>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="29575" toLevel="1" name="Appearance Stone: Sigil of Light Lv. 4">
 		<icon>BranchSys3.Icon.g_shape_shifting_sigil</icon>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLevel>1</magicLevel>
+		<isMagic>2</isMagic>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="29576" toLevel="1" name="Appearance Stone: Sigil of Light Lv. 5">
 		<icon>BranchSys3.Icon.g_shape_shifting_sigil</icon>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLevel>1</magicLevel>
+		<isMagic>2</isMagic>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="29577" toLevel="1" name="Appearance Stone: Sigil of Light Lv. 6">
 		<icon>BranchSys3.Icon.g_shape_shifting_sigil</icon>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLevel>1</magicLevel>
+		<isMagic>2</isMagic>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="29578" toLevel="1" name="Appearance Stone: Sigil of Light Lv. 7">
 		<icon>BranchSys3.Icon.g_shape_shifting_sigil</icon>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLevel>1</magicLevel>
+		<isMagic>2</isMagic>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="29579" toLevel="1" name="Appearance Stone: Sigil of Light Lv. 8">
 		<icon>BranchSys3.Icon.g_shape_shifting_sigil</icon>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLevel>1</magicLevel>
+		<isMagic>2</isMagic>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="29580" toLevel="1" name="Appearance Stone: Sigil of Light Lv. 9">
 		<icon>BranchSys3.Icon.g_shape_shifting_sigil</icon>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLevel>1</magicLevel>
+		<isMagic>2</isMagic>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="29581" toLevel="1" name="Appearance Stone: Sigil of Light Lv. 10">
 		<icon>BranchSys3.Icon.g_shape_shifting_sigil</icon>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLevel>1</magicLevel>
+		<isMagic>2</isMagic>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="29582" toLevel="1" name="Legend 2022: EvillyRU">
 		<!-- Damage +5%, acquired XP/ SP +5%, received damage -5%. Cannot be used in the Olympiad or the Ceremony of Chaos. The buff is applied in honor of the player EvillyRU who took the 1st place in the 2022 rankings. -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/30000-30099.xml
index ded0fef00d..924fc6d5fe 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/30000-30099.xml
@@ -2037,8 +2037,8 @@
 		<operateType>P</operateType>
 		<magicLevel>85</magicLevel>
 		<effects>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>350</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/30700-30799.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/30700-30799.xml
index b1a01808ea..c7a6e2c617 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/30700-30799.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/30700-30799.xml
@@ -3207,6 +3207,7 @@
 			<value level="2">90</value>
 			<value level="3">95</value>
 			<value level="4">110</value>
+			<value level="5">110</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</magicLevel>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/30800-30899.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/30800-30899.xml
index 83c33cb173..fb5bea055f 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/30800-30899.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/30800-30899.xml
@@ -2269,7 +2269,7 @@
 		<abnormalVisualEffect>H_DEBUFF_SELF_B_AVE</abnormalVisualEffect>
 		<magicLevel>
 			<value level="1">110</value>
-			<value level="1">115</value>
+			<value level="2">115</value>
 		</magicLevel>
 		<magicCriticalRate>5</magicCriticalRate>
 		<operateType>AU</operateType>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/31000-31099.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/31000-31099.xml
index 0e6ddb0394..57bc7721f2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/31000-31099.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/31000-31099.xml
@@ -2757,6 +2757,7 @@
 				<amount>
 					<value level="1">1</value>
 					<value level="2">2</value>
+					<value level="3">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 				</amount>
 				<mode>PER</mode>
 				<magicType>0</magicType>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/31100-31199.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/31100-31199.xml
index e473f81e09..b84735fe63 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/31100-31199.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/31100-31199.xml
@@ -1068,7 +1068,7 @@
 		<effectPoint>-716</effectPoint>
 		<reuseDelay>20000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
-		<itemConsumeId>38773</itemConsumeId>
+		<itemConsumeId>1785</itemConsumeId>
 		<itemConsumeCount>3</itemConsumeCount>
 		<conditions>
 			<condition name="EquipWeapon">
@@ -2493,7 +2493,6 @@
 			<effect name="DamageByAttack">
 				<amount>5</amount>
 				<type>ENEMY_ALL</type>
-				<mode>PER</mode>
 			</effect>
 			<effect name="CallSkill">
 				<skillId>31174</skillId> <!-- Avenger's Order -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/34400-34499.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/34400-34499.xml
index 2c7b0f5b43..c8b78fa712 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/34400-34499.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/34400-34499.xml
@@ -188,42 +188,264 @@
 	<skill id="34437" toLevel="2" name="Queen's Ice Bolt">
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<isMagic>1</isMagic> <!-- Magic Skill -->
+		<castRange>2000</castRange>
+		<hitTime>2200</hitTime>
+		<coolTime>300</coolTime>
+		<effectPoint>-704</effectPoint>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<nextAction>ATTACK</nextAction>
+		<effects>
+			<effect name="MagicalAttack">
+				<power>
+					<value level="1">553</value>
+					<value level="2">685</value>
+				</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="34438" toLevel="2" name="Queen's Ice Storm">
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<affectLimit>6-12</affectLimit>
+		<affectRange>400</affectRange>
+		<isMagic>1</isMagic> <!-- Magic Skill -->
+		<hitTime>4500</hitTime>
+		<coolTime>500</coolTime>
+		<effectPoint>-731</effectPoint>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<effects>
+			<effect name="MagicalAttack">
+				<power>
+					<value level="1">553</value>
+					<value level="2">685</value>
+				</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="34439" toLevel="2" name="Queen's Ice Hurricane">
 		<!-- The rebels are filled with soul-chilling terror!. For 10 sec., inflicts Aerial Yoke on the target. -->
 		<icon>icon.ev_magic_flame_game_wind2</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalLevel>1</abnormalLevel>
+		<abnormalTime>10</abnormalTime>
+		<abnormalType>AIRBIND</abnormalType>
+		<abnormalVisualEffect>ASTATINE_WATER</abnormalVisualEffect>
+		<activateRate>100</activateRate>
+		<lvlBonusRate>20</lvlBonusRate>
+		<basicProperty>NONE</basicProperty>
+		<trait>AIRBIND</trait>
+		<affectRange>150</affectRange>
+		<hitTime>3000</hitTime>
+		<coolTime>200</coolTime>
+		<effectPoint>-708</effectPoint>
+		<abnormalResists>STUN;TURN_FLEE</abnormalResists>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>120</magicLevel>
+		<isDebuff>true</isDebuff>
+		<isMagic>2</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<effects>
+			<effect name="AirBind" />
+			<effect name="BlockActions">
+				<allowedSkills>13565;35190;27548;1904;1912;10517;30868;19573;10279;11264;30516;30017;30018</allowedSkills>
+			</effect>
+			<effect name="DefenceTrait">
+				<SLEEP>100</SLEEP>
+				<CHANGEBODY>100</CHANGEBODY>
+				<AIRBIND>100</AIRBIND>
+				<KNOCKDOWN>100</KNOCKDOWN>
+				<HOLD>100</HOLD>
+				<SHOCK>100</SHOCK>
+				<DERANGEMENT>100</DERANGEMENT>
+				<KNOCKBACK>100</KNOCKBACK>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="34440" toLevel="1" name="Queen's Freezing Blizzard">
 		<!-- Merciless fury freezes everything on its way. For 20 sec., freezes the target. The effect cannot be removed or resisted. -->
 		<icon>icon.skill1237</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalLevel>1</abnormalLevel>
+		<abnormalTime>20</abnormalTime>
+		<abnormalType>FREEZING</abnormalType>
+		<abnormalVisualEffect>FREEZING2</abnormalVisualEffect>
+		<activateRate>100</activateRate>
+		<lvlBonusRate>20</lvlBonusRate>
+		<basicProperty>NONE</basicProperty>
+		<affectRange>150</affectRange>
+		<hitTime>3000</hitTime>
+		<coolTime>200</coolTime>
+		<effectPoint>-708</effectPoint>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>120</magicLevel>
+		<isDebuff>true</isDebuff>
+		<isMagic>2</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<irreplacableBuff>true</irreplacableBuff>
+		<canBeDispelled>false</canBeDispelled>
+		<effects>
+			<effect name="BlockActions" />
+		</effects>
 	</skill>
 	<skill id="34441" toLevel="1" name="Queen's Freezing Wave">
 		<!-- Ice energy fills the victim's body with paralyzing fear. For 20 sec., greatly decreases the target's Speed and Atk. Spd./ Casting Spd. and increases Skill Cooldown. The effect cannot be removed or resisted. -->
 		<icon>icon.skill6274</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalLevel>1</abnormalLevel>
+		<abnormalTime>20</abnormalTime>
+		<abnormalType>BLEEDING</abnormalType>
+		<activateRate>120</activateRate>
+		<basicProperty>MAGIC</basicProperty>
+		<trait>DERANGEMENT</trait>
+		<magicLevel>120</magicLevel>
+		<lvlBonusRate>20</lvlBonusRate>
+		<castRange>800</castRange>
+		<effectRange>600</effectRange>
+		<hitTime>2200</hitTime>
+		<coolTime>300</coolTime>
+		<isMagic>1</isMagic>
+		<effectPoint>-704</effectPoint>
+		<magicCriticalRate>5</magicCriticalRate>
+		<isDebuff>true</isDebuff>
+		<targetType>ENEMY</targetType>
+		<affectScope>SQUARE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<fanRange>0;0;500;600</fanRange>
+		<affectLimit>5-12</affectLimit>
+		<effects>
+			<effect name="MagicalAttack">
+				<power>
+					<value level="1">553</value>
+					<value level="2">685</value>
+				</power>
+			</effect>
+			<effect name="Speed">
+				<amount>-80</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<amount>-30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalAttackSpeed">
+				<amount>-30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Reuse">
+				<amount>20</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>20</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>20</amount>
+				<mode>PER</mode>
+				<magicType>22</magicType>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="34442" toLevel="1" name="Eternal Blizzard">
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<affectLimit>6-12</affectLimit>
+		<affectRange>400</affectRange>
+		<hitTime>10500</hitTime>
+		<isMagic>1</isMagic>
+		<effectPoint>-731</effectPoint>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>120</magicLevel>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
 	</skill>
 	<skill id="34443" toLevel="1" name="Freezing Strike">
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<magicLevel>120</magicLevel>
+		<castRange>350</castRange>
+		<effectRange>500</effectRange>
+		<hitTime>1200</hitTime>
+		<coolTime>300</coolTime>
+		<effectPoint>-712</effectPoint>
+		<magicCriticalRate>10</magicCriticalRate>
+		<isMagic>1</isMagic>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="MagicalAttack">
+				<power>553</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="34444" toLevel="1" name="Freezing Smash">
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<affectLimit>6-12</affectLimit>
+		<affectRange>400</affectRange>
+		<hitTime>4500</hitTime>
+		<isMagic>1</isMagic>
+		<effectPoint>-731</effectPoint>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>120</magicLevel>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<effects>
+			<effect name="MagicalAttack">
+				<power>553</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="34445" toLevel="1" name="Freezing Wave">
 		<!-- Abruptly knocks the target down. -->
 		<icon>icon.oasis_feel</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalLevel>1</abnormalLevel>
+		<abnormalTime>5</abnormalTime>
+		<abnormalType>KNOCKDOWN</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>120</magicLevel>
+		<hitTime>4500</hitTime>
+		<effectPoint>-731</effectPoint>
+		<basicProperty>NONE</basicProperty>
+		<isDebuff>true</isDebuff>
+		<activateRate>100</activateRate>
+		<lvlBonusRate>20</lvlBonusRate>
+		<trait>KNOCKDOWN</trait>
+		<affectRange>400</affectRange>
+		<abnormalVisualEffect>KNOCKDOWN</abnormalVisualEffect>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<effects>
+			<effect name="KnockBack">
+				<distance>200</distance>
+				<speed>400</speed>
+				<knockDown>true</knockDown>
+			</effect>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>100</DERANGEMENT>
+				<SLEEP>100</SLEEP>
+				<HOLD>100</HOLD>
+				<SHOCK>100</SHOCK>
+				<CHANGEBODY>100</CHANGEBODY>
+			</effect>
+			<effect name="BlockActions">
+				<allowedSkills>13542;13565;35190;27548;1904;1912;10517;30868;19573;10279;11264;30516;30017;30018</allowedSkills>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="34446" toLevel="2" name="Queen's Ice Hurricane">
 		<icon>icon.skill0000</icon>
@@ -232,6 +454,16 @@
 	<skill id="34447" toLevel="1" name="Final Freezing Burst">
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<affectLimit>6-12</affectLimit>
+		<affectRange>400</affectRange>
+		<hitTime>10500</hitTime>
+		<isMagic>1</isMagic>
+		<effectPoint>-731</effectPoint>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>120</magicLevel>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
 	</skill>
 	<skill id="34448" toLevel="1" name="Queen's Freezing Sting">
 		<icon>icon.skill0000</icon>
@@ -240,12 +472,86 @@
 	<skill id="34449" toLevel="2" name="Freezing Chain">
 		<!-- The enemy is struck with acute pain that prevents them from moving. Stuns for 2 sec. Cannot be removed. -->
 		<icon>icon.skill10015</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalLevel>
+			<value level="1">1</value>
+			<value level="2">2</value>
+		</abnormalLevel>
+		<abnormalTime>
+			<value level="1">2</value>
+			<value level="2">1</value>
+		</abnormalTime>
+		<abnormalType>STUN</abnormalType>
+		<abnormalVisualEffect>
+			<value level="1">STUN</value>
+		</abnormalVisualEffect>
+		<affectRange>
+			<value level="1">2200</value>
+			<value level="2">1000</value>
+		</affectRange>
+		<activateRate>100</activateRate>
+		<lvlBonusRate>20</lvlBonusRate>
+		<basicProperty>PHYSICAL</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>120</magicLevel>
+		<castRange>
+			<value level="1">2000</value>
+			<value level="2">900</value>
+		</castRange>
+		<effectRange>2200</effectRange>
+		<hitTime>
+			<value level="1">1000</value>
+			<value level="2">1500</value>
+		</hitTime>
+		<coolTime>500</coolTime>
+		<effectPoint>-2161</effectPoint>
+		<hitCancelTime>0</hitCancelTime>
+		<trait>PULL</trait>
+		<isDebuff>true</isDebuff>
+		<targetType>
+			<value level="1">ENEMY</value>
+			<value level="2">SELF</value>
+		</targetType>
+		<affectScope>
+			<value level="1">SINGLE</value>
+			<value level="2">RANGE</value>
+		</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<effects>
+			<effect name="AirBind" />
+			<effect name="Bluff" fromLevel="2" toLevel="2">
+				<chance>100</chance>
+			</effect>
+			<effect name="PullBack" fromLevel="2" toLevel="2">
+				<speed>600</speed>
+				<delay>650</delay>
+			</effect>
+			<effect name="BlockActions">
+				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912;7002;18721;18722;28203;30516;35190</allowedSkills>
+			</effect>
+			<effect name="GetAgro" fromLevel="2" toLevel="2" />
+		</effects>
 	</skill>
 	<skill id="34451" toLevel="1" name="Frosty Command">
 		<!-- The Ice Queen's will is absolute!. Greatly increases P. Atk. -->
 		<icon>icon.skill1001</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalLevel>1</abnormalLevel>
+		<abnormalTime>300</abnormalTime>
+		<abnormalType>PA_UP</abnormalType>
+		<magicLevel>120</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<operateType>A2</operateType>
+		<basicProperty>NONE</basicProperty>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PAtk">
+				<amount>100</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="34452" toLevel="2" name="Summon Ice Bolts">
 		<!-- The Ice Queen's energy deals great damage and knocks down. The effect cannot be removed or resisted. -->
@@ -253,17 +559,54 @@
 			<value level="1">icon.skill1399</value>
 			<value level="2">icon.skill0000</value>
 		</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalLevel>1</abnormalLevel>
+		<abnormalTime>3</abnormalTime>
+		<abnormalType>KNOCKDOWN</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>120</magicLevel>
+		<hitTime>5000</hitTime>
+		<effectPoint>-731</effectPoint>
+		<basicProperty>NONE</basicProperty>
+		<isDebuff>true</isDebuff>
+		<activateRate>100</activateRate>
+		<lvlBonusRate>20</lvlBonusRate>
+		<trait>KNOCKDOWN</trait>
+		<affectRange>200</affectRange>
+		<abnormalVisualEffect>KNOCKDOWN</abnormalVisualEffect>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<effects>
+			<effect name="MagicalAttack">
+				<power>553</power>
+			</effect>
+			<effect name="KnockBack">
+				<distance>200</distance>
+				<speed>400</speed>
+				<knockDown>true</knockDown>
+			</effect>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>100</DERANGEMENT>
+				<SLEEP>100</SLEEP>
+				<HOLD>100</HOLD>
+				<SHOCK>100</SHOCK>
+				<CHANGEBODY>100</CHANGEBODY>
+			</effect>
+			<effect name="BlockActions">
+				<allowedSkills>13542;13565;35190;27548;1904;1912;10517;30868;19573;10279;11264;30516;30017;30018</allowedSkills>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="34453" toLevel="1" name="Ice Queen's Authority">
 		<!-- Frosty current is covering the Ice Queen making her unbelievably powerful. -->
 		<icon>icon.skillboss</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
 	</skill>
 	<skill id="34454" toLevel="1" name="Frozen Kanna's Knight">
 		<!-- A knight who served Melisa until she turned into the Ice Queen Freya. Together with Knight Captain Kier, he tried to persuade Freya to return to herself, but she was just angered by his pleas and turned him into an ice statue. -->
 		<icon>icon.skill6301</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
 	</skill>
 	<skill id="34455" toLevel="1" name="Deadly Earth Strike">
 		<!-- An attack on a single target. -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39100-39199.xml
index b16aa0ff47..85ecb9f5d9 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39100-39199.xml
@@ -52,12 +52,14 @@
 			<value level="2">2</value>
 			<value level="3">3</value>
 			<value level="4">4</value>
+			<value level="5">5</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalLevel>
 		<abnormalTime>
 			<value level="1">3600</value>
 			<value level="2">7200</value>
 			<value level="3">21600</value>
 			<value level="4">28800</value>
+			<value level="5">28800</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalTime>
 		<abnormalType>CHANGEBODY</abnormalType>
 		<abnormalVisualEffect>CHANGESHAPE_TRANSFORM</abnormalVisualEffect>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39200-39299.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39200-39299.xml
index 9b791482c2..deb2dd8418 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39200-39299.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39200-39299.xml
@@ -46,6 +46,7 @@
 		<icon>icon.bm_dragon_posion_special</icon>
 		<operateType>A2</operateType>
 		<isMagic>2</isMagic>
+		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>300000</reuseDelay>
 		<abnormalType>GLOWING_DRAGON_POTION</abnormalType>
@@ -115,8 +116,10 @@
 				</amount>
 			</effect>
 			<effect name="SpModify">
-				<value level="1">30</value>
-				<value level="2">50</value>
+				<amount>
+					<value level="1">30</value>
+					<value level="2">50</value>
+				</amount>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39400-39499.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39400-39499.xml
index c290c69e4a..5a885bad2c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39400-39499.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39400-39499.xml
@@ -2091,6 +2091,7 @@
 		</effects>
 	</skill>
 	<skill id="39494" toLevel="1" name="Dye Powder">
+		<!-- Powder for replenishing the Dye Engraving scale. Restores 25% of the full scale. -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -2100,6 +2101,11 @@
 		<itemConsumeCount>1</itemConsumeCount>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="CanUseSymbolSealIncreaseItem">
+				<amount>25</amount> <!-- 25% from max symbol seal points -->
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="RestoreSymbolSeal">
 				<amount>25</amount>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39500-39599.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39500-39599.xml
index 56a4e1751a..7d12757a17 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39500-39599.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39500-39599.xml
@@ -170,6 +170,8 @@
 		<stayAfterDeath>true</stayAfterDeath>
 		<irreplacableBuff>true</irreplacableBuff>
 		<blockedInOlympiad>true</blockedInOlympiad>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<canDoubleCast>false</canDoubleCast>
 		<effects>
 			<effect name="PAtk">
 				<amount>25</amount>
@@ -232,6 +234,26 @@
 				<mode>PER</mode>
 				<magicType>1</magicType>
 			</effect>
+			<effect name="MagicMpCost">
+				<amount>-15</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-15</amount>
+				<mode>PER</mode>
+				<magicType>3</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-15</amount>
+				<mode>PER</mode>
+				<magicType>2</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-15</amount>
+				<mode>PER</mode>
+				<magicType>22</magicType>
+			</effect>
 			<effect name="AttackAttributeAdd">
 				<amount>100</amount>
 				<mode>DIFF</mode>
@@ -252,7 +274,7 @@
 				<magicType>22</magicType>
 			</effect>
 			<effect name="DispelBySlotProbability">
-				<dispel>MULTI_BUFF;DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;INSTINCT;BERSERKER;PA_PD_UP;IMPROVE_SHIELD_RATE_DEFENCE_UP;SHIELD_PROB_UP;SHIELD_DEFENCE_UP;CANCEL_PROB_DOWN;MA_UP_SPECIAL</dispel>
+				<dispel>MULTI_BUFF;DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;INSTINCT;BERSERKER;PA_PD_UP;IMPROVE_SHIELD_RATE_DEFENCE_UP;SHIELD_PROB_UP;SHIELD_DEFENCE_UP;CANCEL_PROB_DOWN;MA_UP_SPECIAL;BUFF_SPECIAL_CLASS</dispel>
 				<rate>100</rate>
 			</effect>
 			<effect name="BlockAbnormalSlot">
@@ -265,8 +287,113 @@
 		<icon>icon.soul_spirit1</icon>
 		<operateType>A2</operateType>
 		<hitTime>100</hitTime>
-		<reuseDelay>2000</reuseDelay>
 		<effectPoint>100</effectPoint>
+		<abnormalType>BUFF_SPECIAL_CLASS</abnormalType>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>85</magicLevel>
+		<abnormalLevel>1</abnormalLevel>
+		<abnormalTime>420</abnormalTime>
+		<isMagic>2</isMagic>
+		<reuseDelay>2000</reuseDelay>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PAtk">
+				<amount>22</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>40</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>45</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>15</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="CriticalRate">
+				<amount>100</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicCriticalRate">
+				<amount>100</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="CriticalDamage">
+				<amount>70</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalAttackSpeed">
+				<amount>15</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="ShieldDefence">
+				<amount>50</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="ShieldDefenceRate">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-15</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-15</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-15</amount>
+				<mode>PER</mode>
+				<magicType>3</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-15</amount>
+				<mode>PER</mode>
+				<magicType>2</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-15</amount>
+				<mode>PER</mode>
+				<magicType>22</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-20</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-20</amount>
+				<mode>PER</mode>
+				<magicType>0</magicType>
+			</effect>
+			<effect name="Reuse">
+				<amount>-20</amount>
+				<mode>PER</mode>
+				<magicType>22</magicType>
+			</effect>
+			<effect name="DisableSkill">
+				<disable>30833</disable>
+			</effect>
+			<effect name="DispelBySlotProbability">
+				<dispel>MULTI_BUFF;DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;INSTINCT;BERSERKER;PA_PD_UP;IMPROVE_SHIELD_RATE_DEFENCE_UP;SHIELD_PROB_UP;SHIELD_DEFENCE_UP;CANCEL_PROB_DOWN;MA_UP_SPECIAL;BUFF_SPECIAL_CLASS</dispel>
+				<rate>100</rate>
+			</effect>
+			<effect name="BlockAbnormalSlot">
+				<slot>MULTI_BUFF;DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;INSTINCT;BERSERKER;PA_PD_UP;IMPROVE_SHIELD_RATE_DEFENCE_UP;SHIELD_PROB_UP;SHIELD_DEFENCE_UP;CANCEL_PROB_DOWN;MA_UP_SPECIAL;BUFF_SPECIAL_CLASS</slot>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39516" toLevel="1" name="Elixir of Harmony">
 		<!-- For 30 min., P. Atk. +22%, M. Atk. +40%, P. Def. +45%, M. Def. +15%, P./ M. Critical Rate +100%, Critical Damage for basic attacks +70%, Atk. Spd. +10%, Casting Spd. +15%, Shield Defense Rate +30 min.0, Shield Defense +30 min.1, Skill Cooldown -30 min.2, Skill MP Consumption -30 min.3. PA only. -->
@@ -298,6 +425,8 @@
 		<stayAfterDeath>true</stayAfterDeath>
 		<irreplacableBuff>true</irreplacableBuff>
 		<blockedInOlympiad>true</blockedInOlympiad>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<canDoubleCast>false</canDoubleCast>
 		<effects>
 			<effect name="AttackAttributeAdd">
 				<amount>10</amount>
@@ -357,19 +486,81 @@
 	<skill id="39520" toLevel="3" name="Emperor's Special Cocktail">
 		<!-- For 60 min., applies the following effects: Musician's Melody Lv. 5, Fantasia Harmony Lv. 2, Drum Concert, Fantasia Melody, United Resistance. To remove the effect, press Alt + Mouse Left Click. -->
 		<icon>icon.bm_special_cocktail_of_king_p</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalTime>
+			<value level="1">3600</value>
+			<value level="2">14400</value>
+			<value level="3">28800</value>
+		</abnormalTime>
+		<effectPoint>1</effectPoint>
+		<basicProperty>NONE</basicProperty>
+		<abnormalLevel>7</abnormalLevel>
+		<specialLevel>-2</specialLevel>
+		<magicLevel>-2</magicLevel>
+		<isMagic>2</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<stayAfterDeath>true</stayAfterDeath>
+		<irreplacableBuff>true</irreplacableBuff>
+		<blockedInOlympiad>true</blockedInOlympiad>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<canDoubleCast>false</canDoubleCast>
 		<reuseDelay>5000</reuseDelay>
+		<effects>
+			<effect name="DispelBySlotProbability">
+				<dispel>BUFF_SPECIAL_CLASS;DITTY;BUFF_SPECIAL_ATTACK;BUFF_SPECIAL_AURA;ARMOR_ELEMENT_ALL</dispel>
+				<rate>100</rate>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39514</skillId> <!-- Fantasia Harmony - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39517</skillId> <!-- Fantasia Melody - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39766</skillId> <!-- Musician's Melody - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39771</skillId> <!-- Drum Concert - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39772</skillId> <!-- United Resistance - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</effects>
+		<endEffects>
+			<effect name="DispelBySlotProbability">
+				<dispel>BUFF_SPECIAL_CLASS;DITTY;BUFF_SPECIAL_ATTACK;BUFF_SPECIAL_AURA;ARMOR_ELEMENT_ALL</dispel>
+				<rate>100</rate>
+			</effect>
+		</endEffects>
 	</skill>
 	<skill id="39521" toLevel="1" name="PA Emperor's Special Cocktail">
 		<!-- For 60 min., applies the following effects: Musician's Melody Lv. 5, Fantasia Harmony Lv. 2, Drum Concert, Fantasia Melody, United Resistance. To remove the effect, press Alt + Mouse Left Click. -->
 		<icon>icon.bm_special_cocktail_of_king_p</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalTime>3600</abnormalTime>
+		<effectPoint>1</effectPoint>
+		<basicProperty>NONE</basicProperty>
+		<abnormalLevel>7</abnormalLevel>
+		<specialLevel>-2</specialLevel>
+		<magicLevel>-2</magicLevel>
+		<isMagic>22</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<stayAfterDeath>true</stayAfterDeath>
+		<irreplacableBuff>true</irreplacableBuff>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<reuseDelay>5000</reuseDelay>
 	</skill>
 	<skill id="39522" toLevel="1" name="Emperor's Special Cocktail">
 		<!-- For 60 min., applies the following effects: Musician's Melody Lv. 5, Fantasia Harmony Lv. 2, Drum Concert, Fantasia Melody, United Resistance. To remove the effect, press Alt + Mouse Left Click. -->
 		<icon>icon.bm_special_cocktail_of_king_p</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
 		<reuseDelay>5000</reuseDelay>
 	</skill>
 	<skill id="39523" toLevel="1" name="Golden Pig's Medium Vitality Tonic">
@@ -1189,11 +1380,16 @@
 	<skill id="39580" toLevel="1" name="Pink's Style Potion - Red Archer">
 		<!-- Changes the armor appearance to that of Red Archer Garment. -->
 		<icon>icon.armor_t2000_b_i00</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalTime>86400</abnormalTime>
+		<abnormalVisualEffect>CGRADE_CHANGE</abnormalVisualEffect>
 		<isMagic>4</isMagic>
 		<hitTime>1500</hitTime>
 		<reuseDelay>5000</reuseDelay>
 		<effectPoint>780</effectPoint>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>81016</itemConsumeId>
+		<stayAfterDeath>true</stayAfterDeath>
 	</skill>
 	<skill id="39581" toLevel="1" name="Pink's Style Potion - Green Archer">
 		<!-- Changes the armor appearance to that of Green Archer Garment. -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39700-39799.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39700-39799.xml
index bec8fef8b2..8a57d5bca4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39700-39799.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39700-39799.xml
@@ -1067,6 +1067,11 @@
 				<mode>PER</mode>
 				<magicType>3</magicType>
 			</effect>
+			<effect name="MagicMpCost">
+				<amount>-10</amount>
+				<mode>PER</mode>
+				<magicType>22</magicType>
+			</effect>
 			<effect name="VampiricAttack">
 				<amount>9</amount>
 				<chance>30</chance>
@@ -1193,6 +1198,16 @@
 				<mode>PER</mode>
 				<magicType>0</magicType>
 			</effect>
+			<effect name="MagicMpCost">
+				<amount>-22</amount>
+				<mode>PER</mode>
+				<magicType>2</magicType>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>-22</amount>
+				<mode>PER</mode>
+				<magicType>22</magicType>
+			</effect>
 			<effect name="VampiricAttack">
 				<amount>8</amount>
 				<chance>30</chance>
@@ -1515,7 +1530,33 @@
 	<skill id="39794" toLevel="1" name="Freya's Scroll of Blessing">
 		<!-- For 30 min., sustains Vitality, acquired XP/ SP +150%, Vitality bonus +100%. Doesn't stack with effects from Freya's Frozen Scroll, Freya's Scroll of Storm, and Maphr's Scroll of Storm. Cooldown: 5 min. The effect remains after death. -->
 		<icon>icon.bless_scroll</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalLevel>1</abnormalLevel>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>FREYA_SCROLL_VIT</abnormalType>
+		<itemConsumeId>82295</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<stayAfterDeath>true</stayAfterDeath>
+		<effects>
+			<effect name="VitalityExpRate">
+				<amount>100</amount>
+			</effect>
+			<effect name="ExpModify">
+				<amount>150</amount>
+			</effect>
+			<effect name="SpModify">
+				<amount>150</amount>
+			</effect>
+			<effect name="VitalityPointsRate">
+				<amount>-100</amount>
+			</effect>
+			<effect name="DispelBySlot">
+				<dispel>EXP_SPECIAL,-1;DANDY_CHALLENGE,-1;SANTIAGO_SCROLL,-1</dispel>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39795" toLevel="1" name="Tavern Special Drink">
 		<!-- For 30 min., damage +15%, Attribute Attack/ Resistance +100, received damage -15%. Doesn't stack with effects from Freya's Charisma Potion, Einhasad's Charisma Potion, and Freya's Luck Potion. Cooldown: 5 min. The effect remains after death. -->
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39800-39899.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39800-39899.xml
index 10efa496ee..7998c32abd 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39800-39899.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/39800-39899.xml
@@ -116,7 +116,50 @@
 	<skill id="39817" toLevel="1" name="Wishing Stone">
 		<!-- For 30 min., Weapon P./ M. Atk. +150, STR/ INT/ CON +3, Speed +7, acquired XP/ SP +10%. The effect remains after death, after switching to a dual class or entering instance zones. Removed when entering the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.elemental_earth_stone_i00</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalLevel>2</abnormalLevel>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<canBeDispelled>false</canBeDispelled>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitTime>1000</hitTime>
+		<reuseDelay>300000</reuseDelay>
+		<effectPoint>1</effectPoint>
+		<isMagic>2</isMagic>
+		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad>
+		<effects>
+			<effect name="WeaponBonusPAtk">
+				<amount>150</amount>
+			</effect>
+			<effect name="WeaponBonusMAtk">
+				<amount>150</amount>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>INT</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>3</amount>
+				<stat>CON</stat>
+			</effect>
+			<effect name="Speed">
+				<amount>7</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="ExpModify">
+				<amount>10</amount>
+			</effect>
+			<effect name="SpModify">
+				<amount>10</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39818" toLevel="1" name="+6 Fallen Angel's Earring Pack (Cooldown Lv. 3)">
 		<!-- Double-click to obtain +6 Fallen Angel's Earring (Cooldown Lv. 3). -->
@@ -147,9 +190,21 @@
 		<!-- For 30 min., Weapon P./ M. Atk. +190, M. Atk./ M. Def. +19,000, acquired XP/ SP +19%. The effect remains after death, after switching to a dual class or entering instance zones. Removed when entering the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.ev_19th_cake</icon>
 		<operateType>A1</operateType>
+		<effectPoint>1</effectPoint>
 	</skill>
 	<skill id="39824" toLevel="1" name="Sealed Fire Source">
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<magicLevel>1</magicLevel>
+		<isMagic>4</isMagic>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>82658</itemConsumeId> <!-- Sealed Fire Source -->
+		<effects>
+			<effect name="AddFireSourcePoints" />
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/documentation.txt
index 3766a361c3..ecfc3ba221 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/stats/skills/documentation.txt
@@ -7,11 +7,14 @@ AbstractStatAddEffect: Abstract class for managing stat adding.
 AbstractStatEffect: Abstract class for managing stats.
 AbstractStatPercentEffect: Abstract class for managing stat percentages. (l2jmobius)
 Accuracy: P. Accuracy stat.
+AddFireSourcePoints: Conquest effect to add Fire Source points. (l2jmobius)
 AddHate: Instant effect that increases target's hate towards you.
 AddHuntingTime: Add time for time limited hunting zones. (l2jmobius)
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -170,11 +173,12 @@ HpCpHealCritical: HpCp heal effects always trigger Magic Critical Hit.
 HpCpHeal: Increases current HP by a given amount. If the given amount exceeds maximum HP, it increases current CP with the rest value as well.
 HpDrain: Magical attack that absorbs given percentage of the damage inflicted as HP.
 Hp: Increases current HP by a static value.
-HpLimit: Increase a character's max hp limit (l2jmobius)
+HpLimit: Increase a character's max hp limit. (l2jmobius)
 HpRegen: HP Regeneration stat.
 HpToOwner: DOT effect that absorbs HP over time.
 Ignition: Transforms sword to Death Knight's Flame Sword. (l2jmobius)
 IgnoreDeath: Become undying. Hp cannot decrease below 1.
+IgnoreReduceDamage: Ignore ReduceDamage effect implementation. (l2jmobius)
 ImmobileDamageBonus: Bonus damage to immobile targets. (l2jmobius)
 ImmobileDamageResist: Resist damage while immobile. (l2jmobius)
 ImmobilePetBuff: Causes your pet to become immobilized.
@@ -213,7 +217,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
@@ -278,6 +281,7 @@ RebalanceHP: Balances targets' current HP.
 RebalanceHPSummon: Balances targets' current HP for summons.
 RecoverVitalityInPeaceZone: Recover periodically vitality when player is in a peace zone. (l2jmobius)
 Recovery: Decreases death penalty level.
+ReduceDamage: Reduce damage effect implementation.
 ReduceCancel: Magic skill casting interruption stat.
 ReduceDropPenalty: Reduces EXP lost and death penalty chance.
 ReflectMagic: Deflects magical damage back to the attacker.
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/AteliaRefineryTeleportDevice2.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/AteliaRefineryTeleportDevice2.xml
deleted file mode 100644
index b253305a59..0000000000
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/AteliaRefineryTeleportDevice2.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/teleporterData.xsd">
-	<npc id="34583"> <!-- TP -->
-		<teleport type="OTHER">
-			<location x="-49033" y="15362" z="-8808" /> <!-- Rashrack Pondus Management Area -->
-			<location x="-49033" y="19645" z="-8808" /> <!-- Rashrack Exqu Management Area -->
-			<location x="-49033" y="11036" z="-8808" /> <!-- Rashrack Spira Management Area -->
-		</teleport>
-	</npc>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/InvestigatorsTeleporter.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/InvestigatorsTeleporter.xml
deleted file mode 100644
index da543cd3e3..0000000000
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/InvestigatorsTeleporter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/teleporterData.xsd">
-	<npc id="34529"> <!-- Investigators Teleporter -->
-		<teleport type="OTHER">
-			<location x="194276" y="176595" z="-1888" /> <!-- Eastern Camp -->
-			<location x="167989" y="187546" z="-2232" /> <!-- Western Camp -->
-			<location x="191000" y="188118" z="-2656" /> <!-- Southern Camp -->
-			<location x="177925" y="172948" z="-2008" /> <!-- Northern Camp -->
-		</teleport>
-	</npc>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/InvestigatorsTeleporterMines.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/InvestigatorsTeleporterMines.xml
deleted file mode 100644
index ac2ee3ef4f..0000000000
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/InvestigatorsTeleporterMines.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/teleporterData.xsd">
-	<npc id="34551"> <!-- Investigators Teleporter -->
-		<teleport type="OTHER">
-			<location x="139396" y="-169445" z="-1600" /> <!-- 1st level -->
-			<location x="144978" y="-178158" z="360" /> <!-- 2nd level north -->
-			<location x="150614" y="-171945" z="360" /> <!-- 2nd level east -->
-			<location x="145927" y="-172153" z="2248" /> <!-- 3rd level -->
-		</teleport>
-	</npc>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/OverseerTeleporter.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/OverseerTeleporter.xml
deleted file mode 100644
index 22bde46b15..0000000000
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/OverseerTeleporter.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/teleporterData.xsd">
-	<npc id="34524"> <!-- Overseer Teleporter -->
-		<teleport type="OTHER">
-			<location x="-109711" y="75449" z="-3184" /> <!-- Golden Hills(north) -->
-			<location x="-112320" y="91965" z="-3184" /> <!-- Golden Hills(south) -->
-			<location x="-112756" y="91958" z="-3163" /> <!-- Golden Altar -->
-			<location x="-94625" y="51773" z="-2024" /> <!-- Mimir's Altar(Lv. 112) -->
-			<location x="-86475" y="36997" z="-2048" /> <!-- Nornil's Altar(Lv. 112) -->
-			<location x="-74376" y="53733" z="-3672" /> <!-- Isle of Souls Harbor(Lv. 112) -->
-			<location x="-110544" y="47480" z="-1056" /> <!-- Kamael Village(East)(Lv. 112) -->
-			<location x="-119643" y="52494" z="-1000" /> <!-- Kamael Village(South)(Lv. 112) -->
-		</teleport>
-	</npc>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/PatrolTeleporter.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/PatrolTeleporter.xml
deleted file mode 100644
index 72bb39b9f7..0000000000
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/PatrolTeleporter.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/teleporterData.xsd">
-	<npc id="34568"> <!-- Patrol Teleporter -->
-		<teleport type="OTHER">
-			<location x="90327" y="198818" z="-3280" /> <!-- Eastern Border -->
-			<location x="80089" y="196453" z="-2792" /> <!-- Western Border -->
-			<location x="96046" y="171015" z="-3640" /> <!-- East of the Field of Silence (Lv.108) -->
-			<location x="77767" y="183441" z="-3576" /> <!-- Western part of the Field of Silence (Lv.108) -->
-			<location x="95981" y="210144" z="-3456" /> <!-- Eastern part of the Field of Whispers (Lv.114) -->
-			<location x="81394" y="226502" z="-3584" /> <!-- Western part of the Field of Whispers (Lv.114) -->
-		</teleport>
-	</npc>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/PrimevalIsle.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/PrimevalIsle.xml
deleted file mode 100644
index 93cf31d10a..0000000000
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/PrimevalIsle.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/teleporterData.xsd">
-	<npc id="34526"> <!-- Expedition Teleporter -->
-		<teleport type="OTHER">
-			<location x="9400" y="-21720" z="-3634" /> <!-- Eastern Camp -->
-			<location x="7917" y="-8322" z="-3608" /> <!-- Western Camp -->
-			<location x="21912" y="-6440" z="-2008" /> <!-- Southern Camp -->
-			<location x="21243" y="-20807" z="-3104" /> <!-- Northern Camp -->
-		</teleport>
-	</npc>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/SearchTeamTeleporter.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/SearchTeamTeleporter.xml
deleted file mode 100644
index 06f20e3409..0000000000
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/SearchTeamTeleporter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/teleporterData.xsd">
-	<npc id="34552"> <!-- Search Team's Teleporter -->
-		<teleport type="OTHER">
-			<location x="181384" y="-78674" z="-2728" /> <!-- Central Square -->
-			<location x="176502" y="-75456" z="-2728" /> <!-- Southern Corridor -->
-			<location x="182277" y="-83875" z="-6272" /> <!-- Northern Corridor -->
-			<location x="187952" y="-80972" z="-6264" /> <!-- Eastern Corridor -->
-		</teleport>
-	</npc>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/SessionZonesTeleporters.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/SessionZonesTeleporters.xml
new file mode 100644
index 0000000000..cf3ebec6bb
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/SessionZonesTeleporters.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/teleporterData.xsd">
+	
+	<!-- Abandoned Coal Mines -->
+	<npc id="34551"> <!-- Investigators Teleporter -->
+		<teleport type="OTHER">
+			<location x="139396" y="-169445" z="-1600" /> <!-- 1st level -->
+			<location x="144978" y="-178158" z="360" /> <!-- 2nd level north -->
+			<location x="150614" y="-171945" z="360" /> <!-- 2nd level east -->
+			<location x="145927" y="-172153" z="2248" /> <!-- 3rd level -->
+		</teleport>
+	</npc>
+	
+	<!-- Fioren's Crystal Prison -->
+	<npc id="34529"> <!-- Storm Isle - Researchers' Teleporter -->
+		<teleport type="OTHER">
+			<location x="-12275" y="-20623" z="-8795" /> <!-- Fioren's Crystal Prison -->
+			<location x="194276" y="176595" z="-1888" /> <!-- Eastern Camp -->
+			<location x="167989" y="187546" z="-2232" /> <!-- Western Camp -->
+			<location x="191000" y="188118" z="-2656" /> <!-- Southern Camp -->
+			<location x="177925" y="172948" z="-2008" /> <!-- Northern Camp -->
+		</teleport>
+	</npc>
+	<npc id="34618"> <!-- Isle of Prayer - Researchers' Teleporter -->
+		<teleport type="OTHER">
+			<location x="-12275" y="-20623" z="-8795" /> <!-- Fioren's Crystal Prison -->
+			<location x="137250" y="177290" z="-3352" /> <!-- Eastern Camp -->
+			<location x="167989" y="187546" z="-2232" /> <!-- Western Camp -->
+			<location x="150287" y="195303" z="-3736" /> <!-- Southern Camp -->
+			<location x="148644" y="165369" z="-2792" /> <!-- Northern Camp -->
+		</teleport>
+	</npc>
+	<npc id="34624"> <!-- Aligator Island - Researchers' Teleporter -->
+		<teleport type="OTHER">
+			<location x="-12275" y="-20623" z="-8795" /> <!-- Fioren's Crystal Prison -->
+			<location x="121289" y="185601" z="-3587" /> <!-- Eastern Camp -->
+			<location x="103336" y="175669" z="-3408" /> <!-- Western Camp -->
+			<location x="115474" y="191553" z="-3368" /> <!-- Southern Camp -->
+			<location x="112640" y="165645" z="-3112" /> <!-- Northern Camp -->
+		</teleport>
+	</npc>
+	
+	<!-- Imperial Tomb -->
+	<npc id="34552"> <!-- Search Team's Teleporter -->
+		<teleport type="OTHER">
+			<location x="181384" y="-78674" z="-2728" /> <!-- Central Square -->
+			<location x="176502" y="-75456" z="-2728" /> <!-- Southern Corridor -->
+			<location x="182277" y="-83875" z="-6272" /> <!-- Northern Corridor -->
+			<location x="187952" y="-80972" z="-6264" /> <!-- Eastern Corridor -->
+		</teleport>
+	</npc>
+	
+	<!-- Jamoa's Camp -->	
+	<npc id="34526"> <!-- Primeval - Expedition Teleporter -->
+		<teleport type="OTHER">
+			<location x="-13551" y="-12693" z="-7227" /> <!-- Jamoa's Camp -->
+			<location x="9400" y="-21720" z="-3634" /> <!-- Eastern Camp -->
+			<location x="7917" y="-8322" z="-3608" /> <!-- Western Camp -->
+			<location x="21912" y="-6440" z="-2008" /> <!-- Southern Camp -->
+			<location x="21243" y="-20807" z="-3104" /> <!-- Northern Camp -->
+		</teleport>
+	</npc>
+	<npc id="34626"> <!-- Swamp of Screams - Expedition Teleporter -->
+		<teleport type="OTHER">
+			<location x="-13551" y="-12693" z="-7227" /> <!-- Jamoa's Camp -->
+			<location x="83659" y="-47655" z="-3224" /> <!-- Eastern Camp -->
+			<location x="69662" y="-50121" z="-3272" /> <!-- Western Camp -->
+			<location x="78699" y="-63804" z="-2296" /> <!-- Northern Camp -->
+		</teleport>
+	</npc>
+	<npc id="34628"> <!-- Blazing Swamp - Expedition Teleporter -->
+		<teleport type="OTHER">
+			<location x="-13551" y="-12693" z="-7227" /> <!-- Jamoa's Camp -->
+			<location x="152527" y="-15051" z="-4400" /> <!-- Eastern Camp -->
+			<location x="138634" y="-9690" z="-4448" /> <!-- Western Camp -->
+			<location x="141501" y="-26069" z="-1992" /> <!-- Northern Camp -->
+		</teleport>
+	</npc>
+		
+	<!-- Otherworldly Atelia Refinery -->
+	<npc id="34583"> <!-- Atelia Refinery Teleport Device -->
+		<teleport type="OTHER">
+			<location x="-49033" y="15362" z="-8803" /> <!-- Area Controlled by Ressurected Pondus -->
+			<location x="-49033" y="19645" z="-8688" /> <!-- Area Controlled by Ressurected Excuro -->
+			<location x="-49033" y="11036" z="-8923" /> <!-- Area Controlled by Ressurected Spira -->
+		</teleport>
+	</npc>
+	
+	<!-- Pantheon's Museum -->
+	<npc id="34524"> <!-- Golden Altar of the Isle of Souls - Overseer Teleporter -->
+		<teleport type="OTHER">
+			<location x="-20755" y="-12091" z="-7347" /> <!-- Pantheon's Museum -->
+			<location x="-109711" y="75449" z="-3184" /> <!-- Golden Hills (north) -->
+			<location x="-112320" y="91965" z="-3184" /> <!-- Golden Hills (south) -->
+			<location x="-112756" y="91958" z="-3163" /> <!-- Golden Altar -->
+		</teleport>
+	</npc>
+	<npc id="34630"> <!-- Mimir's Altar of the Isle of Souls - Overseer Teleporter -->
+		<teleport type="OTHER">
+			<location x="-20755" y="-12091" z="-7347" /> <!-- Pantheon's Museum -->
+			<location x="-94625" y="51773" z="-2024" /> <!-- Mimir's Altar -->
+			<location x="-86475" y="36997" z="-2048" /> <!-- Nornil's Altar -->
+			<location x="-74376" y="53733" z="-3672" /> <!-- Isle of Souls Harbor -->
+			<location x="-110544" y="47480" z="-1056" /> <!-- Kamael Village (East) -->
+			<location x="-119643" y="52494" z="-1000" /> <!-- Kamael Village (South) -->
+		</teleport>
+	</npc>
+	<npc id="34632"> <!-- Plunderous Plains - Overseer Teleporter -->
+		<teleport type="OTHER">
+			<location x="-20755" y="-12091" z="-7347" /> <!-- Pantheon's Museum -->
+			<location x="112284" y="-154167" z="-1534" /> <!-- Railroad Station -->
+			<location x="106264" y="-149305" z="-2517" /> <!-- Plunderous Plains (West) -->
+			<location x="120600" y="-149899" z="-3289" /> <!-- Plunderous Plains (East) -->
+			<location x="113367" y="-144786" z="-3271" /> <!-- Sky Wagon Relic -->
+		</teleport>
+	</npc>
+	
+	<!-- Ravaged Innadril -->
+	<npc id="34646"> <!-- Heine - Lionel Hunter Teleporter -->
+		<teleport type="OTHER">
+			<location x="95983" y="170989" z="-3640" /> <!-- Field of Silence -->
+			<location x="81435" y="226624" z="-3592" /> <!-- Field of Whispers -->
+			<location x="114525" y="202502" z="-3400" /> <!-- Alligator Beach -->
+		</teleport>
+	</npc>
+	<npc id="34568"> <!-- Field of Silence - Patrol Teleporter -->
+		<teleport type="OTHER">
+			<location x="110934" y="220161" z="-3667" /> <!-- Return to Heine -->
+			<location x="90327" y="198818" z="-3280" /> <!-- Eastern Border -->
+			<location x="80089" y="196453" z="-2792" /> <!-- Western Border -->
+			<location x="96046" y="171015" z="-3640" /> <!-- East of the Field of Silence -->
+			<location x="77767" y="183441" z="-3576" /> <!-- Western part of the Field of Silence -->
+			<location x="95981" y="210144" z="-3456" /> <!-- Eastern part of the Field of Whispers -->
+			<location x="81394" y="226502" z="-3584" /> <!-- Western part of the Field of Whispers -->
+		</teleport>
+	</npc>
+	<npc id="34647"> <!-- Alligator Beach - Patrol Teleporter -->
+		<teleport type="OTHER">
+			<location x="110934" y="220161" z="-3667" /> <!-- Return to Heine -->
+			<location x="118685" y="224977" z="-3251" /> <!-- Southern part of the Alligator Beach -->
+			<location x="114532" y="202511" z="-3425" /> <!-- Northern of the Alligator Beach -->
+		</teleport>
+	</npc>	
+
+	<!-- Tower of Insolence -->
+	<npc id="34549"> <!-- Teleporter Scout -->
+		<teleport type="OTHER">
+			<location x="-82014" y="16247" z="-15411" /> <!-- Tower of Insolence (1st Floor) -->
+			<location x="-82018" y="16241" z="-12920" /> <!-- Tower of Insolence (2nd Floor) -->
+			<location x="-82018" y="16241" z="-10296" /> <!-- Tower of Insolence (3rd Floor) -->
+			<location x="-147664" y="21384" z="-14517" /> <!-- Tower of Insolence (4th Floor) -->
+			<location x="-147643" y="21347" z="-12021" /> <!-- Tower of Insolence (5th Floor) -->
+			<location x="-147643" y="21372" z="-9398" /> <!-- Tower of Insolence (6th Floor) -->
+			<location x="-147551" y="53511" z="-14644" /> <!-- Tower of Insolence (7th Floor) -->
+			<location x="-147551" y="53524" z="-12146" /> <!-- Tower of Insolence (8th Floor) -->
+			<location x="-147551" y="53504" z="-9522" /> <!-- Tower of Insolence (9th Floor) -->
+		</teleport>
+	</npc>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/TeleporterScoutToi.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/TeleporterScoutToi.xml
deleted file mode 100644
index 2de8046479..0000000000
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/teleporters/others/TeleporterScoutToi.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/teleporterData.xsd">
-	<npc id="34549"> <!-- Teleporter Scout -->
-		<teleport type="OTHER">
-			<location x="-82014" y="16247" z="-15411" /> <!-- Tower of Insolence (1st Floor) -->
-			<location x="-82018" y="16241" z="-12920" /> <!-- Tower of Insolence (2nd Floor) -->
-			<location x="-82018" y="16241" z="-10296" /> <!-- Tower of Insolence (3rd Floor) -->
-			<location x="-147664" y="21384" z="-14517" /> <!-- Tower of Insolence (4th Floor) -->
-			<location x="-147643" y="21347" z="-12021" /> <!-- Tower of Insolence (5th Floor) -->
-			<location x="-147643" y="21372" z="-9398" /> <!-- Tower of Insolence (6th Floor) -->
-			<location x="-147551" y="53511" z="-14644" /> <!-- Tower of Insolence (7th Floor) -->
-			<location x="-147551" y="53524" z="-12146" /> <!-- Tower of Insolence (8th Floor) -->
-			<location x="-147551" y="53504" z="-9522" /> <!-- Tower of Insolence (9th Floor) -->
-		</teleport>
-	</npc>
-	<npc id="34594">
-		<teleport type="OTHER">
-			<location x="-147664" y="21384" z="-14517" /> <!-- Tower of Insolence (4th Floor) -->
-			<location x="-147643" y="21347" z="-12021" /> <!-- Tower of Insolence (5th Floor) -->
-			<location x="-147643" y="21372" z="-9398" /> <!-- Tower of Insolence (6th Floor) -->
-		</teleport>
-	</npc>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/xsd/LimitShop.xsd b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/xsd/LimitShop.xsd
index 2ef0e76e84..77f1bb3a5d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/xsd/LimitShop.xsd
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/xsd/LimitShop.xsd
@@ -24,6 +24,7 @@
 											<xs:attribute type="xs:long" name="count" use="optional"/>
 											<xs:attribute type="xs:float" name="chance" use="optional"/>
 											<xs:attribute type="xs:boolean" name="announce" use="optional"/>
+											<xs:attribute type="xs:int" name="enchant" use="optional"/>
 											<xs:attribute type="xs:int" name="id2" use="optional"/>
 											<xs:attribute type="xs:long" name="count2" use="optional"/>
 											<xs:attribute type="xs:float" name="chance2" use="optional"/>
@@ -40,6 +41,7 @@
 											<xs:attribute type="xs:long" name="count5" use="optional"/>
 											<xs:attribute type="xs:boolean" name="announce5" use="optional"/>
 											<xs:attribute type="xs:int" name="accountDailyLimit" use="optional"/>
+											<xs:attribute type="xs:int" name="accountMontlyLimit" use="optional"/>
 											<xs:attribute type="xs:int" name="accountBuyLimit" use="optional"/>
 										</xs:extension>
 									</xs:simpleContent>
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/xsd/skills.xsd b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/xsd/skills.xsd
index 21e6cb21be..39b93b6883 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/xsd/skills.xsd
@@ -710,6 +710,36 @@
 																	</xs:sequence>
 																</xs:complexType>
 															</xs:element>
+															<xs:element name="summonerLevels">
+																<xs:complexType mixed="true">
+																	<xs:sequence minOccurs="0">
+																		<xs:element maxOccurs="unbounded" name="value">
+																			<xs:complexType>
+																				<xs:simpleContent>
+																					<xs:extension base="xs:unsignedShort">
+																						<xs:attribute name="level" type="xs:integer" use="required" />
+																					</xs:extension>
+																				</xs:simpleContent>
+																			</xs:complexType>
+																		</xs:element>
+																	</xs:sequence>
+																</xs:complexType>
+															</xs:element>
+															<xs:element name="npcIds">
+																<xs:complexType mixed="true">
+																	<xs:sequence minOccurs="0">
+																		<xs:element maxOccurs="unbounded" name="value">
+																			<xs:complexType>
+																				<xs:simpleContent>
+																					<xs:extension base="xs:unsignedShort">
+																						<xs:attribute name="level" type="xs:integer" use="required" />
+																					</xs:extension>
+																				</xs:simpleContent>
+																			</xs:complexType>
+																		</xs:element>
+																	</xs:sequence>
+																</xs:complexType>
+															</xs:element>
 															<xs:element name="lifeTime">
 																<xs:complexType mixed="true">
 																	<xs:sequence minOccurs="0">
@@ -2752,6 +2782,9 @@
 																</xs:sequence>
 															</xs:complexType>
 														</xs:element>
+														<xs:element minOccurs="0" name="slot" type="xs:string" />
+														<xs:element minOccurs="0" name="dispel" type="xs:string" />
+														<xs:element minOccurs="0" name="rate" type="xs:unsignedByte" />
 													</xs:sequence>
 													<xs:attribute name="name" type="xs:string" use="required" />
 													<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/zones/conquest.xml b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/zones/conquest.xml
index 29dff74a30..8a119c9905 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/zones/conquest.xml
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/dist/game/data/zones/conquest.xml
@@ -16,7 +16,7 @@
 		<node X="-15982" Y="-188096" />
 	</zone>
 	<!-- Ephitany's Temporary Shelter -->
-		<zone name="ephitanys_temporary_helter" type="NoPvPZone" shape="NPoly" minZ="-3504" maxZ="-3104">
+	<zone name="ephitanys_temporary_shelter" type="NoPvPZone" shape="NPoly" minZ="-3504" maxZ="-3104">
 		<node X="-6656" Y="-197402" />
 		<node X="-7002" Y="-197763" />
 		<node X="-6999" Y="-198406" />
@@ -107,13 +107,844 @@
 		<node X="-14673" Y="-195089" />
 	</zone>
 	<!-- Water Zone 1 - Asa -->
-	<!-- TODO -->
+	<zone name="zone_1_asa" type="ArenaZone" shape="NPoly" minZ="-2576" maxZ="-4576">
+		<node X="-18352" Y="-197508" />
+		<node X="-18473" Y="-197996" />
+		<node X="-17168" Y="-197660" />
+		<node X="-16700" Y="-197675" />
+		<node X="-16525" Y="-197444" />
+		<node X="-16025" Y="-197233" />
+		<node X="-15479" Y="-197314" />
+		<node X="-15515" Y="-197334" />
+		<node X="-13112" Y="-196820" />
+		<node X="-11446" Y="-196619" />
+		<node X="-9062" Y="-196625" />
+		<node X="-9099" Y="-197171" />
+		<node X="-9358" Y="-197236" />
+		<node X="-9331" Y="-197595" />
+		<node X="-9151" Y="-197917" />
+		<node X="-8515" Y="-198873" />
+		<node X="-8488" Y="-199102" />
+		<node X="-8498" Y="-199416" />
+		<node X="-7957" Y="-199947" />
+		<node X="-7621" Y="-200187" />
+		<node X="-7137" Y="-200562" />
+		<node X="-6610" Y="-200876" />
+		<node X="-6287" Y="-200009" />
+		<node X="-5896" Y="-199734" />
+		<node X="-5682" Y="-199828" />
+		<node X="-5307" Y="-199557" />
+		<node X="-4995" Y="-199599" />
+		<node X="-4955" Y="-199768" />
+		<node X="-4626" Y="-199801" />
+		<node X="-4473" Y="-200136" />
+		<node X="-3830" Y="-199965" />
+		<node X="-3381" Y="-200429" />
+		<node X="-2446" Y="-199941" />
+		<node X="-2149" Y="-200537" />
+		<node X="-2023" Y="-200971" />
+		<node X="-1276" Y="-202245" />
+		<node X="-1863" Y="-202424" />
+		<node X="-3492" Y="-203624" />
+		<node X="-3763" Y="-204505" />
+		<node X="-3950" Y="-204807" />
+		<node X="-4008" Y="-205058" />
+		<node X="-4423" Y="-205732" />
+		<node X="-5230" Y="-206058" />
+		<node X="-6182" Y="-206103" />
+		<node X="-6967" Y="-206827" />
+		<node X="-7170" Y="-207334" />
+		<node X="-7430" Y="-207775" />
+		<node X="-7901" Y="-207418" />
+		<node X="-8507" Y="-206794" />
+		<node X="-10140" Y="-206309" />
+		<node X="-10595" Y="-205891" />
+		<node X="-10365" Y="-205384" />
+		<node X="-10847" Y="-205268" />
+		<node X="-11157" Y="-204819" />
+		<node X="-11298" Y="-204836" />
+		<node X="-11737" Y="-205257" />
+		<node X="-11854" Y="-205630" />
+		<node X="-12414" Y="-205763" />
+		<node X="-12566" Y="-205915" />
+		<node X="-12885" Y="-205807" />
+		<node X="-13024" Y="-205605" />
+		<node X="-12927" Y="-205241" />
+		<node X="-12961" Y="-205108" />
+		<node X="-13160" Y="-205171" />
+		<node X="-13659" Y="-205024" />
+		<node X="-13739" Y="-204841" />
+		<node X="-13868" Y="-204917" />
+		<node X="-14072" Y="-205432" />
+		<node X="-14479" Y="-205371" />
+		<node X="-14670" Y="-205274" />
+		<node X="-14850" Y="-204755" />
+		<node X="-15224" Y="-204246" />
+		<node X="-15548" Y="-204262" />
+		<node X="-15843" Y="-204121" />
+		<node X="-16179" Y="-204303" />
+		<node X="-16510" Y="-204400" />
+		<node X="-16694" Y="-204328" />
+		<node X="-17211" Y="-204254" />
+		<node X="-17713" Y="-203855" />
+		<node X="-18172" Y="-203804" />
+		<node X="-19647" Y="-203512" />
+		<node X="-19871" Y="-203572" />
+		<node X="-20251" Y="-203522" />
+		<node X="-20498" Y="-203653" />
+		<node X="-20631" Y="-203344" />
+		<node X="-20827" Y="-203175" />
+		<node X="-20784" Y="-202921" />
+		<node X="-21015" Y="-202701" />
+		<node X="-21375" Y="-202732" />
+		<node X="-21699" Y="-202418" />
+		<node X="-21742" Y="-202454" />
+		<node X="-22332" Y="-202208" />
+		<node X="-24138" Y="-201722" />
+		<node X="-24305" Y="-201734" />
+		<node X="-24334" Y="-202035" />
+		<node X="-24814" Y="-202435" />
+		<node X="-25111" Y="-202406" />
+		<node X="-25464" Y="-202130" />
+		<node X="-25605" Y="-201533" />
+		<node X="-25535" Y="-201370" />
+		<node X="-25738" Y="-201239" />
+		<node X="-25838" Y="-201376" />
+		<node X="-25953" Y="-202337" />
+		<node X="-26603" Y="-202516" />
+		<node X="-26759" Y="-202603" />
+		<node X="-27020" Y="-202030" />
+		<node X="-27504" Y="-201875" />
+		<node X="-27662" Y="-201302" />
+		<node X="-28366" Y="-200608" />
+		<node X="-29127" Y="-199540" />
+		<node X="-29378" Y="-199065" />
+		<node X="-29386" Y="-198672" />
+		<node X="-29444" Y="-198248" />
+		<node X="-29046" Y="-198301" />
+		<node X="-28938" Y="-198556" />
+		<node X="-28083" Y="-198823" />
+		<node X="-27915" Y="-198892" />
+		<node X="-27482" Y="-198883" />
+		<node X="-27102" Y="-198741" />
+		<node X="-26795" Y="-199031" />
+		<node X="-26835" Y="-199211" />
+		<node X="-26795" Y="-199467" />
+		<node X="-26693" Y="-199622" />
+		<node X="-26746" Y="-200023" />
+		<node X="-25600" Y="-199500" />
+		<node X="-25296" Y="-199603" />
+		<node X="-25252" Y="-199777" />
+		<node X="-25126" Y="-199552" />
+		<node X="-24798" Y="-199148" />
+		<node X="-24361" Y="-199046" />
+		<node X="-24107" Y="-199073" />
+		<node X="-23981" Y="-199184" />
+		<node X="-23546" Y="-199384" />
+		<node X="-23781" Y="-199216" />
+		<node X="-24322" Y="-197362" />
+		<node X="-24381" Y="-196975" />
+		<node X="-24499" Y="-196621" />
+		<node X="-23297" Y="-196614" />
+		<node X="-21052" Y="-196322" />
+		<node X="-19462" Y="-196321" />
+	</zone>
 	<!-- Water Zone 2 - Anima -->
-	<!-- TODO -->
+	<zone name="zone_2_anima" type="ArenaZone" shape="NPoly" minZ="-3896" maxZ="-1000">
+		<node X="-25085" Y="-205511" />
+		<node X="-25539" Y="-205671" />
+		<node X="-25615" Y="-205901" />
+		<node X="-25741" Y="-205754" />
+		<node X="-25916" Y="-205537" />
+		<node X="-26269" Y="-205239" />
+		<node X="-26562" Y="-204999" />
+		<node X="-26909" Y="-204846" />
+		<node X="-27233" Y="-204800" />
+		<node X="-27273" Y="-204792" />
+		<node X="-27263" Y="-204346" />
+		<node X="-27196" Y="-204180" />
+		<node X="-27203" Y="-203730" />
+		<node X="-27320" Y="-203533" />
+		<node X="-27431" Y="-203441" />
+		<node X="-27426" Y="-203340" />
+		<node X="-27597" Y="-203233" />
+		<node X="-27732" Y="-203229" />
+		<node X="-27857" Y="-203066" />
+		<node X="-28093" Y="-203036" />
+		<node X="-28397" Y="-202927" />
+		<node X="-28539" Y="-202862" />
+		<node X="-28649" Y="-202694" />
+		<node X="-28737" Y="-202644" />
+		<node X="-28849" Y="-202667" />
+		<node X="-28960" Y="-202769" />
+		<node X="-29102" Y="-202713" />
+		<node X="-29181" Y="-202681" />
+		<node X="-29298" Y="-202707" />
+		<node X="-29308" Y="-202990" />
+		<node X="-29554" Y="-203255" />
+		<node X="-29415" Y="-203497" />
+		<node X="-29581" Y="-203824" />
+		<node X="-29587" Y="-204162" />
+		<node X="-29844" Y="-204178" />
+		<node X="-29794" Y="-204379" />
+		<node X="-29697" Y="-204444" />
+		<node X="-29780" Y="-204553" />
+		<node X="-30054" Y="-204893" />
+		<node X="-29988" Y="-205110" />
+		<node X="-29707" Y="-205137" />
+		<node X="-29209" Y="-205466" />
+		<node X="-29161" Y="-205747" />
+		<node X="-29038" Y="-205917" />
+		<node X="-29024" Y="-206177" />
+		<node X="-29137" Y="-206528" />
+		<node X="-29045" Y="-206608" />
+		<node X="-29045" Y="-206668" />
+		<node X="-28914" Y="-206828" />
+		<node X="-28956" Y="-206965" />
+		<node X="-28832" Y="-207260" />
+		<node X="-28723" Y="-207363" />
+		<node X="-28611" Y="-207589" />
+		<node X="-28614" Y="-207774" />
+		<node X="-28440" Y="-208169" />
+		<node X="-28577" Y="-208278" />
+		<node X="-28645" Y="-208860" />
+		<node X="-28754" Y="-208883" />
+		<node X="-28830" Y="-209020" />
+		<node X="-28835" Y="-209278" />
+		<node X="-28991" Y="-209531" />
+		<node X="-29180" Y="-209681" />
+		<node X="-29429" Y="-209969" />
+		<node X="-29548" Y="-210022" />
+		<node X="-29329" Y="-210369" />
+		<node X="-29169" Y="-210504" />
+		<node X="-29134" Y="-210739" />
+		<node X="-29237" Y="-210811" />
+		<node X="-29239" Y="-211003" />
+		<node X="-29421" Y="-211157" />
+		<node X="-29468" Y="-211272" />
+		<node X="-29265" Y="-211596" />
+		<node X="-29289" Y="-211743" />
+		<node X="-29193" Y="-211884" />
+		<node X="-29195" Y="-211967" />
+		<node X="-29109" Y="-212407" />
+		<node X="-29049" Y="-212594" />
+		<node X="-28796" Y="-212723" />
+		<node X="-28712" Y="-212975" />
+		<node X="-28606" Y="-213200" />
+		<node X="-28634" Y="-213524" />
+		<node X="-28633" Y="-213906" />
+		<node X="-28623" Y="-214219" />
+		<node X="-28679" Y="-214731" />
+		<node X="-28701" Y="-215145" />
+		<node X="-28408" Y="-215125" />
+		<node X="-28126" Y="-215342" />
+		<node X="-27835" Y="-215499" />
+		<node X="-27704" Y="-215579" />
+		<node X="-27617" Y="-215680" />
+		<node X="-27456" Y="-215838" />
+		<node X="-27325" Y="-216091" />
+		<node X="-26989" Y="-216682" />
+		<node X="-26989" Y="-216823" />
+		<node X="-27232" Y="-217224" />
+		<node X="-27368" Y="-217472" />
+		<node X="-27325" Y="-217918" />
+		<node X="-27292" Y="-218278" />
+		<node X="-27317" Y="-218229" />
+		<node X="-27364" Y="-218139" />
+		<node X="-27285" Y="-218017" />
+		<node X="-27309" Y="-217933" />
+		<node X="-27505" Y="-217891" />
+		<node X="-27349" Y="-217677" />
+		<node X="-27252" Y="-217537" />
+		<node X="-27476" Y="-217223" />
+		<node X="-27300" Y="-217033" />
+		<node X="-27261" Y="-216743" />
+		<node X="-27260" Y="-216355" />
+		<node X="-27415" Y="-215995" />
+		<node X="-27569" Y="-215833" />
+		<node X="-27572" Y="-215704" />
+		<node X="-27698" Y="-215563" />
+		<node X="-27809" Y="-215527" />
+		<node X="-27985" Y="-215518" />
+		<node X="-28080" Y="-215479" />
+		<node X="-28277" Y="-215441" />
+		<node X="-28384" Y="-215343" />
+		<node X="-28544" Y="-215354" />
+		<node X="-28782" Y="-215415" />
+		<node X="-29003" Y="-215509" />
+		<node X="-29036" Y="-215747" />
+		<node X="-29077" Y="-215735" />
+		<node X="-29333" Y="-216206" />
+		<node X="-29371" Y="-216526" />
+		<node X="-29483" Y="-216648" />
+		<node X="-29344" Y="-217392" />
+		<node X="-29140" Y="-218081" />
+		<node X="-28648" Y="-218317" />
+		<node X="-28334" Y="-218434" />
+		<node X="-27911" Y="-218764" />
+		<node X="-27593" Y="-219323" />
+		<node X="-27135" Y="-219139" />
+		<node X="-27095" Y="-218849" />
+		<node X="-26853" Y="-218741" />
+		<node X="-26695" Y="-218522" />
+		<node X="-26542" Y="-218488" />
+		<node X="-26298" Y="-218329" />
+		<node X="-26339" Y="-218149" />
+		<node X="-26187" Y="-218081" />
+		<node X="-25506" Y="-217785" />
+		<node X="-25223" Y="-217654" />
+		<node X="-24927" Y="-217523" />
+		<node X="-24822" Y="-217555" />
+		<node X="-24795" Y="-217732" />
+		<node X="-24983" Y="-217837" />
+		<node X="-25138" Y="-217972" />
+		<node X="-24715" Y="-218193" />
+		<node X="-24534" Y="-218385" />
+		<node X="-24273" Y="-218597" />
+		<node X="-23842" Y="-218570" />
+		<node X="-23704" Y="-218384" />
+		<node X="-23562" Y="-218406" />
+		<node X="-23360" Y="-218537" />
+		<node X="-22999" Y="-218607" />
+		<node X="-22888" Y="-218802" />
+		<node X="-22872" Y="-218976" />
+		<node X="-22826" Y="-218895" />
+		<node X="-22714" Y="-218788" />
+		<node X="-22641" Y="-218745" />
+		<node X="-22537" Y="-218780" />
+		<node X="-22396" Y="-218866" />
+		<node X="-22209" Y="-218923" />
+		<node X="-22407" Y="-218921" />
+		<node X="-22139" Y="-219161" />
+		<node X="-21784" Y="-219190" />
+		<node X="-21627" Y="-219346" />
+		<node X="-21406" Y="-219402" />
+		<node X="-21237" Y="-219593" />
+		<node X="-21033" Y="-219510" />
+		<node X="-20967" Y="-219564" />
+		<node X="-20999" Y="-219686" />
+		<node X="-20966" Y="-220038" />
+		<node X="-20776" Y="-220414" />
+		<node X="-20441" Y="-220478" />
+		<node X="-20326" Y="-220770" />
+		<node X="-20431" Y="-221073" />
+		<node X="-20581" Y="-221263" />
+		<node X="-20464" Y="-221533" />
+		<node X="-20329" Y="-221563" />
+		<node X="-20411" Y="-221824" />
+		<node X="-20412" Y="-222912" />
+		<node X="-19772" Y="-223200" />
+		<node X="-19490" Y="-223353" />
+		<node X="-18707" Y="-223276" />
+		<node X="-18601" Y="-223177" />
+		<node X="-18515" Y="-222958" />
+		<node X="-18137" Y="-223157" />
+		<node X="-17764" Y="-223618" />
+		<node X="-17305" Y="-223776" />
+		<node X="-16918" Y="-223858" />
+		<node X="-16618" Y="-224173" />
+		<node X="-16567" Y="-224320" />
+		<node X="-16277" Y="-224364" />
+		<node X="-15711" Y="-224819" />
+		<node X="-15402" Y="-225078" />
+		<node X="-14732" Y="-225346" />
+		<node X="-14086" Y="-225641" />
+		<node X="-14015" Y="-225172" />
+		<node X="-13623" Y="-225284" />
+		<node X="-13355" Y="-225357" />
+		<node X="-13337" Y="-225109" />
+		<node X="-13305" Y="-224968" />
+		<node X="-13122" Y="-224457" />
+		<node X="-13057" Y="-223985" />
+		<node X="-13065" Y="-223777" />
+		<node X="-13250" Y="-223485" />
+		<node X="-13348" Y="-223173" />
+		<node X="-13382" Y="-222976" />
+		<node X="-13661" Y="-222662" />
+		<node X="-13479" Y="-222292" />
+		<node X="-13219" Y="-222166" />
+		<node X="-12814" Y="-221815" />
+		<node X="-12368" Y="-221785" />
+		<node X="-11698" Y="-221752" />
+		<node X="-11327" Y="-222196" />
+		<node X="-10865" Y="-222945" />
+		<node X="-10793" Y="-223612" />
+		<node X="-10654" Y="-224348" />
+		<node X="-10165" Y="-224948" />
+		<node X="-9793" Y="-225024" />
+		<node X="-9354" Y="-225162" />
+		<node X="-8695" Y="-225604" />
+		<node X="-8507" Y="-225864" />
+		<node X="-8233" Y="-226379" />
+		<node X="-8377" Y="-227374" />
+		<node X="-7898" Y="-227757" />
+		<node X="-7727" Y="-227586" />
+		<node X="-7374" Y="-227706" />
+		<node X="-7162" Y="-227637" />
+		<node X="-7169" Y="-227551" />
+		<node X="-6932" Y="-227238" />
+		<node X="-6503" Y="-227177" />
+		<node X="-6547" Y="-226920" />
+		<node X="-6360" Y="-226920" />
+		<node X="-6415" Y="-226663" />
+		<node X="-6703" Y="-226321" />
+		<node X="-6841" Y="-225970" />
+		<node X="-6401" Y="-225995" />
+		<node X="-6153" Y="-225817" />
+		<node X="-6288" Y="-225646" />
+		<node X="-6359" Y="-225147" />
+		<node X="-6339" Y="-224922" />
+		<node X="-6493" Y="-224731" />
+		<node X="-6560" Y="-224578" />
+		<node X="-6717" Y="-224621" />
+		<node X="-6861" Y="-224768" />
+		<node X="-7127" Y="-224656" />
+		<node X="-7254" Y="-224725" />
+		<node X="-7332" Y="-224430" />
+		<node X="-7325" Y="-224156" />
+		<node X="-7653" Y="-223996" />
+		<node X="-8062" Y="-223871" />
+		<node X="-8779" Y="-223517" />
+		<node X="-8964" Y="-222835" />
+		<node X="-9440" Y="-222354" />
+		<node X="-9548" Y="-221732" />
+		<node X="-9933" Y="-221175" />
+		<node X="-10064" Y="-220591" />
+		<node X="-10242" Y="-220837" />
+		<node X="-10375" Y="-220858" />
+		<node X="-10507" Y="-220658" />
+		<node X="-10475" Y="-220291" />
+		<node X="-10595" Y="-220073" />
+		<node X="-10873" Y="-219584" />
+		<node X="-11613" Y="-219287" />
+		<node X="-12158" Y="-219499" />
+		<node X="-12880" Y="-219465" />
+		<node X="-13420" Y="-219445" />
+		<node X="-13876" Y="-219224" />
+		<node X="-14101" Y="-219175" />
+		<node X="-14279" Y="-219197" />
+		<node X="-14665" Y="-219323" />
+		<node X="-15093" Y="-219530" />
+		<node X="-15461" Y="-219782" />
+		<node X="-15391" Y="-219911" />
+		<node X="-15358" Y="-220044" />
+		<node X="-15356" Y="-220172" />
+		<node X="-15984" Y="-220345" />
+		<node X="-16304" Y="-220469" />
+		<node X="-16501" Y="-220383" />
+		<node X="-16686" Y="-220395" />
+		<node X="-16923" Y="-220416" />
+		<node X="-17226" Y="-220356" />
+		<node X="-17359" Y="-220142" />
+		<node X="-17714" Y="-220306" />
+		<node X="-18589" Y="-220310" />
+		<node X="-18602" Y="-220122" />
+		<node X="-18959" Y="-219918" />
+		<node X="-19217" Y="-219784" />
+		<node X="-19459" Y="-219778" />
+		<node X="-19544" Y="-219309" />
+		<node X="-19815" Y="-219170" />
+		<node X="-20008" Y="-218936" />
+		<node X="-20338" Y="-218148" />
+		<node X="-20413" Y="-217775" />
+		<node X="-20635" Y="-217750" />
+		<node X="-20988" Y="-217173" />
+		<node X="-21275" Y="-217405" />
+		<node X="-21554" Y="-217720" />
+		<node X="-21686" Y="-217684" />
+		<node X="-22047" Y="-217051" />
+		<node X="-22266" Y="-217072" />
+		<node X="-22215" Y="-216896" />
+		<node X="-21550" Y="-216342" />
+		<node X="-21396" Y="-215990" />
+		<node X="-21684" Y="-215584" />
+		<node X="-22137" Y="-215208" />
+		<node X="-22521" Y="-215198" />
+		<node X="-22555" Y="-215043" />
+		<node X="-22905" Y="-215051" />
+		<node X="-23040" Y="-214921" />
+		<node X="-23664" Y="-214915" />
+		<node X="-23938" Y="-214933" />
+		<node X="-24166" Y="-215055" />
+		<node X="-24102" Y="-214802" />
+		<node X="-23828" Y="-214469" />
+		<node X="-23797" Y="-214296" />
+		<node X="-23751" Y="-214206" />
+		<node X="-23507" Y="-214110" />
+		<node X="-23144" Y="-214105" />
+		<node X="-22846" Y="-214066" />
+		<node X="-21793" Y="-213821" />
+		<node X="-21157" Y="-213365" />
+		<node X="-20986" Y="-213197" />
+		<node X="-21108" Y="-212607" />
+		<node X="-21236" Y="-212241" />
+		<node X="-21365" Y="-212082" />
+		<node X="-21640" Y="-212043" />
+		<node X="-22091" Y="-212514" />
+		<node X="-22942" Y="-212540" />
+		<node X="-23086" Y="-212466" />
+		<node X="-23017" Y="-212425" />
+		<node X="-22828" Y="-212563" />
+		<node X="-22499" Y="-212411" />
+		<node X="-22371" Y="-212156" />
+		<node X="-22406" Y="-211877" />
+		<node X="-22028" Y="-211750" />
+		<node X="-21887" Y="-211539" />
+		<node X="-21630" Y="-211311" />
+		<node X="-21513" Y="-210897" />
+		<node X="-21628" Y="-210708" />
+		<node X="-21356" Y="-210475" />
+		<node X="-21396" Y="-210038" />
+		<node X="-21424" Y="-209836" />
+		<node X="-21836" Y="-209597" />
+		<node X="-21884" Y="-209021" />
+		<node X="-22265" Y="-208510" />
+		<node X="-22605" Y="-208265" />
+		<node X="-23093" Y="-208003" />
+		<node X="-23401" Y="-207997" />
+		<node X="-23815" Y="-208155" />
+		<node X="-23957" Y="-207902" />
+		<node X="-24086" Y="-207727" />
+		<node X="-23863" Y="-207351" />
+		<node X="-23811" Y="-206977" />
+		<node X="-23824" Y="-206602" />
+		<node X="-23929" Y="-206234" />
+		<node X="-24321" Y="-206171" />
+		<node X="-24567" Y="-205715" />
+		<node X="-24558" Y="-205487" />
+		<node X="-24901" Y="-205272" />
+		<node X="-24875" Y="-205683" />
+	</zone>
 	<!-- Water Zone 3 - Nox -->
-	<!-- TODO -->
+	<zone name="zone_3_nox" type="ArenaZone" shape="NPoly" minZ="-5052" maxZ="-1052">
+		<node X="-8928" Y="-217807" />
+		<node X="-8923" Y="-217917" />
+		<node X="-8886" Y="-218065" />
+		<node X="-8807" Y="-218342" />
+		<node X="-8632" Y="-218294" />
+		<node X="-8551" Y="-218438" />
+		<node X="-8562" Y="-218535" />
+		<node X="-8686" Y="-218736" />
+		<node X="-8817" Y="-218966" />
+		<node X="-8736" Y="-219093" />
+		<node X="-8404" Y="-219193" />
+		<node X="-8586" Y="-219448" />
+		<node X="-8552" Y="-219653" />
+		<node X="-8652" Y="-219913" />
+		<node X="-8476" Y="-220110" />
+		<node X="-8343" Y="-220270" />
+		<node X="-8447" Y="-220476" />
+		<node X="-8353" Y="-220646" />
+		<node X="-8069" Y="-220540" />
+		<node X="-7876" Y="-220494" />
+		<node X="-7686" Y="-220481" />
+		<node X="-7620" Y="-220671" />
+		<node X="-7707" Y="-220791" />
+		<node X="-7731" Y="-220992" />
+		<node X="-7666" Y="-221152" />
+		<node X="-7710" Y="-221341" />
+		<node X="-7651" Y="-221425" />
+		<node X="-7634" Y="-221547" />
+		<node X="-7562" Y="-221584" />
+		<node X="-7493" Y="-221558" />
+		<node X="-7395" Y="-221589" />
+		<node X="-7325" Y="-221731" />
+		<node X="-7233" Y="-221738" />
+		<node X="-7111" Y="-221834" />
+		<node X="-6966" Y="-221852" />
+		<node X="-6877" Y="-221943" />
+		<node X="-6737" Y="-221901" />
+		<node X="-6625" Y="-221960" />
+		<node X="-6515" Y="-221891" />
+		<node X="-6391" Y="-221561" />
+		<node X="-6458" Y="-221467" />
+		<node X="-6368" Y="-221482" />
+		<node X="-6300" Y="-221596" />
+		<node X="-6302" Y="-221933" />
+		<node X="-6086" Y="-222158" />
+		<node X="-6218" Y="-222269" />
+		<node X="-6169" Y="-222554" />
+		<node X="-6042" Y="-222659" />
+		<node X="-6138" Y="-222927" />
+		<node X="-6047" Y="-223107" />
+		<node X="-5884" Y="-223289" />
+		<node X="-5528" Y="-223277" />
+		<node X="-5428" Y="-223521" />
+		<node X="-4903" Y="-223842" />
+		<node X="-4790" Y="-223904" />
+		<node X="-4276" Y="-223875" />
+		<node X="-3887" Y="-223802" />
+		<node X="-3594" Y="-223513" />
+		<node X="-3571" Y="-223532" />
+		<node X="-3788" Y="-223664" />
+		<node X="-3986" Y="-223868" />
+		<node X="-5022" Y="-223930" />
+		<node X="-4916" Y="-224068" />
+		<node X="-4904" Y="-224332" />
+		<node X="-4566" Y="-224689" />
+		<node X="-4334" Y="-224766" />
+		<node X="-4108" Y="-224734" />
+		<node X="-4052" Y="-224900" />
+		<node X="-4093" Y="-224969" />
+		<node X="-4046" Y="-225369" />
+		<node X="-4063" Y="-226162" />
+		<node X="-4201" Y="-226307" />
+		<node X="-4082" Y="-226665" />
+		<node X="-3764" Y="-227302" />
+		<node X="-3422" Y="-227375" />
+		<node X="-3283" Y="-227291" />
+		<node X="-3065" Y="-226949" />
+		<node X="-3070" Y="-226845" />
+		<node X="-2879" Y="-226621" />
+		<node X="-2936" Y="-226475" />
+		<node X="-2852" Y="-226400" />
+		<node X="-2625" Y="-226386" />
+		<node X="-2512" Y="-226299" />
+		<node X="-2499" Y="-226098" />
+		<node X="-2466" Y="-226005" />
+		<node X="-2272" Y="-225929" />
+		<node X="-2515" Y="-225568" />
+		<node X="-2522" Y="-225441" />
+		<node X="-2432" Y="-225361" />
+		<node X="-2411" Y="-225230" />
+		<node X="-2194" Y="-225076" />
+		<node X="-2060" Y="-225039" />
+		<node X="-1882" Y="-224725" />
+		<node X="-1668" Y="-224510" />
+		<node X="-1528" Y="-224383" />
+		<node X="-1826" Y="-224185" />
+		<node X="-1949" Y="-223781" />
+		<node X="-2322" Y="-223619" />
+		<node X="-2592" Y="-223369" />
+		<node X="-2735" Y="-222921" />
+		<node X="-2895" Y="-222271" />
+		<node X="-2948" Y="-221943" />
+		<node X="-2816" Y="-221643" />
+		<node X="-2404" Y="-221400" />
+		<node X="-1973" Y="-221183" />
+		<node X="-1869" Y="-220658" />
+		<node X="-1644" Y="-220406" />
+		<node X="-1507" Y="-219812" />
+		<node X="-1462" Y="-219517" />
+		<node X="-1301" Y="-219296" />
+		<node X="-1408" Y="-219170" />
+		<node X="-1755" Y="-219268" />
+		<node X="-1999" Y="-219080" />
+		<node X="-2093" Y="-218821" />
+		<node X="-2225" Y="-218711" />
+		<node X="-2558" Y="-218698" />
+		<node X="-2686" Y="-218474" />
+		<node X="-2791" Y="-218349" />
+		<node X="-3124" Y="-218277" />
+		<node X="-3476" Y="-218137" />
+		<node X="-3737" Y="-217817" />
+		<node X="-3826" Y="-217585" />
+		<node X="-4164" Y="-217021" />
+		<node X="-4154" Y="-216622" />
+		<node X="-4234" Y="-216334" />
+		<node X="-4089" Y="-216020" />
+		<node X="-4330" Y="-215920" />
+		<node X="-4079" Y="-215572" />
+		<node X="-3949" Y="-215027" />
+		<node X="-3486" Y="-214669" />
+		<node X="-3145" Y="-214471" />
+		<node X="-3011" Y="-214083" />
+		<node X="-2722" Y="-214184" />
+		<node X="-2550" Y="-214128" />
+		<node X="-2237" Y="-213932" />
+		<node X="-2189" Y="-213806" />
+		<node X="-2100" Y="-213418" />
+		<node X="-2057" Y="-212974" />
+		<node X="-2034" Y="-212892" />
+		<node X="-1994" Y="-212358" />
+		<node X="-2216" Y="-212376" />
+		<node X="-2362" Y="-212278" />
+		<node X="-2231" Y="-212385" />
+		<node X="-2016" Y="-212349" />
+		<node X="-1756" Y="-212204" />
+		<node X="-1693" Y="-212140" />
+		<node X="-1724" Y="-211643" />
+		<node X="-1581" Y="-211233" />
+		<node X="-1336" Y="-210701" />
+		<node X="-1799" Y="-209791" />
+		<node X="-1826" Y="-209575" />
+		<node X="-1605" Y="-209275" />
+		<node X="-1552" Y="-209053" />
+		<node X="-1757" Y="-208784" />
+		<node X="-1900" Y="-208689" />
+		<node X="-1768" Y="-208325" />
+		<node X="-1943" Y="-207853" />
+		<node X="-2402" Y="-207194" />
+		<node X="-2477" Y="-207287" />
+		<node X="-2729" Y="-207401" />
+		<node X="-2998" Y="-207372" />
+		<node X="-3207" Y="-207159" />
+		<node X="-3195" Y="-206765" />
+		<node X="-3660" Y="-206445" />
+		<node X="-3970" Y="-206142" />
+		<node X="-4203" Y="-206361" />
+		<node X="-4850" Y="-207318" />
+		<node X="-5490" Y="-207811" />
+		<node X="-5651" Y="-208040" />
+		<node X="-5616" Y="-208225" />
+		<node X="-5719" Y="-208351" />
+		<node X="-6121" Y="-208087" />
+		<node X="-6181" Y="-208513" />
+		<node X="-6823" Y="-209135" />
+		<node X="-6785" Y="-209530" />
+		<node X="-6678" Y="-209691" />
+		<node X="-5511" Y="-210002" />
+		<node X="-5965" Y="-210043" />
+		<node X="-6249" Y="-210419" />
+		<node X="-6282" Y="-210713" />
+		<node X="-6402" Y="-211092" />
+		<node X="-6309" Y="-211422" />
+		<node X="-6186" Y="-211542" />
+		<node X="-6299" Y="-212048" />
+		<node X="-6195" Y="-212488" />
+		<node X="-6353" Y="-213070" />
+		<node X="-6119" Y="-213172" />
+		<node X="-5915" Y="-213192" />
+		<node X="-6103" Y="-213138" />
+		<node X="-6243" Y="-213313" />
+		<node X="-6448" Y="-213475" />
+		<node X="-6448" Y="-213651" />
+		<node X="-6532" Y="-213922" />
+		<node X="-6399" Y="-214121" />
+		<node X="-6409" Y="-214336" />
+		<node X="-6471" Y="-214501" />
+		<node X="-6447" Y="-214716" />
+		<node X="-6500" Y="-214907" />
+		<node X="-6476" Y="-215003" />
+		<node X="-6601" Y="-214756" />
+		<node X="-6724" Y="-213872" />
+		<node X="-6989" Y="-213775" />
+		<node X="-7273" Y="-213818" />
+		<node X="-7481" Y="-213970" />
+		<node X="-7769" Y="-214439" />
+		<node X="-7499" Y="-214733" />
+		<node X="-7600" Y="-214913" />
+		<node X="-7511" Y="-215174" />
+		<node X="-7547" Y="-215299" />
+		<node X="-8135" Y="-215318" />
+		<node X="-8293" Y="-215690" />
+		<node X="-8275" Y="-215928" />
+		<node X="-8161" Y="-216118" />
+		<node X="-8233" Y="-216244" />
+		<node X="-8434" Y="-216220" />
+		<node X="-8677" Y="-216454" />
+		<node X="-8641" Y="-216704" />
+		<node X="-8763" Y="-216973" />
+		<node X="-8434" Y="-217261" />
+		<node X="-8509" Y="-217336" />
+		<node X="-8715" Y="-217355" />
+	</zone>
 	<!-- Callide's Hall -->
-	<!-- TODO -->
+	<zone name="callides_hall" type="ArenaZone" shape="NPoly" minZ="-4516" maxZ="-3016">
+		<node X="-14783" Y="-208028" />
+		<node X="-15185" Y="-207601" />
+		<node X="-15499" Y="-207876" />
+		<node X="-15783" Y="-207886" />
+		<node X="-15961" Y="-208249" />
+		<node X="-16025" Y="-208283" />
+		<node X="-16303" Y="-208200" />
+		<node X="-16412" Y="-208200" />
+		<node X="-16534" Y="-208269" />
+		<node X="-16647" Y="-208276" />
+		<node X="-16762" Y="-208472" />
+		<node X="-16903" Y="-208675" />
+		<node X="-17058" Y="-208454" />
+		<node X="-17387" Y="-208688" />
+		<node X="-17542" Y="-208671" />
+		<node X="-17590" Y="-208465" />
+		<node X="-17951" Y="-208241" />
+		<node X="-18319" Y="-208182" />
+		<node X="-18641" Y="-208159" />
+		<node X="-18884" Y="-208210" />
+		<node X="-19009" Y="-208371" />
+		<node X="-19193" Y="-208444" />
+		<node X="-19305" Y="-208828" />
+		<node X="-19350" Y="-209279" />
+		<node X="-19134" Y="-209404" />
+		<node X="-19066" Y="-209566" />
+		<node X="-19148" Y="-209780" />
+		<node X="-19342" Y="-210316" />
+		<node X="-19684" Y="-210530" />
+		<node X="-19740" Y="-210963" />
+		<node X="-19401" Y="-211092" />
+		<node X="-19325" Y="-211142" />
+		<node X="-19275" Y="-211192" />
+		<node X="-19262" Y="-211322" />
+		<node X="-19241" Y="-211567" />
+		<node X="-19943" Y="-212109" />
+		<node X="-20009" Y="-212417" />
+		<node X="-19994" Y="-212595" />
+		<node X="-20180" Y="-212741" />
+		<node X="-20150" Y="-212883" />
+		<node X="-20309" Y="-213050" />
+		<node X="-20326" Y="-213328" />
+		<node X="-20169" Y="-213540" />
+		<node X="-20095" Y="-213775" />
+		<node X="-20212" Y="-214294" />
+		<node X="-20100" Y="-214804" />
+		<node X="-19760" Y="-215048" />
+		<node X="-19551" Y="-215053" />
+		<node X="-19141" Y="-215560" />
+		<node X="-19180" Y="-215753" />
+		<node X="-18941" Y="-216059" />
+		<node X="-18807" Y="-216152" />
+		<node X="-18253" Y="-216179" />
+		<node X="-17908" Y="-216022" />
+		<node X="-17705" Y="-216140" />
+		<node X="-17650" Y="-216400" />
+		<node X="-17532" Y="-216433" />
+		<node X="-17388" Y="-216436" />
+		<node X="-17235" Y="-216611" />
+		<node X="-17140" Y="-216774" />
+		<node X="-17029" Y="-216683" />
+		<node X="-16786" Y="-216447" />
+		<node X="-16284" Y="-216918" />
+		<node X="-15464" Y="-216792" />
+		<node X="-15050" Y="-216864" />
+		<node X="-13790" Y="-216915" />
+		<node X="-13336" Y="-216828" />
+		<node X="-13117" Y="-216821" />
+		<node X="-12846" Y="-216589" />
+		<node X="-12493" Y="-216548" />
+		<node X="-12329" Y="-216683" />
+		<node X="-12030" Y="-216691" />
+		<node X="-11710" Y="-216564" />
+		<node X="-11424" Y="-216192" />
+		<node X="-11125" Y="-215606" />
+		<node X="-11173" Y="-215453" />
+		<node X="-10894" Y="-214911" />
+		<node X="-10639" Y="-214544" />
+		<node X="-10630" Y="-214323" />
+		<node X="-10536" Y="-213899" />
+		<node X="-10371" Y="-213503" />
+		<node X="-10400" Y="-212714" />
+		<node X="-10675" Y="-212736" />
+		<node X="-10789" Y="-212729" />
+		<node X="-10865" Y="-212485" />
+		<node X="-10849" Y="-212133" />
+		<node X="-10945" Y="-211963" />
+		<node X="-11114" Y="-211765" />
+		<node X="-11171" Y="-211448" />
+		<node X="-11136" Y="-211212" />
+		<node X="-11136" Y="-210961" />
+		<node X="-11367" Y="-210719" />
+		<node X="-11592" Y="-210403" />
+		<node X="-12152" Y="-209925" />
+		<node X="-12383" Y="-209359" />
+		<node X="-12547" Y="-208805" />
+		<node X="-12672" Y="-208658" />
+		<node X="-12865" Y="-208440" />
+		<node X="-13068" Y="-208298" />
+		<node X="-13324" Y="-208264" />
+		<node X="-13905" Y="-207947" />
+		<node X="-14021" Y="-208089" />
+		<node X="-14133" Y="-208247" />
+	</zone>
 	<!-- Fire Areas -->
 	<!-- Fire Fortress -->
 	<zone name="fire_fortress" type="NoPvPZone" shape="NPoly" minZ="-5000" maxZ="10000">
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/Config.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/Config.java
index 15e1c2abc1..d951ee43cb 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/Config.java
@@ -611,6 +611,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static AbnormalVisualEffect BLUE_TEAM_ABNORMAL_EFFECT;
 	public static AbnormalVisualEffect RED_TEAM_ABNORMAL_EFFECT;
 	
@@ -841,6 +842,9 @@ public class Config
 	public static boolean HARDIN_ENABLE_ERTHEIAS;
 	public static Map<Integer, List<Integer>> HARDIN_REMOVED_SKILLS;
 	
+	// Eraton
+	public static Set<Integer> ERATON_RETAINED_SKILLS = new HashSet<>();
+	
 	// --------------------------------------------------
 	// Vitality Settings
 	// --------------------------------------------------
@@ -848,6 +852,7 @@ public class Config
 	public static int STARTING_VITALITY_POINTS;
 	public static boolean RAIDBOSS_USE_VITALITY;
 	public static float RATE_VITALITY_EXP_MULTIPLIER;
+	public static float RATE_VITALITY_EXP_PREMIUM_MULTIPLIER;
 	public static int VITALITY_MAX_ITEMS_ALLOWED;
 	public static float RATE_VITALITY_LOST;
 	public static float RATE_VITALITY_GAIN;
@@ -1154,6 +1159,7 @@ public class Config
 	public static int CONQUEST_RATE_SERVER_POINTS;
 	public static int CONQUEST_RATE_SERVER_SOUL_ORBS;
 	public static int CONQUEST_RATE_ZONE_POINTS;
+	public static int CONQUEST_RATE_BLOODY_COINS;
 	public static int CONQUEST_ATTACK_POINTS;
 	public static int CONQUEST_LIFE_POINTS;
 	public static boolean CONQUEST_PVP_ZONE;
@@ -1466,6 +1472,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -1953,6 +1960,15 @@ public class Config
 					HARDIN_REMOVED_SKILLS.get(classId).add(Integer.parseInt(classInfo[i]));
 				}
 			}
+			ERATON_RETAINED_SKILLS.clear();
+			final String eratonRetainedSkills = characterConfig.getString("EratonRetainedSkills", "").trim();
+			if (!eratonRetainedSkills.isEmpty())
+			{
+				for (String id : eratonRetainedSkills.split(","))
+				{
+					ERATON_RETAINED_SKILLS.add(Integer.parseInt(id));
+				}
+			}
 			ENABLE_VITALITY = characterConfig.getBoolean("EnableVitality", true);
 			STARTING_VITALITY_POINTS = characterConfig.getInt("StartingVitalityPoints", 140000);
 			RAIDBOSS_USE_VITALITY = characterConfig.getBoolean("RaidbossUseVitality", true);
@@ -2176,6 +2192,7 @@ public class Config
 			CONQUEST_RATE_SERVER_POINTS = conquestConfig.getInt("ConquestRateServerPoints", 1);
 			CONQUEST_RATE_SERVER_SOUL_ORBS = conquestConfig.getInt("ConquestRateServerSoulOrbs", 100);
 			CONQUEST_RATE_ZONE_POINTS = conquestConfig.getInt("ConquestRateZonePoints", 1);
+			CONQUEST_RATE_BLOODY_COINS = conquestConfig.getInt("ConquestRateBloodyCoins", 1);
 			CONQUEST_ATTACK_POINTS = conquestConfig.getInt("ConquestCharacterAttackPoints", 100);
 			CONQUEST_LIFE_POINTS = conquestConfig.getInt("ConquestCharacterLifePoints", 20);
 			CONQUEST_PVP_ZONE = conquestConfig.getBoolean("ConquestIsPvpZone", false);
@@ -2694,6 +2711,7 @@ public class Config
 			ENABLE_AUTO_SKILL = generalConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = generalConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = generalConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = generalConfig.getBoolean("AssistLeader", false);
 			BLUE_TEAM_ABNORMAL_EFFECT = null;
 			final String blueTeamAve = generalConfig.getString("BlueTeamAbnormalEffect", "").trim();
 			if (!blueTeamAve.isEmpty())
@@ -2822,6 +2840,7 @@ public class Config
 			MONSTER_EXP_MAX_LEVEL_DIFFERENCE = ratesConfig.getInt("MonsterExpMaxLevelDifference", 11);
 			RATE_RAIDBOSS_POINTS = ratesConfig.getFloat("RateRaidbossPointsReward", 1);
 			RATE_VITALITY_EXP_MULTIPLIER = ratesConfig.getFloat("RateVitalityExpMultiplier", 2);
+			RATE_VITALITY_EXP_PREMIUM_MULTIPLIER = ratesConfig.getFloat("RateVitalityExpPremiumMultiplier", 3);
 			VITALITY_MAX_ITEMS_ALLOWED = ratesConfig.getInt("VitalityMaxItemsAllowed", 999);
 			RATE_VITALITY_LOST = ratesConfig.getFloat("RateVitalityLost", 1);
 			RATE_VITALITY_GAIN = ratesConfig.getFloat("RateVitalityGain", 1);
@@ -3889,6 +3908,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/ai/SummonAI.java
index dc9c2e80f1..783e998673 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 33a5ef7906..117eb95754 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index ee8748fe16..1583360766 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index e33a1b0efa..337ac6dd99 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java
index 5bc59aa442..e6f94bf829 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java
@@ -126,7 +126,9 @@ public class LimitShopCraftData implements IXmlReader
 							boolean announce3 = false;
 							boolean announce4 = false;
 							boolean announce5 = false;
+							int enchant = 0;
 							int accountDailyLimit = 0;
+							int accountMontlyLimit = 0;
 							int accountBuyLimit = 0;
 							for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling())
 							{
@@ -217,6 +219,7 @@ public class LimitShopCraftData implements IXmlReader
 									count = parseLong(attrs, "count", 1L);
 									chance = parseFloat(attrs, "chance", 100f);
 									announce = parseBoolean(attrs, "announce", false);
+									enchant = parseInteger(attrs, "enchant", 0);
 									productionId2 = parseInteger(attrs, "id2", 0);
 									count2 = parseLong(attrs, "count2", 1L);
 									chance2 = parseFloat(attrs, "chance2", 100f);
@@ -233,6 +236,7 @@ public class LimitShopCraftData implements IXmlReader
 									count5 = parseLong(attrs, "count5", 1L);
 									announce5 = parseBoolean(attrs, "announce5", false);
 									accountDailyLimit = parseInteger(attrs, "accountDailyLimit", 0);
+									accountMontlyLimit = parseInteger(attrs, "accountMontlyLimit", 0);
 									accountBuyLimit = parseInteger(attrs, "accountBuyLimit", 0);
 									
 									final ItemTemplate item = ItemTable.getInstance().getTemplate(productionId);
@@ -244,7 +248,7 @@ public class LimitShopCraftData implements IXmlReader
 								}
 							}
 							
-							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, count, chance, announce, productionId2, count2, chance2, announce2, productionId3, count3, chance3, announce3, productionId4, count4, chance4, announce4, productionId5, count5, announce5, accountDailyLimit, accountBuyLimit));
+							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, count, chance, announce, enchant, productionId2, count2, chance2, announce2, productionId3, count3, chance3, announce3, productionId4, count4, chance4, announce4, productionId5, count5, announce5, accountDailyLimit, accountMontlyLimit, accountBuyLimit));
 						}
 					}
 				}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
index 19176d0ee5..7303b86055 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
@@ -109,6 +109,7 @@ public class LimitShopData implements IXmlReader
 							ingredientEnchants[4] = 0;
 							int productionId = 0;
 							int accountDailyLimit = 0;
+							int accountMontlyLimit = 0;
 							int accountBuyLimit = 0;
 							for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling())
 							{
@@ -197,6 +198,7 @@ public class LimitShopData implements IXmlReader
 								{
 									productionId = parseInteger(attrs, "id");
 									accountDailyLimit = parseInteger(attrs, "accountDailyLimit", 0);
+									accountMontlyLimit = parseInteger(attrs, "accountMontlyLimit", 0);
 									accountBuyLimit = parseInteger(attrs, "accountBuyLimit", 0);
 									
 									final ItemTemplate item = ItemTable.getInstance().getTemplate(productionId);
@@ -208,7 +210,7 @@ public class LimitShopData implements IXmlReader
 								}
 							}
 							
-							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, 1, 100, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, false, accountDailyLimit, accountBuyLimit));
+							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, 1, 100, false, 0, 0, 0, 0, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, false, accountDailyLimit, accountMontlyLimit, accountBuyLimit));
 						}
 					}
 				}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index a9c180af05..239c2d0a00 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -546,9 +546,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 290c9084cc..320e04a0a7 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 47d701f12b..45772454be 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
index 46f12b32ae..34ca89e316 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
@@ -25,4 +25,9 @@ import org.l2jmobius.gameserver.model.actor.Player;
 public interface IPlayerActionHandler
 {
 	void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed);
+	
+	default boolean isPetAction()
+	{
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index 33e61fdf2f..a0a521fa8a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -139,6 +139,11 @@ public class DailyTaskManager
 			resetHuntPass();
 		}
 		
+		if (calendar.get(Calendar.DAY_OF_MONTH) == 1)
+		{
+			resetMontlyLimitShopData();
+		}
+		
 		// Daily tasks.
 		resetAttendanceRewards();
 		resetDailySkills();
@@ -820,6 +825,31 @@ public class DailyTaskManager
 		LOGGER.info("LimitShopData has been reset.");
 	}
 	
+	private void resetMontlyLimitShopData()
+	{
+		for (LimitShopProductHolder holder : LimitShopData.getInstance().getProducts())
+		{
+			// Update data for offline players.
+			try (Connection con = DatabaseFactory.getConnection();
+				PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?"))
+			{
+				ps.setString(1, AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + holder.getProductionId());
+				ps.executeUpdate();
+			}
+			catch (Exception e)
+			{
+				LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset LimitShopData: " + e);
+			}
+			// Update data for online players.
+			for (Player player : World.getInstance().getPlayers())
+			{
+				player.getAccountVariables().remove(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + holder.getProductionId());
+				player.getAccountVariables().storeMe();
+			}
+		}
+		LOGGER.info("LimitShopData has been resetted.");
+	}
+	
 	private void resetHuntPass()
 	{
 		// Update data for offline players.
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index ed13229014..272c1e6add 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/ShortCuts.java
index b4cd9646dc..83fc87bdab 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -215,7 +215,7 @@ public class ShortCuts implements IRestorable
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
 				newsc.setAutoUse(sc.isAutoUse());
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/Creature.java
index a279bbaa27..a457303a3a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1298,7 +1298,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2826,7 +2826,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2839,177 +2839,139 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						sendPacket(info);
+					}
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/Player.java
index 105d6ddd60..f7b2f29d49 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -331,6 +331,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoAbnormalVisualEf
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic;
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot;
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
+import org.l2jmobius.gameserver.network.serverpackets.ExVitalityEffectInfo;
 import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import org.l2jmobius.gameserver.network.serverpackets.HennaInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
@@ -4696,7 +4697,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8712,9 +8713,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
@@ -10054,6 +10059,7 @@ public class Player extends Playable
 				sendPacket(new ExUserBoostStat(this, BonusExpType.VITALITY));
 				sendPacket(new ExUserBoostStat(this, BonusExpType.BUFFS));
 				sendPacket(new ExUserBoostStat(this, BonusExpType.PASSIVE));
+				sendPacket(new ExVitalityEffectInfo(this));
 				_userBoostStatTask = null;
 			}, 300);
 		}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 8ec5ccbc85..9552cddeff 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -854,7 +855,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -875,7 +876,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -900,7 +908,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -908,7 +916,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -954,7 +969,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 3e5ebd7c98..38b04a0109 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index 647f398100..b5d228678e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index 55f1307036..fb56d30ce1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -883,15 +882,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -902,8 +899,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -912,7 +913,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -985,45 +986,26 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
 		
-		// Notify recalculation to child classes.
+		// Notify recalculation to child classes
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 16208f0ee7..c4a4f1fb0a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -482,7 +482,11 @@ public class PlayerStat extends PlayableStat
 	
 	public double getVitalityExpBonus()
 	{
-		return (getVitalityPoints() > 0) ? getMul(Stat.VITALITY_EXP_RATE, Config.RATE_VITALITY_EXP_MULTIPLIER) : 1.0;
+		if (getVitalityPoints() > 0)
+		{
+			return getMul(Stat.VITALITY_EXP_RATE, 1) * (getActiveChar().hasPremiumStatus() ? Config.RATE_VITALITY_EXP_PREMIUM_MULTIPLIER : Config.RATE_VITALITY_EXP_MULTIPLIER);
+		}
+		return 0;
 	}
 	
 	public void setVitalityPoints(int value)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 61623cf473..d53b9c3c09 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 1a95ccb397..8b59c5c95e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index ba44f05690..6e90aa435c 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
index 49e27ac3e4..aea3f1b7b2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
@@ -57,7 +57,10 @@ public enum CommissionItemType
 	NECKLACE(31),
 	BELT(32),
 	BRACELET(33),
+	AGATHION(62),
 	HAIR_ACCESSORY(34),
+	BROOCH_JEWEL(63),
+	ARTIFACT(64),
 	// Supplies
 	POTION(35),
 	SCROLL_ENCHANT_WEAPON(36),
@@ -65,6 +68,7 @@ public enum CommissionItemType
 	SCROLL_OTHER(38),
 	SOULSHOT(39),
 	SPIRITSHOT(40),
+	OTHER_SUPPLIES(41),
 	// Pet Goods
 	PET_EQUIPMENT(42),
 	PET_SUPPLIES(43),
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
index afa13f0b6c..e3dd26b44a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
@@ -47,8 +47,8 @@ public enum CommissionTreeType
 		CommissionItemType.SPEAR,
 		CommissionItemType.OTHER_WEAPON),
 	ARMOR(1, CommissionItemType.HELMET, CommissionItemType.ARMOR_TOP, CommissionItemType.ARMOR_PANTS, CommissionItemType.FULL_BODY, CommissionItemType.GLOVES, CommissionItemType.FEET, CommissionItemType.SHIELD, CommissionItemType.SIGIL, CommissionItemType.UNDERWEAR, CommissionItemType.CLOAK),
-	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.HAIR_ACCESSORY),
-	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT),
+	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.AGATHION, CommissionItemType.HAIR_ACCESSORY, CommissionItemType.BROOCH_JEWEL, CommissionItemType.ARTIFACT),
+	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT, CommissionItemType.OTHER_SUPPLIES),
 	PET_GOODS(4, CommissionItemType.PET_EQUIPMENT, CommissionItemType.PET_SUPPLIES),
 	MISC(
 		5,
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/effects/EffectType.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/effects/EffectType.java
index c090a0d846..e35490546b 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/effects/EffectType.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/effects/EffectType.java
@@ -64,5 +64,6 @@ public enum EffectType
 	TELEPORT_TO_TARGET,
 	ABNORMAL_SHIELD,
 	DUAL_RANGE,
+	RESTORE_SYMBOL_SEAL,
 	VITALITY_POINT_UP
 }
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 42cc74c313..0609afdb42 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2242,6 +2242,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/events/EventType.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/events/EventType.java
index 8751edde94..e1cdc844f6 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/events/EventType.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/events/EventType.java
@@ -116,6 +116,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSkillL
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSocialAction;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSubChange;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion;
+import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSacredFire;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonTalk;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero;
@@ -296,6 +297,7 @@ public enum EventType
 	ON_PLAYER_QUEST_COMPLETE(OnPlayerQuestComplete.class, void.class),
 	ON_PLAYER_SUMMON_AGATHION(OnPlayerSummonAgathion.class, void.class),
 	ON_PLAYER_UNSUMMON_AGATHION(OnPlayerUnsummonAgathion.class, void.class),
+	ON_PLAYER_SUMMON_SACRED_FIRE(OnPlayerSummonSacredFire.class, void.class),
 	
 	// Trap events
 	ON_TRAP_ACTION(OnTrapAction.class, void.class),
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/events/impl/conquest/OnConquestFlowerCollect.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/events/impl/conquest/OnConquestFlowerCollect.java
index 1ea7c23731..720388c4dc 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/events/impl/conquest/OnConquestFlowerCollect.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/events/impl/conquest/OnConquestFlowerCollect.java
@@ -26,10 +26,12 @@ import org.l2jmobius.gameserver.model.events.impl.IBaseEvent;
 public class OnConquestFlowerCollect implements IBaseEvent
 {
 	private final Player _player;
+	private final int _npcId;
 	
-	public OnConquestFlowerCollect(Player player)
+	public OnConquestFlowerCollect(Player player, int npcId)
 	{
 		_player = player;
+		_npcId = npcId;
 	}
 	
 	public Player getPlayer()
@@ -37,6 +39,11 @@ public class OnConquestFlowerCollect implements IBaseEvent
 		return _player;
 	}
 	
+	public int getNpcId()
+	{
+		return _npcId;
+	}
+	
 	@Override
 	public EventType getType()
 	{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSummonSacredFire.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSummonSacredFire.java
new file mode 100644
index 0000000000..e73f6e4bda
--- /dev/null
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSummonSacredFire.java
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.model.events.impl.creature.player;
+
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.events.EventType;
+import org.l2jmobius.gameserver.model.events.impl.IBaseEvent;
+
+/**
+ * @author CostyKiller
+ */
+public class OnPlayerSummonSacredFire implements IBaseEvent
+{
+	private final Player _player;
+	private final int _npcId;
+	
+	public OnPlayerSummonSacredFire(Player player, int npcId)
+	{
+		_player = player;
+		_npcId = npcId;
+	}
+	
+	public Player getPlayer()
+	{
+		return _player;
+	}
+	
+	public int getNpcId()
+	{
+		return _npcId;
+	}
+	
+	@Override
+	public EventType getType()
+	{
+		return EventType.ON_PLAYER_SUMMON_SACRED_FIRE;
+	}
+}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java
index 425bca897b..4e00472bdf 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java
@@ -32,6 +32,7 @@ public class LimitShopProductHolder
 	private final long _count;
 	private final float _chance;
 	private final boolean _announce;
+	private final int _enchant;
 	private final int _productionId2;
 	private final long _count2;
 	private final float _chance2;
@@ -48,9 +49,10 @@ public class LimitShopProductHolder
 	private final long _count5;
 	private final boolean _announce5;
 	private final int _accountDailyLimit;
+	private final int _accountMontlyLimit;
 	private final int _accountBuyLimit;
 	
-	public LimitShopProductHolder(int id, int category, int minLevel, int maxLevel, int[] ingredientIds, long[] ingredientQuantities, int[] ingredientEnchants, int productionId, long count, float chance, boolean announce, int productionId2, long count2, float chance2, boolean announce2, int productionId3, long count3, float chance3, boolean announce3, int productionId4, long count4, float chance4, boolean announce4, int productionId5, long count5, boolean announce5, int accountDailyLimit, int accountBuyLimit)
+	public LimitShopProductHolder(int id, int category, int minLevel, int maxLevel, int[] ingredientIds, long[] ingredientQuantities, int[] ingredientEnchants, int productionId, long count, float chance, boolean announce, int enchant, int productionId2, long count2, float chance2, boolean announce2, int productionId3, long count3, float chance3, boolean announce3, int productionId4, long count4, float chance4, boolean announce4, int productionId5, long count5, boolean announce5, int accountDailyLimit, int accountMontlyLimit, int accountBuyLimit)
 	{
 		_id = id;
 		_category = category;
@@ -63,6 +65,7 @@ public class LimitShopProductHolder
 		_count = count;
 		_chance = chance;
 		_announce = announce;
+		_enchant = enchant;
 		_productionId2 = productionId2;
 		_count2 = count2;
 		_chance2 = chance2;
@@ -79,6 +82,7 @@ public class LimitShopProductHolder
 		_count5 = count5;
 		_announce5 = announce5;
 		_accountDailyLimit = accountDailyLimit;
+		_accountMontlyLimit = accountMontlyLimit;
 		_accountBuyLimit = accountBuyLimit;
 	}
 	
@@ -137,6 +141,11 @@ public class LimitShopProductHolder
 		return _announce;
 	}
 	
+	public int getEnchant()
+	{
+		return _enchant;
+	}
+	
 	public int getProductionId2()
 	{
 		return _productionId2;
@@ -217,6 +226,11 @@ public class LimitShopProductHolder
 		return _accountDailyLimit;
 	}
 	
+	public int getAccountMontlyLimit()
+	{
+		return _accountMontlyLimit;
+	}
+	
 	public int getAccountBuyLimit()
 	{
 		return _accountBuyLimit;
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index af732fc058..2c7f028186 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -39,6 +39,7 @@ import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AgathionData;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -52,6 +53,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -74,12 +76,14 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemEnchantAdd;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
 import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -94,6 +98,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1074,11 +1079,14 @@ public class Item extends WorldObject
 	 */
 	public boolean setAugmentation(VariationInstance augmentation, boolean updateDatabase)
 	{
-		// there shall be no previous augmentation..
+		// Remove previous augmentation.
 		if (_augmentation != null)
 		{
-			LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + _ownerId);
-			return false;
+			if (isEquipped())
+			{
+				_augmentation.removeBonus(getActingPlayer());
+			}
+			removeAugmentation();
 		}
 		
 		_augmentation = augmentation;
@@ -1652,7 +1660,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2581,6 +2591,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2605,6 +2620,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2630,6 +2647,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 33209934f3..14b7972972 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -757,7 +757,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -909,7 +910,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 2a6b4713b9..83498fdbd8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -686,7 +686,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -709,7 +709,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -744,7 +744,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 785b468e3d..a85ebaa1db 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -97,6 +97,7 @@ public enum Stat
 	REAR_DAMAGE_RATE("rearDamage"),
 	DRAGON_WEAPON_DEFENCE("dragonWeaponDefence"),
 	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
+	IGNORE_REDUCE_DAMAGE("ignoreReduceDamage"),
 	
 	// PVP BONUS
 	PVP_PHYSICAL_ATTACK_DAMAGE("pvpPhysDmg"),
@@ -137,7 +138,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	DEFENCE_CRITICAL_RATE("defCritRate"),
 	DEFENCE_CRITICAL_RATE_ADD("defCritRateAdd"),
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index fc25054af9..a0eed6cc19 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index 89b7db15e1..6c561fc7cd 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 33f96df6cd..a1ef8d0a85 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index 923fe865f0..1179922621 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -97,6 +97,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java
index 320c51638a..66b859c14d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java
@@ -45,6 +45,7 @@ public class AccountVariables extends AbstractVariables
 	public static final String PRIME_SHOP_PRODUCT_DAILY_COUNT = "PSPDailyCount";
 	public static final String LCOIN_SHOP_PRODUCT_COUNT = "LCSCount";
 	public static final String LCOIN_SHOP_PRODUCT_DAILY_COUNT = "LCSDailyCount";
+	public static final String LCOIN_SHOP_PRODUCT_MONTLY_COUNT = "LCSMontlyCount";
 	
 	private final String _accountName;
 	
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
index 69530d1955..6301c52fc8 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
@@ -36,6 +36,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureZoneEnter;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureZoneExit;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.interfaces.ILocational;
+import org.l2jmobius.gameserver.network.SystemMessageId;
+import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 
 /**
@@ -215,6 +217,10 @@ public abstract class ZoneType extends ListenersContainer
 		// Check level
 		if ((creature.getLevel() < _minLevel) || (creature.getLevel() > _maxLevel))
 		{
+			if (creature.isPlayer())
+			{
+				creature.getActingPlayer().sendPacket(new ExShowScreenMessage(SystemMessageId.YOU_CANNOT_ENTER_AS_YOUR_LEVEL_DOES_NOT_MEET_THE_REQUIREMENTS, ExShowScreenMessage.TOP_CENTER, 10000));
+			}
 			return false;
 		}
 		
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index a6eaf014dc..df6cec9f99 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.zone.type;
 
+import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.zone.ZoneType;
@@ -32,6 +33,7 @@ public class TeleportZone extends ZoneType
 	public TeleportZone(int id)
 	{
 		super(id);
+		setTargetType(InstanceType.Player); // Default only player.
 	}
 	
 	@Override
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 2a8203d7ef..49dfb839a3 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -117,6 +117,11 @@ public class RequestAcquireSkill implements ClientPacket
 		
 		final int skillId = player.getReplacementSkill(_id);
 		final Skill existingSkill = player.getKnownSkill(skillId); // Mobius: Keep existing sublevel.
+		if ((_level > 65536000) && (existingSkill != null) && (existingSkill.getSubLevel() > 1000))
+		{
+			_level -= existingSkill.getSubLevel() * 65536;
+		}
+		
 		final Skill skill = SkillData.getInstance().getSkill(skillId, _level, existingSkill == null ? 0 : existingSkill.getSubLevel());
 		if (skill == null)
 		{
@@ -681,7 +686,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList();
 		player.updateShortCuts(_id, skill.getLevel(), skill.getSubLevel());
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index f57765cd74..c58d605857 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 05934422b3..a35d839832 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -87,7 +87,7 @@ public class RequestShortCutReg implements ClientPacket
 		else if (_page == 23)
 		{
 			final Item item = player.getInventory().getItemByObjectId(_id);
-			if ((item != null) && !item.isPotion())
+			if (((item != null) && !item.isPotion()) || (_type == ShortcutType.ACTION))
 			{
 				return;
 			}
@@ -148,7 +148,7 @@ public class RequestShortCutReg implements ClientPacket
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		sc.setAutoUse(_active);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 		player.sendPacket(new ExActivateAutoShortcut(sc, _active));
 		
 		// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 91ac9b3eec..2b8723cb91 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -225,21 +225,21 @@ public class UseItem implements ClientPacket
 			
 			if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, player.getClassId().getId()))
 			{
-				// Death Knight class unequip shields.
+				// Unequip shields.
 				if ((player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND) != null) && (player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND).getItemType() == ArmorType.SHIELD))
 				{
 					player.disarmShield();
 				}
 				
-				// Prevent Death Knight class to equip shields.
+				// Prevent equipping shields.
 				if (item.getItemType() == ArmorType.SHIELD)
 				{
 					player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
 					return;
 				}
 				
-				// Prevent Death Knight class to equip other weapons.
-				if (item.isWeapon() && ((item.getWeaponItem().getItemType() != WeaponType.SWORD) || ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND))))
+				// Prevent equipping other weapons.
+				if (item.isWeapon() && (item.getWeaponItem().getItemType() != WeaponType.FISHINGROD) && ((item.getWeaponItem().getItemType() != WeaponType.SWORD) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND)))
 				{
 					player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
 					return;
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index a140c01f0e..c366a156ba 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/dethrone/RequestExDethroneConnectCastle.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/dethrone/RequestExDethroneConnectCastle.java
index d9517e2201..4a460777ae 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/dethrone/RequestExDethroneConnectCastle.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/dethrone/RequestExDethroneConnectCastle.java
@@ -16,7 +16,6 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets.dethrone;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.ReadablePacket;
 import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -56,11 +55,11 @@ public class RequestExDethroneConnectCastle implements ClientPacket
 			GlobalVariablesManager.getInstance().set("CONQUEST_CONNECTED", true);
 			
 			final long serverPoints = GlobalVariablesManager.getInstance().getLong("CONQUEST_SERVER_POINTS", 0L);
-			final long soulOrbScore = serverPoints * Config.CONQUEST_RATE_SERVER_SOUL_ORBS; // Custom value.
+			final long serverSoulOrbs = GlobalVariablesManager.getInstance().getLong("CONQUEST_SERVER_SOUL_ORBS", 0L);
 			final boolean _bAdenCastleOwner = (player.getClan() != null) && (player.getObjectId() == player.getClan().getLeaderId()) && (player.getClan().getCastleId() == 5); // Aden Castle Id is 5 _bConnected = true
 			
 			player.sendPacket(new ExDethroneConnectCastle(true));
-			player.sendPacket(new ExDethroneServerInfo(serverPoints, soulOrbScore, _bAdenCastleOwner, true));
+			player.sendPacket(new ExDethroneServerInfo(serverPoints, serverSoulOrbs, _bAdenCastleOwner, true));
 			player.sendPacket(SystemMessageId.THE_CONNECTION_TO_THE_CONQUEST_WORLD_WAS_MADE);
 		}
 		else // Already connected.
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/dethrone/RequestExDethroneDisconnectCastle.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/dethrone/RequestExDethroneDisconnectCastle.java
index 2b0a9ee98a..7cc7d24fce 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/dethrone/RequestExDethroneDisconnectCastle.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/dethrone/RequestExDethroneDisconnectCastle.java
@@ -16,7 +16,6 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets.dethrone;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.ReadablePacket;
 import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -55,11 +54,11 @@ public class RequestExDethroneDisconnectCastle implements ClientPacket
 			player.sendMessage("Conquest connection is inactive.");
 			
 			final long serverPoints = GlobalVariablesManager.getInstance().getLong("CONQUEST_SERVER_POINTS", 0);
-			final long soulOrbScore = (serverPoints * Config.CONQUEST_RATE_SERVER_SOUL_ORBS); // Custom value.
+			final long serverSoulOrbs = GlobalVariablesManager.getInstance().getLong("CONQUEST_SERVER_SOUL_ORBS", 0L);
 			final boolean adenCastleOwner = (player.getClan() != null) && (player.getObjectId() == player.getClan().getLeaderId()) && (player.getClan().getCastleId() == 5); // Aden Castle Id is 5 _bConnected = true
 			GlobalVariablesManager.getInstance().set("CONQUEST_CONNECTED", false);
 			player.sendPacket(new ExDethroneDisconnectCastle(false));
-			player.sendPacket(new ExDethroneServerInfo(serverPoints, soulOrbScore, adenCastleOwner, false));
+			player.sendPacket(new ExDethroneServerInfo(serverPoints, serverSoulOrbs, adenCastleOwner, false));
 			player.sendPacket(SystemMessageId.THE_CONNECTION_TO_THE_CONQUEST_WORLD_IS_LOST);
 		}
 	}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/dethrone/RequestExDethronePrevSeasonInfo.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/dethrone/RequestExDethronePrevSeasonInfo.java
index e8da3ec0d2..228d6607f6 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/dethrone/RequestExDethronePrevSeasonInfo.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/dethrone/RequestExDethronePrevSeasonInfo.java
@@ -16,7 +16,6 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets.dethrone;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.network.GameClient;
@@ -38,7 +37,7 @@ public class RequestExDethronePrevSeasonInfo implements ClientPacket
 		}
 		
 		final long prevServerPoints = GlobalVariablesManager.getInstance().getLong("CONQUEST_PREV_SEASON_SERVER_POINTS", 0);
-		final long prevSoulOrbsScore = prevServerPoints * Config.CONQUEST_RATE_SERVER_SOUL_ORBS; // Custom value.
-		player.sendPacket(new ExDethronePrevSeasonInfo(player, prevServerPoints, prevSoulOrbsScore));
+		final long prevServerSoulOrbs = GlobalVariablesManager.getInstance().getLong("CONQUEST_PREV_SEASON_SERVER_SOUL_ORBS", 0);
+		player.sendPacket(new ExDethronePrevSeasonInfo(player, prevServerPoints, prevServerSoulOrbs));
 	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/dethrone/RequestExDethroneServerInfo.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/dethrone/RequestExDethroneServerInfo.java
index cd13051439..e4a74d6253 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/dethrone/RequestExDethroneServerInfo.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/dethrone/RequestExDethroneServerInfo.java
@@ -16,7 +16,6 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets.dethrone;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.network.GameClient;
@@ -38,9 +37,9 @@ public class RequestExDethroneServerInfo implements ClientPacket
 		}
 		
 		final long serverPoints = GlobalVariablesManager.getInstance().getLong("CONQUEST_SERVER_POINTS", 0);
-		final long soulOrbScore = serverPoints * Config.CONQUEST_RATE_SERVER_SOUL_ORBS; // Custom value.
+		final long serverSoulOrbs = GlobalVariablesManager.getInstance().getLong("CONQUEST_SERVER_SOUL_ORBS", 0L);
 		final boolean adenOwner = (player.getClan() != null) && (player.getObjectId() == player.getClan().getLeaderId()) && (player.getClan().getCastleId() == 5); // Aden Castle Id is 5
 		final boolean connected = GlobalVariablesManager.getInstance().getBoolean("CONQUEST_CONNECTED", false);
-		player.sendPacket(new ExDethroneServerInfo(serverPoints, soulOrbScore, adenOwner, connected));
+		player.sendPacket(new ExDethroneServerInfo(serverPoints, serverSoulOrbs, adenOwner, connected));
 	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
index ab3db559b5..16743b2882 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
@@ -99,10 +99,6 @@ public class RequestEnchantItem implements ClientPacket
 			player.removeRequest(request.getClass());
 			return;
 		}
-		if (item.getEnchantLevel() != request.getEnchantLevel())
-		{
-			item.setEnchantLevel(request.getEnchantLevel());
-		}
 		
 		// Template for scroll.
 		final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java
index a7fc5582d2..0d7e79cdab 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java
@@ -126,8 +126,12 @@ public class RequestItemEnsoul implements ClientPacket
 		final ItemTemplate template = item.getTemplate();
 		if ((_type == 1) && (template.getEnsoulSlots() == 0))
 		{
-			PacketLogger.warning("Player: " + player + " attempting to ensoul non ensoulable item: " + item + "!");
-			return;
+			// We use special ensoul slots for jewels.
+			if ((template.getType1() != ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE) || (template.getSpecialEnsoulSlots() == 0))
+			{
+				PacketLogger.warning("Player: " + player + " attempting to ensoul non ensoulable item: " + item + "!");
+				return;
+			}
 		}
 		if ((_type == 2) && (template.getSpecialEnsoulSlots() == 0))
 		{
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/herobook/RequestHeroBookEnchant.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/herobook/RequestHeroBookEnchant.java
index 0a4493f6b8..d0a6c170f4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/herobook/RequestHeroBookEnchant.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/herobook/RequestHeroBookEnchant.java
@@ -29,7 +29,7 @@ public class RequestHeroBookEnchant implements ClientPacket
 	@Override
 	public void run(GameClient client)
 	{
-		Player player = client.getPlayer();
+		final Player player = client.getPlayer();
 		if (player == null)
 		{
 			return;
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java
index 31afc31530..6deff5dad1 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java
@@ -112,26 +112,9 @@ public class RequestHuntPassReward implements ClientPacket
 			return;
 		}
 		
-		// Normal reward.
-		if (!huntPass.isPremium() && (rewardIndex <= HuntPassData.getInstance().getRewardsCount()))
-		{
-			rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
-			huntPass.setRewardStep(rewardIndex + 1);
-		}
-		// Premium reward.
-		else if (huntPass.isPremium())
-		{
-			if ((rewardIndex < HuntPassData.getInstance().getRewardsCount()) && (rewardIndex <= premiumRewardIndex))
-			{
-				rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
-				huntPass.setRewardStep(rewardIndex + 1);
-			}
-			else if ((premiumRewardIndex < rewardIndex) && (premiumRewardIndex <= HuntPassData.getInstance().getPremiumRewardsCount()))
-			{
-				rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex));
-				huntPass.setPremiumRewardStep(premiumRewardIndex + 1);
-			}
-		}
+		normalReward(player);
+		premiumReward(player);
+		huntPass.setRewardStep(rewardIndex + 1);
 		huntPass.setRewardAlert(false);
 		
 		player.sendPacket(new HuntPassInfo(player, _huntPassType));
@@ -157,4 +140,39 @@ public class RequestHuntPassReward implements ClientPacket
 			player.addItem("HuntPassReward", reward, player, true);
 		}
 	}
+	
+	private void premiumReward(Player player)
+	{
+		final HuntPass huntPass = player.getHuntPass();
+		final int premiumRewardIndex = huntPass.getPremiumRewardStep();
+		if (premiumRewardIndex >= HuntPassData.getInstance().getPremiumRewardsCount())
+		{
+			return;
+		}
+		
+		if (!huntPass.isPremium())
+		{
+			return;
+		}
+		
+		rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex));
+		huntPass.setPremiumRewardStep(premiumRewardIndex + 1);
+	}
+	
+	private void normalReward(Player player)
+	{
+		final HuntPass huntPass = player.getHuntPass();
+		final int rewardIndex = huntPass.getRewardStep();
+		if (rewardIndex >= HuntPassData.getInstance().getRewardsCount())
+		{
+			return;
+		}
+		
+		if (huntPass.isPremium() && ((huntPass.getPremiumRewardStep() < rewardIndex) || (huntPass.getPremiumRewardStep() >= HuntPassData.getInstance().getPremiumRewardsCount())))
+		{
+			return;
+		}
+		
+		rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
+	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassRewardAll.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassRewardAll.java
index 8e8cef3fb4..2b0476f4ed 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassRewardAll.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassRewardAll.java
@@ -115,26 +115,9 @@ public class RequestHuntPassRewardAll implements ClientPacket
 				break REWARD_LOOP;
 			}
 			
-			// Normal reward.
-			if (!huntPass.isPremium() && (rewardIndex <= HuntPassData.getInstance().getRewardsCount()))
-			{
-				rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
-				huntPass.setRewardStep(rewardIndex + 1);
-			}
-			// Premium reward.
-			else if (huntPass.isPremium())
-			{
-				if ((rewardIndex < HuntPassData.getInstance().getRewardsCount()) && (rewardIndex <= premiumRewardIndex))
-				{
-					rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
-					huntPass.setRewardStep(rewardIndex + 1);
-				}
-				else if ((premiumRewardIndex < rewardIndex) && (premiumRewardIndex <= HuntPassData.getInstance().getPremiumRewardsCount()))
-				{
-					rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex));
-					huntPass.setPremiumRewardStep(premiumRewardIndex + 1);
-				}
-			}
+			normalReward(player);
+			premiumReward(player);
+			huntPass.setRewardStep(rewardIndex + 1);
 		}
 		
 		if (!inventoryLimitReached)
@@ -165,4 +148,39 @@ public class RequestHuntPassRewardAll implements ClientPacket
 			player.addItem("HuntPassReward", reward, player, true);
 		}
 	}
+	
+	private void premiumReward(Player player)
+	{
+		final HuntPass huntPass = player.getHuntPass();
+		final int premiumRewardIndex = huntPass.getPremiumRewardStep();
+		if (premiumRewardIndex >= HuntPassData.getInstance().getPremiumRewardsCount())
+		{
+			return;
+		}
+		
+		if (!huntPass.isPremium())
+		{
+			return;
+		}
+		
+		rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex));
+		huntPass.setPremiumRewardStep(premiumRewardIndex + 1);
+	}
+	
+	private void normalReward(Player player)
+	{
+		final HuntPass huntPass = player.getHuntPass();
+		final int rewardIndex = huntPass.getRewardStep();
+		if (rewardIndex >= HuntPassData.getInstance().getRewardsCount())
+		{
+			return;
+		}
+		
+		if (huntPass.isPremium() && ((huntPass.getPremiumRewardStep() < rewardIndex) || (huntPass.getPremiumRewardStep() >= HuntPassData.getInstance().getPremiumRewardsCount())))
+		{
+			return;
+		}
+		
+		rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
+	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
index 226946f767..7bf9ea60a4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
@@ -147,6 +147,25 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 				return;
 			}
 		}
+		else if (_product.getAccountMontlyLimit() > 0)
+		{
+			final long amount = _product.getAccountMontlyLimit() * _amount;
+			if (amount < 1)
+			{
+				player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+				player.removeRequest(PrimeShopRequest.class);
+				player.sendPacket(new ExPurchaseLimitShopItemResult(false, _shopIndex, _productId, 0, Collections.emptyList()));
+				return;
+			}
+			if (player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + _product.getProductionId(), 0) >= amount)
+			{
+				player.sendMessage("You have reached your montly limit.");
+				player.removeRequest(PrimeShopRequest.class);
+				player.sendPacket(new ExPurchaseLimitShopItemResult(false, _shopIndex, _productId, 0, Collections.emptyList()));
+				return;
+			}
+			
+		}
 		else if (_product.getAccountBuyLimit() > 0) // Count limit.
 		{
 			final long amount = _product.getAccountBuyLimit() * _amount;
@@ -168,7 +187,7 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 		}
 		
 		// Check existing items.
-		final int remainingInfo = Math.max(0, Math.max(_product.getAccountBuyLimit(), _product.getAccountDailyLimit()));
+		final int remainingInfo = Math.max(0, Math.max(_product.getAccountBuyLimit(), Math.max(_product.getAccountDailyLimit(), _product.getAccountMontlyLimit())));
 		for (int i = 0; i < _product.getIngredientIds().length; i++)
 		{
 			if (_product.getIngredientIds()[i] == 0)
@@ -315,7 +334,7 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 				if (Rnd.get(100) < _product.getChance())
 				{
 					rewards.computeIfAbsent(0, k -> new LimitShopRandomCraftReward(_product.getProductionId(), 0, 0)).getCount().addAndGet((int) _product.getCount());
-					final Item item = player.addItem("LCoinShop", _product.getProductionId(), _product.getCount(), player, true);
+					final Item item = player.addItem("LCoinShop", _product.getProductionId(), _product.getCount(), _product.getEnchant(), player, true);
 					if (_product.isAnnounce())
 					{
 						Broadcast.toAllOnlinePlayers(new ExItemAnnounce(player, item, ExItemAnnounce.SPECIAL_CREATION));
@@ -362,7 +381,7 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 		else if (Rnd.get(100) < _product.getChance())
 		{
 			rewards.put(0, new LimitShopRandomCraftReward(_product.getProductionId(), (int) (_product.getCount() * _amount), 0));
-			final Item item = player.addItem("LCoinShop", _product.getProductionId(), _product.getCount() * _amount, player, true);
+			final Item item = player.addItem("LCoinShop", _product.getProductionId(), _product.getCount() * _amount, _product.getEnchant(), player, true);
 			if (_product.isAnnounce())
 			{
 				Broadcast.toAllOnlinePlayers(new ExItemAnnounce(player, item, ExItemAnnounce.SPECIAL_CREATION));
@@ -374,6 +393,10 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 		{
 			player.getAccountVariables().set(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + _product.getProductionId(), player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + _product.getProductionId(), 0) + _amount);
 		}
+		if (_product.getAccountMontlyLimit() > 0)
+		{
+			player.getAccountVariables().set(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + _product.getProductionId(), player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + _product.getProductionId(), 0) + _amount);
+		}
 		else if (_product.getAccountBuyLimit() > 0)
 		{
 			player.getAccountVariables().set(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + _product.getProductionId(), player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + _product.getProductionId(), 0) + _amount);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/variation/ExApplyVariationOption.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/variation/ExApplyVariationOption.java
index bc77da99e4..d19439926d 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/variation/ExApplyVariationOption.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/clientpackets/variation/ExApplyVariationOption.java
@@ -63,21 +63,20 @@ public class ExApplyVariationOption implements ClientPacket
 			return;
 		}
 		
-		// Remove the augmentation if any (286).
-		if (targetItem.isAugmented())
-		{
-			targetItem.getAugmentation().removeBonus(player);
-			targetItem.removeAugmentation();
-		}
-		
 		targetItem.setAugmentation(augment, true);
 		
 		player.sendPacket(new ApplyVariationOption(1, _enchantedObjectId, _option1, _option2));
-		// apply new augment
-		targetItem.getAugmentation().applyBonus(player);
-		// Recalculate all stats
+		
+		// Apply new augment.
+		if (targetItem.isEquipped())
+		{
+			targetItem.getAugmentation().applyBonus(player);
+		}
+		
+		// Recalculate all stats.
 		player.getStat().recalculateStats(true);
 		
+		player.sendItemList();
 		player.removeRequest(VariationRequest.class);
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index 48381a5b81..189fda4a5a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,129 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 38, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 49, 50, 51,
-		52, 53, 54, 55,
-		56, 57, 58, 59,
-		60, 61, 62, 63,
-		64, 65, 66, 67,
-		68, 69, 70, 71,
-		72, 73, 74, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 92, 93,
-		94, 95, 96, 97,
-		1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index 7efc7cbfe5..aa9b671522 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java
index 1f18c09ee2..c7e257331e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.BonusExpType;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.stats.Stat;
@@ -45,31 +46,10 @@ public class ExUserBoostStat extends ServerPacket
 		{
 			case VITALITY:
 			{
-				final int currentVitalityPoints = _player.getStat().getVitalityPoints();
-				if (currentVitalityPoints > 105000)
+				if (_player.getStat().getVitalityPoints() > 0)
 				{
-					count = 1;
-					bonus = 300;
-				}
-				else if (currentVitalityPoints > 70000)
-				{
-					count = 1;
-					bonus = 250;
-				}
-				else if (currentVitalityPoints > 35000)
-				{
-					count = 1;
-					bonus = 200;
-				}
-				else if (currentVitalityPoints > 0)
-				{
-					count = 1;
-					bonus = 100;
-				}
-				if (bonus > 0)
-				{
-					count += (int) _player.getStat().getValue(Stat.VITALITY_SKILLS, 0);
-					bonus += (int) ((_player.getStat().getMul(Stat.VITALITY_EXP_RATE, 1) - 1) * 100);
+					count = (int) (_player.getStat().getValue(Stat.VITALITY_SKILLS, 0) + 1);
+					bonus = (int) (((_player.getStat().getMul(Stat.VITALITY_EXP_RATE, 1) - 1) + (_player.hasPremiumStatus() ? Config.RATE_VITALITY_EXP_PREMIUM_MULTIPLIER : Config.RATE_VITALITY_EXP_MULTIPLIER)) * 100d);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java
index d12bd00c3d..ce14ebc858 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.stats.Stat;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -26,13 +27,15 @@ import org.l2jmobius.gameserver.network.ServerPackets;
 public class ExVitalityEffectInfo extends ServerPacket
 {
 	private final int _vitalityBonus;
+	private final int _vitalityAddBonus;
 	private final int _vitalityItemsRemaining;
 	private final int _points;
 	
 	public ExVitalityEffectInfo(Player player)
 	{
 		_points = player.getVitalityPoints();
-		_vitalityBonus = (int) player.getStat().getVitalityExpBonus() * 100;
+		_vitalityBonus = (int) ((player.getStat().getMul(Stat.VITALITY_EXP_RATE, 1) - 1) + (player.hasPremiumStatus() ? Config.RATE_VITALITY_EXP_PREMIUM_MULTIPLIER : Config.RATE_VITALITY_EXP_MULTIPLIER)) * 100;
+		_vitalityAddBonus = (int) ((player.getStat().getMul(Stat.VITALITY_EXP_RATE, 1) - 1) * 100);
 		_vitalityItemsRemaining = Config.VITALITY_MAX_ITEMS_ALLOWED - player.getVitalityItemsUsed();
 	}
 	
@@ -42,7 +45,7 @@ public class ExVitalityEffectInfo extends ServerPacket
 		ServerPackets.EX_VITALITY_EFFECT_INFO.writeId(this);
 		writeInt(_points);
 		writeInt(_vitalityBonus); // Vitality Bonus
-		writeShort(0); // Vitality additional bonus in %
+		writeShort(_vitalityAddBonus); // Vitality additional bonus in %
 		writeShort(_vitalityItemsRemaining); // How much vitality items remaining for use
 		writeShort(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use
 	}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
index 4dee5efb84..3c298a3a2a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
@@ -167,7 +167,7 @@ public class FakePlayerInfo extends ServerPacket
 		writeByte(_npc.getTeam().getId());
 		writeInt(_clan != null ? _clan.getCrestLargeId() : 0);
 		writeByte(_fpcHolder.getNobleLevel());
-		writeByte(_fpcHolder.isHero());
+		writeByte(_fpcHolder.isHero() ? 2 : 0); // 152 - Value for enabled changed to 2
 		writeByte(_fpcHolder.isFishing());
 		writeInt(_fpcHolder.getBaitLocationX());
 		writeInt(_fpcHolder.getBaitLocationY());
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
index 1d4d2509c7..b78f4d0bb2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
@@ -118,7 +118,7 @@ public class MultiSellList extends AbstractItemPacket
 				}
 				writeLong(_list.getProductCount(product));
 				writeShort(product.getEnchantmentLevel() > 0 ? product.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
-				writeInt((int) product.getChance() * 1000000); // chance
+				writeInt((int) (product.getChance() * 1000000)); // chance
 				writeItemAugment(displayItemEnchantment);
 				writeItemElemental(displayItemEnchantment);
 				writeItemEnsoulOptions(displayItemEnchantment);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index aad9e27c0a..2fab07ef44 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -170,7 +170,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -330,9 +330,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -350,11 +350,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -378,9 +378,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -410,7 +410,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
similarity index 95%
rename from L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
rename to L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
index b08ae18acf..a5cc36da6f 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -1,201 +1,200 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.enums.Team;
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeByte(0); // 286
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		final Team team = (Config.BLUE_TEAM_ABNORMAL_EFFECT != null) && (Config.RED_TEAM_ABNORMAL_EFFECT != null) ? _summon.getTeam() : Team.NONE;
-		writeShort(aves.size() + (_summon.isInvisible() ? 1 : 0) + (team != Team.NONE ? 1 : 0)); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		if (_summon.isInvisible())
-		{
-			writeShort(AbnormalVisualEffect.STEALTH.getClientId());
-		}
-		if (team == Team.BLUE)
-		{
-			if (Config.BLUE_TEAM_ABNORMAL_EFFECT != null)
-			{
-				writeShort(Config.BLUE_TEAM_ABNORMAL_EFFECT.getClientId());
-			}
-		}
-		else if ((team == Team.RED) && (Config.RED_TEAM_ABNORMAL_EFFECT != null))
-		{
-			writeShort(Config.RED_TEAM_ABNORMAL_EFFECT.getClientId());
-		}
-		writeByte(_statusMask);
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.enums.Team;
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeShort(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		final Team team = (Config.BLUE_TEAM_ABNORMAL_EFFECT != null) && (Config.RED_TEAM_ABNORMAL_EFFECT != null) ? _summon.getTeam() : Team.NONE;
+		writeShort(aves.size() + (_summon.isInvisible() ? 1 : 0) + (team != Team.NONE ? 1 : 0)); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		if (_summon.isInvisible())
+		{
+			writeShort(AbnormalVisualEffect.STEALTH.getClientId());
+		}
+		if (team == Team.BLUE)
+		{
+			if (Config.BLUE_TEAM_ABNORMAL_EFFECT != null)
+			{
+				writeShort(Config.BLUE_TEAM_ABNORMAL_EFFECT.getClientId());
+			}
+		}
+		else if ((team == Team.RED) && (Config.RED_TEAM_ABNORMAL_EFFECT != null))
+		{
+			writeShort(Config.RED_TEAM_ABNORMAL_EFFECT.getClientId());
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index e88df6a6c3..142634a205 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,20 +19,21 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
+		player.restoreAutoShortcutVisual();
 	}
 	
 	@Override
@@ -54,8 +55,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 77c19e8bcb..d3dd7e1eb6 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -43,14 +49,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // item augment id
-				writeInt(0); // visual id
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 209a163197..c2cf957f35 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index b2f166baa5..3b93f1af4a 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -68,7 +68,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -149,7 +149,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -249,9 +249,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -269,11 +269,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -297,9 +297,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -330,7 +329,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/dethrone/ExDethronePrevSeasonInfo.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/dethrone/ExDethronePrevSeasonInfo.java
index 3fca427cb5..281fc1c9f2 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/dethrone/ExDethronePrevSeasonInfo.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/dethrone/ExDethronePrevSeasonInfo.java
@@ -34,14 +34,14 @@ public class ExDethronePrevSeasonInfo extends ServerPacket
 {
 	private final Player _player;
 	private final Long _previousSeasonServerPoints;
-	private final Long _previousSeasonSoulOrbsScore;
+	private final Long _previousSeasonServerSoulOrbs;
 	private final Map<Integer, StatSet> _previousConquestPlayerList;
 	
-	public ExDethronePrevSeasonInfo(Player player, Long prevServerPoints, Long prevSoulOrbsScore)
+	public ExDethronePrevSeasonInfo(Player player, Long prevServerPoints, Long prevServerSoulOrbs)
 	{
 		_player = player;
 		_previousSeasonServerPoints = prevServerPoints;
-		_previousSeasonSoulOrbsScore = prevSoulOrbsScore;
+		_previousSeasonServerSoulOrbs = prevServerSoulOrbs;
 		_previousConquestPlayerList = RankManager.getInstance().getPreviousConquestRankList();
 	}
 	
@@ -81,13 +81,13 @@ public class ExDethronePrevSeasonInfo extends ServerPacket
 		writeInt(Config.SERVER_ID); // server id
 		writeLong(_previousSeasonServerPoints); // Server points
 		
-		writeLong(_previousSeasonSoulOrbsScore); // Total Soul Orbs
+		writeLong(_previousSeasonServerSoulOrbs); // Total Soul Orbs
 		writeLong(_previousSeasonServerPoints); // Server points
 		
 		// Personal Reward
 		if (personalPoints > Config.CONQUEST_PERSONAL_REWARD_MIN_POINTS)
 		{
-			int rewardRank = 0;		
+			int rewardRank = 0;
 			// rank percent formula
 			double rankPercent = ((rank * 100) / (RankManager.getInstance().getPreviousConquestRankList().size()));
 			
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/dethrone/ExDethroneServerInfo.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/dethrone/ExDethroneServerInfo.java
index 34860905bf..62156fb5c7 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/dethrone/ExDethroneServerInfo.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/dethrone/ExDethroneServerInfo.java
@@ -26,14 +26,14 @@ import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 public class ExDethroneServerInfo extends ServerPacket
 {
 	private final long _serverPoints;
-	private final long _soulOrbScore;
+	private final long _serverSoulOrbs;
 	private final boolean _adenCastleOwner;
 	private final boolean _connected;
 	
-	public ExDethroneServerInfo(long serverPoints, long soulOrbScore, boolean adenCastleOwner, boolean connected)
+	public ExDethroneServerInfo(long serverPoints, long serverSoulOrbs, boolean adenCastleOwner, boolean connected)
 	{
 		_serverPoints = serverPoints;
-		_soulOrbScore = soulOrbScore;
+		_serverSoulOrbs = serverSoulOrbs;
 		_adenCastleOwner = adenCastleOwner;
 		_connected = connected;
 	}
@@ -70,7 +70,7 @@ public class ExDethroneServerInfo extends ServerPacket
 		
 		writeInt(1); // server rank 1
 		writeInt(Config.SERVER_ID); // server id 4
-		writeLong(_soulOrbScore); // server score 4
+		writeLong(_serverSoulOrbs); // server score 4
 		
 		// Connection List Array
 		// this number must match the number of server in both arrays
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
index 8e5c5f7765..22eb4ac7d4 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
@@ -83,6 +83,17 @@ public class ExPurchaseLimitShopItemListNew extends ServerPacket
 					writeInt(product.getAccountDailyLimit() - _player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + product.getProductionId(), 0));
 				}
 			}
+			else if (product.getAccountMontlyLimit() > 0)
+			{
+				if (_player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + product.getProductionId(), 0) >= product.getAccountMontlyLimit())
+				{
+					writeInt(0);
+				}
+				else
+				{
+					writeInt(product.getAccountMontlyLimit() - _player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + product.getProductionId(), 0));
+				}
+			}
 			else if (product.getAccountBuyLimit() > 0) // Count limit.
 			{
 				if (_player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + product.getProductionId(), 0) >= product.getAccountBuyLimit())
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 691aba1edc..eb6d2f2c51 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -42,6 +44,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	
@@ -96,6 +99,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking when in offline play.
+							if (player.isOfflinePlay() && player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -121,23 +135,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -145,6 +168,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -179,32 +205,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -310,6 +359,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index f5fca084b1..c005beeb7e 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,7 +35,9 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.effects.EffectType;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemUse;
@@ -46,12 +48,12 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.EffectScope;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +383,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
@@ -394,7 +397,24 @@ public class AutoUseTaskManager
 							final IPlayerActionHandler actionHandler = PlayerActionHandler.getInstance().getHandler(actionHolder.getHandler());
 							if (actionHandler != null)
 							{
-								actionHandler.useAction(player, actionHolder, false, false);
+								if (!actionHandler.isPetAction())
+								{
+									actionHandler.useAction(player, actionHolder, false, false);
+								}
+								else
+								{
+									final Summon summon = player.getAnyServitor();
+									if ((summon != null) && !summon.isAlikeDead())
+									{
+										final Skill skill = summon.getKnownSkill(actionHolder.getOptionId());
+										if ((skill != null) && !canSummonCastSkill(player, summon, skill))
+										{
+											continue ACTIONS;
+										}
+										
+										actionHandler.useAction(player, actionHolder, false, false);
+									}
+								}
 							}
 						}
 					}
@@ -477,6 +497,59 @@ public class AutoUseTaskManager
 			
 			return !player.isSkillDisabled(skill) && skill.checkCondition(player, target, false);
 		}
+		
+		private boolean canSummonCastSkill(Player player, Summon summon, Skill skill)
+		{
+			if (skill.isBad() && (player.getTarget() == null))
+			{
+				return false;
+			}
+			
+			final int mpConsume = skill.getMpConsume() + skill.getMpInitialConsume();
+			if ((((mpConsume != 0) && (mpConsume > (int) Math.floor(summon.getCurrentMp()))) || ((skill.getHpConsume() != 0) && (skill.getHpConsume() > (int) Math.floor(summon.getCurrentHp())))))
+			{
+				return false;
+			}
+			
+			if (summon.isSkillDisabled(skill))
+			{
+				return false;
+			}
+			
+			if (((player.getTarget() != null) && !skill.checkCondition(summon, player.getTarget(), false)) || ((player.getTarget() == null) && !skill.checkCondition(summon, player, false)))
+			{
+				return false;
+			}
+			
+			if ((skill.getItemConsumeCount() > 0) && (summon.getInventory().getInventoryItemCount(skill.getItemConsumeId(), -1) < skill.getItemConsumeCount()))
+			{
+				return false;
+			}
+			
+			if (skill.getTargetType().equals(TargetType.SELF) || skill.getTargetType().equals(TargetType.SUMMON))
+			{
+				final BuffInfo summonInfo = summon.getEffectList().getBuffInfoBySkillId(skill.getId());
+				return (summonInfo != null) && (summonInfo.getTime() >= REUSE_MARGIN_TIME);
+			}
+			
+			if ((skill.getEffects(EffectScope.GENERAL) != null) && skill.getEffects(EffectScope.GENERAL).stream().anyMatch(a -> a.getEffectType().equals(EffectType.MANAHEAL_BY_LEVEL)) && (player.getCurrentMpPercent() > 80))
+			{
+				return false;
+			}
+			
+			final BuffInfo buffInfo = player.getEffectList().getBuffInfoBySkillId(skill.getId());
+			final BuffInfo abnormalBuffInfo = player.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
+			if (abnormalBuffInfo != null)
+			{
+				if (buffInfo != null)
+				{
+					return (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()));
+				}
+				return (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel()) || abnormalBuffInfo.isAbnormalType(AbnormalType.NONE);
+			}
+			
+			return true;
+		}
 	}
 	
 	public synchronized void startAutoUseTask(Player player)
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/util/Util.java
index dde351d51a..d004f93d57 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/readme.txt b/L2J_Mobius_11.1_TheSourceOfFlame/readme.txt
index 86b1a2433c..34a2f73be5 100644
--- a/L2J_Mobius_11.1_TheSourceOfFlame/readme.txt
+++ b/L2J_Mobius_11.1_TheSourceOfFlame/readme.txt
@@ -140,8 +140,10 @@ Master Class Chapter 3: https://eu.4game.com/patchnotes/lineage2/417/
 The Source of Flame: https://eu.4game.com/patchnotes/lineage2/427/
 -Dethrone Shop
 -Fire Conquest area
+-Water Conquest area
 -Primordial Fire Source Abilities
 -Krofin's Nest instance changes
+-Freya instance changes
 
 
 Events:
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/account_gsdata.sql
index d2da07b194..db5cb35ce2 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/account_gsdata.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/announcements.sql
index 686ce7db92..4ea4114b97 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/announcements.sql
@@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auction.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auction.sql
index 2c2ced0587..d4b72187c8 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auction.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auction.sql
@@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `auction` (
   endDate decimal(20,0) NOT NULL default '0',
   PRIMARY KEY  (`itemType`,`itemId`,`itemObjectId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- 
 -- Dumping data for table `auction`
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auction_bid.sql
index 6a2d15bf7c..d622ad2377 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auction_bid.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS auction_bid (
   time_bid decimal(20,0) NOT NULL default '0',
   PRIMARY KEY  (auctionId, bidderId),
   KEY id (id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auction_watch.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auction_watch.sql
index 8854db77d8..0e61578f9e 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auction_watch.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auction_watch.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS auction_watch (
   charObjId INT NOT NULL default 0,
   auctionId INT NOT NULL default 0,
   PRIMARY KEY  (charObjId, auctionId)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auto_chat.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auto_chat.sql
index 0c326c979d..2cfb2bb55a 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auto_chat.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auto_chat.sql
@@ -4,7 +4,7 @@ CREATE TABLE `auto_chat` (
   `npcId` INT NOT NULL default '0',
   `chatDelay` BIGINT NOT NULL default '-1',
   PRIMARY KEY  (`groupId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `auto_chat` VALUES 
 
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auto_chat_text.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auto_chat_text.sql
index f6b375474c..a68983e6a5 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auto_chat_text.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auto_chat_text.sql
@@ -3,7 +3,7 @@ CREATE TABLE `auto_chat_text` (
   `groupId` INT NOT NULL default '0',
   `chatText` VARCHAR(255) NOT NULL default '',
   PRIMARY KEY  (`groupId`,`chatText`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `auto_chat_text` VALUES 
 (1,'%player_cabal_loser%! All is lost! Prepare to meet the goddess of death!'),
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/bbs_favorite.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/bbs_favorite.sql
index e353929990..57506eee67 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/bbs_favorite.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/bbs_favorite.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/buffer_schemes.sql
index b8a7293cf9..ebe63fe38e 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/buffer_schemes.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `object_id` INT UNSIGNED NOT NULL DEFAULT '0',
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle.sql
index 128f7ba369..978be6dd2d 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS castle (
   siegeHourOfDay INT NOT NULL default 20,
   PRIMARY KEY  (name),
   KEY id (id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES 
 (1,'Gludio',0,0,0,7,20),
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_door.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_door.sql
index a5b61c2c14..e46648ef31 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_door.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_door.sql
@@ -20,7 +20,7 @@ CREATE TABLE castle_door (
   mDef INT NOT NULL default 0,
   PRIMARY KEY  (id),
   KEY id (castleId)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `castle_door` (`castleId`, `id`, `name`, `x`, `y`, `z`, `range_xmin`, `range_ymin`, `range_zmin`, `range_xmax`, `range_ymax`, `range_zmax`, `hp`, `pDef`, `mDef`) VALUES 
   (1,19210001,'Gludio_outer_001',-18481,113065,-2774,-18481,113058,-2799,-18350,113072,-2479,316500,644,518),
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_doorupgrade.sql
index 2fd123e5be..3322471cb6 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS castle_doorupgrade (
   pDef INT NOT NULL default 0,
   mDef INT NOT NULL default 0,
   PRIMARY KEY  (doorId )
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_manor_procure.sql
index 688b7e163f..05050a39e2 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
   `reward_type` int(11) NOT NULL DEFAULT '0',
   `period` INT NOT NULL DEFAULT '1',
   PRIMARY KEY  (`castle_id`,`crop_id`,`period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_manor_production.sql
index eec0457130..1ab857a52e 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_manor_production.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
   `seed_price` int(11) NOT NULL DEFAULT '0',
   `period` INT NOT NULL DEFAULT '1',
   PRIMARY KEY  (`castle_id`,`seed_id`,`period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_siege_guards.sql
index e95b8ce89f..eef6a8e5b8 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS castle_siege_guards (
   isHired INT NOT NULL default 1,
   PRIMARY KEY  (id),
   KEY id (castleId)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`, `id`, `npcId`, `x`, `y`, `z`, `heading`, `respawnDelay`, `isHired`) VALUES 
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_friends.sql
index 99533ba429..705ee6f69c 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_friends.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `friend_id` INT UNSIGNED NOT NULL DEFAULT 0,
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`char_id`,`friend_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_hennas.sql
index 655dc5256c..29816c803c 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_hennas.sql
@@ -4,4 +4,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`char_obj_id`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (char_obj_id, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (char_obj_id, slot, class_index);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_macroses.sql
index c5e0f6cb57..b3e5bef177 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_macroses.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(255) ,
   PRIMARY KEY  (`char_obj_id`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_mail.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_mail.sql
index 2ec52edf41..73c49ea2f5 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_mail.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_mail.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_mail` (
   `sentDate` timestamp NULL default NULL,
   `unread` smallint(1) default 1,
   PRIMARY KEY  (`letterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_offline_trade.sql
index 9991c1c092..1bf92a11ef 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,7 +5,7 @@ CREATE TABLE `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 drop table IF EXISTS `character_offline_trade_items`;
 CREATE TABLE `character_offline_trade_items` (
@@ -14,4 +14,4 @@ CREATE TABLE `character_offline_trade_items` (
   `count` int(20) NOT NULL DEFAULT '0',
   `price` int(20) NOT NULL DEFAULT '0',
   `enchant` int(20) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_quests.sql
index d6ceaf2c7a..92d12392d9 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_quests.sql
@@ -6,5 +6,9 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `name` VARCHAR(40) NOT NULL DEFAULT '',
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
-  PRIMARY KEY  (`char_id`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+  PRIMARY KEY (`char_id`,`name`,`var`)
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (char_id, name);
+CREATE INDEX idx_charId_var ON character_quests (char_id, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (char_id, name, var);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_raid_points.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_raid_points.sql
index 0ba8ff2c75..bfcc537fd3 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_raid_points.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_raid_points.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_raid_points` (
   `boss_id` INT UNSIGNED NOT NULL DEFAULT 0,
   `points` INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_recipebook.sql
index ace8137ce1..c83b68b578 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_recipebook.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS character_recipebook (
   id decimal(11) NOT NULL default 0,
   type INT NOT NULL default 0,
   PRIMARY KEY  (id,char_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_recommends.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_recommends.sql
index 29b78c3039..3f203d7b39 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_recommends.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_recommends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS character_recommends (
  char_id INT NOT NULL default 0, 
  target_id INT(11) NOT NULL DEFAULT 0, 
  PRIMARY KEY (char_id,target_id) 
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_shortcuts.sql
index acec4e4aed..314711c829 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_shortcuts.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS character_shortcuts (
   `class_index` int(1) NOT NULL default '0',
   PRIMARY KEY  (char_obj_id,slot,page,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_skills.sql
index d1a70eb512..ada4b43d37 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_skills.sql
@@ -8,4 +8,10 @@ CREATE TABLE IF NOT EXISTS character_skills (
   skill_name varchar(40),
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY  (char_obj_id,skill_id,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (char_obj_id, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, char_obj_id, class_index);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_skills_save.sql
index d9d081523e..7fccf4ee88 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_skills_save.sql
@@ -13,4 +13,10 @@ CREATE TABLE IF NOT EXISTS character_skills_save (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   buff_index INT(2) NOT NULL default 0,
   PRIMARY KEY  (char_obj_id,skill_id,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (char_obj_id, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (char_obj_id, class_index, buff_index);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_subclasses.sql
index fe042e903b..7654a2ea68 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
 	`level` int(2) NOT NULL default '40',
 	`class_index` int(1) NOT NULL default '0',
 	PRIMARY KEY  (`char_obj_id`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (char_obj_id, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (char_obj_id, class_id);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_variables.sql
index e843d01ebd..f42eaecdbc 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/character_variables.sql
@@ -2,4 +2,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/characters.sql
index 34817f15e2..9d1dcf4e14 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/characters.sql
@@ -88,4 +88,9 @@ CREATE TABLE IF NOT EXISTS characters (
   aio_end decimal(20,0) NOT NULL DEFAULT 0,
   PRIMARY KEY  (charId),
   KEY `clanid` (`clanid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_data.sql
index d5a8518eab..6b5789bec7 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_data.sql
@@ -24,4 +24,4 @@ CREATE TABLE IF NOT EXISTS clan_data (
   PRIMARY KEY  (clan_id),
   KEY `leader_id` (`leader_id`),
   KEY `ally_id` (`ally_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_privs.sql
index 28b13ba6da..892d11f4be 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_privs.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS clan_privs (
   party INT NOT NULL default 0,
   privs INT NOT NULL default 0,
   PRIMARY KEY  (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_skills.sql
index 356bdc6fbc..e65d71352e 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_skills.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS clan_skills (
   skill_level int(5) NOT NULL default 0,
   skill_name varchar(26) default NULL,
   PRIMARY KEY  (`clan_id`,`skill_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_subpledges.sql
index f455158d7e..95395bb7ea 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_subpledges.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS clan_subpledges (
   name varchar(45),
   leader_name varchar(35),
   PRIMARY KEY  (`clan_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_wars.sql
index a62317f6de..3dff03b61d 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clan_wars.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `wantspeace1` decimal(1,0) NOT NULL default '0',
   `wantspeace2` decimal(1,0) NOT NULL default '0',
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clanhall.sql
index fdead358cf..8cbf19ec01 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clanhall.sql
@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `Grade` decimal(1,0) NOT NULL default '0',
   `paid` int( 1 ) NOT NULL default '0',
   PRIMARY KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- ----------------------------
 -- Records 
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clanhall_functions.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clanhall_functions.sql
index e6f9e4950e..21446a08b0 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clanhall_functions.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clanhall_functions.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_functions` (
   `rate` decimal(20,0) NOT NULL default '0',
   `endTime` decimal(20,0) NOT NULL default '0',
   PRIMARY KEY  (`hall_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clanhall_siege.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clanhall_siege.sql
index 440863e832..c1486aa222 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clanhall_siege.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clanhall_siege.sql
@@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS `clanhall_siege` (
   `name` varchar(40) NOT NULL,
   `siege_data` decimal(20,0) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- ----------------------------
 -- Records 
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/crests.sql
index b3e6dd8b67..04146da77a 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/crests.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_droplist.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_droplist.sql
index 14e11ab0d6..673107e4ae 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_droplist.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_droplist.sql
@@ -32,4 +32,4 @@ CREATE TABLE `custom_droplist` (
   `chance` INT NOT NULL DEFAULT '0',
   PRIMARY KEY  (`mobId`,`itemId`,`category`),
   KEY `key_mobId` (`mobId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_merchant_buylists.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_merchant_buylists.sql
index 43419a5689..6f1bee732b 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_merchant_buylists.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_merchant_buylists.sql
@@ -12,4 +12,4 @@ CREATE TABLE custom_merchant_buylists (
   time INT NOT NULL DEFAULT '0',
   savetimer DECIMAL(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY  (shop_id,`order`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_merchant_shopids.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_merchant_shopids.sql
index b696f282a7..3b524ec5d2 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_merchant_shopids.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_merchant_shopids.sql
@@ -6,4 +6,4 @@ CREATE TABLE custom_merchant_shopids (
   shop_id decimal(9,0) NOT NULL default '0',
   npc_id varchar(9) default NULL,
   PRIMARY KEY  (shop_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_notspawned.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_notspawned.sql
index 47ef1cfd93..49beda727e 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_notspawned.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_notspawned.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `custom_notspawned` (
   `id` int(11) NOT NULL,
   `isCustom` int(1) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_npc.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_npc.sql
index 1354f12c67..ca787818c7 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_npc.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_npc.sql
@@ -46,7 +46,7 @@ CREATE TABLE `custom_npc`(
   `absorb_level` decimal(2,0) default 0,
   `absorb_type` enum('FULL_PARTY','LAST_HIT','PARTY_ONE_RANDOM') DEFAULT 'LAST_HIT' NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT ignore INTO custom_npc values
 ('500', '7115', 'Jurek', '1', 'Faction Manager', '1', 'NPC.a_mageguild_master_MHuman', '8.00', '24.00', '70', 'male', 'Folk', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '0', '0', '1314', '470', '780', '382', '278', '0', '333', '0', '0', '0', '55', '132', null, '0', '1', '0', 'LAST_HIT'),
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_spawnlist.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_spawnlist.sql
index c3d8af9169..3b5878f440 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_spawnlist.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_spawnlist.sql
@@ -19,4 +19,4 @@ CREATE TABLE `custom_spawnlist` (
   `periodOfDay` decimal(2,0) default '0',
   PRIMARY KEY  (id),
   KEY `key_npc_templateid` (`npc_templateid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_teleport.sql
index dc5a694a3a..a98504b528 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/custom_teleport.sql
@@ -11,4 +11,4 @@ CREATE TABLE custom_teleport (
   price decimal(6,0) default NULL,
   fornoble int(1) NOT NULL default '0',
   PRIMARY KEY  (id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/dimensional_rift.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/dimensional_rift.sql
index 1d7b0b8697..0bb1d714cc 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/dimensional_rift.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/dimensional_rift.sql
@@ -16,7 +16,7 @@ CREATE TABLE `dimensional_rift` (
   `zT` int(11) NOT NULL,
   `boss` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`type`,`room_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- ----------------------------
 -- Records for table dimensional_rift
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/droplist.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/droplist.sql
index 8b82f8260c..9d68ca7d78 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/droplist.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/droplist.sql
@@ -32,7 +32,7 @@ CREATE TABLE `droplist` (
   `chance` INT NOT NULL DEFAULT '0',
   PRIMARY KEY  (`mobId`,`itemId`,`category`),
   KEY `key_mobId` (`mobId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- 
 -- Dumping data for table `droplist`
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/enchant_skill_trees.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/enchant_skill_trees.sql
index 8eca2a2776..880fc0d985 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/enchant_skill_trees.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/enchant_skill_trees.sql
@@ -14,7 +14,7 @@ CREATE TABLE `enchant_skill_trees` (
   `success_rate79` int(3) NOT NULL DEFAULT '0',
   `success_rate80` int(3) NOT NULL DEFAULT '0',
   PRIMARY KEY (`skill_id`,`level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `enchant_skill_trees` VALUES ('1', '101', 'Triple Slash', '37', '+1 Power', '306000', '3060000', '37', '82', '92', '97', '97', '97');
 INSERT INTO `enchant_skill_trees` VALUES ('1', '102', 'Triple Slash', '37', '+2 Power', '315000', '3150000', '101', '80', '90', '95', '95', '95');
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/engrave.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/engrave.sql
index 6a899a544e..bfcbe06d76 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/engrave.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/engrave.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `engraved_items` (
   `object_id` int(11) NOT NULL,
   `item_id` int(11) NOT NULL,
   `engraver_id` int(11) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 
 CREATE TABLE IF NOT EXISTS `engraved_log` (
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `engraved_log` (
   `itemName` varchar(64) NOT NULL,
   `form_char` varchar(64) NOT NULL,
   `to_char` varchar(64) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fake_players.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fake_players.sql
index 8613cf5322..f208fcd8ff 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fake_players.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fake_players.sql
@@ -39,4 +39,4 @@ CREATE TABLE IF NOT EXISTS `fake_players` (
   `max_rnd_enchant` int(7) NOT NULL default '0',
   KEY `spawn` (`spawn`),
   KEY `template` (`template`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fishing_skill_trees.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fishing_skill_trees.sql
index 662583ca93..47ae7c3008 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fishing_skill_trees.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fishing_skill_trees.sql
@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS `fishing_skill_trees` (
   `cost` int(10) NOT NULL default '0',
   `isfordwarf` int(1) NOT NULL default '0',
   PRIMARY KEY  (`skill_id`,`level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 --
 --  Records for table fishing_skill_trees
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fort.sql
index 70a3f0b4b8..72dd8c4a6e 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fort.sql
@@ -9,7 +9,7 @@ CREATE TABLE `fort` (
   `siegeHourOfDay` int(11) NOT NULL default '20',
   `owner` int(11) NOT NULL default '0',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- ----------------------------
 -- Records 
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fort_door.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fort_door.sql
index c045fece64..26091a0055 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fort_door.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fort_door.sql
@@ -20,7 +20,7 @@ CREATE TABLE fort_door (
   mDef INT NOT NULL default 0,
   PRIMARY KEY(id),
   KEY id (fortId)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `fort_door` VALUES 
 (101,18220001,'Gate_of_fort',-50796,155913,-2102,0,0,0,0,0,0,67884,644,518),
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8d10d75303..5e933eac6b 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -8,4 +8,4 @@ CREATE TABLE `fort_doorupgrade` (
   `pDef` int(11) NOT NULL default '0',
   `mDef` int(11) NOT NULL default '0',
   PRIMARY KEY  (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fort_siege_guards.sql
index bb5d1b9fdc..dca419e88c 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` INT NOT NULL default 1,
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_siege_guards` VALUES
 
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fortsiege_clans.sql
index 5576d58bae..03532b5822 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -7,4 +7,4 @@ CREATE TABLE `fortsiege_clans` (
 `type` int(1) default NULL,
 `fort_owner` int(1) default NULL,
 PRIMARY KEY  (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/forums.sql
index 3794026842..786325a423 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/forums.sql
@@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_perm` int(8) NOT NULL default '0',
   `forum_owner_id` int(8) NOT NULL default '0',
   UNIQUE KEY `forum_id` (`forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES 
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql
index 4101c98ca2..8208a8a0a3 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql
@@ -14,7 +14,7 @@ CREATE TABLE `four_sepulchers_spawnlist` (
   `key_npc_id` int(9) NOT NULL DEFAULT '0',
   `spawntype` int(9) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `four_sepulchers_spawnlist` VALUES
 ('1', '', '1', '31468', '182074', '-85579', '-7216', '0', '0', '-32600', '3600', '31921', '0'),
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/global_tasks.sql
index 79e1d942fe..1cc3d87be0 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/global_tasks.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS global_tasks (
   param2 varchar(100) NOT NULL default '',
   param3 varchar(255) NOT NULL default '',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/global_variables.sql
index b53c539dba..56102b09e9 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/global_variables.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/grandboss_data.sql
index da16aa6ecf..9f3df9bf28 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/grandboss_data.sql
@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS grandboss_data (
   `currentMP` DECIMAL(8,0) DEFAULT NULL,
   `status` TINYINT NOT NULL DEFAULT 0,
   PRIMARY KEY(`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` VALUES 
 (29019, 185708,114298,-8221,32768, 0, 13090000, 22197, 0),	-- Antharas
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/grandboss_list.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/grandboss_list.sql
index e580000739..4bd0d4c570 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/grandboss_list.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/grandboss_list.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS grandboss_list
 `player_id` decimal(11,0) NOT NULL,
 `zone` decimal(11,0) NOT NULL,
 PRIMARY KEY  (`player_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/helper_buff_list.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/helper_buff_list.sql
index d0a4daf74d..1aa7a832b3 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/helper_buff_list.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/helper_buff_list.sql
@@ -11,7 +11,7 @@ CREATE TABLE `helper_buff_list` (
 `upper_level` int(10) unsigned NOT NULL default '0',
 `is_magic_class` varchar(5) default NULL,
 PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 #----------------------------
 # Records for table helper_buff_list
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/heroes.sql
index 6f5a71f7a0..3939a66f9d 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/heroes.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `count` decimal(3,0) NOT NULL default '0',
   `played` decimal(1,0) NOT NULL default '0',
   PRIMARY KEY  (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/items.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/items.sql
index f2d09bae91..ae4214a920 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/items.sql
@@ -20,4 +20,12 @@ CREATE TABLE IF NOT EXISTS items (
   KEY `key_loc` (`loc`),
   KEY `key_item_id` (`item_id`),
   KEY `key_time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/itemsonground.sql
index 6ce5e530ca..9d6806baa8 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/itemsonground.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` decimal(20,0) default NULL,
   `equipable` int(1) default '0',
   PRIMARY KEY  (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/locations.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/locations.sql
index d3f1b0b31c..7c0af21014 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/locations.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/locations.sql
@@ -11,7 +11,7 @@ CREATE TABLE `locations` (
   `proc` int(3) NOT NULL default '0',
   PRIMARY KEY  (`loc_id`,`loc_x`,`loc_y`),
   KEY `proc` (`proc`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- 
 -- Dumping data for table `locations`
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/lottery.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/lottery.sql
index 0e6cc924d5..32608ce0ab 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/lottery.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/lottery.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS lottery (
   enddate decimal(20,0) NOT NULL default 0,
   finished INT NOT NULL default 0,
   PRIMARY KEY (`id`,`idnr`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchant_areas_list.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchant_areas_list.sql
index 52a8a5e47d..5c1370c66f 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchant_areas_list.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchant_areas_list.sql
@@ -8,7 +8,7 @@ CREATE TABLE `merchant_areas_list` (
   `tax` double(3,2) unsigned NOT NULL default '0.00',
   `Chaotic` int(11) NOT NULL default '0',
   PRIMARY KEY  (`merchant_area_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 --
 -- Dumping data for table `merchant_areas_list`
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchant_buylists.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchant_buylists.sql
index 1bea118076..e2a90a0c2d 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchant_buylists.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchant_buylists.sql
@@ -12,7 +12,7 @@ CREATE TABLE merchant_buylists (
   time INT NOT NULL DEFAULT '0',
   savetimer DECIMAL(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY  (shop_id,`order`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 --
 -- Dumping data for table `merchant_buylists`
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchant_lease.sql
index e69f59449e..79e57cb028 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchant_lease.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS merchant_lease (
   `type` int(11) NOT NULL default 0,
   player_name varchar(35),
   PRIMARY KEY  (merchant_id,player_id,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchant_shopids.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchant_shopids.sql
index b96a2ce47e..d4e763e80b 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchant_shopids.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchant_shopids.sql
@@ -6,7 +6,7 @@ CREATE TABLE merchant_shopids (
   shop_id decimal(9,0) NOT NULL default '0',
   npc_id varchar(9) default NULL,
   PRIMARY KEY  (shop_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 --
 -- Dumping data for table `merchant_shopids`
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchants.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchants.sql
index 99ba7ccf3e..500d95176c 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchants.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/merchants.sql
@@ -6,7 +6,7 @@ CREATE TABLE `merchants` (
   `npc_id` int(11) NOT NULL default '0',
   `merchant_area_id` tinyint(4) default NULL,
   PRIMARY KEY  (`npc_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 --
 -- Dumping data for table `merchants`
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/minions.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/minions.sql
index 7e4fcb317c..2ed4bffb34 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/minions.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/minions.sql
@@ -9,7 +9,7 @@ CREATE TABLE `minions` (
   `amount_min` int(4) NOT NULL default '0',
   `amount_max` int(4) NOT NULL default '0',
   PRIMARY KEY  (`boss_id`,`minion_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 --
 -- Dumping data for table `minions`
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/mods_wedding.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/mods_wedding.sql
index d043fbacbf..109c1efdb8 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/mods_wedding.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/mods_wedding.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `mods_wedding` (
   `weddingDate` decimal(20,0) default '0',
   `coupleType` int(11) NOT NULL default '0',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/npc.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/npc.sql
index ec0fa09539..8cea61bf8f 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/npc.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/npc.sql
@@ -47,7 +47,7 @@ CREATE TABLE `npc` (
   `absorb_level` decimal(2,0) DEFAULT '0',
   `absorb_type` enum('FULL_PARTY','LAST_HIT','PARTY_ONE_RANDOM') NOT NULL DEFAULT 'LAST_HIT',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- ----------------------------
 -- Records 
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/npcskills.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/npcskills.sql
index 64973cdaad..4a3e869fb8 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/npcskills.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/npcskills.sql
@@ -7,7 +7,7 @@ CREATE TABLE npcskills (
   skillid int(11) NOT NULL default '0',
   level int(11) NOT NULL default '0',
   PRIMARY KEY  (npcid,skillid,level)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- 
 -- Dumping data for table `npcskills`
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/olympiad_data.sql
index 4a4edfb193..852ab89513 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/olympiad_data.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/olympiad_nobles.sql
index 5bc38ad0fc..fc01facc34 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_lost` decimal(3,0) NOT NULL default '0',
   `competitions_drawn` decimal(3,0) NOT NULL default '0',
   PRIMARY KEY  (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `charId` decimal(11,0) NOT NULL default '0',
@@ -20,4 +20,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` decimal(3,0) NOT NULL default '0',
   `competitions_drawn` decimal(3,0) NOT NULL default '0',
   PRIMARY KEY  (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/pets.sql
index 14f80587d6..c8b17fd393 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/pets.sql
@@ -13,4 +13,4 @@ CREATE TABLE IF NOT EXISTS pets (
   pkkills decimal(11) ,
   fed decimal(11) ,
   PRIMARY KEY  (item_obj_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/pets_stats.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/pets_stats.sql
index ef3d0bf826..2de3d2d2aa 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/pets_stats.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/pets_stats.sql
@@ -27,7 +27,7 @@ CREATE TABLE `pets_stats` (
   `mpregen` int(11) NOT NULL default '0',
   `owner_exp_taken` DECIMAL(3,2) DEFAULT '0' NOT NULL,
   PRIMARY KEY  (`typeID`,`level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 #----------------------------
 # Records for table pets_stats
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/pledge_skill_trees.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/pledge_skill_trees.sql
index 0c9b23f8f0..ac5cfe7d4c 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/pledge_skill_trees.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/pledge_skill_trees.sql
@@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS `pledge_skill_trees` (
   `Description` varchar(255) default NULL,
   `repCost` int(11) default NULL,
   `itemId` int(11) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- ----------------------------
 -- Records 
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/posts.sql
index 14040ac89b..0ec4e9d50f 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/posts.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_topic_id` int(8) NOT NULL default '0',
   `post_forum_id` int(8) NOT NULL default '0',
   `post_txt` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/raidboss_spawnlist.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/raidboss_spawnlist.sql
index d1d2f2e929..0154762fa9 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/raidboss_spawnlist.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/raidboss_spawnlist.sql
@@ -15,7 +15,7 @@ CREATE TABLE raidboss_spawnlist (
   currentHp decimal(8,0) default NULL,
   currentMp decimal(8,0) default NULL,
   PRIMARY KEY  (boss_id,loc_x,loc_y,loc_z)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `raidboss_spawnlist` VALUES 
 (25001,1,-54416,146480,-2887,0,43200,129600,0,95986,545), -- Greyclaw Kutus (23)
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/random_spawn.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/random_spawn.sql
index 4fc993097d..96c7dae57f 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/random_spawn.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/random_spawn.sql
@@ -12,7 +12,7 @@ CREATE TABLE random_spawn (
   broadcastSpawn VARCHAR(5) NOT NULL default 'false',
   randomSpawn VARCHAR(5) NOT NULL default 'true',
   PRIMARY KEY  (groupId)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `random_spawn` VALUES 
 (1,30556,1,-1,1800000,1800000,'false','true'),
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/random_spawn_loc.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/random_spawn_loc.sql
index 2d9ef072dc..85baaefbc9 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/random_spawn_loc.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/random_spawn_loc.sql
@@ -6,7 +6,7 @@ CREATE TABLE `random_spawn_loc` (
   `z` int(11) NOT NULL default '0',
   `heading` int(11) NOT NULL default '-1',
   PRIMARY KEY  (`groupId`,`x`,`y`,`z`,`heading`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 --
 -- Dumping data for table `l2jdb`.`random_spawn_loc`
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/rebirth_manager.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/rebirth_manager.sql
index 298f084384..10bbe3e5a9 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/rebirth_manager.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/rebirth_manager.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `rebirth_manager`(
   `playerId` int(20) NOT NULL,
   `rebirthCount` int(2) NOT NULL,
   PRIMARY KEY (`playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/seven_signs.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/seven_signs.sql
index 0093e22b8d..8fe6dff30a 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/seven_signs.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/seven_signs.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `seven_signs` (
   `ancient_adena_amount` DECIMAL(20,0) NOT NULL default '0',
   `contribution_score` DECIMAL(20,0) NOT NULL default '0',
   PRIMARY KEY  (`char_obj_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/seven_signs_festival.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/seven_signs_festival.sql
index eefce920e2..84c8cf7dfe 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/seven_signs_festival.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/seven_signs_festival.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `seven_signs_festival` (
 	`score` int(5) NOT NULL default '0',
 	`members` varchar(255) NOT NULL default '',
 	PRIMARY KEY (`festivalId`,`cabal`,`cycle`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `seven_signs_festival` VALUES 
 (0, "dawn", 1, 0, 0, ""),
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/seven_signs_status.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/seven_signs_status.sql
index 3a167d21d8..78cab9f717 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/seven_signs_status.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/seven_signs_status.sql
@@ -24,7 +24,7 @@ CREATE TABLE IF NOT EXISTS `seven_signs_status` (
   `accumulated_bonus3` int(10) NOT NULL default '0',
   `accumulated_bonus4` int(10) NOT NULL default '0',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `seven_signs_status` VALUES
 (0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/siege_clans.sql
index 3f8ae839a4..f5e5c1456f 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/siege_clans.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS siege_clans (
    type int(1) default NULL,
    castle_owner int(1) default NULL,
    PRIMARY KEY  (clan_id,castle_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/skill_learn.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/skill_learn.sql
index 4f0cef8999..847e0989f3 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/skill_learn.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/skill_learn.sql
@@ -6,7 +6,7 @@ CREATE TABLE skill_learn (
   npc_id int(11) NOT NULL default '0',
   class_id int(11) NOT NULL default '0',
   PRIMARY KEY  (npc_id,class_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 --
 -- Dumping data for table `skill_learn`
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/skill_spellbooks.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/skill_spellbooks.sql
index 583a4acb79..af390674db 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/skill_spellbooks.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/skill_spellbooks.sql
@@ -6,7 +6,7 @@ CREATE TABLE `skill_spellbooks` (
   `skill_id` int(11) NOT NULL default '-1',
   `item_id` int(11) NOT NULL default '-1',
   KEY `skill_id` (`skill_id`,`item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 --
 -- Dumping data for table `skill_spellbooks`
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/skill_trees.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/skill_trees.sql
index 7960b31cff..8cb6a5ac9f 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/skill_trees.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/skill_trees.sql
@@ -7,7 +7,7 @@ CREATE TABLE skill_trees (
   sp int(10) unsigned NOT NULL default '0',
   min_level int(10) unsigned NOT NULL default '0',
   PRIMARY KEY  (class_id,skill_id,level)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- 
 -- Dumping data for table `skill_trees`
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/spawnlist.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/spawnlist.sql
index 97e43da4f6..6b094f1875 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/spawnlist.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/spawnlist.sql
@@ -18,7 +18,7 @@ CREATE TABLE `spawnlist` (
   `periodOfDay` decimal(2,0) default '0',
   PRIMARY KEY  (id),
   KEY `key_npc_templateid` (`npc_templateid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 --
 -- Dumping data for table `spawnlist`
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/teleport.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/teleport.sql
index ad6e5b65d7..2c5356837c 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/teleport.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/teleport.sql
@@ -11,7 +11,7 @@ CREATE TABLE `teleport` (
   `price` decimal(6,0) DEFAULT NULL,
   `fornoble` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- ----------------------------
 -- Records of teleport
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/topic.sql
index 6a3afcef2e..972b016377 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/topic.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL default '0',
   `topic_type` int(8) NOT NULL default '0',
   `topic_reply` int(8) NOT NULL default '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/vanhalter_spawnlist.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/vanhalter_spawnlist.sql
index 79ae69dfc8..6b5803228f 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/vanhalter_spawnlist.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/vanhalter_spawnlist.sql
@@ -15,7 +15,7 @@ CREATE TABLE `vanhalter_spawnlist` (
   `periodOfDay` DECIMAL(2,0) DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `key_npc_templateid` (`npc_templateid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `vanhalter_spawnlist` VALUES 
 ('1','Pagan Temple','1','32051','-14670','-54846','-10629','0','0','16384','60','0','0'),
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/login/account_data.sql
index 17c65c39a8..27da42723e 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/login/account_data.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   var  VARCHAR(20) NOT NULL DEFAULT '',
   value VARCHAR(255) ,
   PRIMARY KEY  (account_name,var)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/login/accounts.sql
index d301d143ed..d1fe9a90c1 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/login/accounts.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `lastIP` CHAR(15) NULL DEFAULT NULL,
   `lastServer` TINYINT DEFAULT 1,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/login/gameservers.sql
index f49ecfdc0a..3fab170880 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/login/gameservers.sql
@@ -3,7 +3,7 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL default '',
   `host` varchar(50) NOT NULL default '',
   PRIMARY KEY  (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- ----------------------------
 -- Records of gameservers
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/custom/AutoPlay.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/custom/AutoPlay.ini
index 9580f01952..de5fcc3ae8 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/custom/AutoPlay.ini
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # List of skills that cannot be added to auto play selection menu, separated by commas.
 DisabledSkillIds = 
 
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java
index da5ecdd7ab..93dc8252cf 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java
@@ -550,6 +550,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
 	public static String AUTO_PLAY_LOGIN_MESSAGE;
@@ -1802,6 +1803,7 @@ public class Config
 		ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 		ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 		RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+		ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 		DISABLED_AUTO_SKILLS.clear();
 		final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
 		if (!disabledSkills.isEmpty())
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index 7c65077aa9..433514d7f0 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
+import org.l2jmobius.gameserver.model.WorldRegion;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.knownlist.NullKnownList;
@@ -1046,10 +1047,11 @@ public class Item extends WorldObject
 			// Set the x,y,z position of the Item dropped and update its _worldregion
 			setSpawned(true);
 			getLocation().setXYZ(x, y, z);
-			setWorldRegion(World.getInstance().getRegion(getLocation()));
+			final WorldRegion region = World.getInstance().getRegion(getLocation());
+			setWorldRegion(region);
 			
 			// Add the Item dropped to _visibleObjects of its WorldRegion
-			getWorldRegion().addVisibleObject(this);
+			region.addVisibleObject(this);
 		}
 		
 		setDropTime(System.currentTimeMillis());
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index f12fbc358e..655c43fbc3 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,6 +25,7 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -40,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -95,6 +98,12 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							final Summon summon = player.getPet();
+							if ((summon != null) && summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+							{
+								summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+							}
 							continue PLAY;
 						}
 						
@@ -120,23 +129,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType() == WeaponType.BOW;
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getTemplate().getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType() == WeaponType.BOW;
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getTemplate().getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -144,6 +162,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -183,41 +204,61 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : player.getKnownList().getKnownCharactersInRadius(player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					if (nearby == null)
+					if (Util.calculateDistance(leader, player, true) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue;
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.getPartyMembers().contains(leaderTarget))))
+						{
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
 					}
-					
-					// Skip unavailable creatures.
-					if (nearby.isAlikeDead())
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : player.getKnownList().getKnownCharactersInRadius(player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player))
-					{
-						final Summon summon = player.getPet();
-						if ((summon != null) && (summon.getObjectId() == nearby.getTarget().getObjectId()))
+						if (nearby == null)
+						{
+							continue;
+						}
+						
+						// Skip unavailable creatures.
+						if (nearby.isAlikeDead())
 						{
 							continue TARGET;
 						}
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceId()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							final Summon summon = player.getPet();
+							if ((summon != null) && (summon.getObjectId() == nearby.getTarget().getObjectId()))
+							{
+								continue TARGET;
+							}
+						}
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceId()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -310,6 +351,7 @@ public class AutoPlayTaskManager
 				{
 					summon.followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/account_gsdata.sql
index d2da07b194..db5cb35ce2 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/account_gsdata.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/announcements.sql
index 686ce7db92..4ea4114b97 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/announcements.sql
@@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auction.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auction.sql
index 15494aeb2c..5151aabcf7 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auction.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auction.sql
@@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `auction` (
   endDate decimal(20,0) NOT NULL default '0',
   PRIMARY KEY  (`itemType`,`itemId`,`itemObjectId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- 
 -- Dumping data for table `auction`
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auction_bid.sql
index 6a2d15bf7c..d622ad2377 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auction_bid.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS auction_bid (
   time_bid decimal(20,0) NOT NULL default '0',
   PRIMARY KEY  (auctionId, bidderId),
   KEY id (id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auction_watch.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auction_watch.sql
index 8854db77d8..0e61578f9e 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auction_watch.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auction_watch.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS auction_watch (
   charObjId INT NOT NULL default 0,
   auctionId INT NOT NULL default 0,
   PRIMARY KEY  (charObjId, auctionId)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/augmentations.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/augmentations.sql
index e962a93717..c3f2b4d2f7 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/augmentations.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/augmentations.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS augmentations (
   skill int(11) default 0,
   level int(11) default 0,
   PRIMARY KEY  (item_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auto_chat.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auto_chat.sql
index 0c326c979d..2cfb2bb55a 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auto_chat.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auto_chat.sql
@@ -4,7 +4,7 @@ CREATE TABLE `auto_chat` (
   `npcId` INT NOT NULL default '0',
   `chatDelay` BIGINT NOT NULL default '-1',
   PRIMARY KEY  (`groupId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `auto_chat` VALUES 
 
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auto_chat_text.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auto_chat_text.sql
index f6b375474c..a68983e6a5 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auto_chat_text.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/auto_chat_text.sql
@@ -3,7 +3,7 @@ CREATE TABLE `auto_chat_text` (
   `groupId` INT NOT NULL default '0',
   `chatText` VARCHAR(255) NOT NULL default '',
   PRIMARY KEY  (`groupId`,`chatText`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `auto_chat_text` VALUES 
 (1,'%player_cabal_loser%! All is lost! Prepare to meet the goddess of death!'),
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/bbs_favorite.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/bbs_favorite.sql
index e353929990..57506eee67 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/bbs_favorite.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/bbs_favorite.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/buffer_schemes.sql
index b8a7293cf9..ebe63fe38e 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/buffer_schemes.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `object_id` INT UNSIGNED NOT NULL DEFAULT '0',
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle.sql
index e5358c6037..4dc858e93c 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS castle (
   siegeHourOfDay INT NOT NULL default 20,
   PRIMARY KEY  (name),
   KEY id (id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES 
 (1,'Gludio',0,0,0,7,20),
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_door.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_door.sql
index a5b61c2c14..e46648ef31 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_door.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_door.sql
@@ -20,7 +20,7 @@ CREATE TABLE castle_door (
   mDef INT NOT NULL default 0,
   PRIMARY KEY  (id),
   KEY id (castleId)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `castle_door` (`castleId`, `id`, `name`, `x`, `y`, `z`, `range_xmin`, `range_ymin`, `range_zmin`, `range_xmax`, `range_ymax`, `range_zmax`, `hp`, `pDef`, `mDef`) VALUES 
   (1,19210001,'Gludio_outer_001',-18481,113065,-2774,-18481,113058,-2799,-18350,113072,-2479,316500,644,518),
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_doorupgrade.sql
index 2fd123e5be..3322471cb6 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS castle_doorupgrade (
   pDef INT NOT NULL default 0,
   mDef INT NOT NULL default 0,
   PRIMARY KEY  (doorId )
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_manor_procure.sql
index 688b7e163f..05050a39e2 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
   `reward_type` int(11) NOT NULL DEFAULT '0',
   `period` INT NOT NULL DEFAULT '1',
   PRIMARY KEY  (`castle_id`,`crop_id`,`period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_manor_production.sql
index eec0457130..1ab857a52e 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_manor_production.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
   `seed_price` int(11) NOT NULL DEFAULT '0',
   `period` INT NOT NULL DEFAULT '1',
   PRIMARY KEY  (`castle_id`,`seed_id`,`period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_siege_guards.sql
index 01023fee95..35acc1f249 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS castle_siege_guards (
   isHired INT NOT NULL default 1,
   PRIMARY KEY  (id),
   KEY id (castleId)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`, `id`, `npcId`, `x`, `y`, `z`, `heading`, `respawnDelay`, `isHired`) VALUES 
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_friends.sql
index 99533ba429..705ee6f69c 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_friends.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `friend_id` INT UNSIGNED NOT NULL DEFAULT 0,
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`char_id`,`friend_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_hennas.sql
index 655dc5256c..29816c803c 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_hennas.sql
@@ -4,4 +4,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`char_obj_id`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (char_obj_id, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (char_obj_id, slot, class_index);
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_macroses.sql
index c5e0f6cb57..b3e5bef177 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_macroses.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(255) ,
   PRIMARY KEY  (`char_obj_id`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_mail.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_mail.sql
index 2ec52edf41..73c49ea2f5 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_mail.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_mail.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_mail` (
   `sentDate` timestamp NULL default NULL,
   `unread` smallint(1) default 1,
   PRIMARY KEY  (`letterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_offline_trade.sql
index 9991c1c092..1bf92a11ef 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,7 +5,7 @@ CREATE TABLE `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 drop table IF EXISTS `character_offline_trade_items`;
 CREATE TABLE `character_offline_trade_items` (
@@ -14,4 +14,4 @@ CREATE TABLE `character_offline_trade_items` (
   `count` int(20) NOT NULL DEFAULT '0',
   `price` int(20) NOT NULL DEFAULT '0',
   `enchant` int(20) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_quests.sql
index d6ceaf2c7a..92d12392d9 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_quests.sql
@@ -6,5 +6,9 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `name` VARCHAR(40) NOT NULL DEFAULT '',
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
-  PRIMARY KEY  (`char_id`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+  PRIMARY KEY (`char_id`,`name`,`var`)
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (char_id, name);
+CREATE INDEX idx_charId_var ON character_quests (char_id, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (char_id, name, var);
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_raid_points.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_raid_points.sql
index 0ba8ff2c75..bfcc537fd3 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_raid_points.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_raid_points.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_raid_points` (
   `boss_id` INT UNSIGNED NOT NULL DEFAULT 0,
   `points` INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_recipebook.sql
index ace8137ce1..c83b68b578 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_recipebook.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS character_recipebook (
   id decimal(11) NOT NULL default 0,
   type INT NOT NULL default 0,
   PRIMARY KEY  (id,char_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_recommends.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_recommends.sql
index 29b78c3039..3f203d7b39 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_recommends.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_recommends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS character_recommends (
  char_id INT NOT NULL default 0, 
  target_id INT(11) NOT NULL DEFAULT 0, 
  PRIMARY KEY (char_id,target_id) 
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_shortcuts.sql
index acec4e4aed..314711c829 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_shortcuts.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS character_shortcuts (
   `class_index` int(1) NOT NULL default '0',
   PRIMARY KEY  (char_obj_id,slot,page,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_skills.sql
index d1a70eb512..ada4b43d37 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_skills.sql
@@ -8,4 +8,10 @@ CREATE TABLE IF NOT EXISTS character_skills (
   skill_name varchar(40),
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY  (char_obj_id,skill_id,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (char_obj_id, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, char_obj_id, class_index);
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_skills_save.sql
index d9d081523e..7fccf4ee88 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_skills_save.sql
@@ -13,4 +13,10 @@ CREATE TABLE IF NOT EXISTS character_skills_save (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   buff_index INT(2) NOT NULL default 0,
   PRIMARY KEY  (char_obj_id,skill_id,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (char_obj_id, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (char_obj_id, class_index, buff_index);
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_subclasses.sql
index fe042e903b..7654a2ea68 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
 	`level` int(2) NOT NULL default '40',
 	`class_index` int(1) NOT NULL default '0',
 	PRIMARY KEY  (`char_obj_id`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (char_obj_id, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (char_obj_id, class_id);
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_variables.sql
index e843d01ebd..f42eaecdbc 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/character_variables.sql
@@ -2,4 +2,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/characters.sql
index 34817f15e2..9d1dcf4e14 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/characters.sql
@@ -88,4 +88,9 @@ CREATE TABLE IF NOT EXISTS characters (
   aio_end decimal(20,0) NOT NULL DEFAULT 0,
   PRIMARY KEY  (charId),
   KEY `clanid` (`clanid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_data.sql
index d5a8518eab..6b5789bec7 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_data.sql
@@ -24,4 +24,4 @@ CREATE TABLE IF NOT EXISTS clan_data (
   PRIMARY KEY  (clan_id),
   KEY `leader_id` (`leader_id`),
   KEY `ally_id` (`ally_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_privs.sql
index 28b13ba6da..892d11f4be 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_privs.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS clan_privs (
   party INT NOT NULL default 0,
   privs INT NOT NULL default 0,
   PRIMARY KEY  (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_skills.sql
index 356bdc6fbc..e65d71352e 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_skills.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS clan_skills (
   skill_level int(5) NOT NULL default 0,
   skill_name varchar(26) default NULL,
   PRIMARY KEY  (`clan_id`,`skill_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_subpledges.sql
index f455158d7e..95395bb7ea 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_subpledges.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS clan_subpledges (
   name varchar(45),
   leader_name varchar(35),
   PRIMARY KEY  (`clan_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_wars.sql
index a62317f6de..3dff03b61d 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clan_wars.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `wantspeace1` decimal(1,0) NOT NULL default '0',
   `wantspeace2` decimal(1,0) NOT NULL default '0',
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clanhall.sql
index 0a0ed745dd..caf98acd98 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clanhall.sql
@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `Grade` decimal(1,0) NOT NULL default '0',
   `paid` int( 1 ) NOT NULL default '0',
   PRIMARY KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- ----------------------------
 -- Records 
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clanhall_functions.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clanhall_functions.sql
index e6f9e4950e..21446a08b0 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clanhall_functions.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clanhall_functions.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_functions` (
   `rate` decimal(20,0) NOT NULL default '0',
   `endTime` decimal(20,0) NOT NULL default '0',
   PRIMARY KEY  (`hall_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clanhall_siege.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clanhall_siege.sql
index 440863e832..c1486aa222 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clanhall_siege.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/clanhall_siege.sql
@@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS `clanhall_siege` (
   `name` varchar(40) NOT NULL,
   `siege_data` decimal(20,0) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- ----------------------------
 -- Records 
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/crests.sql
index b3e6dd8b67..04146da77a 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/crests.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/cursed_weapons.sql
index e4aa1ac884..f43b252722 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/cursed_weapons.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `nbKills` INT DEFAULT 0,
   `endTime` DECIMAL(20,0) DEFAULT 0,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_droplist.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_droplist.sql
index 14e11ab0d6..673107e4ae 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_droplist.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_droplist.sql
@@ -32,4 +32,4 @@ CREATE TABLE `custom_droplist` (
   `chance` INT NOT NULL DEFAULT '0',
   PRIMARY KEY  (`mobId`,`itemId`,`category`),
   KEY `key_mobId` (`mobId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_merchant_buylists.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_merchant_buylists.sql
index 43419a5689..6f1bee732b 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_merchant_buylists.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_merchant_buylists.sql
@@ -12,4 +12,4 @@ CREATE TABLE custom_merchant_buylists (
   time INT NOT NULL DEFAULT '0',
   savetimer DECIMAL(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY  (shop_id,`order`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_merchant_shopids.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_merchant_shopids.sql
index b696f282a7..3b524ec5d2 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_merchant_shopids.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_merchant_shopids.sql
@@ -6,4 +6,4 @@ CREATE TABLE custom_merchant_shopids (
   shop_id decimal(9,0) NOT NULL default '0',
   npc_id varchar(9) default NULL,
   PRIMARY KEY  (shop_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_notspawned.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_notspawned.sql
index 47ef1cfd93..49beda727e 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_notspawned.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_notspawned.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `custom_notspawned` (
   `id` int(11) NOT NULL,
   `isCustom` int(1) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_npc.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_npc.sql
index 2efad91993..e137223ee3 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_npc.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_npc.sql
@@ -46,7 +46,7 @@ CREATE TABLE `custom_npc`(
   `absorb_level` decimal(2,0) default 0,
   `absorb_type` enum('FULL_PARTY','LAST_HIT','PARTY_ONE_RANDOM') DEFAULT 'LAST_HIT' NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT ignore INTO custom_npc values
 ('500', '30115', 'Jurek', '1', 'Faction Manager', '1', 'NPC.a_mageguild_master_MHuman', '8.00', '24.00', '70', 'male', 'Folk', '40', '3862', '1493', '11.85', '2.78', '40', '43', '30', '21', '20', '10', '0', '0', '1314', '470', '780', '382', '278', '0', '333', '0', '0', '0', '55', '132', null, '0', '1', '0', 'LAST_HIT'),
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_spawnlist.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_spawnlist.sql
index c3d8af9169..3b5878f440 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_spawnlist.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_spawnlist.sql
@@ -19,4 +19,4 @@ CREATE TABLE `custom_spawnlist` (
   `periodOfDay` decimal(2,0) default '0',
   PRIMARY KEY  (id),
   KEY `key_npc_templateid` (`npc_templateid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_teleport.sql
index dc5a694a3a..a98504b528 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/custom_teleport.sql
@@ -11,4 +11,4 @@ CREATE TABLE custom_teleport (
   price decimal(6,0) default NULL,
   fornoble int(1) NOT NULL default '0',
   PRIMARY KEY  (id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/dimensional_rift.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/dimensional_rift.sql
index 1d7b0b8697..0bb1d714cc 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/dimensional_rift.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/dimensional_rift.sql
@@ -16,7 +16,7 @@ CREATE TABLE `dimensional_rift` (
   `zT` int(11) NOT NULL,
   `boss` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`type`,`room_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- ----------------------------
 -- Records for table dimensional_rift
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/droplist.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/droplist.sql
index 8b82f8260c..9d68ca7d78 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/droplist.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/droplist.sql
@@ -32,7 +32,7 @@ CREATE TABLE `droplist` (
   `chance` INT NOT NULL DEFAULT '0',
   PRIMARY KEY  (`mobId`,`itemId`,`category`),
   KEY `key_mobId` (`mobId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- 
 -- Dumping data for table `droplist`
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/enchant_skill_trees.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/enchant_skill_trees.sql
index 8eca2a2776..880fc0d985 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/enchant_skill_trees.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/enchant_skill_trees.sql
@@ -14,7 +14,7 @@ CREATE TABLE `enchant_skill_trees` (
   `success_rate79` int(3) NOT NULL DEFAULT '0',
   `success_rate80` int(3) NOT NULL DEFAULT '0',
   PRIMARY KEY (`skill_id`,`level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `enchant_skill_trees` VALUES ('1', '101', 'Triple Slash', '37', '+1 Power', '306000', '3060000', '37', '82', '92', '97', '97', '97');
 INSERT INTO `enchant_skill_trees` VALUES ('1', '102', 'Triple Slash', '37', '+2 Power', '315000', '3150000', '101', '80', '90', '95', '95', '95');
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/engrave.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/engrave.sql
index 6a899a544e..bfcbe06d76 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/engrave.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/engrave.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `engraved_items` (
   `object_id` int(11) NOT NULL,
   `item_id` int(11) NOT NULL,
   `engraver_id` int(11) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 
 CREATE TABLE IF NOT EXISTS `engraved_log` (
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `engraved_log` (
   `itemName` varchar(64) NOT NULL,
   `form_char` varchar(64) NOT NULL,
   `to_char` varchar(64) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fake_players.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fake_players.sql
index 8613cf5322..f208fcd8ff 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fake_players.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fake_players.sql
@@ -39,4 +39,4 @@ CREATE TABLE IF NOT EXISTS `fake_players` (
   `max_rnd_enchant` int(7) NOT NULL default '0',
   KEY `spawn` (`spawn`),
   KEY `template` (`template`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fishing_championship.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fishing_championship.sql
index 92eb395a20..3d0be5f153 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fishing_championship.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fishing_championship.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `fishing_championship` (
   `player_name` VARCHAR(35) NOT NULL,
   `fish_length` DOUBLE(10,3) NOT NULL,
   `rewarded` INT(1) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fishing_skill_trees.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fishing_skill_trees.sql
index 662583ca93..47ae7c3008 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fishing_skill_trees.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fishing_skill_trees.sql
@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS `fishing_skill_trees` (
   `cost` int(10) NOT NULL default '0',
   `isfordwarf` int(1) NOT NULL default '0',
   PRIMARY KEY  (`skill_id`,`level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 --
 --  Records for table fishing_skill_trees
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fort.sql
index 70a3f0b4b8..72dd8c4a6e 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fort.sql
@@ -9,7 +9,7 @@ CREATE TABLE `fort` (
   `siegeHourOfDay` int(11) NOT NULL default '20',
   `owner` int(11) NOT NULL default '0',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- ----------------------------
 -- Records 
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fort_door.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fort_door.sql
index c045fece64..26091a0055 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fort_door.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fort_door.sql
@@ -20,7 +20,7 @@ CREATE TABLE fort_door (
   mDef INT NOT NULL default 0,
   PRIMARY KEY(id),
   KEY id (fortId)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `fort_door` VALUES 
 (101,18220001,'Gate_of_fort',-50796,155913,-2102,0,0,0,0,0,0,67884,644,518),
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8d10d75303..5e933eac6b 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -8,4 +8,4 @@ CREATE TABLE `fort_doorupgrade` (
   `pDef` int(11) NOT NULL default '0',
   `mDef` int(11) NOT NULL default '0',
   PRIMARY KEY  (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fort_siege_guards.sql
index bb5d1b9fdc..dca419e88c 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` INT NOT NULL default 1,
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_siege_guards` VALUES
 
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fortsiege_clans.sql
index 5576d58bae..03532b5822 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -7,4 +7,4 @@ CREATE TABLE `fortsiege_clans` (
 `type` int(1) default NULL,
 `fort_owner` int(1) default NULL,
 PRIMARY KEY  (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/forums.sql
index 3794026842..786325a423 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/forums.sql
@@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_perm` int(8) NOT NULL default '0',
   `forum_owner_id` int(8) NOT NULL default '0',
   UNIQUE KEY `forum_id` (`forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES 
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql
index 4101c98ca2..8208a8a0a3 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql
@@ -14,7 +14,7 @@ CREATE TABLE `four_sepulchers_spawnlist` (
   `key_npc_id` int(9) NOT NULL DEFAULT '0',
   `spawntype` int(9) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `four_sepulchers_spawnlist` VALUES
 ('1', '', '1', '31468', '182074', '-85579', '-7216', '0', '0', '-32600', '3600', '31921', '0'),
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/global_tasks.sql
index 79e1d942fe..1cc3d87be0 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/global_tasks.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS global_tasks (
   param2 varchar(100) NOT NULL default '',
   param3 varchar(255) NOT NULL default '',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/global_variables.sql
index b53c539dba..56102b09e9 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/global_variables.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/grandboss_data.sql
index da16aa6ecf..9f3df9bf28 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/grandboss_data.sql
@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS grandboss_data (
   `currentMP` DECIMAL(8,0) DEFAULT NULL,
   `status` TINYINT NOT NULL DEFAULT 0,
   PRIMARY KEY(`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` VALUES 
 (29019, 185708,114298,-8221,32768, 0, 13090000, 22197, 0),	-- Antharas
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/grandboss_list.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/grandboss_list.sql
index e580000739..4bd0d4c570 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/grandboss_list.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/grandboss_list.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS grandboss_list
 `player_id` decimal(11,0) NOT NULL,
 `zone` decimal(11,0) NOT NULL,
 PRIMARY KEY  (`player_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/helper_buff_list.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/helper_buff_list.sql
index a5c13ad09d..7a33fd9c18 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/helper_buff_list.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/helper_buff_list.sql
@@ -11,7 +11,7 @@ CREATE TABLE `helper_buff_list` (
 `upper_level` int(10) unsigned NOT NULL default '0',
 `is_magic_class` varchar(5) default NULL,
 PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 #----------------------------
 # Records for table helper_buff_list
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/heroes.sql
index 6f5a71f7a0..3939a66f9d 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/heroes.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `count` decimal(3,0) NOT NULL default '0',
   `played` decimal(1,0) NOT NULL default '0',
   PRIMARY KEY  (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/items.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/items.sql
index f2d09bae91..ae4214a920 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/items.sql
@@ -20,4 +20,12 @@ CREATE TABLE IF NOT EXISTS items (
   KEY `key_loc` (`loc`),
   KEY `key_item_id` (`item_id`),
   KEY `key_time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/itemsonground.sql
index 6ce5e530ca..9d6806baa8 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/itemsonground.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` decimal(20,0) default NULL,
   `equipable` int(1) default '0',
   PRIMARY KEY  (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/locations.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/locations.sql
index d3f1b0b31c..7c0af21014 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/locations.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/locations.sql
@@ -11,7 +11,7 @@ CREATE TABLE `locations` (
   `proc` int(3) NOT NULL default '0',
   PRIMARY KEY  (`loc_id`,`loc_x`,`loc_y`),
   KEY `proc` (`proc`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- 
 -- Dumping data for table `locations`
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/lottery.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/lottery.sql
index 0e6cc924d5..32608ce0ab 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/lottery.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/lottery.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS lottery (
   enddate decimal(20,0) NOT NULL default 0,
   finished INT NOT NULL default 0,
   PRIMARY KEY (`id`,`idnr`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchant_areas_list.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchant_areas_list.sql
index 52a8a5e47d..5c1370c66f 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchant_areas_list.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchant_areas_list.sql
@@ -8,7 +8,7 @@ CREATE TABLE `merchant_areas_list` (
   `tax` double(3,2) unsigned NOT NULL default '0.00',
   `Chaotic` int(11) NOT NULL default '0',
   PRIMARY KEY  (`merchant_area_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 --
 -- Dumping data for table `merchant_areas_list`
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchant_buylists.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchant_buylists.sql
index 1bea118076..e2a90a0c2d 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchant_buylists.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchant_buylists.sql
@@ -12,7 +12,7 @@ CREATE TABLE merchant_buylists (
   time INT NOT NULL DEFAULT '0',
   savetimer DECIMAL(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY  (shop_id,`order`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 --
 -- Dumping data for table `merchant_buylists`
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchant_lease.sql
index e69f59449e..79e57cb028 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchant_lease.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS merchant_lease (
   `type` int(11) NOT NULL default 0,
   player_name varchar(35),
   PRIMARY KEY  (merchant_id,player_id,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchant_shopids.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchant_shopids.sql
index b96a2ce47e..d4e763e80b 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchant_shopids.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchant_shopids.sql
@@ -6,7 +6,7 @@ CREATE TABLE merchant_shopids (
   shop_id decimal(9,0) NOT NULL default '0',
   npc_id varchar(9) default NULL,
   PRIMARY KEY  (shop_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 --
 -- Dumping data for table `merchant_shopids`
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchants.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchants.sql
index 99ba7ccf3e..500d95176c 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchants.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/merchants.sql
@@ -6,7 +6,7 @@ CREATE TABLE `merchants` (
   `npc_id` int(11) NOT NULL default '0',
   `merchant_area_id` tinyint(4) default NULL,
   PRIMARY KEY  (`npc_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 --
 -- Dumping data for table `merchants`
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/minions.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/minions.sql
index 7e4fcb317c..2ed4bffb34 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/minions.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/minions.sql
@@ -9,7 +9,7 @@ CREATE TABLE `minions` (
   `amount_min` int(4) NOT NULL default '0',
   `amount_max` int(4) NOT NULL default '0',
   PRIMARY KEY  (`boss_id`,`minion_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 --
 -- Dumping data for table `minions`
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/mods_wedding.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/mods_wedding.sql
index d043fbacbf..109c1efdb8 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/mods_wedding.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/mods_wedding.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `mods_wedding` (
   `weddingDate` decimal(20,0) default '0',
   `coupleType` int(11) NOT NULL default '0',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/npc.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/npc.sql
index d23a17e614..b6014df772 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/npc.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/npc.sql
@@ -47,7 +47,7 @@ CREATE TABLE `npc` (
   `absorb_level` decimal(2,0) DEFAULT '0',
   `absorb_type` enum('FULL_PARTY','LAST_HIT','PARTY_ONE_RANDOM') NOT NULL DEFAULT 'LAST_HIT',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- ----------------------------
 -- Records 
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/npcskills.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/npcskills.sql
index 64973cdaad..4a3e869fb8 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/npcskills.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/npcskills.sql
@@ -7,7 +7,7 @@ CREATE TABLE npcskills (
   skillid int(11) NOT NULL default '0',
   level int(11) NOT NULL default '0',
   PRIMARY KEY  (npcid,skillid,level)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- 
 -- Dumping data for table `npcskills`
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/olympiad_data.sql
index 4a4edfb193..852ab89513 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/olympiad_data.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/olympiad_nobles.sql
index 5bc38ad0fc..fc01facc34 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_lost` decimal(3,0) NOT NULL default '0',
   `competitions_drawn` decimal(3,0) NOT NULL default '0',
   PRIMARY KEY  (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `charId` decimal(11,0) NOT NULL default '0',
@@ -20,4 +20,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` decimal(3,0) NOT NULL default '0',
   `competitions_drawn` decimal(3,0) NOT NULL default '0',
   PRIMARY KEY  (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/pets.sql
index 14f80587d6..c8b17fd393 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/pets.sql
@@ -13,4 +13,4 @@ CREATE TABLE IF NOT EXISTS pets (
   pkkills decimal(11) ,
   fed decimal(11) ,
   PRIMARY KEY  (item_obj_id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/pets_stats.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/pets_stats.sql
index ef3d0bf826..2de3d2d2aa 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/pets_stats.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/pets_stats.sql
@@ -27,7 +27,7 @@ CREATE TABLE `pets_stats` (
   `mpregen` int(11) NOT NULL default '0',
   `owner_exp_taken` DECIMAL(3,2) DEFAULT '0' NOT NULL,
   PRIMARY KEY  (`typeID`,`level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 #----------------------------
 # Records for table pets_stats
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/pledge_skill_trees.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/pledge_skill_trees.sql
index 0c9b23f8f0..ac5cfe7d4c 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/pledge_skill_trees.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/pledge_skill_trees.sql
@@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS `pledge_skill_trees` (
   `Description` varchar(255) default NULL,
   `repCost` int(11) default NULL,
   `itemId` int(11) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- ----------------------------
 -- Records 
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/posts.sql
index 14040ac89b..0ec4e9d50f 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/posts.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_topic_id` int(8) NOT NULL default '0',
   `post_forum_id` int(8) NOT NULL default '0',
   `post_txt` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/raidboss_spawnlist.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/raidboss_spawnlist.sql
index d1d2f2e929..0154762fa9 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/raidboss_spawnlist.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/raidboss_spawnlist.sql
@@ -15,7 +15,7 @@ CREATE TABLE raidboss_spawnlist (
   currentHp decimal(8,0) default NULL,
   currentMp decimal(8,0) default NULL,
   PRIMARY KEY  (boss_id,loc_x,loc_y,loc_z)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `raidboss_spawnlist` VALUES 
 (25001,1,-54416,146480,-2887,0,43200,129600,0,95986,545), -- Greyclaw Kutus (23)
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/random_spawn.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/random_spawn.sql
index 4fc993097d..96c7dae57f 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/random_spawn.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/random_spawn.sql
@@ -12,7 +12,7 @@ CREATE TABLE random_spawn (
   broadcastSpawn VARCHAR(5) NOT NULL default 'false',
   randomSpawn VARCHAR(5) NOT NULL default 'true',
   PRIMARY KEY  (groupId)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `random_spawn` VALUES 
 (1,30556,1,-1,1800000,1800000,'false','true'),
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/random_spawn_loc.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/random_spawn_loc.sql
index 2d9ef072dc..85baaefbc9 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/random_spawn_loc.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/random_spawn_loc.sql
@@ -6,7 +6,7 @@ CREATE TABLE `random_spawn_loc` (
   `z` int(11) NOT NULL default '0',
   `heading` int(11) NOT NULL default '-1',
   PRIMARY KEY  (`groupId`,`x`,`y`,`z`,`heading`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 --
 -- Dumping data for table `l2jdb`.`random_spawn_loc`
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/rebirth_manager.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/rebirth_manager.sql
index 298f084384..10bbe3e5a9 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/rebirth_manager.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/rebirth_manager.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `rebirth_manager`(
   `playerId` int(20) NOT NULL,
   `rebirthCount` int(2) NOT NULL,
   PRIMARY KEY (`playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/seven_signs.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/seven_signs.sql
index 0093e22b8d..8fe6dff30a 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/seven_signs.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/seven_signs.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `seven_signs` (
   `ancient_adena_amount` DECIMAL(20,0) NOT NULL default '0',
   `contribution_score` DECIMAL(20,0) NOT NULL default '0',
   PRIMARY KEY  (`char_obj_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/seven_signs_festival.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/seven_signs_festival.sql
index eefce920e2..84c8cf7dfe 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/seven_signs_festival.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/seven_signs_festival.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `seven_signs_festival` (
 	`score` int(5) NOT NULL default '0',
 	`members` varchar(255) NOT NULL default '',
 	PRIMARY KEY (`festivalId`,`cabal`,`cycle`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `seven_signs_festival` VALUES 
 (0, "dawn", 1, 0, 0, ""),
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/seven_signs_status.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/seven_signs_status.sql
index 3a167d21d8..78cab9f717 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/seven_signs_status.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/seven_signs_status.sql
@@ -24,7 +24,7 @@ CREATE TABLE IF NOT EXISTS `seven_signs_status` (
   `accumulated_bonus3` int(10) NOT NULL default '0',
   `accumulated_bonus4` int(10) NOT NULL default '0',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `seven_signs_status` VALUES
 (0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/siege_clans.sql
index 3f8ae839a4..f5e5c1456f 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/siege_clans.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS siege_clans (
    type int(1) default NULL,
    castle_owner int(1) default NULL,
    PRIMARY KEY  (clan_id,castle_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/skill_learn.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/skill_learn.sql
index 4f0cef8999..847e0989f3 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/skill_learn.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/skill_learn.sql
@@ -6,7 +6,7 @@ CREATE TABLE skill_learn (
   npc_id int(11) NOT NULL default '0',
   class_id int(11) NOT NULL default '0',
   PRIMARY KEY  (npc_id,class_id)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 --
 -- Dumping data for table `skill_learn`
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/skill_spellbooks.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/skill_spellbooks.sql
index 583a4acb79..af390674db 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/skill_spellbooks.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/skill_spellbooks.sql
@@ -6,7 +6,7 @@ CREATE TABLE `skill_spellbooks` (
   `skill_id` int(11) NOT NULL default '-1',
   `item_id` int(11) NOT NULL default '-1',
   KEY `skill_id` (`skill_id`,`item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 --
 -- Dumping data for table `skill_spellbooks`
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/skill_trees.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/skill_trees.sql
index c4257f73e0..ccda4788e6 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/skill_trees.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/skill_trees.sql
@@ -7,7 +7,7 @@ CREATE TABLE skill_trees (
   sp int(10) unsigned NOT NULL default '0',
   min_level int(10) unsigned NOT NULL default '0',
   PRIMARY KEY  (class_id,skill_id,level)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 --
 -- Dumping data for table `skill_trees`
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/spawnlist.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/spawnlist.sql
index 61e904e42d..728fc6e118 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/spawnlist.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/spawnlist.sql
@@ -18,7 +18,7 @@ CREATE TABLE `spawnlist` (
   `periodOfDay` decimal(2,0) default '0',
   PRIMARY KEY  (id),
   KEY `key_npc_templateid` (`npc_templateid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 --
 -- Dumping data for table `spawnlist`
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/teleport.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/teleport.sql
index 60497fe1ef..49f62d7751 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/teleport.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/teleport.sql
@@ -11,7 +11,7 @@ CREATE TABLE teleport (
   price decimal(6,0) default NULL,
   fornoble int(1) NOT NULL default '0',
   PRIMARY KEY  (id)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- 
 -- Dumping data for table `teleport`
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/topic.sql
index 6a3afcef2e..972b016377 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/topic.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL default '0',
   `topic_type` int(8) NOT NULL default '0',
   `topic_reply` int(8) NOT NULL default '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/vanhalter_spawnlist.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/vanhalter_spawnlist.sql
index 79ae69dfc8..6b5803228f 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/vanhalter_spawnlist.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/vanhalter_spawnlist.sql
@@ -15,7 +15,7 @@ CREATE TABLE `vanhalter_spawnlist` (
   `periodOfDay` DECIMAL(2,0) DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `key_npc_templateid` (`npc_templateid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `vanhalter_spawnlist` VALUES 
 ('1','Pagan Temple','1','32051','-14670','-54846','-10629','0','0','16384','60','0','0'),
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/login/account_data.sql
index 17c65c39a8..27da42723e 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/login/account_data.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   var  VARCHAR(20) NOT NULL DEFAULT '',
   value VARCHAR(255) ,
   PRIMARY KEY  (account_name,var)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/login/accounts.sql
index d301d143ed..d1fe9a90c1 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/login/accounts.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `lastIP` CHAR(15) NULL DEFAULT NULL,
   `lastServer` TINYINT DEFAULT 1,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/login/gameservers.sql
index f49ecfdc0a..3fab170880 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/login/gameservers.sql
@@ -3,7 +3,7 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL default '',
   `host` varchar(50) NOT NULL default '',
   PRIMARY KEY  (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- ----------------------------
 -- Records of gameservers
diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/custom/AutoPlay.ini b/L2J_Mobius_C6_Interlude/dist/game/config/custom/AutoPlay.ini
index 9580f01952..de5fcc3ae8 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/config/custom/AutoPlay.ini
+++ b/L2J_Mobius_C6_Interlude/dist/game/config/custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # List of skills that cannot be added to auto play selection menu, separated by commas.
 DisabledSkillIds = 
 
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java
index 4a4b362246..f7adeb0737 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java
@@ -581,6 +581,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
 	public static String AUTO_PLAY_LOGIN_MESSAGE;
@@ -1862,6 +1863,7 @@ public class Config
 		ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 		ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 		RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+		ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 		DISABLED_AUTO_SKILLS.clear();
 		final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
 		if (!disabledSkills.isEmpty())
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index 6ba2bb8076..156998aff8 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
+import org.l2jmobius.gameserver.model.WorldRegion;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.knownlist.NullKnownList;
@@ -1107,10 +1108,11 @@ public class Item extends WorldObject
 			// Set the x,y,z position of the Item dropped and update its _worldregion
 			setSpawned(true);
 			getLocation().setXYZ(x, y, z);
-			setWorldRegion(World.getInstance().getRegion(getLocation()));
+			final WorldRegion region = World.getInstance().getRegion(getLocation());
+			setWorldRegion(region);
 			
 			// Add the Item dropped to _visibleObjects of its WorldRegion
-			getWorldRegion().addVisibleObject(this);
+			region.addVisibleObject(this);
 		}
 		
 		setDropTime(System.currentTimeMillis());
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index f12fbc358e..655c43fbc3 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,6 +25,7 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -40,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -95,6 +98,12 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							final Summon summon = player.getPet();
+							if ((summon != null) && summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+							{
+								summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+							}
 							continue PLAY;
 						}
 						
@@ -120,23 +129,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType() == WeaponType.BOW;
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getTemplate().getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType() == WeaponType.BOW;
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getTemplate().getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -144,6 +162,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -183,41 +204,61 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : player.getKnownList().getKnownCharactersInRadius(player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					if (nearby == null)
+					if (Util.calculateDistance(leader, player, true) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue;
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.getPartyMembers().contains(leaderTarget))))
+						{
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
 					}
-					
-					// Skip unavailable creatures.
-					if (nearby.isAlikeDead())
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : player.getKnownList().getKnownCharactersInRadius(player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player))
-					{
-						final Summon summon = player.getPet();
-						if ((summon != null) && (summon.getObjectId() == nearby.getTarget().getObjectId()))
+						if (nearby == null)
+						{
+							continue;
+						}
+						
+						// Skip unavailable creatures.
+						if (nearby.isAlikeDead())
 						{
 							continue TARGET;
 						}
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceId()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							final Summon summon = player.getPet();
+							if ((summon != null) && (summon.getObjectId() == nearby.getTarget().getObjectId()))
+							{
+								continue TARGET;
+							}
+						}
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceId()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -310,6 +351,7 @@ public class AutoPlayTaskManager
 				{
 					summon.followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/account_gsdata.sql
index d2da07b194..db5cb35ce2 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/account_gsdata.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/announcements.sql
index 686ce7db92..4ea4114b97 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/announcements.sql
@@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/auction.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/auction.sql
index 5d307b8ec7..0446601374 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/auction.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/auction.sql
@@ -13,4 +13,4 @@ CREATE TABLE IF NOT EXISTS `auction` (
   `endDate` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemType`,`itemId`,`itemObjectId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/auction_bid.sql
index 31fdbd466c..0aca65f92a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/auction_bid.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/auction_watch.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/auction_watch.sql
index 5834f4e511..97aa7c020f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/auction_watch.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/auction_watch.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `auction_watch` (
   `charObjId` INT NOT NULL DEFAULT 0,
   `auctionId` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`charObjId`,`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/bbs_favorite.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/bbs_favorite.sql
index e353929990..57506eee67 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/bbs_favorite.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/bbs_favorite.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/buffer_schemes.sql
index 55eb836dbb..2d7a14e81f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/buffer_schemes.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL,
   PRIMARY KEY (`object_id`,`scheme_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/buylists.sql
index ea76140994..291a4ac88f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/buylists.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle.sql
index 0f2cc1f5c4..9e34e1bdc8 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio',0,0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_doorupgrade.sql
index 467549c7f3..f2ae13d23c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_functions.sql
index b111fb4bb7..48f019f7e3 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_functions.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_manor_procure.sql
index 6f081a435e..aa29107f01 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_manor_production.sql
index 4b0fefcf9e..42ac40d507 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_manor_production.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_trapupgrade.sql
index b16306c804..ab5e5e2051 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_contacts.sql
index b242905114..1c84187b03 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_contacts.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_friends.sql
index 7e5fc9ffa3..8ac7e449e2 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_friends.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `friendId` INT UNSIGNED NOT NULL DEFAULT 0,
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_hennas.sql
index b274ca90ee..b5f10d2462 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_hennas.sql
@@ -4,4 +4,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_instance_time.sql
index 4b9efb912a..f9b0cfa7d4 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_instance_time.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_item_reuse_save.sql
index 43f531deb2..79433cbbab 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_macroses.sql
index 06e83eddff..07e83a1adb 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_macroses.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_offline_trade.sql
index 0fd9522890..69b18fbfdf 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_offline_trade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_offline_trade_items.sql
index 5fcd5653e8..317fc42bf7 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_pet_skills_save.sql
index 98a58b9c62..e01871070e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_quests.sql
index c683185655..e33ff5ba97 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_quests.sql
@@ -4,4 +4,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_raid_points.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_raid_points.sql
index 0ba8ff2c75..bfcc537fd3 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_raid_points.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_raid_points.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_raid_points` (
   `boss_id` INT UNSIGNED NOT NULL DEFAULT 0,
   `points` INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_recipebook.sql
index 6edd20fd88..2acaa26250 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_recipebook.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_recipeshoplist.sql
index 3b6aed2a9c..4ea37c5249 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_recommends.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_recommends.sql
index 17c71144fc..bee300c7d9 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_recommends.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_recommends.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `character_recommends` (
   `charId` INT UNSIGNED NOT NULL default 0,
   `target_id` INT(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`target_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_shortcuts.sql
index 06a3f14d72..a2349f79c3 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_shortcuts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_skills.sql
index ca20cda6a6..a26b62cfcc 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_skills.sql
@@ -4,4 +4,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_level` INT(3) NOT NULL DEFAULT 1,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_skills_save.sql
index 23297a4724..ab821f45de 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_skills_save.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_subclasses.sql
index a2bdbb93b8..af152623f7 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_subclasses.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `level` int(2) NOT NULL DEFAULT 40,
   `class_index` int(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_summon_skills_save.sql
index 69f5f276b1..7dbb8268d6 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_summons.sql
index bde6cd28bf..500cd4363a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_summons.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_variables.sql
index e843d01ebd..f42eaecdbc 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/character_variables.sql
@@ -2,4 +2,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/characters.sql
index 57b7796bc9..c0088b1a0b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/characters.sql
@@ -65,4 +65,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_data.sql
index 70d48ca49f..c9f8f13cb1 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_data.sql
@@ -22,4 +22,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_notices.sql
index b28a79dd62..e725586084 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_notices.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_privs.sql
index 6da0d19b15..57461b9e54 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_privs.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_skills.sql
index 0bc644e66e..be13835749 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_skills.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_subpledges.sql
index cf8144cbf2..3bee2d38f8 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_subpledges.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_wars.sql
index 59492a6542..31ee2db1f4 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clan_wars.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `wantspeace1` decimal(1,0) NOT NULL DEFAULT '0',
   `wantspeace2` decimal(1,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clanhall.sql
index 41a06cac48..f55afb8c14 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clanhall.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paid` int( 1 ) NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `clanhall` VALUES
 ('22','Moonstone Hall','0','500000','Clan hall located in the Town of Gludio','Gludio','0','2','0'),
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clanhall_functions.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clanhall_functions.sql
index 28cf4d0a8e..7ebed4ca53 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clanhall_functions.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clanhall_functions.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`hall_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clanhall_siege_attackers.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clanhall_siege_attackers.sql
index 16c4216bfe..dc27ded096 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clanhall_siege_attackers.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clanhall_siege_attackers.sql
@@ -1,4 +1,4 @@
 CREATE TABLE IF NOT EXISTS `clanhall_siege_attackers` (
   `clanhall_id` int(3) NOT NULL DEFAULT '0',
   `attacker_id` int(10) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clanhall_siege_guards.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clanhall_siege_guards.sql
index b334f13a9e..60d14d1640 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clanhall_siege_guards.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/clanhall_siege_guards.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `clanhall_siege_guards` (
   `respawnDelay` mediumint(5) NOT NULL DEFAULT '0',
   `isSiegeBoss` enum('false','true') NOT NULL DEFAULT 'false',
   KEY `clanHallId` (`clanHallId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `clanhall_siege_guards` VALUES
 -- Devasted Castle
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/crests.sql
index b3e6dd8b67..04146da77a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/crests.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/cursed_weapons.sql
index dc7a921a83..c18f76bbee 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/cursed_weapons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/custom_teleport.sql
index 96dad1f9fc..c472e6d75b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/custom_teleport.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/dimensional_rift.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/dimensional_rift.sql
index 1e01f688cf..4e2f248d62 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/dimensional_rift.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/dimensional_rift.sql
@@ -13,7 +13,7 @@ CREATE TABLE `dimensional_rift` (
   `zT` mediumint(6) NOT NULL,
   `boss` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`type`,`room_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `dimensional_rift` VALUES
 (0, 0, -115440, -114160, -182160, -178048, -6816, -6240, -114790, -180576, -6752, 0),	-- peace zone (waiting room)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/enchant_skill_trees.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/enchant_skill_trees.sql
index 8eca2a2776..880fc0d985 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/enchant_skill_trees.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/enchant_skill_trees.sql
@@ -14,7 +14,7 @@ CREATE TABLE `enchant_skill_trees` (
   `success_rate79` int(3) NOT NULL DEFAULT '0',
   `success_rate80` int(3) NOT NULL DEFAULT '0',
   PRIMARY KEY (`skill_id`,`level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `enchant_skill_trees` VALUES ('1', '101', 'Triple Slash', '37', '+1 Power', '306000', '3060000', '37', '82', '92', '97', '97', '97');
 INSERT INTO `enchant_skill_trees` VALUES ('1', '102', 'Triple Slash', '37', '+2 Power', '315000', '3150000', '101', '80', '90', '95', '95', '95');
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/fishing_championship.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/fishing_championship.sql
index aa9ffef1ee..646424bd2b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/fishing_championship.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/fishing_championship.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fishing_championship` (
   `player_name` VARCHAR(35) NOT NULL,
   `fish_length` DOUBLE(10,3) NOT NULL,
   `rewarded` INT(1) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/forums.sql
index fede0432b9..f565baebfa 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/forums.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql
index 4ae82c0039..ef44b39cf4 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql
@@ -14,7 +14,7 @@ CREATE TABLE `four_sepulchers_spawnlist` (
   `key_npc_id` smallint(5) unsigned NOT NULL DEFAULT '0',
   `spawntype` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `four_sepulchers_spawnlist` VALUES
 ('1', '', '1', '31468', '182074', '-85579', '-7216', '0', '0', '-32600', '3600', '31921', '0'),
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/global_tasks.sql
index 33fe875e44..8be95c521f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/global_tasks.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/global_variables.sql
index 86cabd2d0f..b5f04d1339 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/global_variables.sql
@@ -2,6 +2,6 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 REPLACE INTO `global_variables` VALUES ('HBLevel', '11');
 REPLACE INTO `global_variables` VALUES ('HBTrust', '4000000');
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/grandboss_data.sql
index c0666646a9..726901699f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/grandboss_data.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant (40)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/grandboss_list.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/grandboss_list.sql
index 3de82ecdb8..cba2ad418e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/grandboss_list.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/grandboss_list.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `grandboss_list` (
   `player_id` decimal(11,0) NOT NULL,
   `zone` decimal(11,0) NOT NULL,
   PRIMARY KEY (`player_id`,`zone`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/herb_droplist_groups.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/herb_droplist_groups.sql
index 91029fb985..a5e524415c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/herb_droplist_groups.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/herb_droplist_groups.sql
@@ -24,7 +24,7 @@ CREATE TABLE `herb_droplist_groups` (
   `chance` mediumint(7) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`groupId`,`itemId`,`category`),
   KEY `key_mobId` (`groupId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `herb_droplist_groups` VALUES
 -- default group
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/heroes.sql
index 593b5b3c72..f66ed313ee 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/heroes.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/heroes_diary.sql
index 3540726e4b..b87f1ec2b3 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/heroes_diary.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/item_attributes.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/item_attributes.sql
index 787e4e6c07..933267af4e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/item_attributes.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/item_attributes.sql
@@ -2,4 +2,6 @@ CREATE TABLE IF NOT EXISTS `item_attributes` (
   `itemId` int(11) NOT NULL DEFAULT 0,
   `augAttributes` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_attributes (itemId);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/item_auction.sql
index 6ac2d3deb9..49a9229f57 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/item_auction.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/item_auction_bid.sql
index 5ac2a00221..283ccfad6e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/item_auction_bid.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/items.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/items.sql
index 3fc23ea75b..64c3a59c5e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/items.sql
@@ -16,4 +16,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/itemsonground.sql
index d87a1f6777..71962e9cdd 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/itemsonground.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/lottery.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/lottery.sql
index e9f02cd64a..1bd9f73b19 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/lottery.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/lottery.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `lottery` (
   `enddate` bigint(13) unsigned NOT NULL DEFAULT '0',
   `finished` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`idnr`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/merchant_lease.sql
index 931744d3ce..7b74a60806 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/merchant_lease.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/messages.sql
index 1af8e44845..381e442e41 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/messages.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `sendBySystem` tinyint(1) NOT NULL DEFAULT 0,
   `isReturned` enum('true','false') DEFAULT 'false' NOT NULL,
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/mods_wedding.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/mods_wedding.sql
index 3d9f409d69..01c6506ca6 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/mods_wedding.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/mods_wedding.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `mods_wedding` (
   PRIMARY KEY (`id`),
   KEY `player1Id` (`player1Id`),
   KEY `player2Id` (`player2Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/olympiad_data.sql
index 4a4edfb193..852ab89513 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/olympiad_data.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/olympiad_fights.sql
index d0016dcd28..9a9f98bfac 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/olympiad_fights.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(1) unsigned NOT NULL DEFAULT '0',
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/olympiad_nobles.sql
index ce32bbf800..3609ae84f0 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_lost` decimal(3,0) NOT NULL default 0,
   `competitions_drawn` decimal(3,0) NOT NULL default 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index ababd5fe67..afe36b3125 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` decimal(3,0) NOT NULL default 0,
   `competitions_drawn` decimal(3,0) NOT NULL default 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/petition_feedback.sql
index a00d9d507a..096d2429f3 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/petition_feedback.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/pets.sql
index 7f36bc7498..b83073d6fe 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/pets.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/posts.sql
index d11bf6aa92..aec8325bdd 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/posts.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/prime_shop_transactions.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/prime_shop_transactions.sql
index 5cd9ceb4cd..96cb20bdf4 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/prime_shop_transactions.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/prime_shop_transactions.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `prime_shop_transactions` (
   `productId` INT NOT NULL DEFAULT 0,
   `quantity` INT NOT NULL DEFAULT 1,
   `transactionTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/punishments.sql
index 30a22f0e5f..ce5130fc23 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/punishments.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/raidboss_spawnlist.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/raidboss_spawnlist.sql
index 61ff85a6cc..97b33dc7eb 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/raidboss_spawnlist.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/raidboss_spawnlist.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `raidboss_spawnlist` (
   `currentHp` decimal(8,0) DEFAULT NULL,
   `currentMp` decimal(8,0) DEFAULT NULL,
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `raidboss_spawnlist` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`respawn_delay`,`respawn_random`,`currentHp`,`currentMp`) VALUES
 (25001,-54416,146480,-2887,0,86400,43200,95986,514), -- Greyclaw Kutus (23)
@@ -82,18 +82,18 @@ INSERT IGNORE INTO `raidboss_spawnlist` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`head
 (25170,26064,121808,-3738,0,86400,43200,195371,994), -- Lizardmen Leader Hellion (38)
 (25173,75968,110784,-2512,0,86400,43200,288415,1355), -- Tiger King Karuta (45)
 -- (25176,92544,115232,-3200,0,86400,43200,451391,1975), -- Black Lily (55) (Not spawned anymore in H5)
-(25179,167152,53120,-4148,0,86400,43200,526218,2301), -- Guardian Of The Statue Of Giant Karum (60)
+(25179,181814,52379,-4344,0,86400,43200,526218,2301), -- Guardian Of The Statue Of Giant Karum (60)
 (25182,41966,215417,-3728,0,86400,43200,512194,2235), -- Demon Kurikups (59)
-(25185,99732,204331,-3784,0,86400,43200,165289,893), -- Tasaba Patriarch Hellena (35)
+(25185,88123,166312,-3412,0,86400,43200,165289,893), -- Tasaba Patriarch Hellena (35)
 (25188,127544,215264,-2960,0,86400,43200,255564,731), -- Apepi (30)
-(25189,127837,200661,-3792,0,86400,43200,156584,860), -- Cronos's Servitor Mumu (34)
+(25189,68832,203024,-3547,0,86400,43200,156584,860), -- Cronos's Servitor Mumu (34)
 (25192,125920,190208,-3291,0,86400,43200,258849,1237), -- Earth Protector Panathen (43)
 (25198,102656,157424,-3735,0,86400,43200,1777317,2987), -- Fafurion's Herald Lokness (70)
 (25199,108096,157408,-3688,0,86400,43200,912634,3130), -- Water Dragon Seer Sheshark (72)
 (25202,119760,157392,-3744,0,86400,43200,935092,3274), -- Krokian Padisha Sobekk (74)
 (25205,123808,153408,-3671,0,86400,43200,956490,3420), -- Ocean Flame Ashakiel (76)
-(25208,109663,213615,-3624,0,86400,43200,218810,1062), -- Water Couatle Ateka (40)
-(25211,113456,198118,-3689,0,86400,43200,174646,927), -- Sebek (36)
+(25208,73776,201552,-3760,0,86400,43200,218810,1062), -- Water Couatle Ateka (40)
+(25211,76352,193216,-3648,0,86400,43200,174646,927), -- Sebek (36)
 (25214,111582,209341,-3687,0,86400,43200,218810,1062), -- Fafurion's Page Sika (40)
 -- (25217,89904,105712,-3292,0,86400,43200,369009,1660), -- Cursed Clara (50) (Not spawned anymore in H5)
 (25220,113551,17083,-2120,0,86400,43200,924022,3202), -- Death Lord Hallate (73)
@@ -122,7 +122,7 @@ INSERT IGNORE INTO `raidboss_spawnlist` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`head
 -- (25273,23800,119500,-8976,0,86400,43200,507285,2104), -- Carnamakos (50) (Spawn by Quest)
 (25276,154088,-14116,-3736,0,86400,43200,1891801,3347), -- Death Lord Ipos (75)
 (25277,54651,180269,-4976,0,86400,43200,507285,1660), -- Lilith's Witch Marilion (50)
-(25280,85622,88766,-5120,0,86400,43200,1248928,1975), -- Pagan Watcher Cerberon (55)
+(25280,-12621,-240437,-8160,0,86400,43200,1248928,1975), -- Pagan Watcher Cerberon (55)
 (25281,151053,88124,-5424,0,86400,43200,1777317,2987), -- Anakim's Nemesis Zakaron (70)
 (25282,179311,-7632,-4896,0,86400,43200,1891801,3347), -- Death Lord Shax (75)
 -- (25283,184410,-10111,-5488,0,86400,43200,1639146,3793), -- Lilith (80) (Spawn by Seven Signs)
@@ -170,7 +170,7 @@ INSERT IGNORE INTO `raidboss_spawnlist` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`head
 (25388,40128,101920,-1241,0,86400,43200,165289,893), -- Red Eye Captain Trakia (35)
 (25391,45600,120592,-2455,0,86400,43200,297015,827), -- Nurka's Messenger (33)
 (25392,29928,107160,-3708,0,86400,43200,141034,795), -- Captain Of Queen's Royal Guards (32)
-(25394,129481,219722,-3600,0,86400,43200,390743,994), -- Premo Prime (38)
+(25394,101888,200224,-3708,0,86400,43200,390743,994), -- Premo Prime (38)
 (25395,15000,119000,-11900,0,86400,43200,288415,1355), -- Archon Suscepter (45)
 (25398,5000,189000,-3728,0,86400,43200,165289,893), -- Eye Of Beleth (35)
 (25401,117808,102880,-3600,0,86400,43200,141034,795), -- Skyla (32)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/rainbowsprings_attacker_list.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/rainbowsprings_attacker_list.sql
index ec166bff70..03250f25e7 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/rainbowsprings_attacker_list.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/rainbowsprings_attacker_list.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `rainbowsprings_attacker_list` (
   `clanId` int(10) DEFAULT NULL,
   `war_decrees_count` double(20,0) DEFAULT NULL,
   KEY `clanid` (`clanid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/random_spawn.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/random_spawn.sql
index fd99673627..bdec18101e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/random_spawn.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/random_spawn.sql
@@ -9,7 +9,7 @@ CREATE TABLE `random_spawn` (
   `broadcastSpawn` enum('true','false') NOT NULL DEFAULT 'false',
   `randomSpawn` enum('true','false') NOT NULL DEFAULT 'true',
   PRIMARY KEY (`groupId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `random_spawn` VALUES
 (11,31113,1,-1,-1,-1,'true','true'), -- Merchant of Mammon
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/random_spawn_loc.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/random_spawn_loc.sql
index 86f7dd77fe..471d8df84d 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/random_spawn_loc.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/random_spawn_loc.sql
@@ -6,7 +6,7 @@ CREATE TABLE `random_spawn_loc` (
   `z` mediumint(6) NOT NULL,
   `heading` mediumint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`groupId`,`x`,`y`,`z`,`heading`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `random_spawn_loc` VALUES
 -- Merchant of Mammon
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/seven_signs.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/seven_signs.sql
index ef94a10582..cec3ff4a4d 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/seven_signs.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/seven_signs.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `seven_signs` (
   `ancient_adena_amount` DECIMAL(20,0) NOT NULL DEFAULT 0,
   `contribution_score` DECIMAL(20,0) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/seven_signs_festival.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/seven_signs_festival.sql
index 7683fa8467..5d2925a98f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/seven_signs_festival.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/seven_signs_festival.sql
@@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS `seven_signs_festival` (
   `score` int(5) NOT NULL DEFAULT '0',
   `members` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`festivalId`,`cabal`,`cycle`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `seven_signs_festival` VALUES
 (0, "dawn", 1, 0, 0, ""),
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/seven_signs_status.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/seven_signs_status.sql
index bf65f25901..3cc137bec4 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/seven_signs_status.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/seven_signs_status.sql
@@ -24,7 +24,7 @@ CREATE TABLE IF NOT EXISTS `seven_signs_status` (
   `accumulated_bonus3` int(10) NOT NULL DEFAULT '0',
   `accumulated_bonus4` int(10) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `seven_signs_status` VALUES
 (0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/siegable_clanhall.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/siegable_clanhall.sql
index e38b1792ee..a49e90db7a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/siegable_clanhall.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/siegable_clanhall.sql
@@ -17,7 +17,7 @@ CREATE TABLE IF NOT EXISTS `siegable_clanhall` (
   `schedule_config` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`clanHallId`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `siegable_clanhall` (`clanHallId`, `name`, `ownerId`, `desc`, `location`, `nextSiege`, `siegeLength`, `schedule_config`) VALUES
 (21, 'Fortress of Resistance', 0, 'Contestable Clan Hall', 'Dion', 0, 3600000, '14;0;0;12;00'),
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/siegable_hall_flagwar_attackers.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/siegable_hall_flagwar_attackers.sql
index 2d5a1d60c4..9ce6060577 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/siegable_hall_flagwar_attackers.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/siegable_hall_flagwar_attackers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `siegable_hall_flagwar_attackers` (
   PRIMARY KEY (`flag`),
   KEY `hall_id` (`hall_id`),
   KEY `clan_id` (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/siegable_hall_flagwar_attackers_members.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/siegable_hall_flagwar_attackers_members.sql
index 63e0270430..566a64fb10 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/siegable_hall_flagwar_attackers_members.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/siegable_hall_flagwar_attackers_members.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siegable_hall_flagwar_attackers_members` (
   KEY `hall_id` (`hall_id`),
   KEY `clan_id` (`clan_id`),
   KEY `object_id` (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/siege_clans.sql
index a583deb0a7..65b7738285 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/siege_clans.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/teleport.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/teleport.sql
index e3a5680d16..c84faa92d7 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/teleport.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/teleport.sql
@@ -10,7 +10,7 @@ CREATE TABLE `teleport` (
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `teleport` VALUES
 ('DE Village -> Town of Gludio',1,-12787,122779,-3112,10000,0,57),
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/topic.sql
index 005d87b4e0..d7147c830f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/game/topic.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_CT_0_Interlude/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/config/Custom/AutoPlay.ini b/L2J_Mobius_CT_0_Interlude/dist/game/config/Custom/AutoPlay.ini
index 9a4fd4bf2e..6e9d9628be 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/config/Custom/AutoPlay.ini
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/config/Custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # Enable .play command only for premium players.
 # Premium System must be enabled.
 # Default: False
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_CT_0_Interlude/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/config/General.ini b/L2J_Mobius_CT_0_Interlude/dist/game/config/General.ini
index 2680eb1cb4..aa63bae2f0 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/config/General.ini
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/config/General.ini
@@ -417,8 +417,8 @@ ChatFilterChars = ^_^
 # MPCC_ROOM
 # NPC_GENERAL
 # NPC_SHOUT
-# Default: GENERAL;SHOUT;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/config/GrandBoss.ini b/L2J_Mobius_CT_0_Interlude/dist/game/config/GrandBoss.ini
index 337f133638..9660080217 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/config/GrandBoss.ini
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/config/GrandBoss.ini
@@ -64,6 +64,16 @@ IntervalOfQueenAntSpawn = 36
 # Random interval. Range 1-192
 RandomOfQueenAntSpawn = 8
 
+# ---------------------------------------------------------------------------
+# Zaken
+# ---------------------------------------------------------------------------
+
+# Interval time of Zaken. Value is hour. Range 1-480
+IntervalOfZakenSpawn = 60
+
+# Random interval. Range 1-192
+RandomOfZakenSpawn = 8
+
 # ---------------------------------------------------------------------------
 # Frintezza
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/Doors.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/Doors.xml
index 7a77058c12..248c7de845 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/Doors.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/Doors.xml
@@ -227,7 +227,7 @@
 	<door id="21240003" name="Devil_003" open_method="8" level="3" close_time="120" height="245" baseHpMax="150000" hp_showable="false" basePDef="476" baseMDef="383" pos="42166;213285;-3643" node1="42246,213285" node2="42246,213285" node3="42085,213285" node4="42085,213285" nodeZ="-3760" default_status="close" />
 	<door id="21240004" name="Devil_004" open_method="8" level="3" close_time="120" height="245" baseHpMax="150000" hp_showable="false" basePDef="476" baseMDef="383" pos="51110;206106;-3912" node1="51270,206103" node2="51270,206110" node3="51105,206110" node4="51105,206102" nodeZ="-4031" default_status="close" />
 	<door id="21240005" name="Devil_005" open_method="8" level="3" close_time="120" height="245" baseHpMax="150000" hp_showable="false" basePDef="476" baseMDef="383" pos="52910;206720;-3692" node1="52910,206638" node2="52910,206638" node3="52910,206801" node4="52910,206801" nodeZ="-3808" default_status="close" />
-	<door id="21240006" name="Devil_006" open_method="8" level="7" close_time="3600" height="245" baseHpMax="150000" hp_showable="false" basePDef="1000000" baseMDef="383" pos="52423;219103;-3209" node1="52423,219032" node2="52423,219032" node3="52423,219174" node4="52423,219174" nodeZ="-3312" default_status="close" />
+	<door id="21240006" name="Devil_006" open_method="4" level="7" close_time="3600" height="245" baseHpMax="150000" hp_showable="false" basePDef="1000000" baseMDef="383" pos="52423;219103;-3209" node1="52423,219032" node2="52423,219032" node3="52423,219174" node4="52423,219174" nodeZ="-3312" default_status="close" />
 	<door id="22130001" name="schutt_castle_outter_002" open_method="0" height="320" baseHpMax="633000" basePDef="644" baseMDef="518" pos="77732;-149635;-213" node1="77538,-149648" node2="77753,-149647" node3="77753,-149617" node4="77539,-149616" nodeZ="-384" />
 	<door id="22130002" name="schutt_castle_outter_001" open_method="0" height="320" baseHpMax="633000" basePDef="644" baseMDef="518" pos="77380;-149635;-213" node1="77363,-149648" node2="77570,-149647" node3="77570,-149616" node4="77362,-149617" nodeZ="-384" />
 	<door id="22130003" name="schutt_castle_inner_001" open_method="0" default_status="open" height="256" baseHpMax="1357680" hp_showable="false" basePDef="644" baseMDef="518" pos="77554;-150264;-255" node1="77456,-150281" node2="77652,-150281" node3="77652,-150235" node4="77457,-150235" nodeZ="-380" />
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/WorldAreas/AdenTerritory.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/WorldAreas/AdenTerritory.htm
index 59d662e7d3..94b456a156 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/WorldAreas/AdenTerritory.htm
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/WorldAreas/AdenTerritory.htm
@@ -18,24 +18,17 @@
 <a action="bypass -h admin_move_to 135580 19467 -3424">Plains of Glory</a><br1>
 <a action="bypass -h admin_move_to 183543 -14974 -2768">Fields of Massacre</a><br1>
 <a action="bypass -h admin_move_to 156898 11217 -4032">War-Torn Plains</a><br1>
-<a action="bypass -h admin_move_to -121436 56288 -1586">Isle of Souls</a><br1>
-<a action="bypass -h admin_move_to -103032 46457 -1136">Mimir's Forest</a><br1>
-<a action="bypass -h admin_move_to -116114 87005 -3544">Hills of Gold</a><br>
 <font color="LEVEL">Dungeons</font><br1>
 <a action="bypass -h admin_move_to 114649 11115 -5120">Tower of Insolence</a><br1>
 <a action="bypass -h admin_move_to 181737 46469 -4276">The Giant's Cave</a><br1>
 <a action="bypass -h admin_move_to 110912 84912 -4816">Catacomb of the Forbidden Path</a><br1>
 <a action="bypass -h admin_move_to 136672 79328 -3702">Catacomb of the Witch</a><br1>
 <a action="bypass -h admin_move_to 168560 -17968 -3174">The Disciple's Necropolis</a><br1>
-<a action="bypass -h admin_move_to -84728 60089 -2576">Nornil's Garden</a><br>
 <font color="LEVEL">Towns</font><br1>
 <a action="bypass -h admin_move_to 146783 25808 -2000">Town of Aden</a><br1>
 <a action="bypass -h admin_move_to 117088 76931 -2670">Hunters Village</a><br>
 <font color="LEVEL">Castle</font><br1>
 <a action="bypass -h admin_move_to 147461 9898 -592">Aden Castle</a><br>
-<font color="LEVEL">Starting</font><br1>
-<a action="bypass -h admin_move_to -118070 45956 420">Kamael Village</a><br1>
-<a action="bypass -h admin_move_to -86961 43356 -2680">Nornil's Cave</a><br>
 <font color="LEVEL">Fortresses</font><br1>
 <a action="bypass -h admin_move_to 154613 55391 -3096">Narsell Fortress</a><br1>
 <a action="bypass -h admin_move_to 189828 40014 -3248">Bayou Fortress</a><br1>
@@ -49,6 +42,5 @@
 <a action="bypass -h admin_move_to 158141 -24543 -1288">Eastern Border Outpost</a><br1>
 <a action="bypass -h admin_move_to 146440 46723 -3400">Narsell Lake</a><br1>
 <a action="bypass -h admin_move_to 112405 -16607 -1864">Western Border Outpost</a><br1>
-<a action="bypass -h admin_move_to -123842 38117 1176">Cave of Souls</a>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_30.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_30.htm
index b086785b0e..db5fb6a8b6 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_30.htm
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_30.htm
@@ -24,23 +24,23 @@
 <a action="bypass -h admin_move_to 35992 191312 -3104">Corsair Captain Kylon (33)</a><br1>
 <a action="bypass -h admin_move_to 90384 125568 -2128">Breka Warlock Pastu (34)</a><br1>
 <a action="bypass -h admin_move_to 27280 101744 -3696">Stakato Queen Zyrnna (34)</a><br1>
-<a action="bypass -h admin_move_to 127837 200661 -3792">Cronos's Servitor Mumu (34)</a><br1>
+<a action="bypass -h admin_move_to 68832 203024 -3547">Cronos's Servitor Mumu (34)</a><br1>
 <a action="bypass -h admin_move_to 51632 153920 -3552">Revenant of Sir Calibus (34)</a><br1>
 <a action="bypass -h admin_move_to 10416 126880 -3676">Remmel (35)</a><br1>
 <a action="bypass -h admin_move_to -91024 116304 -3466">Chertuba of Great Soul (35)</a><br1>
 <a action="bypass -h admin_move_to 123536 133504 -3584">Sejarr's Servitor (35)</a><br1>
 <a action="bypass -h admin_move_to 50896 146576 -3645">Guilotine, Warden of the Execution Grounds (35)</a><br1>
 <a action="bypass -h admin_move_to 43872 123968 -2928">Flame Lord Shadar (35)</a><br1>
-<a action="bypass -h admin_move_to 99732 204331 -3784">Tasaba Patriarch Hellena (35)</a><br1>
+<a action="bypass -h admin_move_to 88123 166312 -3412">Tasaba Patriarch Hellena (35)</a><br1>
 <a action="bypass -h admin_move_to 43152 152352 -2848">Soul Collector Acheron (35)</a><br1>
 <a action="bypass -h admin_move_to -16096 184288 -3817">Gargoyle Lord Sirocco (35)</a><br1>
 <a action="bypass -h admin_move_to 40128 101920 -1241">Red Eye Captain Trakia (35)</a><br1>
 <a action="bypass -h admin_move_to 5000 189000 -3728">Eye of Beleth (35)</a><br1>
-<a action="bypass -h admin_move_to 113456 198118 -3689">Sebek (36)</a><br1>
+<a action="bypass -h admin_move_to 76352 193216 -3648">Sebek (36)</a><br1>
 <a action="bypass -h admin_move_to 53600 143472 -3872">Evil Spirit Tempest (36)</a><br1>
 <a action="bypass -h admin_move_to 127900 -160600 -1100">Rayito The Looter (37)</a><br1>
 <a action="bypass -h admin_move_to 26064 121808 -3738">Lizardmen Leader Hellion (38)</a><br1>
-<a action="bypass -h admin_move_to 129025 219237 -3678">Premo Prime (38)</a><br1>
+<a action="bypass -h admin_move_to 101888 200224 -3708">Premo Prime (38)</a><br1>
 <a action="bypass -h admin_move_to 88512 140576 -3483">Leader of Cat Gang (39)</a><br1>
 <a action="bypass -h admin_move_to 123000 -141000 -1100">Nellis' Vengeful Spirit (39)</a><br1>
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_40.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_40.htm
index 2dc66fc8ff..94cec7ae49 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_40.htm
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_40.htm
@@ -10,11 +10,13 @@
 <br>
 <br>
 <center>
+<a action="bypass -h admin_move_to 86534 216888 -3176">Gwindorr (40)</a><br1>
+<a action="bypass -h admin_move_to 83056 183232 -3616">Water Spirit Lian (40)</a><br1>
 <a action="bypass -h admin_move_to 92528 84752 -3703">Wizard of Storm Teruk (40)</a><br1>
 <a action="bypass -h admin_move_to 125789 207644 -3752">Icarus Sample 1 (40)</a><br1>
 <a action="bypass -h admin_move_to 87536 75872 -3591">Leto Chief Talkin (40)</a><br1>
 <a action="bypass -h admin_move_to 73520 66912 -3728">Shaman King Selu (40)</a><br1>
-<a action="bypass -h admin_move_to 109801 213314 -3924">Water Couatle Ateka (40)</a><br1>
+<a action="bypass -h admin_move_to 73776 201552 -3760">Water Couatle Ateka (40)</a><br1>
 <a action="bypass -h admin_move_to 111582 209341 -3687">Fafurion's Page Sika (40)</a><br1>
 <a action="bypass -h admin_move_to 72192 125424 -3657">Road Scavenger Leader (40)</a><br1>
 <a action="bypass -h admin_move_to 128352 138464 -3467">Nakondas (40)</a><br1>
@@ -35,6 +37,7 @@
 <a action="bypass -h admin_move_to 111440 82912 -2912">Evil Spirit Cyrion (45)</a><br1>
 <a action="bypass -h admin_move_to 126624 174448 -3056">Fafurion's Henchman Istary (45)</a><br1>
 <a action="bypass -h admin_move_to 107792 27728 -3488">Barion (47)</a><br1>
+<a action="bypass -h admin_move_to 81920 113136 -3056">Necrosentinel Royal Guard (47)</a><br1>
 <a action="bypass -h admin_move_to 77104 5408 -3088">King Tarlk (48)</a><br1>
 <a action="bypass -h admin_move_to 42032 24128 -4704">Orfen's Handmaiden (48)</a><br1>
 <a action="bypass -h admin_move_to 92976 7920 -3914">Katu Van Leader Atui (49)</a><br1>
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_50.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_50.htm
index 0006f7f63b..70c62db529 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_50.htm
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_50.htm
@@ -14,6 +14,7 @@
 <a action="bypass -h admin_move_to 169744 11920 -2732">Ghost of Peasant Leader (50)</a><br1>
 <a action="bypass -h admin_move_to 121872 64032 -3536">Messenger of Fairy Queen Berun (50)</a><br1>
 <a action="bypass -h admin_move_to 75488 -9360 -2720">Carnage Lord Gato (50)</a><br1>
+<a action="bypass -h admin_move_to 89904 105712 -3292">Cursed Clara (50)</a><br1>
 <a action="bypass -h admin_move_to 54651 180269 -4976">Lilith's Witch Marilion (50)</a><br1>
 <a action="bypass -h admin_move_to 43160 220463 -3680">Zaken's Chief Mate Tillion (50)</a><br1>
 <a action="bypass -h admin_move_to 125520 27216 -3632">Verfa (51)</a><br1>
@@ -23,15 +24,17 @@
 <a action="bypass -h admin_move_to 96524 -111070 -3335">Gigantic Chaos Golem (52)</a><br1>
 <a action="bypass -h admin_move_to 88300 258000 -10200">Fafurion's Envoy Pingolpin (52)</a><br1>
 <a action="bypass -h admin_move_to 54941 206705 -3728">Atraiban (53)</a><br1>
+<a action="bypass -h admin_move_to 74516 -101968 -960">Dark Shaman Varangka (53)</a><br1>
 <a action="bypass -h admin_move_to 53517 205413 -3728">Magus Kenishee (53)</a><br1>
 <a action="bypass -h admin_move_to 124984 43200 -3625">Paniel The Unicorn (54)</a><br1>
 <a action="bypass -h admin_move_to 113920 52960 -3735">Furious Thieles (55)</a><br1>
 <a action="bypass -h admin_move_to 125600 50100 -3600">Enchanted Forest Watcher Ruell (55)</a><br1>
 <a action="bypass -h admin_move_to 135872 94592 -3735">Sorcerer Isirr (55)</a><br1>
 <a action="bypass -h admin_move_to 125280 102576 -3305">Beleth's Seer Sephia (55)</a><br1>
+<a action="bypass -h admin_move_to 92544 115232 -3200">Black Lily (55)</a><br1>
 <a action="bypass -h admin_move_to 165984 88048 -2384">Harit Hero Tamash (55)</a><br1>
 <a action="bypass -h admin_move_to 42050 208107 -3752">Zaken's Butcher Krantz (55)</a><br1>
-<a action="bypass -h admin_move_to 85622 88766 -5120">Pagan Watcher Cerberon (55)</a><br1>
+<a action="bypass -h admin_move_to -12621 -240437 -8160">Pagan Watcher Cerberon (55)</a><br1>
 <a action="bypass -h admin_move_to 104096 -16896 -1803">Bandit Leader Barda (55)</a><br1>
 <a action="bypass -h admin_move_to 183568 24560 -3184">Ghost Knight Kabed (55)</a><br1>
 <a action="bypass -h admin_move_to 83174 254428 -10873">Eva's Spirit Niniel (55)</a><br1>
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_60.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_60.htm
index d94bca9a76..5a264bf680 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_60.htm
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_60.htm
@@ -11,11 +11,15 @@
 <br>
 <center>
 <a action="bypass -h admin_move_to 76787 245775 -10376">The 3rd Underwater Guardian (60)</a><br1>
-<a action="bypass -h admin_move_to 167152 53120 -4148">Guardian of the Statue of Giant Karum (60)</a><br1>
+<a action="bypass -h admin_move_to 181834 52353 -4344">Guardian of the Statue of Giant Karum (60)</a><br1>
 <a action="bypass -h admin_move_to 170320 42640 -4832">Taik High Prefect Arak (60)</a><br1>
+<a action="bypass -h admin_move_to 120080 111248 -3047">Ancient Weird Drake (60)</a><br1>
+<a action="bypass -h admin_move_to 115072 112272 -3018">Lord Ishka (60)</a><br1>
 <a action="bypass -h admin_move_to 113600 47120 -4640">Fairy Queen Timiniel (60)</a><br1>
+<a action="bypass -h admin_move_to 193902 54135 -4184">Giant Marpanak (60)</a><br1>
 <a action="bypass -h admin_move_to 104240 -3664 -3392">Roaring Lord Kastor (62)</a><br1>
 <a action="bypass -h admin_move_to 173880 -11412 -2880">Ghost of the Well Lidia (63)</a><br1>
+<a action="bypass -h admin_move_to 186210 61479 -4000">Gorgolos (64)</a><br1>
 <a action="bypass -h admin_move_to 88532 245798 -10376">Eva's Guardian Millenu (65)</a><br1>
 <a action="bypass -h admin_move_to 117232 -9476 -3320">Rahha (65)</a><br1>
 <a action="bypass -h admin_move_to 170656 85184 -2000">Fierce Tiger King Angel (65)</a><br1>
@@ -23,8 +27,11 @@
 <a action="bypass -h admin_move_to 170048 -24896 -3440">Gargoyle Lord Tiphon (65)</a><br1>
 <a action="bypass -h admin_move_to 113232 17456 -4384">Enmity Ghost Ramdal (65)</a><br1>
 <a action="bypass -h admin_move_to 168288 28368 -3632">Shilen's Priest Hisilrome (65)</a><br1>
+<a action="bypass -h admin_move_to 191777 56197 -7624">Hekaton Prime (65)</a><br1>
+<a action="bypass -h admin_move_to 186919 56297 -4480">Last Titan Utenus (66)</a><br1>
 <a action="bypass -h admin_move_to 93296 -75104 -1824">Demon's Agent Falston (66)</a><br1>
 <a action="bypass -h admin_move_to 155000 85400 -3200">Abyss Brukunt (67)</a><br1>
 <a action="bypass -h admin_move_to 144400 -28192 -1920">Kernon's Faithful Servant Kelone (67)</a><br1>
+<a action="bypass -h admin_move_to 143265 110044 -3944">Bloody Priest Rudelto (69)</a><br1>
 <a action="bypass -h admin_move_to 185800 -26500 -2000">Spirit of Andras, The Betrayer (69)</a><br1>
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_70.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_70.htm
index f6cc482bd0..8fbb65b8c0 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_70.htm
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_70.htm
@@ -26,6 +26,7 @@
 <a action="bypass -h admin_move_to 127903 -13399 -3720">Doom Blade Tanatos (72)</a><br1>
 <a action="bypass -h admin_move_to 113551 17083 -2120">Death Lord Hallate (73)</a><br1>
 <a action="bypass -h admin_move_to 170000 -60000 -3500">Plague Golem (73)</a><br1>
+<a action="bypass -h admin_move_to 152660 110387 -5520">Antharas Priest Cloe (74)</a><br1>
 <a action="bypass -h admin_move_to 119760 157392 -3744">Krokian Padisha Sobekk (74)</a><br1>
 <a action="bypass -h admin_move_to 158352 -121088 -2240">Icicle Emperor Bumbalump (74)</a><br1>
 <a action="bypass -h admin_move_to 113432 16403 3960">Kernon (75)</a><br1>
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_80.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_80.htm
index a78f2a8631..b94d165bec 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_80.htm
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/admin/teleports/raid/raid_80.htm
@@ -12,34 +12,22 @@
 <center>
 <a action="bypass -h admin_move_to 148160 -73808 -4919">Ketra's Hero Hekaton (80)</a><br1>
 <a action="bypass -h admin_move_to 115552 -39200 -2480">Varka's Hero Shadith (80)</a><br1>
-<a action="bypass -h admin_move_to 145504 -81664 -6016">Ketra's Commander Tayr (80)</a><br1>
-<a action="bypass -h admin_move_to 109216 -36160 -938">Varka's Commander Mos (80)</a><br1>
-<a action="bypass -h admin_move_to 184542 -106330 -6304">Ember (80)</a><br1>
-<a action="bypass -h admin_move_to 3776 -6768 -3276">Uruka (80)</a><br1>
-<a action="bypass -h admin_move_to 145008 -84992 -6240">Ketra's Chief Brakki (80)</a><br1>
-<a action="bypass -h admin_move_to 105584 -43024 -1728">Varka's Chief Horus (80)</a><br1>
-<a action="bypass -h admin_move_to 142368 -82512 -6487">Soul Of Fire Nastron (80)</a><br1>
-<a action="bypass -h admin_move_to 105452 -36775 -1050">Soul Of Water Ashutar (80)</a><br1>
-<a action="bypass -h admin_move_to -16382 -53450 -10432">Andreas Van Halter (80)</a><br1>
-<a action="bypass -h admin_move_to 27298 -6846 -1970">Sailren (80)</a><br1>
-<a action="bypass -h admin_move_to 173193 -76299 -7184">Shadow of Halisha (80)</a><br1>
-<a action="bypass -h admin_move_to 175610 -72453 -7184">Shadow of Halisha (80)</a><br1>
-<a action="bypass -h admin_move_to 189801 -88965 -7184">Shadow of Halisha (80)</a><br1>
-<a action="bypass -h admin_move_to 191544 -85575 -7184">Shadow of Halisha (80)</a><br1>
-<a action="bypass -h admin_move_to 152759 145949 -12588">Darnel (81)</a><br1>
-<a action="bypass -h admin_move_to 154069 149525 -12158">Kechi (82)</a><br1>
-<a action="bypass -h admin_move_to 193902 54135 -4184">Giant Marpanak (82)</a><br1>
-<a action="bypass -h admin_move_to 186210 61479 -4000">Gorgolos (82)</a><br1>
-<a action="bypass -h admin_move_to 144298 154420 -11854">Tears (83)</a><br1>
-<a action="bypass -h admin_move_to -22195 278232 -7879">Demon Prince (83)</a><br1>
-<a action="bypass -h admin_move_to -19013 278621 -8215">Ranku (83)</a><br1>
-<a action="bypass -h admin_move_to -12537 273938 -9013">Tully (83)</a><br1>
-<a action="bypass -h admin_move_to 86534 216888 -3176">Gwindorr (83)</a><br1>
-<a action="bypass -h admin_move_to 186919 56297 -4480">Last Titan Utenus (83)</a><br1>
-<a action="bypass -h admin_move_to 191777 56197 -7624">Hekaton Prime (83)</a><br1>
-<a action="bypass -h admin_move_to 112798 -76800 -10">Anais (84)</a><br1>
-<a action="bypass -h admin_move_to 79634 -55428 -6104">Queen Shyeed (84)</a><br1>
-<a action="bypass -h admin_move_to 83056 183232 -3616">Water Spirit Lian (84)</a><br1>
-<a action="bypass -h admin_move_to 189400 -105702 -782">Wings of Flame Ixion (84)</a><br1>
+<a action="bypass -h admin_move_to 79634 -55428 -6104">Queen Shyeed (80)</a><br1>
+<a action="bypass -h admin_move_to 173193 -76299 -7184">Shadow of Halisha (81)</a><br1>
+<a action="bypass -h admin_move_to 175610 -72453 -7184">Shadow of Halisha (81)</a><br1>
+<a action="bypass -h admin_move_to 189801 -88965 -7184">Shadow of Halisha (81)</a><br1>
+<a action="bypass -h admin_move_to 191544 -85575 -7184">Shadow of Halisha (81)</a><br1>
+<a action="bypass -h admin_move_to 145504 -81664 -6016">Ketra's Commander Tayr (84)</a><br1>
+<a action="bypass -h admin_move_to 109216 -36160 -938">Varka's Commander Mos (84)</a><br1>
+<a action="bypass -h admin_move_to 184542 -106330 -6304">Ember (85)</a><br1>
+<a action="bypass -h admin_move_to 189400 -105702 -782">Wings of Flame Ixion (85)</a><br1>
+<a action="bypass -h admin_move_to 3776 -6768 -3276">Uruka (86)</a><br1>
+<a action="bypass -h admin_move_to 145008 -84992 -6240">Ketra's Chief Brakki (87)</a><br1>
+<a action="bypass -h admin_move_to 105584 -43024 -1728">Varka's Chief Horus (87)</a><br1>
+<a action="bypass -h admin_move_to 142368 -82512 -6487">Soul Of Fire Nastron (87)</a><br1>
+<a action="bypass -h admin_move_to 105452 -36775 -1050">Soul Of Water Ashutar (87)</a><br1>
+<a action="bypass -h admin_move_to 27298 -6846 -1970">Sailren (87)</a><br1>
+<a action="bypass -h admin_move_to 112798 -76800 -10">Anais (87)</a><br1>
+<a action="bypass -h admin_move_to -16382 -53450 -10432">Andreas Van Halter (87)</a><br1>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
index 2dbddb7d68..53cf0d9b9f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
@@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.GrandBoss;
@@ -50,6 +51,10 @@ public class DrChaos extends AbstractNpcAI
 	private static final byte NORMAL = 0; // Dr. Chaos is in NPC form.
 	private static final byte CRAZY = 1; // Dr. Chaos entered on golem form.
 	private static final byte DEAD = 2; // Dr. Chaos has been killed and has not yet spawned.
+	private static final int CHAOS_X = 96320;
+	private static final int CHAOS_Y = -110912;
+	private static final int CHAOS_Z = -3328;
+	private static final int CHAOS_HEAD = 8191;
 	
 	private long _lastAttackVsGolem = 0;
 	private int _pissedOffTimer;
@@ -76,7 +81,7 @@ public class DrChaos extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Delete the saved time and
 				// immediately spawn Dr. Chaos. Also the state need to be changed for NORMAL
-				addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false);
+				addSpawn(DOCTOR_CHAOS, CHAOS_X, CHAOS_Y, CHAOS_Z, CHAOS_HEAD, false, 0, false);
 				GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
 			}
 		}
@@ -109,84 +114,115 @@ public class DrChaos extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)
 	{
-		if (event.equalsIgnoreCase("reset_drchaos"))
+		switch (event)
 		{
-			GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
-			addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false);
-		}
-		// despawn the live Dr. Chaos after 30 minutes of inactivity
-		else if (event.equalsIgnoreCase("golem_despawn"))
-		{
-			if ((npc.getId() == CHAOS_GOLEM) && ((_lastAttackVsGolem + 1800000) < System.currentTimeMillis()))
+			case "reset_drchaos":
 			{
-				final Npc chaos = addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false); // spawn Dr. Chaos
-				GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
-				cancelQuestTimer("golem_despawn", chaos, null);
+				GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
+				addSpawn(DOCTOR_CHAOS, CHAOS_X, CHAOS_Y, CHAOS_Z, CHAOS_HEAD, false, 0, false);
+				break;
+			}
+			case "golem_despawn": // despawn the live Dr. Chaos after 30 minutes of inactivity
+			{
+				if ((npc.getId() == CHAOS_GOLEM) && ((_lastAttackVsGolem + 1800000) < System.currentTimeMillis()))
+				{
+					final Npc chaos = addSpawn(DOCTOR_CHAOS, CHAOS_X, CHAOS_Y, CHAOS_Z, CHAOS_HEAD, false, 0, false); // spawn Dr. Chaos
+					GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
+					cancelQuestTimer("golem_despawn", chaos, null);
+					cancelQuestTimers("DISTANCE_CHECK");
+					
+					// Despawn the war golem.
+					npc.deleteMe();
+				}
+				break;
+			}
+			case "1":
+			{
+				npc.broadcastPacket(new SocialAction(npc.getObjectId(), 2));
+				npc.broadcastPacket(new SpecialCamera(npc, 1, -200, 15, 5500, 1000, 13500, 0, 0, 0, 0, 0));
+				break;
+			}
+			case "2":
+			{
+				npc.broadcastPacket(new SocialAction(npc.getObjectId(), 3));
+				break;
+			}
+			case "3":
+			{
+				npc.broadcastPacket(new SocialAction(npc.getObjectId(), 1));
+				break;
+			}
+			case "4":
+			{
+				npc.broadcastPacket(new SpecialCamera(npc, 1, -150, 10, 3500, 1000, 5000, 0, 0, 0, 0, 0));
+				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(95928, -110671, -3340, 0));
+				break;
+			}
+			case "5":
+			{
+				final GrandBoss golem = (GrandBoss) addSpawn(CHAOS_GOLEM, 96080, -110822, -3343, 0, false, 0, false);
+				GrandBossManager.getInstance().addBoss(golem);
+				startQuestTimer("DISTANCE_CHECK", 10000, golem, null, true);
+				golem.broadcastPacket(new SpecialCamera(npc, 30, 200, 20, 6000, 700, 8000, 0, 0, 0, 0, 0));
+				golem.broadcastPacket(new SocialAction(npc.getObjectId(), 1));
+				golem.broadcastPacket(new PlaySound(1, "Rm03_A", 0, 0, 0, 0, 0));
 				
-				// Despawn the war golem.
+				// start monitoring Dr. Chaos's inactivity
+				_lastAttackVsGolem = System.currentTimeMillis();
+				startQuestTimer("golem_despawn", 60000, golem, null, true);
+				
+				// Delete Dr. Chaos after spawned the war golem.
 				npc.deleteMe();
+				break;
 			}
-		}
-		else if (event.equalsIgnoreCase("1"))
-		{
-			npc.broadcastPacket(new SocialAction(npc.getObjectId(), 2));
-			npc.broadcastPacket(new SpecialCamera(npc, 1, -200, 15, 5500, 1000, 13500, 0, 0, 0, 0, 0));
-		}
-		else if (event.equalsIgnoreCase("2"))
-		{
-			npc.broadcastPacket(new SocialAction(npc.getObjectId(), 3));
-		}
-		else if (event.equalsIgnoreCase("3"))
-		{
-			npc.broadcastPacket(new SocialAction(npc.getObjectId(), 1));
-		}
-		else if (event.equalsIgnoreCase("4"))
-		{
-			npc.broadcastPacket(new SpecialCamera(npc, 1, -150, 10, 3500, 1000, 5000, 0, 0, 0, 0, 0));
-			npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(95928, -110671, -3340, 0));
-		}
-		else if (event.equalsIgnoreCase("5"))
-		{
-			final GrandBoss golem = (GrandBoss) addSpawn(CHAOS_GOLEM, 96080, -110822, -3343, 0, false, 0, false);
-			GrandBossManager.getInstance().addBoss(golem);
-			
-			golem.broadcastPacket(new SpecialCamera(npc, 30, 200, 20, 6000, 700, 8000, 0, 0, 0, 0, 0));
-			golem.broadcastPacket(new SocialAction(npc.getObjectId(), 1));
-			golem.broadcastPacket(new PlaySound(1, "Rm03_A", 0, 0, 0, 0, 0));
-			
-			// start monitoring Dr. Chaos's inactivity
-			_lastAttackVsGolem = System.currentTimeMillis();
-			startQuestTimer("golem_despawn", 60000, golem, null, true);
-			
-			// Delete Dr. Chaos after spawned the war golem.
-			npc.deleteMe();
-		}
-		// Check every sec if someone is in range, if found, launch one task to decrease the timer.
-		else if (event.equalsIgnoreCase("paranoia_activity") && (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL))
-		{
-			for (Player obj : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 500))
+			case "paranoia_activity":
 			{
-				if (obj.isDead())
+				if (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL)
 				{
-					continue;
+					for (Player obj : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 500))
+					{
+						if (obj.isDead())
+						{
+							continue;
+						}
+						
+						_pissedOffTimer -= 1;
+						
+						// Make him speak.
+						if (_pissedOffTimer == 15)
+						{
+							npc.broadcastSay(ChatType.NPC_GENERAL, "How dare you trespass into my territory! Have you no fear?");
+						}
+						
+						// That was "too much" for that time.
+						if (_pissedOffTimer <= 0)
+						{
+							crazyMidgetBecomesAngry(npc);
+						}
+					}
 				}
-				
-				_pissedOffTimer -= 1;
-				
-				// Make him speak.
-				if (_pissedOffTimer == 15)
+				if (npc.calculateDistance2D(CHAOS_X, CHAOS_Y, CHAOS_Z) > 2000)
 				{
-					npc.broadcastSay(ChatType.NPC_GENERAL, "How dare you trespass into my territory! Have you no fear?");
+					((Attackable) npc).clearAggroList();
+					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(CHAOS_X, CHAOS_Y, CHAOS_Z, 0));
 				}
-				
-				// That was "too much" for that time.
-				if (_pissedOffTimer <= 0)
+				break;
+			}
+			case "DISTANCE_CHECK":
+			{
+				if ((npc == null) || npc.isDead())
 				{
-					crazyMidgetBecomesAngry(npc);
+					cancelQuestTimers("DISTANCE_CHECK");
 				}
+				else if (npc.calculateDistance2D(npc.getSpawn()) > 10000)
+				{
+					((Attackable) npc).clearAggroList();
+					// npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(CHAOS_X, CHAOS_Y, CHAOS_Z, 0));
+					npc.teleToLocation(npc.getSpawn(), false);
+				}
+				break;
 			}
 		}
-		
 		return super.onAdvEvent(event, npc, player);
 	}
 	
@@ -225,6 +261,10 @@ public class DrChaos extends AbstractNpcAI
 		
 		// Initialization of the paranoia.
 		startQuestTimer("paranoia_activity", 1000, npc, null, true);
+		
+		cancelQuestTimer("DISTANCE_CHECK", npc, null);
+		startQuestTimer("DISTANCE_CHECK", 10000, npc, null, true);
+		
 		return null;
 	}
 	
@@ -243,6 +283,10 @@ public class DrChaos extends AbstractNpcAI
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CHAOS_GOLEM);
 		info.set("respawn_time", System.currentTimeMillis() + respawnTime);
 		GrandBossManager.getInstance().setStatSet(CHAOS_GOLEM, info);
+		
+		// Stop distance check task.
+		cancelQuestTimers("DISTANCE_CHECK");
+		
 		return null;
 	}
 	
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java
new file mode 100644
index 0000000000..ec70ae0c53
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java
@@ -0,0 +1,78 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.others.NewbieHelper;
+
+import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
+
+import ai.AbstractNpcAI;
+import quests.Q00255_Tutorial.Q00255_Tutorial;
+
+/**
+ * @author Mobius
+ */
+public class NewbieHelper extends AbstractNpcAI
+{
+	private static final int SOULSHOT_NOVICE = 5789;
+	private static final int SPIRITSHOT_NOVICE = 5790;
+	private static final int TOKEN = 8542;
+	private static final int SCROLL = 8594;
+	private static final int SCROLL_REWARD_CHANCE = 100; // 0 to disable.
+	
+	public NewbieHelper()
+	{
+		addStartNpc(30598, 30599, 30600, 30601, 30602);
+		addTalkId(30598, 30599, 30600, 30601, 30602);
+		addFirstTalkId(30598, 30599, 30600, 30601, 30602);
+	}
+	
+	@Override
+	public String onFirstTalk(Npc npc, Player player)
+	{
+		if (!Config.DISABLE_TUTORIAL)
+		{
+			final QuestState qs1 = getQuestState(player, true);
+			if (!qs1.isCompleted() && (player.getLevel() < 18))
+			{
+				final QuestState qs2 = player.getQuestState(Q00255_Tutorial.class.getSimpleName());
+				if (((qs2 != null) && (qs2.getInt("Ex") == 4)))
+				{
+					final boolean isMage = player.isMageClass();
+					final boolean isOrcMage = player.getClassId().getId() == 49;
+					qs1.playTutorialVoice(isMage && !isOrcMage ? "tutorial_voice_027" : "tutorial_voice_026");
+					giveItems(player, isMage && !isOrcMage ? SPIRITSHOT_NOVICE : SOULSHOT_NOVICE, isMage && !isOrcMage ? 100 : 200);
+					giveItems(player, TOKEN, 12);
+					if (getRandom(100) < SCROLL_REWARD_CHANCE) // Old C6 had this at 50%.
+					{
+						giveItems(player, SCROLL, 2);
+					}
+					qs1.setState(State.COMPLETED);
+				}
+			}
+		}
+		npc.showChatWindow(player);
+		return null;
+	}
+	
+	public static void main(String[] args)
+	{
+		new NewbieHelper();
+	}
+}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30598.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30598.htm
index 58ebb1080f..72baedb189 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30598.htm
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30598.htm
@@ -3,5 +3,4 @@
 <a action="bypass -h Quest NewbieTravelToken 30601">Dwarven Village - 1 Newbie Travel Token</a><br>
 <a action="bypass -h Quest NewbieTravelToken 30599">Elven Village - 1 Newbie Travel Token</a><br>
 <a action="bypass -h Quest NewbieTravelToken 30602">Orc Village - 1 Newbie Travel Token</a><br>
-<a action="bypass -h Quest NewbieTravelToken 32135">Kamael Village - 1 Newbie Travel Token</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30599.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30599.htm
index a88c1e9ab3..7e032d50d5 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30599.htm
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30599.htm
@@ -3,5 +3,4 @@
 <a action="bypass -h Quest NewbieTravelToken 30601">Dwarven Village - 1 Newbie Travel Token</a><br>
 <a action="bypass -h Quest NewbieTravelToken 30598">Talking Island - 1 Newbie Travel Token</a><br>
 <a action="bypass -h Quest NewbieTravelToken 30602">Orc Village - 1 Newbie Travel Token</a><br>
-<a action="bypass -h Quest NewbieTravelToken 32135">Kamael Village - 1 Newbie Travel Token</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30600.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30600.htm
index a7577f73e7..a5afa45351 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30600.htm
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30600.htm
@@ -3,5 +3,4 @@
 <a action="bypass -h Quest NewbieTravelToken 30598">Talking Island - 1 Newbie Travel Token</a><br>
 <a action="bypass -h Quest NewbieTravelToken 30599">Elven Village - 1 Newbie Travel Token</a><br>
 <a action="bypass -h Quest NewbieTravelToken 30602">Orc Village - 1 Newbie Travel Token</a><br>
-<a action="bypass -h Quest NewbieTravelToken 32135">Kamael Village - 1 Newbie Travel Token</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30601.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30601.htm
index a659d85aac..aae1c19d3f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30601.htm
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30601.htm
@@ -3,5 +3,4 @@
 <a action="bypass -h Quest NewbieTravelToken 30598">Talking Island - 1 Newbie Travel Token</a><br>
 <a action="bypass -h Quest NewbieTravelToken 30599">Elven Village - 1 Newbie Travel Token</a><br>
 <a action="bypass -h Quest NewbieTravelToken 30602">Orc Village - 1 Newbie Travel Token</a><br>
-<a action="bypass -h Quest NewbieTravelToken 32135">Kamael Village - 1 Newbie Travel Token</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30602.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30602.htm
index 8518890ff8..86837edfdd 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30602.htm
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NewbieTravelToken/30602.htm
@@ -3,5 +3,4 @@
 <a action="bypass -h Quest NewbieTravelToken 30601">Dwarven Village - 1 Newbie Travel Token</a><br>
 <a action="bypass -h Quest NewbieTravelToken 30598">Talking Island - 1 Newbie Travel Token</a><br>
 <a action="bypass -h Quest NewbieTravelToken 30599">Elven Village - 1 Newbie Travel Token</a><br>
-<a action="bypass -h Quest NewbieTravelToken 32135">Kamael Village - 1 Newbie Travel Token</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.java
index a87d477061..3df4e5bd81 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.java
@@ -240,7 +240,7 @@ public class CabaleBuffer extends AbstractNpcAI
 		 */
 		private boolean handleCast(Player player, int skillId)
 		{
-			if (player.isDead() || !player.isSpawned() || !_npc.isInsideRadius2D(player, DISTANCE_TO_WATCH_OBJECT))
+			if (player.isDead() || !player.isSpawned() || !_npc.isInsideRadius3D(player, DISTANCE_TO_WATCH_OBJECT))
 			{
 				return false;
 			}
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index aa42ef6a9d..24a2dfdd05 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -259,6 +260,8 @@ public class TvT extends Event
 				world.setInstance(InstanceManager.getInstance().createDynamicInstance(INSTANCE_ID));
 				InstanceManager.getInstance().addWorld(world);
 				PVP_WORLD = world;
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
index 28391d6a41..ecb82b0bcc 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
@@ -170,14 +170,14 @@ public class DropSearchBoard implements IParseBoardHandler
 				final int itemId = Integer.parseInt(params[1]);
 				int page = Integer.parseInt(params[2]);
 				final List<CBDropHolder> list = DROP_INDEX_CACHE.get(itemId);
-				int pages = list.size() / 14;
+				int pages = list.size() / 4;
 				if (pages == 0)
 				{
 					pages++;
 				}
 				
-				final int start = (page - 1) * 14;
-				final int end = Math.min(list.size() - 1, start + 14);
+				final int start = (page - 1) * 4;
+				final int end = Math.min(list.size() - 1, start + 4);
 				final StringBuilder builder = new StringBuilder();
 				for (int index = start; index <= end; index++)
 				{
@@ -347,7 +347,7 @@ public class DropSearchBoard implements IParseBoardHandler
 				limit++;
 			}
 			
-			if (limit == 14)
+			if (limit == 6)
 			{
 				break;
 			}
@@ -396,9 +396,9 @@ public class DropSearchBoard implements IParseBoardHandler
 			builder.append("</tr>");
 		}
 		
-		if (line < 7)
+		if (line < 6)
 		{
-			for (i = 0; i < (7 - line); i++)
+			for (i = 0; i < (6 - line); i++)
 			{
 				builder.append("<tr><td height=36></td></tr>");
 			}
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/communityboard/HomeBoard.java
index f6317f35d2..7264ecc085 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/communityboard/HomeBoard.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/communityboard/HomeBoard.java
@@ -33,7 +33,6 @@ import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.cache.HtmCache;
 import org.l2jmobius.gameserver.data.sql.ClanTable;
-import org.l2jmobius.gameserver.data.xml.BuyListData;
 import org.l2jmobius.gameserver.data.xml.ExperienceData;
 import org.l2jmobius.gameserver.data.xml.MultisellData;
 import org.l2jmobius.gameserver.data.xml.SkillData;
@@ -46,9 +45,8 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.network.serverpackets.BuyList;
-import org.l2jmobius.gameserver.network.serverpackets.ItemList;
 import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
+import org.l2jmobius.gameserver.network.serverpackets.SellList;
 import org.l2jmobius.gameserver.network.serverpackets.ShowBoard;
 
 /**
@@ -165,9 +163,7 @@ public class HomeBoard implements IParseBoardHandler
 		{
 			final String page = command.replace("_bbssell;", "");
 			returnHtml = HtmCache.getInstance().getHtm(player, "data/html/CommunityBoard/Custom/" + page + ".html");
-			// final BuyListHolder buyList = BuyListData.getInstance().getBuyList(423);
-			player.sendPacket(new BuyList(BuyListData.getInstance().getBuyList(423), player.getAdena(), 0));
-			player.sendPacket(new ItemList(player, true));
+			player.sendPacket(new SellList(player));
 		}
 		else if (command.startsWith("_bbsteleport"))
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/06.html b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/06.html
index 42f701f842..ca74c3da97 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/06.html
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/06.html
@@ -5,7 +5,6 @@ Which region's monster would you like you see?<br>
 <a action="bypass -h Quest Q00426_QuestForFishingShot 11.html">Near the Dark Elf Village.</a><br>
 <a action="bypass -h Quest Q00426_QuestForFishingShot 12.html">Near the Orc Village.</a><br>
 <a action="bypass -h Quest Q00426_QuestForFishingShot 13.html">Near the Dwarven Village.</a><br>
-<a action="bypass -h Quest Q00426_QuestForFishingShot 13a.html">Near Kamael Village.</a><br>
 <a action="bypass -h Quest Q00426_QuestForFishingShot 14.html">Gludio Territory.</a><br>
 <a action="bypass -h Quest Q00426_QuestForFishingShot 15.html">Dion Territory.</a><br>
 <a action="bypass -h Quest Q00426_QuestForFishingShot 16.html">Giran Territory.</a><br>
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/13a.html b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/13a.html
deleted file mode 100644
index 34e26dccb2..0000000000
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/13a.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Fishing Guild Member:<br>
-Near Kamael Village, if you hunt <font color="LEVEL">the Dominant Grey Keltir, the Dominant Black Wolf, Green Goblin, Mountain Fungus, Mountain Werewolf, Chief of the Mountain Werewolf, Colossus, Crimson Spider, Grotto Golem, Grotto Puma or Grotto Grizzly</font>, you can obtain a sweet liquid much favored by the Spirit of Water.<br>
-<a action="bypass -h Quest Q00426_QuestForFishingShot 06.html">Back.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
index ccfcb2282d..e5407abd3f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
@@ -17,10 +17,10 @@
 package quests.Q00604_DaimonTheWhiteEyedPart2;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.enums.QuestSound;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.Quest;
@@ -265,6 +265,6 @@ public class Q00604_DaimonTheWhiteEyedPart2 extends Quest
 	
 	private static boolean isDaimonSpawned()
 	{
-		return SpawnTable.getInstance().getAnySpawn(DAIMON_THE_WHITE_EYED) != null;
+		return World.getInstance().getVisibleObjects().stream().anyMatch(object -> object.getId() == DAIMON_THE_WHITE_EYED);
 	}
 }
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
index 96dbacaa97..f68f98dee6 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
@@ -17,9 +17,9 @@
 package quests.Q00625_TheFinestIngredientsPart2;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -121,7 +121,7 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 						{
 							rewardItems(player, GREATER_DYE_OF_DEX_2);
 						}
-						qs.exitQuest(false, true);
+						qs.exitQuest(true, true);
 						htmltext = event;
 					}
 					else
@@ -137,12 +137,11 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 				{
 					if (hasItem(player, FOOD_FOR_BUMBALUMP))
 					{
+						qs.setCond(2, true);
 						if (!isBumbalumpSpawned())
 						{
-							qs.setCond(2, true);
 							takeItem(player, FOOD_FOR_BUMBALUMP);
-							final Npc umpaloopa = addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
-							umpaloopa.setSummoner(player);
+							addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
 							htmltext = event;
 						}
 						else
@@ -155,6 +154,18 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 						htmltext = "31542-04.html";
 					}
 				}
+				else if (qs.isCond(2))
+				{
+					if (!isBumbalumpSpawned())
+					{
+						addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
+						htmltext = event;
+					}
+					else
+					{
+						htmltext = "31542-03.html";
+					}
+				}
 				break;
 			}
 			case "NPC_TALK":
@@ -182,7 +193,7 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 				{
 					if (talker.getLevel() >= MIN_LEVEL)
 					{
-						htmltext = (hasItem(talker, SOY_SOURCE_JAR)) ? "31521-01.htm" : "31521-02.htm";
+						htmltext = hasItem(talker, SOY_SOURCE_JAR) ? "31521-01.htm" : "31521-02.htm";
 					}
 					else
 					{
@@ -222,18 +233,14 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 				{
 					case 1:
 					{
-						if (hasItem(talker, FOOD_FOR_BUMBALUMP))
-						{
-							htmltext = "31542-01.html";
-						}
+						htmltext = "31542-01.html";
 						break;
 					}
 					case 2:
 					{
 						if (!isBumbalumpSpawned())
 						{
-							final Npc umpaloopa = addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
-							umpaloopa.setSummoner(talker);
+							addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
 							htmltext = "31542-02.html";
 						}
 						else
@@ -265,17 +272,23 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 	@Override
 	public String onKill(Npc npc, Player killer, boolean isSummon)
 	{
-		final QuestState qs = getRandomPartyMemberState(killer, 1, 2, npc);
-		if ((qs != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, killer, true) && (npc.getSummoner() == killer))
+		executeForEachPlayer(killer, npc, isSummon, true, false);
+		return super.onKill(npc, killer, isSummon);
+	}
+	
+	@Override
+	public void actionForEachPlayer(Player player, Npc npc, boolean isSummon)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if ((qs != null) && qs.isCond(2) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, true))
 		{
 			qs.setCond(3, true);
-			giveItems(qs.getPlayer(), SPECIAL_YETI_MEAT);
+			giveItems(player, SPECIAL_YETI_MEAT);
 		}
-		return super.onKill(npc, killer, isSummon);
 	}
 	
 	private static boolean isBumbalumpSpawned()
 	{
-		return SpawnTable.getInstance().getAnySpawn(ICICLE_EMPEROR_BUMBALUMP) != null;
+		return World.getInstance().getVisibleObjects().stream().anyMatch(object -> object.getId() == ICICLE_EMPEROR_BUMBALUMP);
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
index cb2825c12a..750958df2b 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
@@ -218,7 +218,7 @@ public class Q00638_SeekersOfTheHolyGrail extends Quest
 			final DropInfo info = MOBS_DROP_CHANCES.get(npc.getId());
 			if (giveItemRandomly(qs.getPlayer(), npc, info.getId(), 1, 0, info.getChance(), true) && (info.getKeyId() > 0) && (getRandom(100) < info.getKeyChance()))
 			{
-				npc.dropItem(qs.getPlayer(), info.getKeyId(), info.getKeyCount());
+				giveItems(qs.getPlayer(), info.getKeyId(), info.getKeyCount());
 			}
 		}
 		return super.onKill(npc, killer, isSummon);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-01.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-01.htm
new file mode 100644
index 0000000000..7ed476480e
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-01.htm
@@ -0,0 +1,4 @@
+<html><body>Priest Dominic:<br>
+Do you know of a place called the <font color="LEVEL">Monastery of Silence</font>? It may call itself a monastery, but it is more like a social club; few are admitted, and they are inclined to attack anyone they suspect of intruding upon <font color="LEVEL">that which they protect</font>, that which Saint Solina left behind.<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 31350-03.htm">"What did Saint Solina leave behind?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-01.html b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-01.html
deleted file mode 100644
index 71a938aab4..0000000000
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-01.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Priest Dominic:<br>
-Ahhh... that mission has been.. satisfied. It's time for a new mission.
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-02.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-02.htm
new file mode 100644
index 0000000000..687c6d435c
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-02.htm
@@ -0,0 +1,5 @@
+<html><body>Priest Dominic:<br>
+Have you heard tell of a place called the Monastery of Silence? Well, they are suspicious of strangers and quick to attack intruders. Why? Well, there's a reason...<br>
+But hold. I think it would be better to tell you this later on, when you have grown stronger and more skillful.<br>
+(This quest may only be undertaken by a character of level 73 and above.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-03.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-03.htm
new file mode 100644
index 0000000000..f50fd02b9c
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-03.htm
@@ -0,0 +1,4 @@
+<html><body>Priest Dominic:<br>
+Well, that's not really important for you to know, is it? I'm sorry, but that's a secret I'm sworn to keep. Suffice it to say that it is something my order needs enough to hire you to get it. Sadly, the monastery is just as intent on keeping it, and their resistance was stronger than we expected. We failed to get it, and so I am here asking you to succeed where we have failed. You will have to defeat them totally; nothing less will allow my order to retrieve what we need from them.<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 31350-04.htm">Tell him you will do it.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-04.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-04.htm
new file mode 100644
index 0000000000..0db4685aec
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-04.htm
@@ -0,0 +1,4 @@
+<html><body>Priest Dominic:<br>
+Very good! Then go to the <font color="LEVEL">Monastery of Silence</font> and defeat its monks. I will give you a reward if you bring me the <font color="LEVEL">Scripture of Monk</font> as proof that you eliminated them.<br>
+Oh, yes...one more thing. We have a man on the inside, an agent named <font color="LEVEL">Gremory</font> who infiltrated the Monastery of Silence. He has done brave work, and if you can help him to escape, that would be best. He can be of great assistance to you.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-05.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-05.htm
new file mode 100644
index 0000000000..fc89e6dd6e
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-05.htm
@@ -0,0 +1,5 @@
+<html><body>Priest Dominic:<br>
+Fine work. Haha! Thank you for eliminating those pesky monks. So, would you like to collect your just reward?<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 31350-07.htm">Don't collect the reward now.</a><br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 31350-08.htm">Get the reward in exchange for the Scripture of Monk you brought.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-06.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-06.htm
new file mode 100644
index 0000000000..d6dc4a96ed
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-06.htm
@@ -0,0 +1,6 @@
+<html><body>Priest Dominic:<br>
+Here's the quest: Go to the <font color="LEVEL">Monastery of Silence</font> and vanquish the monks. I will give you a reward if you bring me the <font color="LEVEL">Scripture of Monk</font> as proof that you have defeated them. I hope, of course, that they surrender to you, but if they do not, you may kill them in good conscience; we will pray for their souls.<br>
+Oh, here's something that may help you: we have a man on the inside. Our brave <font color="LEVEL">Gremory</font> has managed to infiltrate the monastery, a task many had thought impossible. Please help him to escape if possible; the poor man has done more than enough, and he may be of help to you.<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 31350-07.htm">Continue the job.</a><br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 31350-09.htm">Quit the job.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-07.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-07.htm
new file mode 100644
index 0000000000..b3ede3fb84
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-07.htm
@@ -0,0 +1,3 @@
+<html><body>Priest Dominic:<br>
+Fine, then. Keep up the good work... until we retake from those pestilent monks what is ours by right!
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-08.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-08.htm
new file mode 100644
index 0000000000..4f42201b6e
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-08.htm
@@ -0,0 +1,3 @@
+<html><body>Priest Dominic:<br>
+Here, then, is your payment. You have done excellent work.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-09.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-09.htm
new file mode 100644
index 0000000000..e0d96eef4e
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-09.htm
@@ -0,0 +1,4 @@
+<html><body>Priest Dominic:<br>
+Oh, very well. I can't make you do it. But do be careful, now; I wouldn't want to see you side with those pestilential monks. Who knows what might happen to you if you did? You might just...die, of remorse and shame. Heh.<br>
+If you change your mind, you know where to find me.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-01.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-01.htm
new file mode 100644
index 0000000000..af880da083
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-01.htm
@@ -0,0 +1,5 @@
+<html><body>Priest Gremory:<br>
+Curses! I've been unmasked! How did you find me, damn you? My disguise was perfect. Well, question me all you like; my lips are sealed.<br>
+What? Dominic sent you? Oh, thank the gods. For a moment I feared the worst!<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 32008-02.htm">"Why are you here?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-02.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-02.htm
new file mode 100644
index 0000000000..47b4053a27
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-02.htm
@@ -0,0 +1,6 @@
+<html><body>Priest Gremory:<br>
+I infiltrated this order to find the <font color="LEVEL">Grail of Splendor</font> they keep hidden here in the Monastery of Silence. Now that's a mission for a man! I wouldn't blame you for envying me.<br>
+Wait - if you were sent by Dominic, then you report to me now! Hahaha! Yes, I've been expecting this. I have served here so long, so very long... the pressures, you wouldn't understand them. You couldn't. And now he finally recognizes my service and my abilities!<br>
+Very well, servant. Your first task will be to massage my shoulders. I'm weary from hiding in this narrow space for so long...<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 32008-03.htm">"I'm not your underling. I'm here to help you fulfill your mission."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-03.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-03.htm
new file mode 100644
index 0000000000..9ac271762f
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-03.htm
@@ -0,0 +1,6 @@
+<html><body>Priest Gremory:<br>
+What? Damn it all! I have needed an underling for so long...<br>
+Well, never mind that now. Let's talk business. In my searches within the monastery, I have found a <font color="LEVEL">broken bridge</font>. Across the bridge, there is a chamber called the <font color="LEVEL">Room of Splendor</font>.<br>
+I don't know what that name means, but... they say the <font color="LEVEL">Holy Grail</font> lies within. That's the place to go.<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 32008-04.htm">"A broken bridge? How do I cross it?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-04.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-04.htm
new file mode 100644
index 0000000000..21a8304ae9
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-04.htm
@@ -0,0 +1,5 @@
+<html><body>Priest Gremory:<br>
+The broken bridge? It is simply an optical illusion. Just step out onto it and you'll find the bridge is intact and whole. I have a fear of heights, so I cannot manage the crossing myself. It has been my one and only failure as an agent.<br>
+Get me that Grail, and I will <font color="LEVEL">trade you some unique items</font> which form a part of the <font color="LEVEL">Scripture of Monk</font> that you are collecting. Do we have a deal?<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 32008-05.htm">"OK, what do I have to do?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-05.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-05.htm
new file mode 100644
index 0000000000..2735d5e64d
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-05.htm
@@ -0,0 +1,4 @@
+<html><body>Priest Gremory:<br>
+Then we understand each other. Go to the <font color="LEVEL">Room of Splendor</font> and <font color="LEVEL">pour water into the Holy Grail. Then pour that water back into a jar and bring it to me.</font> Thus can we verify the genuineness of the Holy Grail. Be careful, though; the Grail may be guarded.<br>
+One more thing: the Room of Splendor is locked. You will need a <font color="LEVEL">key to enter there.</font> Some monks have such keys to perform their duties, so I suggest that you overcome one of them and take his key.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-06.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-06.htm
new file mode 100644
index 0000000000..0151c3200a
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-06.htm
@@ -0,0 +1,4 @@
+<html><body>Priest Gremory:<br>
+Go to the <font color="LEVEL">Room of Splendor</font> and <font color="LEVEL">pour a measure of water into the Holy Grail. Then pour the water back into a jar and bring it to me.</font> We can test the water to determine if the Grail is the real thing or not. Be careful when you do this; the room may be guarded.<br>
+Oh, another thing. The Room of Splendor is locked, and you'll need a <font color="LEVEL">key to enter it.</font> Some of the monks carry a key to that room; I suggest that you overcome of one of them and take his key.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-08.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-08.htm
new file mode 100644
index 0000000000..e9cbc0efe5
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-08.htm
@@ -0,0 +1,6 @@
+<html><body>Priest Gremory:<br>
+Nice! You got away clean, did you? Well, let's test the water.<br>
+Alas! The water fails the test. <font color="LEVEL">They must keep the real Grail somewhere else!</font><br>
+Well, thank you, I suppose. It was worth knowing about the false lead. Now leave me; I must return to my task of finding the real Grail. Go quickly, before they discover us!<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 32008-09.htm">"That wasn't the deal. You promised us a part of the Scripture of Monk in exchange for what we found."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-09.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-09.htm
new file mode 100644
index 0000000000..98541c6660
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-09.htm
@@ -0,0 +1,4 @@
+<html><body>Priest Gremory:<br>
+Ah, that's true, that's true. Such forgetfulness is rare in a spy of my caliber, I assure you! Well, I am a man of my word, so here you go. I assume that takes care of our deal, yes?<br>
+What's more, I'll make another deal with you: If you bring me <font color="LEVEL">4000 or 400 Monk Scriptures, I will exchange them for an S-grade Enchant Weapon Scroll or an S-grade Enchant Armor Scroll, respectively</font>. Come back after you slay those bothersome monks.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-10.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-10.htm
new file mode 100644
index 0000000000..79bf83507f
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-10.htm
@@ -0,0 +1,6 @@
+<html><body>Priest Gremory:<br>
+The Grail, the Grail...o, where is the blasted thing? A spy of my stature should surely have found it by now! Does it even exist?<br>
+...Huh? Ah, it's you again! Did you bring me any Monk Scriptures?<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 32008-12.htm">Exchange 4000 Monk Scriptures for an S-grade Enchant Weapon Scroll.</a><br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 32008-14.htm">Exchange 400 Monk Scriptures for an S-grade Enchant Armor Scroll.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-11.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-11.htm
new file mode 100644
index 0000000000..17025419a2
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-11.htm
@@ -0,0 +1,4 @@
+<html><body>Priest Gremory:<br>
+Here you go: one S-grade Enchant Weapon Scroll. Do you like it? You'd better appreciate it; it's a gift from me, after all! Hahaha!<br>
+And here are my Scriptures. Once I show Dominic all of the Scriptures, he'll finally appreciate my abilities properly. Of course, he'll think I collected them myself... but in a sense I did, didn't I?
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-12.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-12.htm
new file mode 100644
index 0000000000..ad4132fe85
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-12.htm
@@ -0,0 +1,4 @@
+<html><body>Priest Gremory:<br>
+Huh? You need more of the Monk Scriptures to meet my terms! What is this, some sort of con game? You'll never fool me that easily.<br>
+Kill the monks, as many as you need to, and bring me more scriptures. Understood?
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-13.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-13.htm
new file mode 100644
index 0000000000..494dc40b70
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-13.htm
@@ -0,0 +1,4 @@
+<html><body>Priest Gremory:<br>
+Here is the S-grade Enchant Armor Scroll I promised you, then. Do you like it? You'd better appreciate it, fellow; it's a gift from Gremory the spy! Hahaha!<br>
+And here are my Scriptures. Once I show Dominic my collection of Scriptures, he'll properly appreciate my abilities. He'll think I collected them myself... but in a sense I did, didn't I?
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-14.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-14.htm
new file mode 100644
index 0000000000..37a1fc0d08
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-14.htm
@@ -0,0 +1,4 @@
+<html><body>Priest Gremory:<br>
+Oh, nonsense. You know very well that these aren't enough Scriptures. What is this, some sort of inept con game? You'll need more than that to trick me, my friend. You're dealing with Gremory, understand?<br>
+Go kill the monks and bring me more Scriptures. Understood?
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32028-01.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32028-01.htm
new file mode 100644
index 0000000000..4518bc6b4e
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32028-01.htm
@@ -0,0 +1,4 @@
+<html><body>The Grail of Splendor:<br>
+Gremory's instructions were to pour some water into the Grail, then pour that water into a bottle and bring it to him.<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 32028-02.htm">Pour the water.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32028-02.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32028-02.htm
new file mode 100644
index 0000000000..fe75441ea6
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32028-02.htm
@@ -0,0 +1,3 @@
+<html><body>The Grail of Splendor:<br>
+I pour the water into the Grail. I see no change... Now, I'll pour the water into this bottle and return to Gremory.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32028-03.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32028-03.htm
new file mode 100644
index 0000000000..604430f402
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32028-03.htm
@@ -0,0 +1,3 @@
+<html><body>The Grail of Splendor:<br>
+I have completed what Gremory asked of me, so now I will go to see him.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java
index 3c598bdd09..7701742de6 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java
@@ -16,33 +16,230 @@
  */
 package quests.Q00639_GuardiansOfTheHolyGrail;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.enums.QuestSound;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
 
-/**
- * Guardians of the Holy Grail (639)<br>
- * NOTE: This quest is no longer available since Freya(CT2.5)
- * @author corbin12
- */
 public class Q00639_GuardiansOfTheHolyGrail extends Quest
 {
-	// NPC
+	// NPCs
 	private static final int DOMINIC = 31350;
+	private static final int GREMORY = 32008;
+	private static final int HOLY_GRAIL = 32028;
+	// Items
+	private static final int SCRIPTURE = 8069;
+	private static final int WATER_BOTTLE = 8070;
+	private static final int HOLY_WATER_BOTTLE = 8071;
+	private static final Map<Integer, Integer> CHANCES = new HashMap<>();
+	static
+	{
+		CHANCES.put(22122, 760000);
+		CHANCES.put(22123, 750000);
+		CHANCES.put(22124, 590000);
+		CHANCES.put(22125, 580000);
+		CHANCES.put(22126, 590000);
+		CHANCES.put(22127, 580000);
+		CHANCES.put(22128, 170000);
+		CHANCES.put(22129, 590000);
+		CHANCES.put(22130, 850000);
+		CHANCES.put(22131, 920000);
+		CHANCES.put(22132, 580000);
+		CHANCES.put(22133, 930000);
+		CHANCES.put(22134, 230000);
+		CHANCES.put(22135, 580000);
+	}
 	
 	public Q00639_GuardiansOfTheHolyGrail()
 	{
 		super(639);
+		registerQuestItems(SCRIPTURE, WATER_BOTTLE, HOLY_WATER_BOTTLE);
 		addStartNpc(DOMINIC);
-		addTalkId(DOMINIC);
+		addTalkId(DOMINIC, GREMORY, HOLY_GRAIL);
+		addKillId(CHANCES.keySet());
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		String htmltext = null;
+		if (qs == null)
+		{
+			return htmltext;
+		}
+		
+		switch (event)
+		{
+			case "31350-03.htm":
+			case "31350-07.htm":
+			case "32008-02.htm":
+			case "32008-03.htm":
+			case "32008-04.htm":
+			{
+				htmltext = event;
+				break;
+			}
+			case "31350-04.htm":
+			{
+				qs.startQuest();
+				htmltext = event;
+				break;
+			}
+			case "31350-08.htm":
+			{
+				final int count = getQuestItemsCount(player, SCRIPTURE);
+				takeItems(player, SCRIPTURE, -1);
+				rewardItems(player, 57, (1625 * count) + ((count >= 10) ? 33940 : 0));
+				htmltext = event;
+				break;
+			}
+			case "31350-09.htm":
+			{
+				qs.exitQuest(true, true);
+				htmltext = event;
+				break;
+			}
+			case "32008-05.htm":
+			{
+				qs.setCond(2, true);
+				giveItems(player, WATER_BOTTLE, 1);
+				htmltext = event;
+				break;
+			}
+			case "32008-09.htm":
+			{
+				qs.setCond(4, true);
+				takeItems(player, HOLY_WATER_BOTTLE, 1);
+				htmltext = event;
+				break;
+			}
+			case "32008-12.htm":
+			{
+				if (getQuestItemsCount(player, SCRIPTURE) >= 4000)
+				{
+					takeItems(player, SCRIPTURE, 4000);
+					rewardItems(player, 959, 1);
+					htmltext = "32008-11.htm";
+				}
+				else
+				{
+					htmltext = event;
+				}
+				break;
+			}
+			case "32008-14.htm":
+			{
+				if (getQuestItemsCount(player, SCRIPTURE) >= 400)
+				{
+					takeItems(player, SCRIPTURE, 400);
+					rewardItems(player, 960, 1);
+					htmltext = "32008-13.htm";
+				}
+				else
+				{
+					htmltext = event;
+				}
+				break;
+			}
+			case "32028-02.htm":
+			{
+				qs.setCond(3, true);
+				takeItems(player, WATER_BOTTLE, 1);
+				giveItems(player, HOLY_WATER_BOTTLE, 1);
+				htmltext = event;
+				break;
+			}
+		}
+		
+		return htmltext;
 	}
 	
 	@Override
 	public String onTalk(Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, true);
-		qs.exitQuest(true);
-		return "31350-01.html";
+		String htmltext = getNoQuestMsg(player);
+		
+		switch (qs.getState())
+		{
+			case State.CREATED:
+			{
+				htmltext = player.getLevel() < 73 ? "31350-02.htm" : "31350-01.htm";
+				break;
+			}
+			case State.STARTED:
+			{
+				switch (npc.getId())
+				{
+					case DOMINIC:
+					{
+						htmltext = hasQuestItems(player, SCRIPTURE) ? "31350-05.htm" : "31350-06.htm";
+						break;
+					}
+					case GREMORY:
+					{
+						switch (qs.getCond())
+						{
+							case 1:
+							{
+								htmltext = "32008-01.htm";
+								break;
+							}
+							case 2:
+							{
+								htmltext = "32008-06.htm";
+								break;
+							}
+							case 3:
+							{
+								htmltext = "32008-08.htm";
+								break;
+							}
+							case 4:
+							{
+								htmltext = "32008-10.htm";
+								break;
+							}
+						}
+						break;
+					}
+					case HOLY_GRAIL:
+					{
+						if (qs.isCond(2))
+						{
+							htmltext = "32028-01.htm";
+						}
+						else if (qs.getCond() > 2)
+						{
+							htmltext = "32028-03.htm";
+						}
+						break;
+					}
+				}
+				break;
+			}
+		}
+		
+		return htmltext;
 	}
-}
\ No newline at end of file
+	
+	@Override
+	public String onKill(Npc npc, Player killer, boolean isSummon)
+	{
+		final QuestState qs = getRandomPartyMemberState(killer, 4, 3, npc);
+		if ((qs != null) && (Rnd.get(1000000) < CHANCES.get(npc.getId())))
+		{
+			playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			giveItems(qs.getPlayer(), SCRIPTURE, 1);
+		}
+		
+		return super.onKill(npc, killer, isSummon);
+	}
+}
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
index 2ba8380f79..7036dd86cb 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
@@ -17,6 +17,7 @@
 package quests.Q00655_AGrandPlanForTamingWildBeasts;
 
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 
 import org.l2jmobius.gameserver.cache.HtmCache;
 import org.l2jmobius.gameserver.enums.QuestSound;
@@ -181,7 +182,15 @@ public class Q00655_AGrandPlanForTamingWildBeasts extends Quest
 	private static String getSiegeDate()
 	{
 		final SiegableHall hall = CHSiegeManager.getInstance().getSiegableHall(ClanHallSiegeEngine.BEAST_FARM);
-		return hall != null ? new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(hall.getSiegeDate()) : "Error in date.";
+		if (hall != null)
+		{
+			final Calendar calendar = hall.getSiegeDate();
+			if (calendar != null)
+			{
+				return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(calendar.getTime());
+			}
+		}
+		return "Unknown date.";
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ClanMaster/9000-03.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ClanMaster/9000-03.htm
index 62cf1b1ba3..d84b710ab9 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ClanMaster/9000-03.htm
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ClanMaster/9000-03.htm
@@ -8,14 +8,9 @@ Level 5 - SP: 2,500,000 / Item: Seal of Aspiration<br>
 Level 6 - Clan Fame: 5,000 / Clan Member: More than 30<br>
 Level 7 - Clan Fame: 10,000 / Clan Member: More than 50<br>
 Level 8 - Clan Fame: 20,000 / Clan Member: More than 80<br>
-Level 9 - Clan Fame: 40,000 / Clan Member: More than 120 / Item: 150 Blood Oaths<br>
-Level 10 - Clan Fame: 40,000 / Clan Member: More than 140 / Item: 5 Blood Alliance<br>
-Level 11 - Clan Fame: 75,000 / Clan Member: More than 170 / Must be Territory Owner<br>
 You can obtain a Blood Mark by killing a Bloody Queen. They are located in Watcher's Tomb or around the Forbidden Gateway.<br>
 To obtain an Alliance Manifesto, meet sir Christopher Rodemai of Giran Castle Town.<br>
 To obtain a Seal of Aspiration, see Sir Gustav Athebaldt in the Town of Oren.<br>
-To obtain Blood Oath, acquire a fortress and prove that the territories are being protected.<br>
-To obtain the Determination of Blood, possess a castle and prove that the territories are being protected and citizens are being taken care of.<br>
 <a action="bypass -h Quest ClanMaster 9000-16.htm">How to obtain Clan Fame</a><br>
 <button value="Level Up" action="bypass -h npc_%objectId%_increase_clan_level" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
 <button value="Cancel" action="bypass -h Quest ClanMaster 9000-01.htm" width=75 height=21 back="L2UI_ch3.Btn1_normalOn" fore="L2UI_ch3.Btn1_normal">
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ClanMaster/9000-14.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ClanMaster/9000-14.htm
index bc43bc0846..bf12c92167 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ClanMaster/9000-14.htm
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ClanMaster/9000-14.htm
@@ -1,7 +1,6 @@
 <html><body>
 A clan that is clan level 7 or above may use 10,000 reputation points to create Knight units.<br>
 Up to 4 Knights units may be created in this way. At the time of creation, 10 clan members may be accepted per Knight unit.<br>
-Clans at level 9 may use a reputation score of 5,000 to increase the Order of Knights.<br>
 Each Knight unit created must appoint one direct clan member as a Knight Commander. The social rank of the appointed clan commander will be accordingly raised.<br><br>
 <a action="bypass -h Quest ClanMaster 9000-14a.htm">Create Knights.</a><br>
 Reinforce Knights. [not done]<br>
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ClanMaster/9000-16.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ClanMaster/9000-16.htm
index 89c2568645..584caebad6 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ClanMaster/9000-16.htm
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/village_master/ClanMaster/9000-16.htm
@@ -10,8 +10,6 @@
 8. Fame can also be increased through special clan quests.<br>
 9. If your clan defeats an enemy clan member during clan war (dual declared state) or a castle siege, <font color="00FFFF">1 points</font> per clan member is added from the enemy clan.<br>
 *If the other clan is below level 5 or its fame is less than 0, your clan cannot acquire its fame.<br>
-10. If a fortress is captured following a siege, <font color="00FFFF">200 points</font> are added.<br>
-11. If your clan demolished the ballistas inside a fortress, <font color="00FFFF">30 points</font> are added.<br>
 <font color="FF9900">[Losing Clan Fame]</font><br>
 1. If you fail to defend a castle or fortress in a siege, up to <font color="00FFFF">3000 points</font> can be lost.<br>
 2. If you lose a battle-type hideout to another clan, up to <font color="00FFFF">1000 points</font> can be lost.<br>
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/1stClass/Scavenger.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/1stClass/Scavenger.xml
index 11c9fe5292..adc1df5168 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/1stClass/Scavenger.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/1stClass/Scavenger.xml
@@ -5,7 +5,6 @@
 		<skill skillName="Bandage" skillId="34" skillLevel="1" getLevel="20" levelUpSp="3700" learnedByNpc="true" />
 		<skill skillName="Blunt Weapon Mastery" skillId="205" skillLevel="1" getLevel="20" levelUpSp="3700" learnedByNpc="true" />
 		<skill skillName="Boost HP" skillId="211" skillLevel="1" getLevel="20" levelUpSp="3700" learnedByNpc="true" />
-		<skill skillName="Crystallize" skillId="248" skillLevel="1" getLevel="20" levelUpSp="3700" learnedByNpc="true" />
 		<skill skillName="Heavy Armor Mastery" skillId="231" skillLevel="1" getLevel="20" levelUpSp="1900" learnedByNpc="true" />
 		<skill skillName="Heavy Armor Mastery" skillId="231" skillLevel="2" getLevel="20" levelUpSp="1900" learnedByNpc="true" />
 		<skill skillName="Light Armor Mastery" skillId="227" skillLevel="1" getLevel="20" levelUpSp="1900" learnedByNpc="true" />
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/2ndClass/AbyssWalker.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/2ndClass/AbyssWalker.xml
index 56d46e5e5d..ca33912f9d 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/2ndClass/AbyssWalker.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/2ndClass/AbyssWalker.xml
@@ -398,6 +398,5 @@
 		<skill skillName="Mortal Strike" skillId="410" skillLevel="3" getLevel="74" levelUpSp="1180000" learnedByNpc="true" />
 		<skill skillName="Sand Bomb" skillId="412" skillLevel="10" getLevel="74" levelUpSp="1180000" learnedByNpc="true" />
 		<skill skillName="Summon Treasure Key" skillId="419" skillLevel="4" getLevel="74" levelUpSp="1180000" learnedByNpc="true" />
-		<skill skillName="Critical Power" skillId="193" skillLevel="7" getLevel="74" levelUpSp="1180000" learnedByNpc="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/2ndClass/BountyHunter.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/2ndClass/BountyHunter.xml
index 41c609b384..68c197cb77 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/2ndClass/BountyHunter.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/2ndClass/BountyHunter.xml
@@ -5,7 +5,6 @@
 		<skill skillName="Blunt Weapon Mastery" skillId="205" skillLevel="9" getLevel="40" levelUpSp="12000" learnedByNpc="true" />
 		<skill skillName="Blunt Weapon Mastery" skillId="205" skillLevel="10" getLevel="40" levelUpSp="12000" learnedByNpc="true" />
 		<skill skillName="Blunt Weapon Mastery" skillId="205" skillLevel="11" getLevel="40" levelUpSp="12000" learnedByNpc="true" />
-		<skill skillName="Crystallize" skillId="248" skillLevel="2" getLevel="40" levelUpSp="35000" learnedByNpc="true" />
 		<skill skillName="Fake Death" skillId="60" skillLevel="1" getLevel="40" levelUpSp="35000" learnedByNpc="true" />
 		<skill skillName="Fast HP Recovery" skillId="212" skillLevel="3" getLevel="40" levelUpSp="35000" learnedByNpc="true" />
 		<skill skillName="Fatal Strike" skillId="190" skillLevel="1" getLevel="40" levelUpSp="11000" learnedByNpc="true" />
@@ -103,7 +102,6 @@
 		<skill skillName="Blunt Weapon Mastery" skillId="205" skillLevel="21" getLevel="52" levelUpSp="50000" learnedByNpc="true" />
 		<skill skillName="Blunt Weapon Mastery" skillId="205" skillLevel="22" getLevel="52" levelUpSp="50000" learnedByNpc="true" />
 		<skill skillName="Blunt Weapon Mastery" skillId="205" skillLevel="23" getLevel="52" levelUpSp="50000" learnedByNpc="true" />
-		<skill skillName="Crystallize" skillId="248" skillLevel="3" getLevel="52" levelUpSp="150000" learnedByNpc="true" />
 		<skill skillName="Fast HP Recovery" skillId="212" skillLevel="5" getLevel="52" levelUpSp="150000" learnedByNpc="true" />
 		<skill skillName="Fatal Strike" skillId="190" skillLevel="13" getLevel="52" levelUpSp="42000" learnedByNpc="true" />
 		<skill skillName="Fatal Strike" skillId="190" skillLevel="14" getLevel="52" levelUpSp="42000" learnedByNpc="true" />
@@ -175,7 +173,6 @@
 		<skill skillName="Whirlwind" skillId="36" skillLevel="21" getLevel="58" levelUpSp="67000" learnedByNpc="true" />
 		<skill skillName="Blunt Weapon Mastery" skillId="205" skillLevel="30" getLevel="60" levelUpSp="161000" learnedByNpc="true" />
 		<skill skillName="Blunt Weapon Mastery" skillId="205" skillLevel="31" getLevel="60" levelUpSp="161000" learnedByNpc="true" />
-		<skill skillName="Crystallize" skillId="248" skillLevel="4" getLevel="60" levelUpSp="322000" learnedByNpc="true" />
 		<skill skillName="Fatal Strike" skillId="190" skillLevel="22" getLevel="60" levelUpSp="161000" learnedByNpc="true" />
 		<skill skillName="Fatal Strike" skillId="190" skillLevel="23" getLevel="60" levelUpSp="161000" learnedByNpc="true" />
 		<skill skillName="Hammer Crush" skillId="260" skillLevel="22" getLevel="60" levelUpSp="161000" learnedByNpc="true" />
@@ -263,7 +260,6 @@
 		<skill skillName="Blunt Weapon Mastery" skillId="205" skillLevel="40" getLevel="70" levelUpSp="350000" learnedByNpc="true" />
 		<skill skillName="Blunt Weapon Mastery" skillId="205" skillLevel="41" getLevel="70" levelUpSp="350000" learnedByNpc="true" />
 		<skill skillName="Boost HP" skillId="211" skillLevel="9" getLevel="70" levelUpSp="780000" learnedByNpc="true" />
-		<skill skillName="Crystallize" skillId="248" skillLevel="5" getLevel="70" levelUpSp="780000" learnedByNpc="true" />
 		<skill skillName="Fatal Strike" skillId="190" skillLevel="32" getLevel="70" levelUpSp="390000" learnedByNpc="true" />
 		<skill skillName="Fatal Strike" skillId="190" skillLevel="33" getLevel="70" levelUpSp="390000" learnedByNpc="true" />
 		<skill skillName="Hammer Crush" skillId="260" skillLevel="32" getLevel="70" levelUpSp="350000" learnedByNpc="true" />
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/2ndClass/PlainsWalker.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/2ndClass/PlainsWalker.xml
index e31ac9d377..e6985c552f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/2ndClass/PlainsWalker.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/2ndClass/PlainsWalker.xml
@@ -184,7 +184,6 @@
 		<skill skillName="Mortal Strike" skillId="410" skillLevel="1" getLevel="58" levelUpSp="150000" learnedByNpc="true" />
 		<skill skillName="Sand Bomb" skillId="412" skillLevel="2" getLevel="58" levelUpSp="150000" learnedByNpc="true" />
 		<skill skillName="Summon Treasure Key" skillId="419" skillLevel="2" getLevel="58" levelUpSp="150000" learnedByNpc="true" />
-		<skill skillName="Critical Chance" skillId="137" skillLevel="4" getLevel="58" levelUpSp="150000" learnedByNpc="true" />
 		<skill skillName="Dagger Mastery" skillId="209" skillLevel="30" getLevel="60" levelUpSp="112000" learnedByNpc="true" />
 		<skill skillName="Dagger Mastery" skillId="209" skillLevel="31" getLevel="60" levelUpSp="112000" learnedByNpc="true" />
 		<skill skillName="Light Armor Mastery" skillId="233" skillLevel="32" getLevel="60" levelUpSp="112000" learnedByNpc="true" />
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/3rdClass/Duelist.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/3rdClass/Duelist.xml
index 70d401fa60..d1e587fcf6 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/3rdClass/Duelist.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/3rdClass/Duelist.xml
@@ -12,7 +12,6 @@
 		<skill skillName="Master of Combat" skillId="430" skillLevel="1" getLevel="78" levelUpSp="16000000" learnedByNpc="true" />
 		<skill skillName="Sonic Rage" skillId="345" skillLevel="1" getLevel="78" levelUpSp="16000000" learnedByNpc="true" />
 		<skill skillName="Sonic Barrier" skillId="442" skillLevel="1" getLevel="79" levelUpSp="80000000" learnedByNpc="true" />
-		<skill skillName="Sonic Focus" skillId="8" skillLevel="8" getLevel="79" levelUpSp="80000000" learnedByNpc="true" />
 		<skill skillName="Symbol of Energy" skillId="458" skillLevel="1" getLevel="80" levelUpSp="150000000" learnedByNpc="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/3rdClass/GrandKhavatari.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/3rdClass/GrandKhavatari.xml
index 669cf6ee27..cc0fb5ac90 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/3rdClass/GrandKhavatari.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/skillTrees/3rdClass/GrandKhavatari.xml
@@ -10,7 +10,6 @@
 		<skill skillName="Force Meditation" skillId="441" skillLevel="1" getLevel="78" levelUpSp="21340000" learnedByNpc="true" />
 		<skill skillName="Master of Combat" skillId="430" skillLevel="1" getLevel="78" levelUpSp="21340000" learnedByNpc="true" />
 		<skill skillName="Raging Force" skillId="346" skillLevel="1" getLevel="78" levelUpSp="21340000" learnedByNpc="true" />
-		<skill skillName="Focused Force" skillId="50" skillLevel="8" getLevel="79" levelUpSp="80000000" learnedByNpc="true" />
 		<skill skillName="Force Barrier" skillId="443" skillLevel="1" getLevel="79" levelUpSp="80000000" learnedByNpc="true" />
 		<skill skillName="Symbol of Energy" skillId="458" skillLevel="1" getLevel="80" levelUpSp="150000000" learnedByNpc="true" />
 	</skillTree>
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/spawns/InterludeSpawns.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/spawns/InterludeSpawns.xml
index 0518a9b986..c95c68899d 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/spawns/InterludeSpawns.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/spawns/InterludeSpawns.xml
@@ -16197,7 +16197,6 @@
 		<npc id="20553" x="74584" y="102400" z="-2776" heading="49153" respawnDelay="60" />
 		<npc id="20569" x="74593" y="9106" z="-3613" heading="39489" respawnDelay="25" />
 		<npc id="21510" x="74637" y="-51953" z="-3117" heading="868" respawnDelay="42" />
-		<npc id="21091" x="74638" y="111152" z="-2288" heading="23837" respawnDelay="60" />
 		<npc id="21511" x="74652" y="-53977" z="-3209" heading="0" respawnDelay="42" />
 		<npc id="21510" x="74677" y="-44792" z="-3163" heading="10994" respawnDelay="42" />
 		<npc id="20573" x="74696" y="-5515" z="-2956" heading="186" respawnDelay="41" />
@@ -16223,7 +16222,6 @@
 		<npc id="27097" x="75152" y="165688" z="-3684" heading="0" respawnDelay="180" />
 		<npc id="21509" x="75156" y="-46623" z="-3226" heading="6846" respawnDelay="42" />
 		<npc id="21510" x="75170" y="-45101" z="-3170" heading="61079" respawnDelay="42" />
-		<npc id="21091" x="75187" y="110067" z="-2464" heading="55934" respawnDelay="60" />
 		<npc id="20571" x="75224" y="9281" z="-3584" heading="27964" respawnDelay="25" />
 		<npc id="20574" x="75245" y="1836" z="-3669" heading="1077" respawnDelay="41" />
 		<npc id="20570" x="75247" y="18954" z="-3688" heading="3489" respawnDelay="25" />
@@ -16286,7 +16284,6 @@
 		<npc id="20569" x="75909" y="11696" z="-3516" heading="53170" respawnDelay="25" />
 		<npc id="21523" x="75914" y="-76469" z="-3618" heading="306" respawnDelay="48" />
 		<npc id="20554" x="75917" y="98748" z="-3400" heading="14018" respawnDelay="60" />
-		<npc id="21091" x="75919" y="110377" z="-2528" heading="16526" respawnDelay="60" />
 		<npc id="21509" x="75924" y="-40980" z="-3161" heading="31258" respawnDelay="42" />
 		<npc id="21516" x="75955" y="-60240" z="-2335" heading="51100" respawnDelay="42" />
 		<npc id="21541" x="75963" y="-85019" z="-3610" heading="0" respawnDelay="100" />
@@ -16329,9 +16326,6 @@
 		<npc id="21529" x="76433" y="-85910" z="-3610" heading="0" respawnDelay="48" />
 		<npc id="21523" x="76456" y="-88228" z="-3137" heading="59402" respawnDelay="48" />
 		<npc id="20269" x="76464" y="124228" z="-2792" heading="36125" respawnDelay="33" />
-		<npc id="21091" x="76468" y="109757" z="-2576" heading="18139" respawnDelay="60" />
-		<npc id="21092" x="76468" y="110377" z="-2480" heading="8085" respawnDelay="60" />
-		<npc id="21092" x="76468" y="110687" z="-2440" heading="23103" respawnDelay="60" />
 		<npc id="20574" x="76470" y="-3248" z="-3792" heading="0" respawnDelay="41" />
 		<npc id="21513" x="76471" y="-59044" z="-2391" heading="0" respawnDelay="42" />
 		<npc id="21510" x="76472" y="-40081" z="-3196" heading="59274" respawnDelay="42" />
@@ -16352,7 +16346,6 @@
 		<npc id="21529" x="76635" y="-85554" z="-3610" heading="0" respawnDelay="48" />
 		<npc id="20199" x="76636" y="132735" z="-3632" heading="38752" respawnDelay="35" />
 		<npc id="20268" x="76640" y="131570" z="-3632" heading="59895" respawnDelay="33" />
-		<npc id="21091" x="76651" y="110067" z="-2512" heading="11757" respawnDelay="60" />
 		<npc id="31508" x="76656" y="-76416" z="-3602" heading="30000" respawnDelay="60" />
 		<npc id="21508" x="76660" y="-54774" z="-3095" heading="6317" respawnDelay="42" />
 		<npc id="21511" x="76660" y="-43634" z="-3223" heading="46046" respawnDelay="42" />
@@ -16368,8 +16361,6 @@
 		<npc id="20798" x="76792" y="252367" z="-9327" heading="16972" respawnDelay="94" />
 		<npc id="20797" x="76798" y="251719" z="-9335" heading="21095" respawnDelay="94" />
 		<npc id="21511" x="76823" y="-43123" z="-3223" heading="59306" respawnDelay="42" />
-		<npc id="21092" x="76834" y="110997" z="-2304" heading="48346" respawnDelay="60" />
-		<npc id="21092" x="76834" y="111462" z="-2264" heading="26518" respawnDelay="60" />
 		<npc id="21516" x="76876" y="-62035" z="-2558" heading="0" respawnDelay="42" />
 		<npc id="20569" x="76876" y="16945" z="-3945" heading="57460" respawnDelay="25" />
 		<npc id="21533" x="76906" y="-92821" z="-3400" heading="16384" respawnDelay="48" />
@@ -16381,9 +16372,6 @@
 		<npc id="20554" x="76972" y="101694" z="-3352" heading="4099" respawnDelay="60" />
 		<npc id="20574" x="76981" y="441" z="-3723" heading="49724" respawnDelay="41" />
 		<npc id="21515" x="77013" y="-60763" z="-2335" heading="33561" respawnDelay="42" />
-		<npc id="21091" x="77017" y="110532" z="-2344" heading="42954" respawnDelay="60" />
-		<npc id="21092" x="77017" y="110687" z="-2320" heading="33974" respawnDelay="60" />
-		<npc id="21092" x="77017" y="110842" z="-2304" heading="57219" respawnDelay="60" />
 		<npc id="20573" x="77024" y="-3153" z="-3575" heading="56132" respawnDelay="41" />
 		<npc id="30452" x="77026" y="148813" z="-3598" heading="32768" respawnDelay="60" />
 		<npc id="30477" x="77029" y="148447" z="-3599" heading="32768" respawnDelay="60" />
@@ -16403,8 +16391,6 @@
 		<npc id="21517" x="77178" y="-61857" z="-2558" heading="0" respawnDelay="42" />
 		<npc id="21532" x="77179" y="-91240" z="-3248" heading="10683" respawnDelay="48" />
 		<npc id="31662" x="77184" y="-44064" z="-3264" heading="0" respawnDelay="60" />
-		<npc id="21092" x="77200" y="109757" z="-2504" heading="36865" respawnDelay="60" />
-		<npc id="21092" x="77200" y="111152" z="-2192" heading="41328" respawnDelay="60" />
 		<npc id="21514" x="77201" y="-61345" z="-2335" heading="22782" respawnDelay="42" />
 		<npc id="20571" x="77216" y="17663" z="-3852" heading="65242" respawnDelay="25" />
 		<npc id="21524" x="77228" y="-86076" z="-3608" heading="43993" respawnDelay="48" />
@@ -16438,7 +16424,6 @@
 		<npc id="21514" x="77548" y="-58514" z="-2542" heading="0" respawnDelay="42" />
 		<npc id="20794" x="77549" y="247539" z="-8823" heading="26152" respawnDelay="94" />
 		<npc id="20570" x="77550" y="20392" z="-3559" heading="14298" respawnDelay="25" />
-		<npc id="21091" x="77566" y="110532" z="-2240" heading="5248" respawnDelay="60" />
 		<npc id="21524" x="77576" y="-87812" z="-3668" heading="0" respawnDelay="48" />
 		<npc id="21529" x="77576" y="-87456" z="-3668" heading="0" respawnDelay="48" />
 		<npc id="20799" x="77577" y="248790" z="-9337" heading="0" respawnDelay="94" />
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/initialEquipmentEvent.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/initialEquipmentEvent.xml
index b7f7bbb286..29ac76e37f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/initialEquipmentEvent.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/initialEquipmentEvent.xml
@@ -10,7 +10,6 @@
 	</equipment>
 	<!-- Human Mystic -->
 	<equipment classId="10">
-		<item id="20637" count="1" /> <!-- D-Grade Mage Support Pack -->
 		<item id="6" count="1" equipped="true" /> <!-- Apprentice's Wand -->
 		<item id="425" count="1" equipped="true" /> <!-- Apprentice's Tunic -->
 		<item id="461" count="1" equipped="true" /> <!-- Apprentice's Stockings -->
@@ -26,7 +25,6 @@
 	</equipment>
 	<!-- Elven Mystic -->
 	<equipment classId="25">
-		<item id="20637" count="1" /> <!-- D-Grade Mage Support Pack -->
 		<item id="6" count="1" equipped="true" /> <!-- Apprentice's Wand -->
 		<item id="425" count="1" equipped="true" /> <!-- Apprentice's Tunic -->
 		<item id="461" count="1" equipped="true" /> <!-- Apprentice's Stockings -->
@@ -42,7 +40,6 @@
 	</equipment>
 	<!-- Dark Mystic -->
 	<equipment classId="38">
-		<item id="20637" count="1" /> <!-- D-Grade Mage Support Pack -->
 		<item id="6" count="1" equipped="true" /> <!-- Apprentice's Wand -->
 		<item id="425" count="1" equipped="true" /> <!-- Apprentice's Tunic -->
 		<item id="461" count="1" equipped="true" /> <!-- Apprentice's Stockings -->
@@ -59,7 +56,6 @@
 	<!-- Orc Mystic -->
 	<!-- NOTE: This is orc_mage (orc_shaman is retail typo) -->
 	<equipment classId="49">
-		<item id="20637" count="1" /> <!-- D-Grade Mage Support Pack -->
 		<item id="2368" count="1" equipped="true" /> <!-- Training Gloves -->
 		<item id="425" count="1" equipped="true" /> <!-- Apprentice's Tunic -->
 		<item id="461" count="1" equipped="true" /> <!-- Apprentice's Stockings -->
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/items/01000-01099.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/items/01000-01099.xml
index e1441c6330..e3c87accb0 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/items/01000-01099.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/items/01000-01099.xml
@@ -564,6 +564,7 @@
 		<set name="material" val="PAPER" />
 		<set name="weight" val="120" />
 		<set name="price" val="100" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="1048" type="EtcItem" name="Spellbook: Might">
 		<!-- Spellbook needed to learn Might. Used by Human Mystics, Elven Mystics and Dark Mystics. -->
@@ -653,6 +654,7 @@
 		<set name="material" val="PAPER" />
 		<set name="weight" val="120" />
 		<set name="price" val="500" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="1058" type="EtcItem" name="Spellbook: Shield">
 		<!-- Spellbook needed to learn Shield. Used by Human Mystics, Elven Mystics and Dark Mystics. -->
@@ -670,6 +672,7 @@
 		<set name="material" val="PAPER" />
 		<set name="weight" val="120" />
 		<set name="price" val="500" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="1060" type="EtcItem" name="Lesser Healing Potion">
 		<!-- A magical potion that slowly restores HP. Low endurance. -->
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/items/01300-01399.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/items/01300-01399.xml
index 1d473511b3..ed87eb5ce7 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/items/01300-01399.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/items/01300-01399.xml
@@ -1343,6 +1343,7 @@
 		<set name="material" val="PAPER" />
 		<set name="weight" val="120" />
 		<set name="price" val="1250" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="1396" type="EtcItem" name="Spellbook: Surrender to Wind">
 		<!-- Spellbook needed to learn Surrender to Water -->
@@ -1351,6 +1352,7 @@
 		<set name="material" val="PAPER" />
 		<set name="weight" val="120" />
 		<set name="price" val="1250" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="1397" type="EtcItem" name="Spellbook: Peace">
 		<!-- Spellbook needed to learn Peace. Used by Clerics. -->
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/npcs/22100-22199.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/npcs/22100-22199.xml
index fb6ab52140..c7134730f8 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/npcs/22100-22199.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/npcs/22100-22199.xml
@@ -6070,7 +6070,7 @@
 			<height normal="22.3" />
 		</collision>
 	</npc>
-	<npc id="22188" level="78" type="Monster" name="Andreas' Captain of the Royal Guard">
+	<npc id="22188" level="87" type="Monster" name="Andreas' Captain of the Royal Guard">
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
 			<param name="MoveAroundSocial1" value="80" />
@@ -6134,7 +6134,7 @@
 			<height normal="23.2" />
 		</collision>
 	</npc>
-	<npc id="22189" level="78" type="Monster" name="Andreas' Royal Guards">
+	<npc id="22189" level="86" type="Monster" name="Andreas' Royal Guards">
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
 			<param name="MoveAroundSocial1" value="80" />
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/npcs/25300-25399.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/npcs/25300-25399.xml
index e39e15b2a9..f959c3c57e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/npcs/25300-25399.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/npcs/25300-25399.xml
@@ -68,7 +68,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="25302" level="80" type="RaidBoss" name="Ketra's Commander Tayr" title="Raid Boss">
+	<npc id="25302" level="84" type="RaidBoss" name="Ketra's Commander Tayr" title="Raid Boss">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25303" count="3" respawnTime="360" weightPoint="1" /> <!-- Tayr's Aide -->
@@ -132,7 +132,7 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="25303" level="80" type="Monster" name="Tayr's Aide" title="Raid Fighter">
+	<npc id="25303" level="83" type="Monster" name="Tayr's Aide" title="Raid Fighter">
 		<parameters>
 			<skill name="DDMagic_a" id="4195" level="9" /> <!-- BOSS Twister -->
 			<skill name="Debuff_a" id="4200" level="9" /> <!-- Decrease Atk. Spd. -->
@@ -172,7 +172,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="25304" level="80" type="Monster" name="Tayr's Guard" title="Raid Fighter">
+	<npc id="25304" level="83" type="Monster" name="Tayr's Guard" title="Raid Fighter">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4741" level="9" /> <!-- BOSS Strike -->
 		</parameters>
@@ -210,7 +210,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="25305" level="80" type="RaidBoss" name="Ketra's Chief Brakki" title="Raid Boss">
+	<npc id="25305" level="87" type="RaidBoss" name="Ketra's Chief Brakki" title="Raid Boss">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm01_A" />
 			<param name="doSummonNPC" value="1" />
@@ -281,7 +281,7 @@
 			<height normal="33.5" />
 		</collision>
 	</npc>
-	<npc id="25306" level="80" type="RaidBoss" name="Soul of Fire Nastron" title="Raid Boss">
+	<npc id="25306" level="87" type="RaidBoss" name="Soul of Fire Nastron" title="Raid Boss">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25307" count="1" respawnTime="360" weightPoint="1" /> <!-- Family of Nastron -->
@@ -360,7 +360,7 @@
 			<height normal="42" />
 		</collision>
 	</npc>
-	<npc id="25307" level="80" type="Monster" name="Family of Nastron" title="Raid Fighter">
+	<npc id="25307" level="86" type="Monster" name="Family of Nastron" title="Raid Fighter">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4741" level="10" /> <!-- BOSS Strike -->
 		</parameters>
@@ -397,7 +397,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="25308" level="80" type="Monster" name="Family of Nastron" title="Raid Fighter">
+	<npc id="25308" level="86" type="Monster" name="Family of Nastron" title="Raid Fighter">
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -569,7 +569,7 @@
 			<height normal="38" />
 		</collision>
 	</npc>
-	<npc id="25312" level="80" type="RaidBoss" name="Varka's Commander Mos" title="Raid Boss">
+	<npc id="25312" level="84" type="RaidBoss" name="Varka's Commander Mos" title="Raid Boss">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25313" count="2" respawnTime="360" weightPoint="1" /> <!-- Mos' Aide -->
@@ -640,7 +640,7 @@
 			<height normal="51" />
 		</collision>
 	</npc>
-	<npc id="25313" level="80" type="Monster" name="Mos' Aide" title="Raid Fighter">
+	<npc id="25313" level="83" type="Monster" name="Mos' Aide" title="Raid Fighter">
 		<parameters>
 			<skill name="HealMagic_a" id="4786" level="9" /> <!-- BOSS Chant of Life -->
 			<skill name="SelfRangeBuff_a" id="4212" level="9" /> <!-- BOSS Shield -->
@@ -680,7 +680,7 @@
 			<height normal="41.5" />
 		</collision>
 	</npc>
-	<npc id="25314" level="80" type="Monster" name="Mos' Guard" title="Raid Fighter">
+	<npc id="25314" level="83" type="Monster" name="Mos' Guard" title="Raid Fighter">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="142" /> <!-- rhand: Keshanberk -->
@@ -714,7 +714,7 @@
 			<height normal="38" />
 		</collision>
 	</npc>
-	<npc id="25315" level="80" type="RaidBoss" name="Varka's Chief Horus" title="Raid Boss">
+	<npc id="25315" level="87" type="RaidBoss" name="Varka's Chief Horus" title="Raid Boss">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm01_A" />
 			<param name="doSummonNPC" value="1" />
@@ -794,7 +794,7 @@
 			<height normal="51" />
 		</collision>
 	</npc>
-	<npc id="25316" level="80" type="RaidBoss" name="Soul of Water Ashutar" title="Raid Boss">
+	<npc id="25316" level="87" type="RaidBoss" name="Soul of Water Ashutar" title="Raid Boss">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25317" count="1" respawnTime="360" weightPoint="1" /> <!-- Family of Ashutar -->
@@ -861,7 +861,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25317" level="80" type="Monster" name="Family of Ashutar" title="Raid Fighter">
+	<npc id="25317" level="86" type="Monster" name="Family of Ashutar" title="Raid Fighter">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4726" level="10" /> <!-- Stun -->
 		</parameters>
@@ -898,7 +898,7 @@
 			<height normal="20" grown="24" />
 		</collision>
 	</npc>
-	<npc id="25318" level="80" type="Monster" name="Family of Ashutar" title="Raid Fighter">
+	<npc id="25318" level="86" type="Monster" name="Family of Ashutar" title="Raid Fighter">
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -931,7 +931,7 @@
 			<height normal="20" grown="24" />
 		</collision>
 	</npc>
-	<npc id="25319" level="80" type="RaidBoss" name="Ember" title="Raid Boss">
+	<npc id="25319" level="85" type="RaidBoss" name="Ember" title="Raid Boss">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25320" count="3" respawnTime="360" weightPoint="1" /> <!-- Sentinel of Ember -->
@@ -1014,7 +1014,7 @@
 			<height normal="73" />
 		</collision>
 	</npc>
-	<npc id="25320" level="80" type="Monster" name="Sentinel of Ember" title="Raid Fighter">
+	<npc id="25320" level="84" type="Monster" name="Sentinel of Ember" title="Raid Fighter">
 		<parameters>
 			<skill name="DDMagic_a" id="4191" level="9" /> <!-- BOSS Windstrike -->
 			<skill name="Debuff_a" id="4199" level="9" /> <!-- Decrease P. Atk. -->
@@ -1056,7 +1056,7 @@
 			<height normal="45" />
 		</collision>
 	</npc>
-	<npc id="25321" level="80" type="Monster" name="Messenger of Ember" title="Raid Fighter">
+	<npc id="25321" level="84" type="Monster" name="Messenger of Ember" title="Raid Fighter">
 		<parameters>
 			<skill name="HealMagic_a" id="4209" level="9" /> <!-- BOSS Heal -->
 			<skill name="SelfRangeBuff_a" id="4213" level="9" /> <!-- BOSS Haste -->
@@ -2045,7 +2045,7 @@
 			<height normal="90" grown="109" />
 		</collision>
 	</npc>
-	<npc id="25339" level="80" type="SepulcherMonster" name="Shadow of Halisha" title="Ruler of Sepulcher">
+	<npc id="25339" level="81" type="SepulcherMonster" name="Shadow of Halisha" title="Ruler of Sepulcher">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25340" count="2" respawnTime="360" weightPoint="1" /> <!-- Knight of Shadow -->
@@ -2188,7 +2188,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="25342" level="80" type="SepulcherMonster" name="Shadow of Halisha" title="Ruler of Sepulcher">
+	<npc id="25342" level="81" type="SepulcherMonster" name="Shadow of Halisha" title="Ruler of Sepulcher">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25343" count="1" respawnTime="360" weightPoint="1" /> <!-- Knight of Shadow -->
@@ -2364,7 +2364,7 @@
 			<height normal="34" />
 		</collision>
 	</npc>
-	<npc id="25346" level="80" type="SepulcherMonster" name="Shadow of Halisha" title="Ruler of Sepulcher">
+	<npc id="25346" level="81" type="SepulcherMonster" name="Shadow of Halisha" title="Ruler of Sepulcher">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25347" count="3" respawnTime="360" weightPoint="1" /> <!-- Knight of Shadow -->
@@ -2508,7 +2508,7 @@
 			<height normal="40" grown="48" />
 		</collision>
 	</npc>
-	<npc id="25349" level="80" type="SepulcherMonster" name="Shadow of Halisha" title="Ruler of Sepulcher">
+	<npc id="25349" level="81" type="SepulcherMonster" name="Shadow of Halisha" title="Ruler of Sepulcher">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25350" count="3" respawnTime="360" weightPoint="1" /> <!-- Knight of Shadow -->
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/npcs/25500-25599.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/npcs/25500-25599.xml
index b00eab947b..44d675d2e1 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/npcs/25500-25599.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/npcs/25500-25599.xml
@@ -1156,7 +1156,7 @@
 			<height normal="20" grown="24" />
 		</collision>
 	</npc>
-	<npc id="25527" level="80" type="RaidBoss" name="Uruka" title="Raid Boss">
+	<npc id="25527" level="86" type="RaidBoss" name="Uruka" title="Raid Boss">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm03_A" />
 			<skill name="SelfRangeCancel_a" id="4177" level="10" /> <!-- BOSS Cancel Magic -->
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/npcs/29000-29099.xml
index b7b9025b3e..dc37c131e0 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/npcs/29000-29099.xml
@@ -2346,7 +2346,7 @@
 			<height normal="42" />
 		</collision>
 	</npc>
-	<npc id="29040" level="84" type="RaidBoss" name="Wings of Flame, Ixion" title="Gatekeeper of Valakas">
+	<npc id="29040" level="85" type="RaidBoss" name="Wings of Flame, Ixion" title="Gatekeeper of Valakas">
 		<parameters>
 			<minions name="Privates">
 				<npc id="29041" count="1" respawnTime="30" weightPoint="1" /> <!-- Inferno Golem -->
@@ -3058,7 +3058,7 @@
 			<height normal="58" />
 		</collision>
 	</npc>
-	<npc id="29054" level="78" type="RaidBoss" name="Benom" title="Triol's Leader">
+	<npc id="29054" level="75" type="RaidBoss" name="Benom" title="Triol's Leader">
 		<parameters>
 			<skill name="PhysicalSpecial" id="4993" level="1" /> <!-- Venom - Strike -->
 			<skill name="DDMagic" id="4994" level="1" /> <!-- Venom - Sonic Storm -->
@@ -3466,7 +3466,7 @@
 			<height normal="80" />
 		</collision>
 	</npc>
-	<npc id="29062" level="80" type="RaidBoss" name="Andreas Van Halter" title="Seer of Pagan">
+	<npc id="29062" level="87" type="RaidBoss" name="Andreas Van Halter" title="Seer of Pagan">
 		<parameters>
 			<minions name="Privates">
 				<npc id="29063" count="3" respawnTime="360" weightPoint="1" />
@@ -3539,7 +3539,7 @@
 			<height normal="21.3" />
 		</collision>
 	</npc>
-	<npc id="29063" level="80" type="Monster" name="Andreas' Acolyte" title="Raid Fighter">
+	<npc id="29063" level="86" type="Monster" name="Andreas' Acolyte" title="Raid Fighter">
 		<parameters>
 			<skill name="DDMagic_a" id="4193" level="10" /> <!-- BOSS Life Drain -->
 			<skill name="Debuff_a" id="4206" level="10" /> <!-- Decrease MP -->
@@ -3590,7 +3590,7 @@
 			<height normal="28.4" />
 		</collision>
 	</npc>
-	<npc id="29064" level="80" type="Monster" name="Andreas' Acolyte" title="Raid Fighter">
+	<npc id="29064" level="86" type="Monster" name="Andreas' Acolyte" title="Raid Fighter">
 		<parameters>
 			<skill name="HealMagic_a" id="4210" level="10" /> <!-- BOSS Chant of Life -->
 			<skill name="SelfRangeBuff_a" id="4214" level="10" /> <!-- BOSS Reflect Damage -->
@@ -3641,7 +3641,7 @@
 			<height normal="28.4" />
 		</collision>
 	</npc>
-	<npc id="29065" level="80" type="RaidBoss" name="Sailren" title="Sealed Evil Power">
+	<npc id="29065" level="87" type="RaidBoss" name="Sailren" title="Sealed Evil Power">
 		<parameters>
 			<param name="RootingManage" value="0" />
 			<skill name="SelfRangeCancel_a" id="5118" level="1" /> <!-- Cancel Sailren Use -->
@@ -5551,7 +5551,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29095" level="80" type="RaidBoss" name="Gordon" title="Knight of Destruction">
+	<npc id="29095" level="87" type="RaidBoss" name="Gordon" title="Knight of Destruction">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm01_A" />
 			<skill name="SelfRangeCancel_a" id="4177" level="10" /> <!-- BOSS Cancel Magic -->
@@ -5616,7 +5616,7 @@
 			<height normal="46.6" />
 		</collision>
 	</npc>
-	<npc id="29096" level="80" type="RaidBoss" name="Anais" title="Lord of Splendor">
+	<npc id="29096" level="87" type="RaidBoss" name="Anais" title="Lord of Splendor">
 		<parameters>
 			<minions name="Privates">
 				<npc id="29098" count="3" respawnTime="360" weightPoint="1" /> <!-- Splendor Worshiper -->
@@ -5687,7 +5687,7 @@
 			<height normal="41.8" />
 		</collision>
 	</npc>
-	<npc id="29097" level="80" type="Monster" name="Splendor Disciple" title="Raid Fighter">
+	<npc id="29097" level="86" type="Monster" name="Splendor Disciple" title="Raid Fighter">
 		<race>DIVINE</race>
 		<sex>MALE</sex>
 		<equipment rhand="8221" /> <!-- rhand: Monster Only (Grail Apostle Spear) -->
@@ -5732,7 +5732,7 @@
 			<height normal="47" />
 		</collision>
 	</npc>
-	<npc id="29098" level="80" type="Monster" name="Splendor Worshiper" title="Raid Fighter">
+	<npc id="29098" level="86" type="Monster" name="Splendor Worshiper" title="Raid Fighter">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4208" level="10" /> <!-- Stun -->
 		</parameters>
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/00000-00099.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/00000-00099.xml
index 7f9e6b9e83..45300c3742 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/00000-00099.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/00000-00099.xml
@@ -257,10 +257,10 @@
 			</effect>
 		</enchant1for>
 	</skill>
-	<skill id="8" levels="8" name="Sonic Focus">
+	<skill id="8" levels="7" name="Sonic Focus">
 		<!-- Channels force energy for use with other Sonic skills. An equipped sword, blunt weapon or Dual-Sword Weapon is required to use this skill. Force energy will disperse after 10 minutes of non-use. Can be charged up to level 1. -->
-		<table name="#magicLevel">40 43 49 55 60 66 70 79</table>
-		<table name="#maxCharges">1 2 3 4 5 6 7 8</table>
+		<table name="#magicLevel">40 43 49 55 60 66 70</table>
+		<table name="#maxCharges">1 2 3 4 5 6 7</table>
 		<set name="effectPoint" val="200" />
 		<set name="hitTime" val="900" />
 		<set name="hpConsume" val="25" />
@@ -1204,10 +1204,10 @@
 			<effect name="MagicalAttack" />
 		</for>
 	</skill>
-	<skill id="50" levels="8" name="Focused Force">
+	<skill id="50" levels="7" name="Focused Force">
 		<!-- Channels force energy when using a hand-to-hand combat weapon. Force energy will disperse after 10 minutes of non-use. Can be charged up to level 1. -->
-		<table name="#magicLevel">24 32 40 52 60 66 72 79</table>
-		<table name="#maxCharges">1 2 3 4 5 6 7 8</table>
+		<table name="#magicLevel">24 32 40 52 60 66 72</table>
+		<table name="#maxCharges">1 2 3 4 5 6 7</table>
 		<set name="effectPoint" val="150" />
 		<set name="hitTime" val="900" />
 		<set name="hpConsume" val="20" />
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/00100-00199.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/00100-00199.xml
index eff37768d7..b0c50808de 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/00100-00199.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/00100-00199.xml
@@ -851,10 +851,10 @@
 			</effect>
 		</for>
 	</skill>
-	<skill id="137" levels="4" name="Critical Chance">
+	<skill id="137" levels="3" name="Critical Chance">
 		<!-- Critical rate increases. -->
-		<table name="#magicLevel">28 40 49 58</table>
-		<table name="#rate">1.2 1.3 1.4 1.5</table>
+		<table name="#magicLevel">28 40 49</table>
+		<table name="#rate">1.2 1.3 1.4</table>
 		<set name="icon" val="icon.skill0137" />
 		<set name="magicLevel" val="#magicLevel" />
 		<set name="operateType" val="P" />
@@ -1273,10 +1273,10 @@
 			</effect>
 		</for>
 	</skill>
-	<skill id="193" levels="7" name="Critical Power">
+	<skill id="193" levels="6" name="Critical Power">
 		<!-- Increases the power of a critical attack. -->
-		<table name="#crit">32 56 93 177 295 384 406</table>
-		<table name="#magicLevel">24 32 40 52 64 72 74</table>
+		<table name="#crit">32 56 93 177 295 384</table>
+		<table name="#magicLevel">24 32 40 52 64 72</table>
 		<set name="icon" val="icon.skill0193" />
 		<set name="magicLevel" val="#magicLevel" />
 		<set name="operateType" val="P" />
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/00200-00299.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/00200-00299.xml
index 4b2fbd6716..53efe35f77 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/00200-00299.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/00200-00299.xml
@@ -1580,7 +1580,9 @@
 		<table name="#ench2MpConsume">80 79 78 77 76 75 74 72 71 70 69 68 67 65 64 63 62 61 60 59 57 56 55 54 53 52 50 49 48 47</table>
 		<table name="#ench2MpInitialConsume">20 19 19 19 19 18 18 18 17 17 17 17 16 16 16 15 15 15 15 14 14 14 13 13 13 13 12 12 12 11</table>
 		<table name="#enchMagicLvl">76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85</table>
-		<set name="abnormalTime" val="15" />
+		<set name="abnormalTime" val="30" />
+		<set name="abnormalType" val="PARALYZE" />
+		<set name="abnormalVisualEffect" val="PARALYZE" />
 		<set name="activateRate" val="40" />
 		<set name="basicProperty" val="MEN" />
 		<set name="castRange" val="400" />
@@ -1611,12 +1613,8 @@
 				<mul stat="runSpd" val="0.5" />
 				<mul stat="mAtkSpd" val="0.5" />
 			</effect>
+			<effect name="Paralyze" />
 		</for>
-		<endEffects>
-			<effect name="CallSkill">
-				<param skillId="6090" skillLevel="1" />
-			</effect>
-		</endEffects>
 	</skill>
 	<skill id="280" levels="37" name="Burning Fist" enchantGroup1="2" enchantGroup2="2">
 		<!-- Propels a powerful fiery iron fist. An equipped hand-to-hand combat weapon is required to use this skill. Ignores Shield Defense. Over-hit is possible. Power 431. -->
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/01100-01199.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/01100-01199.xml
index 08e7fb062f..9244972d23 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/01100-01199.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/01100-01199.xml
@@ -1163,7 +1163,9 @@
 		<table name="#ench2mpConsume">54 53 52 51 50 49 48 47 46 45 44 43 42 42 41 40 39 38 37 36 35 34 33 32 31 30 29 29 28 27</table> <!-- Epilogue Modification -->
 		<table name="#ench2mpInitialConsume">13 13 13 12 12 12 12 11 11 11 11 10 10 10 10 10 9 9 9 9 8 8 8 8 7 7 7 7 7 6</table> <!-- Epilogue Modification -->
 		<table name="#enchMagicLvl">76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 82 83 83 83 84 84 85 85 85</table> <!-- Epilogue Modification -->
-		<set name="abnormalTime" val="15" /> <!-- Epilogue Modification -->
+		<set name="abnormalTime" val="30" />
+		<set name="abnormalType" val="PARALYZE" />
+		<set name="abnormalVisualEffect" val="FLESH_STONE" />
 		<set name="activateRate" val="40" />
 		<set name="basicProperty" val="MEN" />
 		<set name="castRange" val="400" />
@@ -1193,12 +1195,8 @@
 				<mul stat="runSpd" val="0.5" />
 				<mul stat="mAtkSpd" val="0.5" />
 			</effect>
+			<effect name="Paralyze" />
 		</for>
-		<endEffects>
-			<effect name="CallSkill">
-				<param skillId="6091" skillLevel="1" />
-			</effect>
-		</endEffects>
 	</skill>
 	<skill id="1171" levels="19" name="Blazing Circle" enchantGroup1="2" enchantGroup2="2">
 		<!-- Sends out a ring of flames around oneself. Power 29. -->
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/01300-01399.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/01300-01399.xml
index f1fbc80f28..5cb2ba19a7 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/01300-01399.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/01300-01399.xml
@@ -1494,19 +1494,13 @@
 		<set name="targetType" val="PARTY_MEMBER" />
 		<for>
 			<effect name="Buff">
-				<add stat="mCritRate" val="2" />
-				<mul stat="regMp" val="1.2" />
-				<mul stat="pAtk" val="1.1" />
-				<mul stat="pDef" val="1.2" />
-				<mul stat="pAtkSpd" val="1.2" />
 				<mul stat="mAtk" val="1.2" />
 				<mul stat="mDef" val="1.2" />
 				<mul stat="mAtkSpd" val="1.2" />
-				<sub stat="debuffVuln" val="10" />
+				<mul stat="mCritRate" val="2.0" />
+				<mul stat="regMp" val="1.2" />
 				<mul stat="runSpd" val="0.8" />
-				<mul stat="magicalMpConsumeRate" val="0.95" />
-				<mul stat="physicalMpConsumeRate" val="0.95" />
-				<mul stat="danceMpConsumeRate" val="0.95" />
+				<mul stat="debuffVuln" val="0.9" />
 			</effect>
 		</for>
 	</skill>
@@ -1531,19 +1525,14 @@
 		<set name="targetType" val="PARTY_MEMBER" />
 		<for>
 			<effect name="Buff">
-				<mul stat="maxMp" val="1.2" />
-				<mul stat="regHp" val="1.2" />
-				<add stat="mCritRate" val="2" />
-				<mul stat="critDmg" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
 				<mul stat="pDef" val="1.2" />
-				<mul stat="pAtkSpd" val="1.2" />
-				<mul stat="mAtk" val="1.2" />
-				<mul stat="mDef" val="1.2" />
-				<mul stat="mAtkSpd" val="1.2" />
 				<add stat="accCombat" val="4" />
-				<sub stat="debuffVuln" val="10" />
-				<mul stat="runSpd" val="0.8" />
+				<mul stat="pAtkSpd" val="1.2" />
+				<mul stat="runSpd" val="0.9" />
+				<mul stat="maxHp" val="1.2" />
+				<mul stat="regHp" val="1.2" />
+				<mul stat="debuffVuln" val="0.9" />
 			</effect>
 		</for>
 	</skill>
@@ -1568,18 +1557,17 @@
 		<set name="targetType" val="PARTY_MEMBER" />
 		<for>
 			<effect name="Buff">
-				<mul stat="maxHp" val="1.2" />
-				<mul stat="critRate" val="1.2" />
-				<mul stat="mCritPower" val="1.2" />
-				<mul stat="pAtk" val="1.1" />
-				<mul stat="pDef" val="1.2" />
+				<add stat="accCombat" val="4" />
+				<add stat="rEvas" val="4" />
 				<mul stat="pAtkSpd" val="1.2" />
-				<mul stat="mAtk" val="1.2" />
-				<mul stat="mDef" val="1.2" />
-				<mul stat="mAtkSpd" val="1.2" />
-				<sub stat="debuffVuln" val="10" />
-				<mul stat="runSpd" val="0.8" />
-				<add stat="absorbDam" val="5" /> <!-- absorb 5% HP from damage inflicted on enemies -->
+				<add stat="absorbDam" val="5" />
+				<mul stat="critRate" val="1.2" />
+				<mul stat="critDmg" val="1.2">
+					<and>
+						<player behind="true" />
+					</and>
+				</mul>
+				<mul stat="debuffVuln" val="0.9" />
 			</effect>
 		</for>
 	</skill>
@@ -1757,21 +1745,19 @@
 		<set name="reuseDelay" val="300000" />
 		<set name="targetType" val="PARTY" />
 		<for>
-			<effect name="MaxHp">
-				<param power="20" />
-				<param type="PER" />
-				<param heal="true" />
-				<add stat="mCritRate" val="2" />
-				<mul stat="critDmg" val="1.2" />
+			<effect name="Buff">
 				<mul stat="pAtk" val="1.1" />
 				<mul stat="pDef" val="1.2" />
+				<mul stat="critRate" val="1.2" />
+				<add stat="accCombat" val="4" />
 				<mul stat="pAtkSpd" val="1.2" />
+				<mul stat="mAtkSpd" val="1.2" />
+				<mul stat="critDmg" val="1.2" />
 				<mul stat="mAtk" val="1.2" />
 				<mul stat="mDef" val="1.2" />
-				<mul stat="mAtkSpd" val="1.2" />
-				<sub stat="debuffVuln" val="10" />
-				<add stat="accCombat" val="4" />
 				<mul stat="runSpd" val="0.8" />
+				<mul stat="maxHp" val="1.2" />
+				<mul stat="debuffVuln" val="0.8" />
 			</effect>
 		</for>
 	</skill>
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/01400-01499.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/01400-01499.xml
index 42db2f6d5b..4b123a497a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/01400-01499.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/01400-01499.xml
@@ -396,22 +396,16 @@
 		<set name="targetType" val="PARTY" />
 		<for>
 			<effect name="Buff">
-				<mul stat="maxMp" val="1.15" />
-				<add stat="regMp" val="1.5">
-					<using kind="HEAVY,LIGHT" />
-				</add>
-				<add stat="regMp" val="4">
-					<using kind="MAGIC" />
-				</add>
-				<mul stat="mDef" val="1.3" />
-				<mul stat="mAtk" val="1.3" />
+				<mul stat="regMp" val="1.5" />
 				<mul stat="mAtkSpd" val="1.2" />
+				<mul stat="mDef" val="1.2" />
+				<mul stat="mAtk" val="1.3" />
 				<add stat="fireRes" val="10" />
 				<add stat="waterRes" val="10" />
 				<add stat="windRes" val="10" />
 				<add stat="earthRes" val="10" />
-				<sub stat="debuffVuln" val="25" />
-				<sub stat="cancelVuln" val="40" />
+				<mul stat="maxMp" val="1.2" />
+				<mul stat="magicalMpConsumeRate" val="0.8" />
 			</effect>
 		</for>
 	</skill>
@@ -436,22 +430,18 @@
 		<set name="targetType" val="PARTY_CLAN" />
 		<for>
 			<effect name="Buff">
-				<mul stat="maxCp" val="1.2" />
-				<mul stat="regCp" val="1.2" />
-				<mul stat="maxMp" val="1.2" />
-				<mul stat="critRate" val="1.2" />
-				<mul stat="mCritPower" val="1.2" />
 				<mul stat="pAtk" val="1.1" />
 				<mul stat="pDef" val="1.2" />
+				<mul stat="critRate" val="1.2" />
+				<add stat="accCombat" val="4" />
 				<mul stat="pAtkSpd" val="1.2" />
+				<mul stat="mAtkSpd" val="1.2" />
+				<mul stat="critDmg" val="1.2" />
 				<mul stat="mAtk" val="1.2" />
 				<mul stat="mDef" val="1.2" />
-				<mul stat="mAtkSpd" val="1.2" />
-				<sub stat="debuffVuln" val="10" />
 				<mul stat="runSpd" val="0.8" />
-			</effect>
-			<effect name="CpHealPercent">
-				<param power="20" />
+				<mul stat="maxHp" val="1.2" />
+				<mul stat="debuffVuln" val="0.8" />
 			</effect>
 		</for>
 	</skill>
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/03000-03099.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/03000-03099.xml
index 721f7b67c7..14f142790f 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/03000-03099.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/03000-03099.xml
@@ -1240,8 +1240,9 @@
 		<!-- Temporarily paralyzes target. -->
 		<table name="#magicLevel">64 67</table>
 		<set name="abnormalLevel" val="1" />
-		<set name="abnormalTime" val="15" />
+		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="PARALYZE" />
+		<set name="abnormalVisualEffect" val="PARALYZE" />
 		<set name="activateRate" val="20" />
 		<set name="basicProperty" val="MEN" />
 		<set name="castRange" val="1000" />
@@ -1261,12 +1262,8 @@
 				<mul stat="runSpd" val="0.5" />
 				<mul stat="mAtkSpd" val="0.5" />
 			</effect>
+			<effect name="Paralyze" />
 		</for>
-		<endEffects>
-			<effect name="CallSkill">
-				<param skillId="6126" skillLevel="1" />
-			</effect>
-		</endEffects>
 	</skill>
 	<skill id="3076" levels="6" name="Special Ability: Empower">
 		<!-- Increases M. Atk. -->
@@ -1325,8 +1322,9 @@
 		<!-- Temporarily paralyzes target. -->
 		<table name="#magicLevel">46 49 52 55 58 61</table>
 		<set name="abnormalLevel" val="1" />
-		<set name="abnormalTime" val="15" />
+		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="PARALYZE" />
+		<set name="abnormalVisualEffect" val="PARALYZE" />
 		<set name="activateRate" val="20" />
 		<set name="basicProperty" val="MEN" />
 		<set name="castRange" val="1000" />
@@ -1346,12 +1344,8 @@
 				<mul stat="runSpd" val="0.5" />
 				<mul stat="mAtkSpd" val="0.5" />
 			</effect>
+			<effect name="Paralyze" />
 		</for>
-		<endEffects>
-			<effect name="CallSkill">
-				<param skillId="6126" skillLevel="1" />
-			</effect>
-		</endEffects>
 	</skill>
 	<skill id="3080" levels="10" name="Item Skill: Aggression">
 		<!-- Chance: Provokes a target to attack during an ordinary physical attack. Power 438. -->
@@ -1562,7 +1556,7 @@
 		</for>
 		<endEffects>
 			<effect name="CallSkill">
-				<param skillId="6126" skillLevel="1" />
+				<param skillId="5171" skillLevel="1" />
 			</effect>
 		</endEffects>
 	</skill>
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/04100-04199.xml b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/04100-04199.xml
index a0591a927c..671b41fed5 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/04100-04199.xml
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/04100-04199.xml
@@ -1295,8 +1295,9 @@
 		<!-- Paralyzes a target, instantly immobilizing it. -->
 		<table name="#magicLevel">40 44 48 52 56 60 64 68 72 74 76 78 80 81 82 83 84 85</table>
 		<set name="abnormalLevel" val="1" />
-		<set name="abnormalTime" val="15" />
+		<set name="abnormalTime" val="120" />
 		<set name="abnormalType" val="PARALYZE" />
+		<set name="abnormalVisualEffect" val="PARALYZE" />
 		<set name="activateRate" val="40" />
 		<set name="basicProperty" val="MEN" />
 		<set name="icon" val="icon.skill1170" />
@@ -1313,12 +1314,8 @@
 				<mul stat="pAtkSpd" val="0.5" />
 				<mul stat="mAtkSpd" val="0.5" />
 			</effect>
+			<effect name="Paralyze" />
 		</for>
-		<endEffects>
-			<effect name="CallSkill">
-				<param skillId="6125" skillLevel="1" />
-			</effect>
-		</endEffects>
 	</skill>
 	<skill id="4165" levels="17" name="Icy Air">
 		<!-- Inflicts continuous damage by Icy Air. Effect 5. -->
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/Config.java
index 553ce878ff..eab3042d92 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/Config.java
@@ -1208,6 +1208,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static boolean AUTO_PLAY_PREMIUM;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
@@ -1280,6 +1281,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2505,8 +2507,8 @@ public class Config
 			ORFEN_SPAWN_RANDOM = grandBossConfig.getInt("RandomOfOrfenSpawn", 20);
 			QUEEN_ANT_SPAWN_INTERVAL = grandBossConfig.getInt("IntervalOfQueenAntSpawn", 36);
 			QUEEN_ANT_SPAWN_RANDOM = grandBossConfig.getInt("RandomOfQueenAntSpawn", 17);
-			ZAKEN_SPAWN_INTERVAL = grandBossConfig.getInt("IntervalOfFrintezzaSpawn", 36);
-			ZAKEN_SPAWN_RANDOM = grandBossConfig.getInt("RandomOfFrintezzaSpawn", 17);
+			ZAKEN_SPAWN_INTERVAL = grandBossConfig.getInt("IntervalOfZakenSpawn", 36);
+			ZAKEN_SPAWN_RANDOM = grandBossConfig.getInt("RandomOfZakenSpawn", 17);
 			FRINTEZZA_SPAWN_INTERVAL = grandBossConfig.getInt("IntervalOfFrintezzaSpawn", 48);
 			FRINTEZZA_SPAWN_RANDOM = grandBossConfig.getInt("RandomOfFrintezzaSpawn", 8);
 			
@@ -2562,6 +2564,7 @@ public class Config
 			ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 			AUTO_PLAY_PREMIUM = autoPlayConfig.getBoolean("AutoPlayPremium", false);
 			DISABLED_AUTO_SKILLS.clear();
 			final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
@@ -2807,6 +2810,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/LoginServerThread.java
index 5dd6589243..8a19d3db94 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/LoginServerThread.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/LoginServerThread.java
@@ -73,6 +73,7 @@ import org.l2jmobius.gameserver.network.loginserverpackets.login.PlayerAuthRespo
 import org.l2jmobius.gameserver.network.loginserverpackets.login.RequestCharacters;
 import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo;
 import org.l2jmobius.gameserver.network.serverpackets.LoginFail;
+import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 public class LoginServerThread extends Thread
@@ -436,12 +437,7 @@ public class LoginServerThread extends Thread
 			return;
 		}
 		
-		final GameClient removed = _accountsInGameServer.remove(account);
-		if (removed != null)
-		{
-			removed.disconnect();
-		}
-		
+		_accountsInGameServer.remove(account);
 		sendPacket(new PlayerLogout(account));
 	}
 	
@@ -517,17 +513,24 @@ public class LoginServerThread extends Thread
 		final GameClient client = _accountsInGameServer.get(account);
 		if (client != null)
 		{
+			final Player player = client.getPlayer();
 			if (client.isDetached())
 			{
-				if (client.getPlayer() != null)
+				if (player != null)
 				{
-					client.getPlayer().deleteMe();
+					player.deleteMe();
 				}
+				
 				client.close(new SystemMessage(SystemMessageId.ANOTHER_PERSON_HAS_LOGGED_IN_WITH_THE_SAME_ACCOUNT));
 			}
 			else
 			{
-				Disconnection.of(client).defaultSequence(new SystemMessage(SystemMessageId.ANOTHER_PERSON_HAS_LOGGED_IN_WITH_THE_SAME_ACCOUNT));
+				if (player != null)
+				{
+					player.sendPacket(SystemMessageId.ANOTHER_PERSON_HAS_LOGGED_IN_WITH_THE_SAME_ACCOUNT);
+				}
+				
+				Disconnection.of(client).defaultSequence(ServerClose.STATIC_PACKET);
 				ACCOUNTING_LOGGER.info("Kicked by login, " + client);
 			}
 		}
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
index 8e1dd40519..b79e68dce1 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
@@ -424,10 +424,11 @@ public class MultisellData implements IXmlReader
 		}
 	}
 	
-	private final boolean verifyIngredient(Ingredient ing)
+	private boolean verifyIngredient(Ingredient ing)
 	{
 		switch (ing.getItemId())
 		{
+			case PC_CAFE_POINTS:
 			case CLAN_REPUTATION:
 			case FAME:
 			{
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 605b84a0be..34674ab147 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -153,6 +153,7 @@ import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched;
 import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 import org.l2jmobius.gameserver.network.serverpackets.MoveToLocation;
 import org.l2jmobius.gameserver.network.serverpackets.Revive;
+import org.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SetupGauge;
 import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
@@ -1111,7 +1112,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				_attackEndTime = currentTime + TimeUnit.MILLISECONDS.toNanos(Integer.MAX_VALUE);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -1857,7 +1858,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 			}
 			
-			sendPacket(sm);
+			if (sm != null)
+			{
+				sendPacket(sm);
+			}
 		}
 		
 		if (skill.hasEffects(EffectScope.START))
@@ -2464,6 +2468,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if (hasAI())
 		{
+			if (isAttackable())
+			{
+				getAttackByList().clear();
+				((Attackable) this).clearAggroList();
+				getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+			}
 			getAI().stopAITask();
 		}
 		
@@ -2485,12 +2495,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if (hasAI())
 		{
-			if (isAttackable())
-			{
-				getAttackByList().clear();
-				((Attackable) this).clearAggroList();
-				getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
-			}
 			getAI().stopAITask();
 		}
 		
@@ -2901,10 +2905,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				{
 					player.sendPacket(new FakePlayerInfo((Npc) this));
 				}
-				// else if (_stat.getRunSpeed() == 0)
-				// {
-				// player.sendPacket(new ServerObjectInfo((Npc) this, player));
-				// }
+				else if (_stat.getRunSpeed() == 0)
+				{
+					player.sendPacket(new ServerObjectInfo((Npc) this, player));
+				}
 				else
 				{
 					player.sendPacket(new AbstractNpcInfo.NpcInfo((Npc) this, player));
@@ -3736,10 +3740,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						{
 							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						// else if (_stat.getRunSpeed() == 0)
-						// {
-						// player.sendPacket(new ServerObjectInfo((Npc) this, player));
-						// }
+						else if (_stat.getRunSpeed() == 0)
+						{
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
+						}
 						else
 						{
 							player.sendPacket(new AbstractNpcInfo.NpcInfo((Npc) this, player));
@@ -5856,7 +5860,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 							}
 						}
 					}
-					if (target.isFakePlayer())
+					if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 					{
 						player.updatePvPStatus();
 					}
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java
index c7edf43d27..b6198024bf 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -93,6 +93,7 @@ import org.l2jmobius.gameserver.network.serverpackets.FakePlayerInfo;
 import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
 import org.l2jmobius.gameserver.network.serverpackets.NpcSay;
+import org.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.DecayTaskManager;
 import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager;
@@ -389,10 +390,10 @@ public class Npc extends Creature
 			{
 				player.sendPacket(new FakePlayerInfo(this));
 			}
-			// else if (getRunSpeed() == 0)
-			// {
-			// player.sendPacket(new ServerObjectInfo(this, player));
-			// }
+			else if (getRunSpeed() == 0)
+			{
+				player.sendPacket(new ServerObjectInfo(this, player));
+			}
 			else if (isSpawned())
 			{
 				player.sendPacket(new AbstractNpcInfo.NpcInfo(this, player));
@@ -1402,10 +1403,10 @@ public class Npc extends Creature
 			{
 				player.sendPacket(new FakePlayerInfo(this));
 			}
-			// else if (getRunSpeed() == 0)
-			// {
-			// player.sendPacket(new ServerObjectInfo(this, player));
-			// }
+			else if (getRunSpeed() == 0)
+			{
+				player.sendPacket(new ServerObjectInfo(this, player));
+			}
 			else
 			{
 				player.sendPacket(new AbstractNpcInfo.NpcInfo(this, player));
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
index 15b2180f88..2b04fbbc14 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4348,7 +4348,7 @@ public class Player extends Playable
 	{
 		super.doAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -4893,7 +4893,7 @@ public class Player extends Playable
 					}
 					
 					// Should not penalize player when lucky, in a non siege PvP zone or is in an event.
-					if (!isLucky() && (insideSiegeZone || !insidePvpZone) && !isOnEvent())
+					if (Config.PLAYER_DELEVEL && !isLucky() && (insideSiegeZone || !insidePvpZone) && !isOnEvent())
 					{
 						calculateDeathExpPenalty(killer, isAtWarWith(pk));
 					}
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java
index aaf11f7b37..6528177e86 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -948,7 +948,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 70e099fc18..dac6745b92 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -610,12 +610,12 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				player.sendPacket(new OnEventTrigger(this, _open));
 			}
-			
-			player.sendPacket(new StaticObjectInfo(this));
 		}
 	}
 	
@@ -659,16 +659,25 @@ public class Door extends Creature
 	
 	private void startAutoCloseTask()
 	{
-		if ((getTemplate().getCloseTime() < 0) || isOpenableByTime())
+		final DoorTemplate template = getTemplate();
+		if ((template.getCloseTime() < 0) || isOpenableByTime())
 		{
 			return;
 		}
+		
+		// Clanhall doors should not auto close.
+		if (template.getClanHallId() > 0)
+		{
+			return;
+		}
+		
 		final Future<?> oldTask = _autoCloseTask;
 		if (oldTask != null)
 		{
 			_autoCloseTask = null;
 			oldTask.cancel(false);
 		}
+		
 		_autoCloseTask = ThreadPool.schedule(new AutoClose(), getTemplate().getCloseTime() * 1000);
 	}
 	
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index a246af3484..41dcdd3843 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -62,7 +62,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 0f535cf851..9144673f35 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -2569,44 +2569,6 @@ public class Clan implements IIdentifiable, INamable
 				}
 				break;
 			}
-			case 8:
-			{
-				// Upgrade to 9 (itemId 9910 = Blood Oath)
-				if ((_reputationScore >= Config.CLAN_LEVEL_9_COST) && (player.getInventory().getItemByItemId(9910) != null) && (_members.size() >= Config.CLAN_LEVEL_9_REQUIREMENT) && player.destroyItemByItemId("ClanLvl", 9910, 150, player.getTarget(), false))
-				{
-					setReputationScore(_reputationScore - Config.CLAN_LEVEL_9_COST);
-					final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
-					cr.addInt(Config.CLAN_LEVEL_9_COST);
-					player.sendPacket(cr);
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_HAS_DISAPPEARED);
-					sm.addItemName(9910);
-					sm.addInt(150);
-					player.sendPacket(sm);
-					increaseClanLevel = true;
-				}
-				break;
-			}
-			case 9:
-			{
-				// Upgrade to 10
-				if ((_reputationScore >= Config.CLAN_LEVEL_10_COST) && (player.getInventory().getItemByItemId(9911) != null) && (_members.size() >= Config.CLAN_LEVEL_10_REQUIREMENT))
-				{
-					// itemId 9911 == Blood Alliance
-					if (player.destroyItemByItemId("ClanLvl", 9911, 5, player.getTarget(), false))
-					{
-						setReputationScore(_reputationScore - Config.CLAN_LEVEL_10_COST);
-						final SystemMessage cr = new SystemMessage(SystemMessageId.S1_POINTS_HAVE_BEEN_DEDUCTED_FROM_THE_CLAN_S_REPUTATION_SCORE);
-						cr.addInt(Config.CLAN_LEVEL_10_COST);
-						player.sendPacket(cr);
-						final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_HAS_DISAPPEARED);
-						sm.addItemName(9911);
-						sm.addInt(5);
-						player.sendPacket(sm);
-						increaseClanLevel = true;
-					}
-				}
-				break;
-			}
 			default:
 			{
 				return false;
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index a8f773e805..5894b18867 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -1878,6 +1878,17 @@ public abstract class AbstractScript extends ManagedScript
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java
index 6627c6db2d..7da9743f9b 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java
@@ -355,6 +355,15 @@ public class InstanceWorld
 		}
 	}
 	
+	/**
+	 * Get all doors spawned inside instance world.
+	 * @return collection of spawned doors
+	 */
+	public Collection<Door> getDoors()
+	{
+		return _instance.getDoors();
+	}
+	
 	/**
 	 * Get spawned door by template ID.
 	 * @param doorId template ID of door
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index 29eabaae04..80eded2b08 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -1379,7 +1379,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java
index 7600df4bbd..320a7358da 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java
@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.model.zone.ZoneType;
 import org.l2jmobius.gameserver.network.serverpackets.AbstractNpcInfo;
 import org.l2jmobius.gameserver.network.serverpackets.FakePlayerInfo;
+import org.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo;
 
 public class WaterZone extends ZoneType
 {
@@ -50,10 +51,10 @@ public class WaterZone extends ZoneType
 				{
 					player.sendPacket(new FakePlayerInfo((Npc) creature));
 				}
-				// else if (creature.getRunSpeed() == 0)
-				// {
-				// player.sendPacket(new ServerObjectInfo((Npc) creature, player));
-				// }
+				else if (creature.getRunSpeed() == 0)
+				{
+					player.sendPacket(new ServerObjectInfo((Npc) creature, player));
+				}
 				else
 				{
 					player.sendPacket(new AbstractNpcInfo.NpcInfo((Npc) creature, player));
@@ -88,10 +89,10 @@ public class WaterZone extends ZoneType
 				{
 					player.sendPacket(new FakePlayerInfo((Npc) creature));
 				}
-				// else if (creature.getRunSpeed() == 0)
-				// {
-				// player.sendPacket(new ServerObjectInfo((Npc) creature, player));
-				// }
+				else if (creature.getRunSpeed() == 0)
+				{
+					player.sendPacket(new ServerObjectInfo((Npc) creature, player));
+				}
 				else
 				{
 					player.sendPacket(new AbstractNpcInfo.NpcInfo((Npc) creature, player));
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/ClientPackets.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/ClientPackets.java
index 83e809b56d..496339c4a4 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/ClientPackets.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/ClientPackets.java
@@ -50,8 +50,8 @@ public enum ClientPackets
 	ADD_TRADE_ITEM(0x16, AddTradeItem::new, ConnectionState.IN_GAME),
 	TRADE_DONE(0x17, TradeDone::new, ConnectionState.IN_GAME),
 	REQUEST_SOCIAL_ACTION(0x1B, RequestSocialAction::new, ConnectionState.IN_GAME),
-	CHANGE_MOVE_TYPE2(0x1C, null, ConnectionState.IN_GAME),
-	CHANGE_WAIT_TYPE2(0x1D, null, ConnectionState.IN_GAME),
+	CHANGE_MOVE_TYPE2(0x1C, ChangeMoveType2::new, ConnectionState.IN_GAME),
+	CHANGE_WAIT_TYPE2(0x1D, ChangeWaitType2::new, ConnectionState.IN_GAME),
 	REQUEST_SELL_ITEM(0x1E, RequestSellItem::new, ConnectionState.IN_GAME),
 	REQUEST_BUY_ITEM(0x1F, RequestBuyItem::new, ConnectionState.IN_GAME),
 	REQUEST_LINK_HTML(0x20, RequestLinkHtml::new, ConnectionState.IN_GAME),
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/ServerPackets.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/ServerPackets.java
index 88e0cd9a93..8c222b3724 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/ServerPackets.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/ServerPackets.java
@@ -130,6 +130,7 @@ public enum ServerPackets
 	PLEDGE_SHOW_INFO_UPDATE(0x88),
 	ACQUIRE_SKILL_LIST(0x8A),
 	ACQUIRE_SKILL_INFO(0x8B),
+	SERVER_OBJECT_INFO(0x8C),
 	ACQUIRE_SKILL_DONE(0x8E),
 	GM_VIEW_CHARACTER_INFO(0x8F),
 	GM_VIEW_PLEDGE_INFO(0x90),
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ChangeMoveType2.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ChangeMoveType2.java
new file mode 100644
index 0000000000..5915589896
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ChangeMoveType2.java
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.clientpackets;
+
+import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.network.GameClient;
+
+public class ChangeMoveType2 implements ClientPacket
+{
+	private boolean _typeRun;
+	
+	@Override
+	public void read(ReadablePacket packet)
+	{
+		_typeRun = packet.readInt() == 1;
+	}
+	
+	@Override
+	public void run(GameClient client)
+	{
+		final Player player = client.getPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		if (_typeRun)
+		{
+			player.setRunning();
+		}
+		else
+		{
+			player.setWalking();
+		}
+	}
+}
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ChangeWaitType2.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ChangeWaitType2.java
new file mode 100644
index 0000000000..cbedc636ce
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ChangeWaitType2.java
@@ -0,0 +1,76 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.clientpackets;
+
+import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.gameserver.instancemanager.CastleManager;
+import org.l2jmobius.gameserver.model.WorldObject;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.instance.StaticObject;
+import org.l2jmobius.gameserver.network.GameClient;
+import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
+import org.l2jmobius.gameserver.network.serverpackets.ChairSit;
+
+public class ChangeWaitType2 implements ClientPacket
+{
+	private boolean _typeStand;
+	
+	@Override
+	public void read(ReadablePacket packet)
+	{
+		_typeStand = packet.readInt() == 1;
+	}
+	
+	@Override
+	public void run(GameClient client)
+	{
+		final Player player = client.getPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (player.isOutOfControl())
+		{
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (player.isMounted())
+		{
+			return;
+		}
+		
+		if ((target != null) && !player.isSitting() && (target instanceof StaticObject) && (((StaticObject) target).getType() == 1) && (CastleManager.getInstance().getCastle(target) != null) && player.isInsideRadius2D(target, StaticObject.INTERACTION_DISTANCE))
+		{
+			final ChairSit cs = new ChairSit(player, ((StaticObject) target).getId());
+			player.sendPacket(cs);
+			player.sitDown();
+			player.broadcastPacket(cs);
+		}
+		
+		if (_typeStand)
+		{
+			player.standUp();
+		}
+		else
+		{
+			player.sitDown();
+		}
+	}
+}
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index a9a9bb9a6c..53a6aa7a42 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -339,18 +339,12 @@ public class EnterWorld implements ClientPacket
 		// Send Macro List
 		player.getMacros().sendUpdate();
 		
-		// Apply item skills.
-		player.getInventory().applyItemSkills();
-		
 		// Send Item List
 		player.sendPacket(new ItemList(player, false));
 		
 		// Send Shortcuts
 		player.sendPacket(new ShortCutInit(player));
 		
-		// Send Skill list
-		player.sendSkillList();
-		
 		// Send Dye Information
 		player.sendPacket(new HennaInfo(player));
 		Quest.playerEnter(player);
@@ -456,6 +450,12 @@ public class EnterWorld implements ClientPacket
 		
 		player.onPlayerEnter();
 		
+		// Apply item skills.
+		player.getInventory().applyItemSkills();
+		
+		// Send Skill list
+		player.sendSkillList();
+		
 		player.sendPacket(new SkillCoolTime(player));
 		for (Item i : player.getInventory().getItems())
 		{
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index b698b06cd4..4cee54da4e 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -43,7 +43,6 @@ import org.l2jmobius.gameserver.util.Util;
 public class RequestBuyItem implements ClientPacket
 {
 	private static final int BATCH_LENGTH = 8;
-	private static final int CUSTOM_CB_SELL_LIST = 423;
 	
 	private int _listId;
 	private List<ItemHolder> _items = null;
@@ -110,7 +109,7 @@ public class RequestBuyItem implements ClientPacket
 		
 		final WorldObject target = player.getTarget();
 		Creature merchant = null;
-		if (!player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
+		if (!player.isGM())
 		{
 			if (!(target instanceof Merchant) || (!player.isInsideRadius3D(target, INTERACTION_DISTANCE)) || (player.getInstanceId() != target.getInstanceId()))
 			{
@@ -122,7 +121,7 @@ public class RequestBuyItem implements ClientPacket
 		
 		double castleTaxRate = 0;
 		double baseTaxRate = 0;
-		if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
+		if ((merchant == null) && !player.isGM())
 		{
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index ce5f21ca7d..eefed57c38 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -44,7 +44,6 @@ import org.l2jmobius.gameserver.util.Util;
 public class RequestSellItem implements ClientPacket
 {
 	private static final int BATCH_LENGTH = 12;
-	private static final int CUSTOM_CB_SELL_LIST = 423;
 	
 	private int _listId;
 	private List<UniqueItemHolder> _items = null;
@@ -104,7 +103,7 @@ public class RequestSellItem implements ClientPacket
 		
 		final WorldObject target = player.getTarget();
 		Creature merchant = null;
-		if (!player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
+		if (!player.isGM())
 		{
 			if ((target == null) || (!player.isInsideRadius3D(target, INTERACTION_DISTANCE)) || (player.getInstanceId() != target.getInstanceId()))
 			{
@@ -122,7 +121,7 @@ public class RequestSellItem implements ClientPacket
 			}
 		}
 		
-		if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
+		if ((merchant == null) && !player.isGM())
 		{
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java
new file mode 100644
index 0000000000..de77e8fadb
--- /dev/null
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java
@@ -0,0 +1,74 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.network.ServerPackets;
+
+/**
+ * @author devScarlet, mrTJO
+ */
+public class ServerObjectInfo extends ServerPacket
+{
+	private final Npc _activeChar;
+	private final int _x;
+	private final int _y;
+	private final int _z;
+	private final int _heading;
+	private final int _displayId;
+	private final boolean _isAttackable;
+	private final double _collisionHeight;
+	private final double _collisionRadius;
+	private final String _name;
+	
+	public ServerObjectInfo(Npc activeChar, Creature actor)
+	{
+		_activeChar = activeChar;
+		_displayId = _activeChar.getTemplate().getDisplayId();
+		_isAttackable = _activeChar.isAutoAttackable(actor);
+		_collisionHeight = _activeChar.getCollisionHeight();
+		_collisionRadius = _activeChar.getCollisionRadius();
+		_x = _activeChar.getX();
+		_y = _activeChar.getY();
+		_z = _activeChar.getZ();
+		_heading = _activeChar.getHeading();
+		_name = _activeChar.getTemplate().isUsingServerSideName() ? _activeChar.getTemplate().getName() : "";
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.SERVER_OBJECT_INFO.writeId(this);
+		writeInt(_activeChar.getObjectId());
+		writeInt(_displayId + 1000000);
+		writeString(_name); // name
+		writeInt(_isAttackable);
+		writeInt(_x);
+		writeInt(_y);
+		writeInt(_z);
+		writeInt(_heading);
+		writeDouble(1.0); // movement multiplier
+		writeDouble(1.0); // attack speed multiplier
+		writeDouble(_collisionRadius);
+		writeDouble(_collisionHeight);
+		writeInt((int) (_isAttackable ? _activeChar.getCurrentHp() : 0));
+		writeInt(_isAttackable ? _activeChar.getMaxHp() : 0);
+		writeInt(1); // object type
+		writeInt(0); // special effects
+	}
+}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 127d9c52c0..37c66c84c0 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,10 +25,12 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
@@ -39,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -94,6 +98,12 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							final Summon summon = player.getSummon();
+							if ((summon != null) && summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+							{
+								summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+							}
 							continue PLAY;
 						}
 						
@@ -119,23 +129,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getTemplate().getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getTemplate().getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -143,6 +162,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -177,32 +199,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !(player.hasSummon() && (player.getSummon().getObjectId() == nearby.getTarget().getObjectId())))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceId()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !(player.hasSummon() && (player.getSummon().getObjectId() == nearby.getTarget().getObjectId())))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceId()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -294,6 +339,7 @@ public class AutoPlayTaskManager
 				{
 					player.getSummon().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/util/Util.java
index 8796da8853..32312c6c2b 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/util/Util.java
@@ -27,6 +27,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.StringJoiner;
 import java.util.StringTokenizer;
 import java.util.logging.Logger;
@@ -969,13 +970,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_CT_0_Interlude/readme.txt b/L2J_Mobius_CT_0_Interlude/readme.txt
index b510071e94..b16f69df16 100644
--- a/L2J_Mobius_CT_0_Interlude/readme.txt
+++ b/L2J_Mobius_CT_0_Interlude/readme.txt
@@ -112,6 +112,7 @@ What is done
 -Hot Springs one hour diseases.
 -Updated pledge skilltree data.
 -Adjusted custom community board htmls.
+-Replaced quest 639.
 
 TODO: Important (project unusable due to the following)
 -Adjust all skills according to Interlude description.
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/account_gsdata.sql
index d2da07b194..db5cb35ce2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/account_gsdata.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/airships.sql
index c821fa6236..8e6c0161e7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/airships.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/announcements.sql
index 686ce7db92..4ea4114b97 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/announcements.sql
@@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/auction.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/auction.sql
index 5d307b8ec7..0446601374 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/auction.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/auction.sql
@@ -13,4 +13,4 @@ CREATE TABLE IF NOT EXISTS `auction` (
   `endDate` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemType`,`itemId`,`itemObjectId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/auction_bid.sql
index 31fdbd466c..0aca65f92a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/auction_bid.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/auction_watch.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/auction_watch.sql
index 5834f4e511..97aa7c020f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/auction_watch.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/auction_watch.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `auction_watch` (
   `charObjId` INT NOT NULL DEFAULT 0,
   `auctionId` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`charObjId`,`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/bbs_favorite.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/bbs_favorite.sql
index e353929990..57506eee67 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/bbs_favorite.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/bbs_favorite.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/bot_reported_char_data.sql
index 066d8ad824..a609f36eca 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/buffer_schemes.sql
index 55eb836dbb..2d7a14e81f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/buffer_schemes.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL,
   PRIMARY KEY (`object_id`,`scheme_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/buylists.sql
index ea76140994..291a4ac88f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/buylists.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle.sql
index 0f2cc1f5c4..9e34e1bdc8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio',0,0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_doorupgrade.sql
index 467549c7f3..f2ae13d23c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_functions.sql
index b111fb4bb7..48f019f7e3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_functions.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_manor_procure.sql
index 6f081a435e..aa29107f01 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_manor_production.sql
index 4b0fefcf9e..42ac40d507 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_manor_production.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_trapupgrade.sql
index b16306c804..ab5e5e2051 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_contacts.sql
index b242905114..1c84187b03 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_contacts.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_friends.sql
index 7e5fc9ffa3..8ac7e449e2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_friends.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `friendId` INT UNSIGNED NOT NULL DEFAULT 0,
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_hennas.sql
index b274ca90ee..b5f10d2462 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_hennas.sql
@@ -4,4 +4,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_instance_time.sql
index 4b9efb912a..f9b0cfa7d4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_instance_time.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_item_reuse_save.sql
index 43f531deb2..79433cbbab 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_macroses.sql
index 06e83eddff..07e83a1adb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_macroses.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_offline_trade.sql
index 0fd9522890..69b18fbfdf 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_offline_trade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_offline_trade_items.sql
index 5fcd5653e8..317fc42bf7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_pet_skills_save.sql
index 98a58b9c62..e01871070e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_premium_items.sql
index 8c90e3e55e..6007e11d28 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_premium_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_quests.sql
index c683185655..e33ff5ba97 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_quests.sql
@@ -4,4 +4,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_raid_points.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_raid_points.sql
index 0ba8ff2c75..bfcc537fd3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_raid_points.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_raid_points.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_raid_points` (
   `boss_id` INT UNSIGNED NOT NULL DEFAULT 0,
   `points` INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_recipebook.sql
index 6edd20fd88..2acaa26250 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_recipebook.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_recipeshoplist.sql
index 3b6aed2a9c..4ea37c5249 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_recommends.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_recommends.sql
index 17c71144fc..bee300c7d9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_recommends.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_recommends.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `character_recommends` (
   `charId` INT UNSIGNED NOT NULL default 0,
   `target_id` INT(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`target_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_shortcuts.sql
index 06a3f14d72..a2349f79c3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_shortcuts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_skills.sql
index ca20cda6a6..a26b62cfcc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_skills.sql
@@ -4,4 +4,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_level` INT(3) NOT NULL DEFAULT 1,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_skills_save.sql
index 23297a4724..ab821f45de 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_skills_save.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_subclasses.sql
index a2bdbb93b8..af152623f7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_subclasses.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `level` int(2) NOT NULL DEFAULT 40,
   `class_index` int(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_summon_skills_save.sql
index 69f5f276b1..7dbb8268d6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_summons.sql
index bde6cd28bf..500cd4363a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_summons.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_tpbookmark.sql
index 6438919eb1..89a2326080 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_ui_actions.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_ui_actions.sql
index d0e76f04c0..f88c1be333 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_ui_actions.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_ui_actions.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_ui_actions` (
   `tgKey2` int(8) DEFAULT NULL,
   `show` tinyint(4) NOT NULL,
   PRIMARY KEY (`charId`,`cat`,`cmd`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_ui_categories.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_ui_categories.sql
index 9a138348dc..d21982ad83 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_ui_categories.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_ui_categories.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_ui_categories` (
   `order` tinyint(4) NOT NULL,
   `cmdId` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`catId`,`order`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_variables.sql
index e843d01ebd..f42eaecdbc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/character_variables.sql
@@ -2,4 +2,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/characters.sql
index 57b7796bc9..c0088b1a0b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/characters.sql
@@ -65,4 +65,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_data.sql
index 70d48ca49f..c9f8f13cb1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_data.sql
@@ -22,4 +22,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_notices.sql
index b28a79dd62..e725586084 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_notices.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_privs.sql
index 6da0d19b15..57461b9e54 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_privs.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_skills.sql
index 0bc644e66e..be13835749 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_skills.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_subpledges.sql
index cf8144cbf2..3bee2d38f8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_subpledges.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_wars.sql
index 59492a6542..31ee2db1f4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clan_wars.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `wantspeace1` decimal(1,0) NOT NULL DEFAULT '0',
   `wantspeace2` decimal(1,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clanhall.sql
index 41a06cac48..f55afb8c14 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clanhall.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paid` int( 1 ) NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `clanhall` VALUES
 ('22','Moonstone Hall','0','500000','Clan hall located in the Town of Gludio','Gludio','0','2','0'),
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clanhall_functions.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clanhall_functions.sql
index 28cf4d0a8e..7ebed4ca53 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clanhall_functions.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clanhall_functions.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`hall_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clanhall_siege_attackers.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clanhall_siege_attackers.sql
index 16c4216bfe..dc27ded096 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clanhall_siege_attackers.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clanhall_siege_attackers.sql
@@ -1,4 +1,4 @@
 CREATE TABLE IF NOT EXISTS `clanhall_siege_attackers` (
   `clanhall_id` int(3) NOT NULL DEFAULT '0',
   `attacker_id` int(10) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clanhall_siege_guards.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clanhall_siege_guards.sql
index b334f13a9e..60d14d1640 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clanhall_siege_guards.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/clanhall_siege_guards.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `clanhall_siege_guards` (
   `respawnDelay` mediumint(5) NOT NULL DEFAULT '0',
   `isSiegeBoss` enum('false','true') NOT NULL DEFAULT 'false',
   KEY `clanHallId` (`clanHallId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `clanhall_siege_guards` VALUES
 -- Devasted Castle
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/crests.sql
index b3e6dd8b67..04146da77a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/crests.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/cursed_weapons.sql
index dc7a921a83..c18f76bbee 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/cursed_weapons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/custom_teleport.sql
index 96dad1f9fc..c472e6d75b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/custom_teleport.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/dimensional_rift.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/dimensional_rift.sql
index 1e01f688cf..4e2f248d62 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/dimensional_rift.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/dimensional_rift.sql
@@ -13,7 +13,7 @@ CREATE TABLE `dimensional_rift` (
   `zT` mediumint(6) NOT NULL,
   `boss` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`type`,`room_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `dimensional_rift` VALUES
 (0, 0, -115440, -114160, -182160, -178048, -6816, -6240, -114790, -180576, -6752, 0),	-- peace zone (waiting room)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fishing_championship.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fishing_championship.sql
index aa9ffef1ee..646424bd2b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fishing_championship.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fishing_championship.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fishing_championship` (
   `player_name` VARCHAR(35) NOT NULL,
   `fish_length` DOUBLE(10,3) NOT NULL,
   `rewarded` INT(1) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort.sql
index 4839495ef4..3c0a7da931 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort_doorupgrade.sql
index 033953be32..8d88f03d2c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort_functions.sql
index 18282939af..9360e19315 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort_functions.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort_siege_guards.sql
index a3dc91e468..aae71b4c1f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_siege_guards` VALUES
 -- Shanty Guards
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort_spawnlist.sql
index 038038ca63..38cb3a63ab 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,7 +11,7 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_spawnlist` VALUES
 (101,null,35658,-53273,156650,-1896,62000,0,0),
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fortsiege_clans.sql
index 7caa95162d..2267d9e32d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/forums.sql
index fede0432b9..f565baebfa 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/forums.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql
index 4ae82c0039..ef44b39cf4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql
@@ -14,7 +14,7 @@ CREATE TABLE `four_sepulchers_spawnlist` (
   `key_npc_id` smallint(5) unsigned NOT NULL DEFAULT '0',
   `spawntype` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `four_sepulchers_spawnlist` VALUES
 ('1', '', '1', '31468', '182074', '-85579', '-7216', '0', '0', '-32600', '3600', '31921', '0'),
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/global_tasks.sql
index 33fe875e44..8be95c521f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/global_tasks.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/global_variables.sql
index 86cabd2d0f..b5f04d1339 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/global_variables.sql
@@ -2,6 +2,6 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 REPLACE INTO `global_variables` VALUES ('HBLevel', '11');
 REPLACE INTO `global_variables` VALUES ('HBTrust', '4000000');
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/grandboss_data.sql
index c0666646a9..726901699f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/grandboss_data.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant (40)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/grandboss_list.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/grandboss_list.sql
index 3de82ecdb8..cba2ad418e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/grandboss_list.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/grandboss_list.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `grandboss_list` (
   `player_id` decimal(11,0) NOT NULL,
   `zone` decimal(11,0) NOT NULL,
   PRIMARY KEY (`player_id`,`zone`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/herb_droplist_groups.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/herb_droplist_groups.sql
index 91029fb985..a5e524415c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/herb_droplist_groups.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/herb_droplist_groups.sql
@@ -24,7 +24,7 @@ CREATE TABLE `herb_droplist_groups` (
   `chance` mediumint(7) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`groupId`,`itemId`,`category`),
   KEY `key_mobId` (`groupId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `herb_droplist_groups` VALUES
 -- default group
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/heroes.sql
index 593b5b3c72..f66ed313ee 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/heroes.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/heroes_diary.sql
index 3540726e4b..b87f1ec2b3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/heroes_diary.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/item_attributes.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/item_attributes.sql
index 787e4e6c07..933267af4e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/item_attributes.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/item_attributes.sql
@@ -2,4 +2,6 @@ CREATE TABLE IF NOT EXISTS `item_attributes` (
   `itemId` int(11) NOT NULL DEFAULT 0,
   `augAttributes` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_attributes (itemId);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/item_auction.sql
index 6ac2d3deb9..49a9229f57 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/item_auction.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/item_auction_bid.sql
index 5ac2a00221..283ccfad6e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/item_auction_bid.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/item_elementals.sql
index c6b07a116c..7d1bbe1c2a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/item_elementals.sql
@@ -3,4 +3,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/items.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/items.sql
index 3fc23ea75b..64c3a59c5e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/items.sql
@@ -16,4 +16,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/itemsonground.sql
index d87a1f6777..71962e9cdd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/itemsonground.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/lottery.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/lottery.sql
index e9f02cd64a..1bd9f73b19 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/lottery.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/lottery.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `lottery` (
   `enddate` bigint(13) unsigned NOT NULL DEFAULT '0',
   `finished` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`idnr`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/merchant_lease.sql
index 931744d3ce..7b74a60806 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/merchant_lease.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/messages.sql
index 1af8e44845..381e442e41 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/messages.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `sendBySystem` tinyint(1) NOT NULL DEFAULT 0,
   `isReturned` enum('true','false') DEFAULT 'false' NOT NULL,
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/mods_wedding.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/mods_wedding.sql
index 3d9f409d69..01c6506ca6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/mods_wedding.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/mods_wedding.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `mods_wedding` (
   PRIMARY KEY (`id`),
   KEY `player1Id` (`player1Id`),
   KEY `player2Id` (`player2Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/olympiad_data.sql
index 4a4edfb193..852ab89513 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/olympiad_data.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/olympiad_fights.sql
index d0016dcd28..9a9f98bfac 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/olympiad_fights.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(1) unsigned NOT NULL DEFAULT '0',
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/olympiad_nobles.sql
index ce32bbf800..3609ae84f0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_lost` decimal(3,0) NOT NULL default 0,
   `competitions_drawn` decimal(3,0) NOT NULL default 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index ababd5fe67..afe36b3125 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` decimal(3,0) NOT NULL default 0,
   `competitions_drawn` decimal(3,0) NOT NULL default 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/petition_feedback.sql
index a00d9d507a..096d2429f3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/petition_feedback.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/pets.sql
index 7f36bc7498..b83073d6fe 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/pets.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/posts.sql
index d11bf6aa92..aec8325bdd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/posts.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/prime_shop_transactions.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/prime_shop_transactions.sql
index 5cd9ceb4cd..96cb20bdf4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/prime_shop_transactions.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/prime_shop_transactions.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `prime_shop_transactions` (
   `productId` INT NOT NULL DEFAULT 0,
   `quantity` INT NOT NULL DEFAULT 1,
   `transactionTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/punishments.sql
index 30a22f0e5f..ce5130fc23 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/punishments.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/raidboss_spawnlist.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/raidboss_spawnlist.sql
index 61ff85a6cc..b58c540197 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/raidboss_spawnlist.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/raidboss_spawnlist.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `raidboss_spawnlist` (
   `currentHp` decimal(8,0) DEFAULT NULL,
   `currentMp` decimal(8,0) DEFAULT NULL,
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `raidboss_spawnlist` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`respawn_delay`,`respawn_random`,`currentHp`,`currentMp`) VALUES
 (25001,-54416,146480,-2887,0,86400,43200,95986,514), -- Greyclaw Kutus (23)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/rainbowsprings_attacker_list.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/rainbowsprings_attacker_list.sql
index ec166bff70..03250f25e7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/rainbowsprings_attacker_list.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/rainbowsprings_attacker_list.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `rainbowsprings_attacker_list` (
   `clanId` int(10) DEFAULT NULL,
   `war_decrees_count` double(20,0) DEFAULT NULL,
   KEY `clanid` (`clanid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/random_spawn.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/random_spawn.sql
index fd99673627..bdec18101e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/random_spawn.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/random_spawn.sql
@@ -9,7 +9,7 @@ CREATE TABLE `random_spawn` (
   `broadcastSpawn` enum('true','false') NOT NULL DEFAULT 'false',
   `randomSpawn` enum('true','false') NOT NULL DEFAULT 'true',
   PRIMARY KEY (`groupId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `random_spawn` VALUES
 (11,31113,1,-1,-1,-1,'true','true'), -- Merchant of Mammon
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/random_spawn_loc.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/random_spawn_loc.sql
index 86f7dd77fe..471d8df84d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/random_spawn_loc.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/random_spawn_loc.sql
@@ -6,7 +6,7 @@ CREATE TABLE `random_spawn_loc` (
   `z` mediumint(6) NOT NULL,
   `heading` mediumint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`groupId`,`x`,`y`,`z`,`heading`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `random_spawn_loc` VALUES
 -- Merchant of Mammon
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/seven_signs.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/seven_signs.sql
index ef94a10582..cec3ff4a4d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/seven_signs.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/seven_signs.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `seven_signs` (
   `ancient_adena_amount` DECIMAL(20,0) NOT NULL DEFAULT 0,
   `contribution_score` DECIMAL(20,0) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/seven_signs_festival.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/seven_signs_festival.sql
index 7683fa8467..5d2925a98f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/seven_signs_festival.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/seven_signs_festival.sql
@@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS `seven_signs_festival` (
   `score` int(5) NOT NULL DEFAULT '0',
   `members` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`festivalId`,`cabal`,`cycle`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `seven_signs_festival` VALUES
 (0, "dawn", 1, 0, 0, ""),
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/seven_signs_status.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/seven_signs_status.sql
index bf65f25901..3cc137bec4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/seven_signs_status.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/seven_signs_status.sql
@@ -24,7 +24,7 @@ CREATE TABLE IF NOT EXISTS `seven_signs_status` (
   `accumulated_bonus3` int(10) NOT NULL DEFAULT '0',
   `accumulated_bonus4` int(10) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `seven_signs_status` VALUES
 (0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siegable_clanhall.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siegable_clanhall.sql
index e38b1792ee..a49e90db7a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siegable_clanhall.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siegable_clanhall.sql
@@ -17,7 +17,7 @@ CREATE TABLE IF NOT EXISTS `siegable_clanhall` (
   `schedule_config` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`clanHallId`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `siegable_clanhall` (`clanHallId`, `name`, `ownerId`, `desc`, `location`, `nextSiege`, `siegeLength`, `schedule_config`) VALUES
 (21, 'Fortress of Resistance', 0, 'Contestable Clan Hall', 'Dion', 0, 3600000, '14;0;0;12;00'),
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siegable_hall_flagwar_attackers.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siegable_hall_flagwar_attackers.sql
index 2d5a1d60c4..9ce6060577 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siegable_hall_flagwar_attackers.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siegable_hall_flagwar_attackers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `siegable_hall_flagwar_attackers` (
   PRIMARY KEY (`flag`),
   KEY `hall_id` (`hall_id`),
   KEY `clan_id` (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siegable_hall_flagwar_attackers_members.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siegable_hall_flagwar_attackers_members.sql
index 63e0270430..566a64fb10 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siegable_hall_flagwar_attackers_members.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siegable_hall_flagwar_attackers_members.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siegable_hall_flagwar_attackers_members` (
   KEY `hall_id` (`hall_id`),
   KEY `clan_id` (`clan_id`),
   KEY `object_id` (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siege_clans.sql
index a583deb0a7..65b7738285 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siege_clans.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/teleport.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/teleport.sql
index 1eff4832fc..8a45ecf956 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/teleport.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/teleport.sql
@@ -10,7 +10,7 @@ CREATE TABLE `teleport` (
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `teleport` VALUES
 ('DE Village -> Town of Gludio',1,-12787,122779,-3112,10000,0,57),
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/territories.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/territories.sql
index 803612f942..0ed370f4f8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/territories.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/territories.sql
@@ -4,7 +4,7 @@ CREATE TABLE IF NOT EXISTS `territories` (
   `fortId` INT NOT NULL DEFAULT 0,
   `ownedWardIds` varchar(30) NOT NULL DEFAULT '',
   PRIMARY KEY (`territoryId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `territories` VALUES
 (81,1,101,'81;'),
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/territory_registrations.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/territory_registrations.sql
index 9a7308f0a9..26def83e6d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/territory_registrations.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/territory_registrations.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `territory_registrations` (
   `castleId` int(1) NOT NULL DEFAULT '0',
   `registeredId` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`castleId`,`registeredId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/territory_spawnlist.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/territory_spawnlist.sql
index 3444cf5ae1..cefdc2ce6a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/territory_spawnlist.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/territory_spawnlist.sql
@@ -10,7 +10,7 @@ CREATE TABLE `territory_spawnlist` (
   `spawnType` tinyint(1) unsigned NOT NULL DEFAULT '0', -- 0-spawned when castle have owner, 1-fortress spawns in TW time, 2-Castle spawns in TW time, 3-Ward spawn places
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `territory_spawnlist` VALUES
 (1,null,36481,-15094,124113,-3119,50948,0),
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/topic.sql
index 005d87b4e0..d7147c830f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/topic.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Custom/AutoPlay.ini b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Custom/AutoPlay.ini
index 9a4fd4bf2e..6e9d9628be 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Custom/AutoPlay.ini
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # Enable .play command only for premium players.
 # Premium System must be enabled.
 # Default: False
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/General.ini b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/General.ini
index ffa9c90db7..ede0227cb7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/General.ini
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/General.ini
@@ -427,8 +427,8 @@ ChatFilterChars = ^_^
 # MPCC_ROOM
 # NPC_GENERAL
 # NPC_SHOUT
-# Default: GENERAL;SHOUT;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
index 2dbddb7d68..53cf0d9b9f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
@@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.GrandBoss;
@@ -50,6 +51,10 @@ public class DrChaos extends AbstractNpcAI
 	private static final byte NORMAL = 0; // Dr. Chaos is in NPC form.
 	private static final byte CRAZY = 1; // Dr. Chaos entered on golem form.
 	private static final byte DEAD = 2; // Dr. Chaos has been killed and has not yet spawned.
+	private static final int CHAOS_X = 96320;
+	private static final int CHAOS_Y = -110912;
+	private static final int CHAOS_Z = -3328;
+	private static final int CHAOS_HEAD = 8191;
 	
 	private long _lastAttackVsGolem = 0;
 	private int _pissedOffTimer;
@@ -76,7 +81,7 @@ public class DrChaos extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Delete the saved time and
 				// immediately spawn Dr. Chaos. Also the state need to be changed for NORMAL
-				addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false);
+				addSpawn(DOCTOR_CHAOS, CHAOS_X, CHAOS_Y, CHAOS_Z, CHAOS_HEAD, false, 0, false);
 				GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
 			}
 		}
@@ -109,84 +114,115 @@ public class DrChaos extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)
 	{
-		if (event.equalsIgnoreCase("reset_drchaos"))
+		switch (event)
 		{
-			GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
-			addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false);
-		}
-		// despawn the live Dr. Chaos after 30 minutes of inactivity
-		else if (event.equalsIgnoreCase("golem_despawn"))
-		{
-			if ((npc.getId() == CHAOS_GOLEM) && ((_lastAttackVsGolem + 1800000) < System.currentTimeMillis()))
+			case "reset_drchaos":
 			{
-				final Npc chaos = addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false); // spawn Dr. Chaos
-				GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
-				cancelQuestTimer("golem_despawn", chaos, null);
+				GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
+				addSpawn(DOCTOR_CHAOS, CHAOS_X, CHAOS_Y, CHAOS_Z, CHAOS_HEAD, false, 0, false);
+				break;
+			}
+			case "golem_despawn": // despawn the live Dr. Chaos after 30 minutes of inactivity
+			{
+				if ((npc.getId() == CHAOS_GOLEM) && ((_lastAttackVsGolem + 1800000) < System.currentTimeMillis()))
+				{
+					final Npc chaos = addSpawn(DOCTOR_CHAOS, CHAOS_X, CHAOS_Y, CHAOS_Z, CHAOS_HEAD, false, 0, false); // spawn Dr. Chaos
+					GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
+					cancelQuestTimer("golem_despawn", chaos, null);
+					cancelQuestTimers("DISTANCE_CHECK");
+					
+					// Despawn the war golem.
+					npc.deleteMe();
+				}
+				break;
+			}
+			case "1":
+			{
+				npc.broadcastPacket(new SocialAction(npc.getObjectId(), 2));
+				npc.broadcastPacket(new SpecialCamera(npc, 1, -200, 15, 5500, 1000, 13500, 0, 0, 0, 0, 0));
+				break;
+			}
+			case "2":
+			{
+				npc.broadcastPacket(new SocialAction(npc.getObjectId(), 3));
+				break;
+			}
+			case "3":
+			{
+				npc.broadcastPacket(new SocialAction(npc.getObjectId(), 1));
+				break;
+			}
+			case "4":
+			{
+				npc.broadcastPacket(new SpecialCamera(npc, 1, -150, 10, 3500, 1000, 5000, 0, 0, 0, 0, 0));
+				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(95928, -110671, -3340, 0));
+				break;
+			}
+			case "5":
+			{
+				final GrandBoss golem = (GrandBoss) addSpawn(CHAOS_GOLEM, 96080, -110822, -3343, 0, false, 0, false);
+				GrandBossManager.getInstance().addBoss(golem);
+				startQuestTimer("DISTANCE_CHECK", 10000, golem, null, true);
+				golem.broadcastPacket(new SpecialCamera(npc, 30, 200, 20, 6000, 700, 8000, 0, 0, 0, 0, 0));
+				golem.broadcastPacket(new SocialAction(npc.getObjectId(), 1));
+				golem.broadcastPacket(new PlaySound(1, "Rm03_A", 0, 0, 0, 0, 0));
 				
-				// Despawn the war golem.
+				// start monitoring Dr. Chaos's inactivity
+				_lastAttackVsGolem = System.currentTimeMillis();
+				startQuestTimer("golem_despawn", 60000, golem, null, true);
+				
+				// Delete Dr. Chaos after spawned the war golem.
 				npc.deleteMe();
+				break;
 			}
-		}
-		else if (event.equalsIgnoreCase("1"))
-		{
-			npc.broadcastPacket(new SocialAction(npc.getObjectId(), 2));
-			npc.broadcastPacket(new SpecialCamera(npc, 1, -200, 15, 5500, 1000, 13500, 0, 0, 0, 0, 0));
-		}
-		else if (event.equalsIgnoreCase("2"))
-		{
-			npc.broadcastPacket(new SocialAction(npc.getObjectId(), 3));
-		}
-		else if (event.equalsIgnoreCase("3"))
-		{
-			npc.broadcastPacket(new SocialAction(npc.getObjectId(), 1));
-		}
-		else if (event.equalsIgnoreCase("4"))
-		{
-			npc.broadcastPacket(new SpecialCamera(npc, 1, -150, 10, 3500, 1000, 5000, 0, 0, 0, 0, 0));
-			npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(95928, -110671, -3340, 0));
-		}
-		else if (event.equalsIgnoreCase("5"))
-		{
-			final GrandBoss golem = (GrandBoss) addSpawn(CHAOS_GOLEM, 96080, -110822, -3343, 0, false, 0, false);
-			GrandBossManager.getInstance().addBoss(golem);
-			
-			golem.broadcastPacket(new SpecialCamera(npc, 30, 200, 20, 6000, 700, 8000, 0, 0, 0, 0, 0));
-			golem.broadcastPacket(new SocialAction(npc.getObjectId(), 1));
-			golem.broadcastPacket(new PlaySound(1, "Rm03_A", 0, 0, 0, 0, 0));
-			
-			// start monitoring Dr. Chaos's inactivity
-			_lastAttackVsGolem = System.currentTimeMillis();
-			startQuestTimer("golem_despawn", 60000, golem, null, true);
-			
-			// Delete Dr. Chaos after spawned the war golem.
-			npc.deleteMe();
-		}
-		// Check every sec if someone is in range, if found, launch one task to decrease the timer.
-		else if (event.equalsIgnoreCase("paranoia_activity") && (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL))
-		{
-			for (Player obj : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 500))
+			case "paranoia_activity":
 			{
-				if (obj.isDead())
+				if (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL)
 				{
-					continue;
+					for (Player obj : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 500))
+					{
+						if (obj.isDead())
+						{
+							continue;
+						}
+						
+						_pissedOffTimer -= 1;
+						
+						// Make him speak.
+						if (_pissedOffTimer == 15)
+						{
+							npc.broadcastSay(ChatType.NPC_GENERAL, "How dare you trespass into my territory! Have you no fear?");
+						}
+						
+						// That was "too much" for that time.
+						if (_pissedOffTimer <= 0)
+						{
+							crazyMidgetBecomesAngry(npc);
+						}
+					}
 				}
-				
-				_pissedOffTimer -= 1;
-				
-				// Make him speak.
-				if (_pissedOffTimer == 15)
+				if (npc.calculateDistance2D(CHAOS_X, CHAOS_Y, CHAOS_Z) > 2000)
 				{
-					npc.broadcastSay(ChatType.NPC_GENERAL, "How dare you trespass into my territory! Have you no fear?");
+					((Attackable) npc).clearAggroList();
+					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(CHAOS_X, CHAOS_Y, CHAOS_Z, 0));
 				}
-				
-				// That was "too much" for that time.
-				if (_pissedOffTimer <= 0)
+				break;
+			}
+			case "DISTANCE_CHECK":
+			{
+				if ((npc == null) || npc.isDead())
 				{
-					crazyMidgetBecomesAngry(npc);
+					cancelQuestTimers("DISTANCE_CHECK");
 				}
+				else if (npc.calculateDistance2D(npc.getSpawn()) > 10000)
+				{
+					((Attackable) npc).clearAggroList();
+					// npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(CHAOS_X, CHAOS_Y, CHAOS_Z, 0));
+					npc.teleToLocation(npc.getSpawn(), false);
+				}
+				break;
 			}
 		}
-		
 		return super.onAdvEvent(event, npc, player);
 	}
 	
@@ -225,6 +261,10 @@ public class DrChaos extends AbstractNpcAI
 		
 		// Initialization of the paranoia.
 		startQuestTimer("paranoia_activity", 1000, npc, null, true);
+		
+		cancelQuestTimer("DISTANCE_CHECK", npc, null);
+		startQuestTimer("DISTANCE_CHECK", 10000, npc, null, true);
+		
 		return null;
 	}
 	
@@ -243,6 +283,10 @@ public class DrChaos extends AbstractNpcAI
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CHAOS_GOLEM);
 		info.set("respawn_time", System.currentTimeMillis() + respawnTime);
 		GrandBossManager.getInstance().setStatSet(CHAOS_GOLEM, info);
+		
+		// Stop distance check task.
+		cancelQuestTimers("DISTANCE_CHECK");
+		
 		return null;
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.java
index a87d477061..3df4e5bd81 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.java
@@ -240,7 +240,7 @@ public class CabaleBuffer extends AbstractNpcAI
 		 */
 		private boolean handleCast(Player player, int skillId)
 		{
-			if (player.isDead() || !player.isSpawned() || !_npc.isInsideRadius2D(player, DISTANCE_TO_WATCH_OBJECT))
+			if (player.isDead() || !player.isSpawned() || !_npc.isInsideRadius3D(player, DISTANCE_TO_WATCH_OBJECT))
 			{
 				return false;
 			}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 59a27c17e9..265b4de140 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -261,6 +262,8 @@ public class TvT extends Event
 				world.setInstance(InstanceManager.getInstance().createDynamicInstance(INSTANCE_ID));
 				InstanceManager.getInstance().addWorld(world);
 				PVP_WORLD = world;
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
index ccfcb2282d..e5407abd3f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
@@ -17,10 +17,10 @@
 package quests.Q00604_DaimonTheWhiteEyedPart2;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.enums.QuestSound;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.Quest;
@@ -265,6 +265,6 @@ public class Q00604_DaimonTheWhiteEyedPart2 extends Quest
 	
 	private static boolean isDaimonSpawned()
 	{
-		return SpawnTable.getInstance().getAnySpawn(DAIMON_THE_WHITE_EYED) != null;
+		return World.getInstance().getVisibleObjects().stream().anyMatch(object -> object.getId() == DAIMON_THE_WHITE_EYED);
 	}
 }
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
index 96dbacaa97..f68f98dee6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
@@ -17,9 +17,9 @@
 package quests.Q00625_TheFinestIngredientsPart2;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -121,7 +121,7 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 						{
 							rewardItems(player, GREATER_DYE_OF_DEX_2);
 						}
-						qs.exitQuest(false, true);
+						qs.exitQuest(true, true);
 						htmltext = event;
 					}
 					else
@@ -137,12 +137,11 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 				{
 					if (hasItem(player, FOOD_FOR_BUMBALUMP))
 					{
+						qs.setCond(2, true);
 						if (!isBumbalumpSpawned())
 						{
-							qs.setCond(2, true);
 							takeItem(player, FOOD_FOR_BUMBALUMP);
-							final Npc umpaloopa = addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
-							umpaloopa.setSummoner(player);
+							addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
 							htmltext = event;
 						}
 						else
@@ -155,6 +154,18 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 						htmltext = "31542-04.html";
 					}
 				}
+				else if (qs.isCond(2))
+				{
+					if (!isBumbalumpSpawned())
+					{
+						addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
+						htmltext = event;
+					}
+					else
+					{
+						htmltext = "31542-03.html";
+					}
+				}
 				break;
 			}
 			case "NPC_TALK":
@@ -182,7 +193,7 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 				{
 					if (talker.getLevel() >= MIN_LEVEL)
 					{
-						htmltext = (hasItem(talker, SOY_SOURCE_JAR)) ? "31521-01.htm" : "31521-02.htm";
+						htmltext = hasItem(talker, SOY_SOURCE_JAR) ? "31521-01.htm" : "31521-02.htm";
 					}
 					else
 					{
@@ -222,18 +233,14 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 				{
 					case 1:
 					{
-						if (hasItem(talker, FOOD_FOR_BUMBALUMP))
-						{
-							htmltext = "31542-01.html";
-						}
+						htmltext = "31542-01.html";
 						break;
 					}
 					case 2:
 					{
 						if (!isBumbalumpSpawned())
 						{
-							final Npc umpaloopa = addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
-							umpaloopa.setSummoner(talker);
+							addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
 							htmltext = "31542-02.html";
 						}
 						else
@@ -265,17 +272,23 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 	@Override
 	public String onKill(Npc npc, Player killer, boolean isSummon)
 	{
-		final QuestState qs = getRandomPartyMemberState(killer, 1, 2, npc);
-		if ((qs != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, killer, true) && (npc.getSummoner() == killer))
+		executeForEachPlayer(killer, npc, isSummon, true, false);
+		return super.onKill(npc, killer, isSummon);
+	}
+	
+	@Override
+	public void actionForEachPlayer(Player player, Npc npc, boolean isSummon)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if ((qs != null) && qs.isCond(2) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, true))
 		{
 			qs.setCond(3, true);
-			giveItems(qs.getPlayer(), SPECIAL_YETI_MEAT);
+			giveItems(player, SPECIAL_YETI_MEAT);
 		}
-		return super.onKill(npc, killer, isSummon);
 	}
 	
 	private static boolean isBumbalumpSpawned()
 	{
-		return SpawnTable.getInstance().getAnySpawn(ICICLE_EMPEROR_BUMBALUMP) != null;
+		return World.getInstance().getVisibleObjects().stream().anyMatch(object -> object.getId() == ICICLE_EMPEROR_BUMBALUMP);
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
index cb2825c12a..750958df2b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
@@ -218,7 +218,7 @@ public class Q00638_SeekersOfTheHolyGrail extends Quest
 			final DropInfo info = MOBS_DROP_CHANCES.get(npc.getId());
 			if (giveItemRandomly(qs.getPlayer(), npc, info.getId(), 1, 0, info.getChance(), true) && (info.getKeyId() > 0) && (getRandom(100) < info.getKeyChance()))
 			{
-				npc.dropItem(qs.getPlayer(), info.getKeyId(), info.getKeyCount());
+				giveItems(qs.getPlayer(), info.getKeyId(), info.getKeyCount());
 			}
 		}
 		return super.onKill(npc, killer, isSummon);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-01.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-01.htm
new file mode 100644
index 0000000000..7ed476480e
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-01.htm
@@ -0,0 +1,4 @@
+<html><body>Priest Dominic:<br>
+Do you know of a place called the <font color="LEVEL">Monastery of Silence</font>? It may call itself a monastery, but it is more like a social club; few are admitted, and they are inclined to attack anyone they suspect of intruding upon <font color="LEVEL">that which they protect</font>, that which Saint Solina left behind.<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 31350-03.htm">"What did Saint Solina leave behind?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-01.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-01.html
deleted file mode 100644
index 71a938aab4..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-01.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Priest Dominic:<br>
-Ahhh... that mission has been.. satisfied. It's time for a new mission.
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-02.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-02.htm
new file mode 100644
index 0000000000..687c6d435c
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-02.htm
@@ -0,0 +1,5 @@
+<html><body>Priest Dominic:<br>
+Have you heard tell of a place called the Monastery of Silence? Well, they are suspicious of strangers and quick to attack intruders. Why? Well, there's a reason...<br>
+But hold. I think it would be better to tell you this later on, when you have grown stronger and more skillful.<br>
+(This quest may only be undertaken by a character of level 73 and above.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-03.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-03.htm
new file mode 100644
index 0000000000..ec91abd92d
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-03.htm
@@ -0,0 +1,4 @@
+<html><body>Priest Dominic:<br>
+Well, that's not really important for you to know, is it? I'm sorry, but that's a secret I'm sworn to keep. Suffice it to say that it is something my order needs enough to hire you to get it. Sadly, the monastery is just as intent on keeping it, and their resistance was stronger than we expected. We failed to get it, and so I am here asking you to succeed where we have failed. You will have to defeat them totally; nothing less will allow my order to retrieve what we need from them.<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 31350-04.html">Tell him you will do it.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-04.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-04.html
new file mode 100644
index 0000000000..0db4685aec
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-04.html
@@ -0,0 +1,4 @@
+<html><body>Priest Dominic:<br>
+Very good! Then go to the <font color="LEVEL">Monastery of Silence</font> and defeat its monks. I will give you a reward if you bring me the <font color="LEVEL">Scripture of Monk</font> as proof that you eliminated them.<br>
+Oh, yes...one more thing. We have a man on the inside, an agent named <font color="LEVEL">Gremory</font> who infiltrated the Monastery of Silence. He has done brave work, and if you can help him to escape, that would be best. He can be of great assistance to you.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-05.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-05.html
new file mode 100644
index 0000000000..d4ba2d435c
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-05.html
@@ -0,0 +1,5 @@
+<html><body>Priest Dominic:<br>
+Fine work. Haha! Thank you for eliminating those pesky monks. So, would you like to collect your just reward?<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 31350-07.html">Don't collect the reward now.</a><br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 31350-08.html">Get the reward in exchange for the Scripture of Monk you brought.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-06.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-06.html
new file mode 100644
index 0000000000..16fed63a9f
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-06.html
@@ -0,0 +1,6 @@
+<html><body>Priest Dominic:<br>
+Here's the quest: Go to the <font color="LEVEL">Monastery of Silence</font> and vanquish the monks. I will give you a reward if you bring me the <font color="LEVEL">Scripture of Monk</font> as proof that you have defeated them. I hope, of course, that they surrender to you, but if they do not, you may kill them in good conscience; we will pray for their souls.<br>
+Oh, here's something that may help you: we have a man on the inside. Our brave <font color="LEVEL">Gremory</font> has managed to infiltrate the monastery, a task many had thought impossible. Please help him to escape if possible; the poor man has done more than enough, and he may be of help to you.<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 31350-07.html">Continue the job.</a><br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 31350-09.html">Quit the job.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-07.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-07.html
new file mode 100644
index 0000000000..b3ede3fb84
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-07.html
@@ -0,0 +1,3 @@
+<html><body>Priest Dominic:<br>
+Fine, then. Keep up the good work... until we retake from those pestilent monks what is ours by right!
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-08.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-08.html
new file mode 100644
index 0000000000..4f42201b6e
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-08.html
@@ -0,0 +1,3 @@
+<html><body>Priest Dominic:<br>
+Here, then, is your payment. You have done excellent work.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-09.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-09.html
new file mode 100644
index 0000000000..e0d96eef4e
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/31350-09.html
@@ -0,0 +1,4 @@
+<html><body>Priest Dominic:<br>
+Oh, very well. I can't make you do it. But do be careful, now; I wouldn't want to see you side with those pestilential monks. Who knows what might happen to you if you did? You might just...die, of remorse and shame. Heh.<br>
+If you change your mind, you know where to find me.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-01.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-01.html
new file mode 100644
index 0000000000..c3eb63a63a
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-01.html
@@ -0,0 +1,5 @@
+<html><body>Priest Gremory:<br>
+Curses! I've been unmasked! How did you find me, damn you? My disguise was perfect. Well, question me all you like; my lips are sealed.<br>
+What? Dominic sent you? Oh, thank the gods. For a moment I feared the worst!<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 32008-02.html">"Why are you here?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-02.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-02.html
new file mode 100644
index 0000000000..117069696c
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-02.html
@@ -0,0 +1,6 @@
+<html><body>Priest Gremory:<br>
+I infiltrated this order to find the <font color="LEVEL">Grail of Splendor</font> they keep hidden here in the Monastery of Silence. Now that's a mission for a man! I wouldn't blame you for envying me.<br>
+Wait - if you were sent by Dominic, then you report to me now! Hahaha! Yes, I've been expecting this. I have served here so long, so very long... the pressures, you wouldn't understand them. You couldn't. And now he finally recognizes my service and my abilities!<br>
+Very well, servant. Your first task will be to massage my shoulders. I'm weary from hiding in this narrow space for so long...<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 32008-03.html">"I'm not your underling. I'm here to help you fulfill your mission."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-03.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-03.html
new file mode 100644
index 0000000000..4f25350f3f
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-03.html
@@ -0,0 +1,6 @@
+<html><body>Priest Gremory:<br>
+What? Damn it all! I have needed an underling for so long...<br>
+Well, never mind that now. Let's talk business. In my searches within the monastery, I have found a <font color="LEVEL">broken bridge</font>. Across the bridge, there is a chamber called the <font color="LEVEL">Room of Splendor</font>.<br>
+I don't know what that name means, but... they say the <font color="LEVEL">Holy Grail</font> lies within. That's the place to go.<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 32008-04.html">"A broken bridge? How do I cross it?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-04.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-04.html
new file mode 100644
index 0000000000..366da2be80
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-04.html
@@ -0,0 +1,5 @@
+<html><body>Priest Gremory:<br>
+The broken bridge? It is simply an optical illusion. Just step out onto it and you'll find the bridge is intact and whole. I have a fear of heights, so I cannot manage the crossing myself. It has been my one and only failure as an agent.<br>
+Get me that Grail, and I will <font color="LEVEL">trade you some unique items</font> which form a part of the <font color="LEVEL">Scripture of Monk</font> that you are collecting. Do we have a deal?<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 32008-05.html">"OK, what do I have to do?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-05.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-05.html
new file mode 100644
index 0000000000..2735d5e64d
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-05.html
@@ -0,0 +1,4 @@
+<html><body>Priest Gremory:<br>
+Then we understand each other. Go to the <font color="LEVEL">Room of Splendor</font> and <font color="LEVEL">pour water into the Holy Grail. Then pour that water back into a jar and bring it to me.</font> Thus can we verify the genuineness of the Holy Grail. Be careful, though; the Grail may be guarded.<br>
+One more thing: the Room of Splendor is locked. You will need a <font color="LEVEL">key to enter there.</font> Some monks have such keys to perform their duties, so I suggest that you overcome one of them and take his key.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-06.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-06.html
new file mode 100644
index 0000000000..0151c3200a
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-06.html
@@ -0,0 +1,4 @@
+<html><body>Priest Gremory:<br>
+Go to the <font color="LEVEL">Room of Splendor</font> and <font color="LEVEL">pour a measure of water into the Holy Grail. Then pour the water back into a jar and bring it to me.</font> We can test the water to determine if the Grail is the real thing or not. Be careful when you do this; the room may be guarded.<br>
+Oh, another thing. The Room of Splendor is locked, and you'll need a <font color="LEVEL">key to enter it.</font> Some of the monks carry a key to that room; I suggest that you overcome of one of them and take his key.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-08.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-08.html
new file mode 100644
index 0000000000..20b35b0883
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-08.html
@@ -0,0 +1,6 @@
+<html><body>Priest Gremory:<br>
+Nice! You got away clean, did you? Well, let's test the water.<br>
+Alas! The water fails the test. <font color="LEVEL">They must keep the real Grail somewhere else!</font><br>
+Well, thank you, I suppose. It was worth knowing about the false lead. Now leave me; I must return to my task of finding the real Grail. Go quickly, before they discover us!<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 32008-09.html">"That wasn't the deal. You promised us a part of the Scripture of Monk in exchange for what we found."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-09.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-09.html
new file mode 100644
index 0000000000..98541c6660
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-09.html
@@ -0,0 +1,4 @@
+<html><body>Priest Gremory:<br>
+Ah, that's true, that's true. Such forgetfulness is rare in a spy of my caliber, I assure you! Well, I am a man of my word, so here you go. I assume that takes care of our deal, yes?<br>
+What's more, I'll make another deal with you: If you bring me <font color="LEVEL">4000 or 400 Monk Scriptures, I will exchange them for an S-grade Enchant Weapon Scroll or an S-grade Enchant Armor Scroll, respectively</font>. Come back after you slay those bothersome monks.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-10.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-10.html
new file mode 100644
index 0000000000..6d433997dc
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-10.html
@@ -0,0 +1,6 @@
+<html><body>Priest Gremory:<br>
+The Grail, the Grail...o, where is the blasted thing? A spy of my stature should surely have found it by now! Does it even exist?<br>
+...Huh? Ah, it's you again! Did you bring me any Monk Scriptures?<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 32008-12.html">Exchange 4000 Monk Scriptures for an S-grade Enchant Weapon Scroll.</a><br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 32008-14.html">Exchange 400 Monk Scriptures for an S-grade Enchant Armor Scroll.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-11.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-11.html
new file mode 100644
index 0000000000..17025419a2
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-11.html
@@ -0,0 +1,4 @@
+<html><body>Priest Gremory:<br>
+Here you go: one S-grade Enchant Weapon Scroll. Do you like it? You'd better appreciate it; it's a gift from me, after all! Hahaha!<br>
+And here are my Scriptures. Once I show Dominic all of the Scriptures, he'll finally appreciate my abilities properly. Of course, he'll think I collected them myself... but in a sense I did, didn't I?
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-12.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-12.html
new file mode 100644
index 0000000000..ad4132fe85
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-12.html
@@ -0,0 +1,4 @@
+<html><body>Priest Gremory:<br>
+Huh? You need more of the Monk Scriptures to meet my terms! What is this, some sort of con game? You'll never fool me that easily.<br>
+Kill the monks, as many as you need to, and bring me more scriptures. Understood?
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-13.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-13.html
new file mode 100644
index 0000000000..494dc40b70
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-13.html
@@ -0,0 +1,4 @@
+<html><body>Priest Gremory:<br>
+Here is the S-grade Enchant Armor Scroll I promised you, then. Do you like it? You'd better appreciate it, fellow; it's a gift from Gremory the spy! Hahaha!<br>
+And here are my Scriptures. Once I show Dominic my collection of Scriptures, he'll properly appreciate my abilities. He'll think I collected them myself... but in a sense I did, didn't I?
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-14.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-14.html
new file mode 100644
index 0000000000..37a1fc0d08
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32008-14.html
@@ -0,0 +1,4 @@
+<html><body>Priest Gremory:<br>
+Oh, nonsense. You know very well that these aren't enough Scriptures. What is this, some sort of inept con game? You'll need more than that to trick me, my friend. You're dealing with Gremory, understand?<br>
+Go kill the monks and bring me more Scriptures. Understood?
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32028-01.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32028-01.html
new file mode 100644
index 0000000000..6c9a102393
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32028-01.html
@@ -0,0 +1,4 @@
+<html><body>The Grail of Splendor:<br>
+Gremory's instructions were to pour some water into the Grail, then pour that water into a bottle and bring it to him.<br>
+<a action="bypass -h Quest Q00639_GuardiansOfTheHolyGrail 32028-02.html">Pour the water.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32028-02.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32028-02.html
new file mode 100644
index 0000000000..fe75441ea6
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32028-02.html
@@ -0,0 +1,3 @@
+<html><body>The Grail of Splendor:<br>
+I pour the water into the Grail. I see no change... Now, I'll pour the water into this bottle and return to Gremory.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32028-03.html b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32028-03.html
new file mode 100644
index 0000000000..604430f402
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/32028-03.html
@@ -0,0 +1,3 @@
+<html><body>The Grail of Splendor:<br>
+I have completed what Gremory asked of me, so now I will go to see him.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java
index 3c598bdd09..d62bdcb8b1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java
@@ -16,33 +16,230 @@
  */
 package quests.Q00639_GuardiansOfTheHolyGrail;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.enums.QuestSound;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
 
-/**
- * Guardians of the Holy Grail (639)<br>
- * NOTE: This quest is no longer available since Freya(CT2.5)
- * @author corbin12
- */
 public class Q00639_GuardiansOfTheHolyGrail extends Quest
 {
-	// NPC
+	// NPCs
 	private static final int DOMINIC = 31350;
+	private static final int GREMORY = 32008;
+	private static final int HOLY_GRAIL = 32028;
+	// Items
+	private static final int SCRIPTURE = 8069;
+	private static final int WATER_BOTTLE = 8070;
+	private static final int HOLY_WATER_BOTTLE = 8071;
+	private static final Map<Integer, Integer> CHANCES = new HashMap<>();
+	static
+	{
+		CHANCES.put(22122, 760000);
+		CHANCES.put(22123, 750000);
+		CHANCES.put(22124, 590000);
+		CHANCES.put(22125, 580000);
+		CHANCES.put(22126, 590000);
+		CHANCES.put(22127, 580000);
+		CHANCES.put(22128, 170000);
+		CHANCES.put(22129, 590000);
+		CHANCES.put(22130, 850000);
+		CHANCES.put(22131, 920000);
+		CHANCES.put(22132, 580000);
+		CHANCES.put(22133, 930000);
+		CHANCES.put(22134, 230000);
+		CHANCES.put(22135, 580000);
+	}
 	
 	public Q00639_GuardiansOfTheHolyGrail()
 	{
 		super(639);
+		registerQuestItems(SCRIPTURE, WATER_BOTTLE, HOLY_WATER_BOTTLE);
 		addStartNpc(DOMINIC);
-		addTalkId(DOMINIC);
+		addTalkId(DOMINIC, GREMORY, HOLY_GRAIL);
+		addKillId(CHANCES.keySet());
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		String htmltext = null;
+		if (qs == null)
+		{
+			return htmltext;
+		}
+		
+		switch (event)
+		{
+			case "31350-03.htm":
+			case "31350-07.html":
+			case "32008-02.html":
+			case "32008-03.html":
+			case "32008-04.html":
+			{
+				htmltext = event;
+				break;
+			}
+			case "31350-04.html":
+			{
+				qs.startQuest();
+				htmltext = event;
+				break;
+			}
+			case "31350-08.html":
+			{
+				final long count = getQuestItemsCount(player, SCRIPTURE);
+				takeItems(player, SCRIPTURE, -1);
+				rewardItems(player, 57, (1625 * count) + ((count >= 10) ? 33940 : 0));
+				htmltext = event;
+				break;
+			}
+			case "31350-09.html":
+			{
+				qs.exitQuest(true, true);
+				htmltext = event;
+				break;
+			}
+			case "32008-05.html":
+			{
+				qs.setCond(2, true);
+				giveItems(player, WATER_BOTTLE, 1);
+				htmltext = event;
+				break;
+			}
+			case "32008-09.html":
+			{
+				qs.setCond(4, true);
+				takeItems(player, HOLY_WATER_BOTTLE, 1);
+				htmltext = event;
+				break;
+			}
+			case "32008-12.html":
+			{
+				if (getQuestItemsCount(player, SCRIPTURE) >= 4000)
+				{
+					takeItems(player, SCRIPTURE, 4000);
+					rewardItems(player, 959, 1);
+					htmltext = "32008-11.html";
+				}
+				else
+				{
+					htmltext = event;
+				}
+				break;
+			}
+			case "32008-14.html":
+			{
+				if (getQuestItemsCount(player, SCRIPTURE) >= 400)
+				{
+					takeItems(player, SCRIPTURE, 400);
+					rewardItems(player, 960, 1);
+					htmltext = "32008-13.html";
+				}
+				else
+				{
+					htmltext = event;
+				}
+				break;
+			}
+			case "32028-02.html":
+			{
+				qs.setCond(3, true);
+				takeItems(player, WATER_BOTTLE, 1);
+				giveItems(player, HOLY_WATER_BOTTLE, 1);
+				htmltext = event;
+				break;
+			}
+		}
+		
+		return htmltext;
 	}
 	
 	@Override
 	public String onTalk(Npc npc, Player player)
 	{
 		final QuestState qs = getQuestState(player, true);
-		qs.exitQuest(true);
-		return "31350-01.html";
+		String htmltext = getNoQuestMsg(player);
+		
+		switch (qs.getState())
+		{
+			case State.CREATED:
+			{
+				htmltext = player.getLevel() < 73 ? "31350-02.htm" : "31350-01.htm";
+				break;
+			}
+			case State.STARTED:
+			{
+				switch (npc.getId())
+				{
+					case DOMINIC:
+					{
+						htmltext = hasQuestItems(player, SCRIPTURE) ? "31350-05.html" : "31350-06.html";
+						break;
+					}
+					case GREMORY:
+					{
+						switch (qs.getCond())
+						{
+							case 1:
+							{
+								htmltext = "32008-01.html";
+								break;
+							}
+							case 2:
+							{
+								htmltext = "32008-06.html";
+								break;
+							}
+							case 3:
+							{
+								htmltext = "32008-08.html";
+								break;
+							}
+							case 4:
+							{
+								htmltext = "32008-10.html";
+								break;
+							}
+						}
+						break;
+					}
+					case HOLY_GRAIL:
+					{
+						if (qs.isCond(2))
+						{
+							htmltext = "32028-01.html";
+						}
+						else if (qs.getCond() > 2)
+						{
+							htmltext = "32028-03.html";
+						}
+						break;
+					}
+				}
+				break;
+			}
+		}
+		
+		return htmltext;
 	}
-}
\ No newline at end of file
+	
+	@Override
+	public String onKill(Npc npc, Player killer, boolean isSummon)
+	{
+		final QuestState qs = getRandomPartyMemberState(killer, 4, 3, npc);
+		if ((qs != null) && (Rnd.get(1000000) < CHANCES.get(npc.getId())))
+		{
+			playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+			giveItems(qs.getPlayer(), SCRIPTURE, 1);
+		}
+		
+		return super.onKill(npc, killer, isSummon);
+	}
+}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
index 6601debad4..846079bb62 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
@@ -17,6 +17,7 @@
 package quests.Q00655_AGrandPlanForTamingWildBeasts;
 
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 
 import org.l2jmobius.gameserver.cache.HtmCache;
 import org.l2jmobius.gameserver.enums.QuestSound;
@@ -181,7 +182,15 @@ public class Q00655_AGrandPlanForTamingWildBeasts extends Quest
 	private static String getSiegeDate()
 	{
 		final SiegableHall hall = CHSiegeManager.getInstance().getSiegableHall(ClanHallSiegeEngine.BEAST_FARM);
-		return hall != null ? new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(hall.getSiegeDate()) : "Error in date.";
+		if (hall != null)
+		{
+			final Calendar calendar = hall.getSiegeDate();
+			if (calendar != null)
+			{
+				return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(calendar.getTime());
+			}
+		}
+		return "Unknown date.";
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/items/01000-01099.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/items/01000-01099.xml
index 244b7f0df3..32bc2991f9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/items/01000-01099.xml
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/items/01000-01099.xml
@@ -564,6 +564,7 @@
 		<set name="material" val="PAPER" />
 		<set name="weight" val="120" />
 		<set name="price" val="100" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="1048" type="EtcItem" name="Spellbook: Might">
 		<!-- Spellbook needed to learn Might. Used by Human Mystics, Elven Mystics and Dark Mystics. Required level: 7 -->
@@ -653,6 +654,7 @@
 		<set name="material" val="PAPER" />
 		<set name="weight" val="120" />
 		<set name="price" val="500" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="1058" type="EtcItem" name="Spellbook: Shield">
 		<!-- Spellbook needed to learn Shield. Used by Human Mystics, Elven Mystics and Dark Mystics. Required level: 7 -->
@@ -670,6 +672,7 @@
 		<set name="material" val="PAPER" />
 		<set name="weight" val="120" />
 		<set name="price" val="500" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="1060" type="EtcItem" name="Lesser Healing Potion">
 		<!-- A magical potion that slowly restores HP. Low endurance. -->
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/items/01300-01399.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/items/01300-01399.xml
index 6032f60a36..f962f85972 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/items/01300-01399.xml
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/items/01300-01399.xml
@@ -1349,6 +1349,7 @@
 		<set name="material" val="PAPER" />
 		<set name="weight" val="120" />
 		<set name="price" val="1250" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="1396" type="EtcItem" name="Spellbook: Surrender to Wind">
 		<!-- Spellbook needed to learn Surrender to Water -->
@@ -1357,6 +1358,7 @@
 		<set name="material" val="PAPER" />
 		<set name="weight" val="120" />
 		<set name="price" val="1250" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="1397" type="EtcItem" name="Spellbook: Peace">
 		<!-- Spellbook needed to learn Peace. Used by Clerics. Required level: 35 -->
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java
index 8673e54f13..7afec81afa 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java
@@ -1262,6 +1262,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static boolean AUTO_PLAY_PREMIUM;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
@@ -1334,6 +1335,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2674,6 +2676,7 @@ public class Config
 			ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 			AUTO_PLAY_PREMIUM = autoPlayConfig.getBoolean("AutoPlayPremium", false);
 			DISABLED_AUTO_SKILLS.clear();
 			final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
@@ -2919,6 +2922,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/LoginServerThread.java
index 5dd6589243..8a19d3db94 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/LoginServerThread.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/LoginServerThread.java
@@ -73,6 +73,7 @@ import org.l2jmobius.gameserver.network.loginserverpackets.login.PlayerAuthRespo
 import org.l2jmobius.gameserver.network.loginserverpackets.login.RequestCharacters;
 import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo;
 import org.l2jmobius.gameserver.network.serverpackets.LoginFail;
+import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 public class LoginServerThread extends Thread
@@ -436,12 +437,7 @@ public class LoginServerThread extends Thread
 			return;
 		}
 		
-		final GameClient removed = _accountsInGameServer.remove(account);
-		if (removed != null)
-		{
-			removed.disconnect();
-		}
-		
+		_accountsInGameServer.remove(account);
 		sendPacket(new PlayerLogout(account));
 	}
 	
@@ -517,17 +513,24 @@ public class LoginServerThread extends Thread
 		final GameClient client = _accountsInGameServer.get(account);
 		if (client != null)
 		{
+			final Player player = client.getPlayer();
 			if (client.isDetached())
 			{
-				if (client.getPlayer() != null)
+				if (player != null)
 				{
-					client.getPlayer().deleteMe();
+					player.deleteMe();
 				}
+				
 				client.close(new SystemMessage(SystemMessageId.ANOTHER_PERSON_HAS_LOGGED_IN_WITH_THE_SAME_ACCOUNT));
 			}
 			else
 			{
-				Disconnection.of(client).defaultSequence(new SystemMessage(SystemMessageId.ANOTHER_PERSON_HAS_LOGGED_IN_WITH_THE_SAME_ACCOUNT));
+				if (player != null)
+				{
+					player.sendPacket(SystemMessageId.ANOTHER_PERSON_HAS_LOGGED_IN_WITH_THE_SAME_ACCOUNT);
+				}
+				
+				Disconnection.of(client).defaultSequence(ServerClose.STATIC_PACKET);
 				ACCOUNTING_LOGGER.info("Kicked by login, " + client);
 			}
 		}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
index 005e745357..526adbdd51 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
@@ -424,7 +424,7 @@ public class MultisellData implements IXmlReader
 		}
 	}
 	
-	private final boolean verifyIngredient(Ingredient ing)
+	private boolean verifyIngredient(Ingredient ing)
 	{
 		switch (ing.getItemId())
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 359e2299fa..a896ec8130 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1170,7 +1170,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				_attackEndTime = currentTime + TimeUnit.MILLISECONDS.toNanos(Integer.MAX_VALUE);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2017,7 +2017,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 			}
 			
-			sendPacket(sm);
+			if (sm != null)
+			{
+				sendPacket(sm);
+			}
 		}
 		
 		if (skill.hasEffects(EffectScope.START))
@@ -6092,7 +6095,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 							}
 						}
 					}
-					if (target.isFakePlayer())
+					if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 					{
 						player.updatePvPStatus();
 					}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java
index a35145578c..7e5cd98ecf 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4600,7 +4600,7 @@ public class Player extends Playable
 	{
 		super.doAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -5256,7 +5256,7 @@ public class Player extends Playable
 					}
 					
 					// Should not penalize player when lucky, in a non siege PvP zone or is in an event.
-					if (!isLucky() && (insideSiegeZone || !insidePvpZone) && !isOnEvent())
+					if (Config.PLAYER_DELEVEL && !isLucky() && (insideSiegeZone || !insidePvpZone) && !isOnEvent())
 					{
 						calculateDeathExpPenalty(killer, isAtWarWith(pk));
 					}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Summon.java
index c68721a7ef..ab235ff55e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -960,7 +960,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index d046d54685..9e00f1afd3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -657,12 +657,12 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				player.sendPacket(new OnEventTrigger(this, _open));
 			}
-			
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
@@ -706,16 +706,25 @@ public class Door extends Creature
 	
 	private void startAutoCloseTask()
 	{
-		if ((getTemplate().getCloseTime() < 0) || isOpenableByTime())
+		final DoorTemplate template = getTemplate();
+		if ((template.getCloseTime() < 0) || isOpenableByTime())
 		{
 			return;
 		}
+		
+		// Clanhall doors should not auto close.
+		if (template.getClanHallId() > 0)
+		{
+			return;
+		}
+		
 		final Future<?> oldTask = _autoCloseTask;
 		if (oldTask != null)
 		{
 			_autoCloseTask = null;
 			oldTask.cancel(false);
 		}
+		
 		_autoCloseTask = ThreadPool.schedule(new AutoClose(), getTemplate().getCloseTime() * 1000);
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index a246af3484..41dcdd3843 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -62,7 +62,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 7b67ac9b8f..9fb6e35b40 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -1904,6 +1904,17 @@ public abstract class AbstractScript extends ManagedScript
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java
index 6627c6db2d..7da9743f9b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java
@@ -355,6 +355,15 @@ public class InstanceWorld
 		}
 	}
 	
+	/**
+	 * Get all doors spawned inside instance world.
+	 * @return collection of spawned doors
+	 */
+	public Collection<Door> getDoors()
+	{
+		return _instance.getDoors();
+	}
+	
 	/**
 	 * Get spawned door by template ID.
 	 * @param doorId template ID of door
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index 4cbc83314f..364722f4ab 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -1601,7 +1601,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index d1a8f4bc81..041ea7a29f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -390,9 +390,6 @@ public class EnterWorld implements ClientPacket
 		// Send Macro List
 		player.getMacros().sendUpdate();
 		
-		// Apply item skills.
-		player.getInventory().applyItemSkills();
-		
 		// Send Item List
 		player.sendPacket(new ItemList(player, false));
 		
@@ -405,9 +402,6 @@ public class EnterWorld implements ClientPacket
 		// Send Action list
 		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		
-		// Send Skill list
-		player.sendSkillList();
-		
 		// Send Dye Information
 		player.sendPacket(new HennaInfo(player));
 		Quest.playerEnter(player);
@@ -518,6 +512,12 @@ public class EnterWorld implements ClientPacket
 		
 		player.onPlayerEnter();
 		
+		// Apply item skills.
+		player.getInventory().applyItemSkills();
+		
+		// Send Skill list
+		player.sendSkillList();
+		
 		player.sendPacket(new SkillCoolTime(player));
 		for (Item i : player.getInventory().getItems())
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java
index b8f5008465..057191780a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.model.ItemInfo;
 import org.l2jmobius.gameserver.model.itemauction.ItemAuction;
 import org.l2jmobius.gameserver.model.itemauction.ItemAuctionBid;
 import org.l2jmobius.gameserver.model.itemauction.ItemAuctionState;
@@ -59,12 +60,55 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket
 		final ItemAuctionBid highestBid = _currentAuction.getHighestBid();
 		writeLong(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid());
 		writeInt(_timeRemaining);
-		writeItem(_currentAuction.getItemInfo());
+		writeItemInfo(_currentAuction.getItemInfo());
 		if (_nextAuction != null)
 		{
 			writeLong(_nextAuction.getAuctionInitBid());
 			writeInt((int) (_nextAuction.getStartingTime() / 1000)); // unix time in seconds
-			writeItem(_nextAuction.getItemInfo());
+			writeItemInfo(_nextAuction.getItemInfo());
 		}
 	}
+	
+	private void writeItemInfo(ItemInfo info)
+	{
+		writeInt(info.getItem().getId());
+		writeInt(info.getItem().getId());
+		writeInt(info.getLocation());
+		writeLong(info.getCount());
+		writeShort(info.getEnchant());
+		
+		// TODO: Find bellow values.
+		writeShort(0);
+		writeInt(0);
+		writeShort(0);
+		writeShort(0);
+		
+		writeShort(0);
+		writeShort(0);
+		writeShort(0);
+		writeShort(0);
+		writeShort(0);
+		writeShort(0);
+		
+		writeInt(0);
+		
+		writeShort(0);
+		writeShort(0);
+		writeShort(0);
+		
+		// Example.
+		// writeShort(info.getItem().getType2());
+		// writeInt(info.getAugmentationBonus());
+		// writeShort(info.getAttackElementType());
+		// writeShort(info.getAttackElementPower());
+		// for (byte i = 0; i < 6; i++)
+		// {
+		// writeShort(info.getElementDefAttr(i));
+		// }
+		// writeInt(info.getTime());
+		// for (int op : info.getEnchantOptions())
+		// {
+		// writeShort(op);
+		// }
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index bc4f3a64b7..1bd2943546 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,10 +25,12 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
@@ -39,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -94,6 +98,12 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							final Summon summon = player.getSummon();
+							if ((summon != null) && summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+							{
+								summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+							}
 							continue PLAY;
 						}
 						
@@ -119,23 +129,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getTemplate().getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getTemplate().getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -143,6 +162,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -177,32 +199,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !(player.hasSummon() && (player.getSummon().getObjectId() == nearby.getTarget().getObjectId())))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceId()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !(player.hasSummon() && (player.getSummon().getObjectId() == nearby.getTarget().getObjectId())))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceId()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -294,6 +339,7 @@ public class AutoPlayTaskManager
 				{
 					player.getSummon().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Util.java
index 8796da8853..32312c6c2b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Util.java
@@ -27,6 +27,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.StringJoiner;
 import java.util.StringTokenizer;
 import java.util.logging.Logger;
@@ -969,13 +970,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/account_gsdata.sql
index d2da07b194..db5cb35ce2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/account_gsdata.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/airships.sql
index c821fa6236..8e6c0161e7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/airships.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/announcements.sql
index 1bda4b3036..c13dbf2c4c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/announcements.sql
@@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/auction.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/auction.sql
index 5d307b8ec7..0446601374 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/auction.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/auction.sql
@@ -13,4 +13,4 @@ CREATE TABLE IF NOT EXISTS `auction` (
   `endDate` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemType`,`itemId`,`itemObjectId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/auction_bid.sql
index 31fdbd466c..0aca65f92a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/auction_bid.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/auction_watch.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/auction_watch.sql
index 5834f4e511..97aa7c020f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/auction_watch.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/auction_watch.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `auction_watch` (
   `charObjId` INT NOT NULL DEFAULT 0,
   `auctionId` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`charObjId`,`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/bbs_favorite.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/bbs_favorite.sql
index e353929990..57506eee67 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/bbs_favorite.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/bbs_favorite.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/bot_reported_char_data.sql
index 066d8ad824..a609f36eca 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/buffer_schemes.sql
index 55eb836dbb..2d7a14e81f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/buffer_schemes.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL,
   PRIMARY KEY (`object_id`,`scheme_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/buylists.sql
index ea76140994..291a4ac88f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/buylists.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle.sql
index 0f2cc1f5c4..9e34e1bdc8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio',0,0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_doorupgrade.sql
index 467549c7f3..f2ae13d23c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_functions.sql
index b111fb4bb7..48f019f7e3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_functions.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_manor_procure.sql
index 6f081a435e..aa29107f01 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_manor_production.sql
index 4b0fefcf9e..42ac40d507 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_manor_production.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_trapupgrade.sql
index b16306c804..ab5e5e2051 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_contacts.sql
index b242905114..1c84187b03 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_contacts.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_friends.sql
index 7e5fc9ffa3..8ac7e449e2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_friends.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `friendId` INT UNSIGNED NOT NULL DEFAULT 0,
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_hennas.sql
index b274ca90ee..b5f10d2462 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_hennas.sql
@@ -4,4 +4,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_instance_time.sql
index 4b9efb912a..f9b0cfa7d4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_instance_time.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_item_reuse_save.sql
index 43f531deb2..79433cbbab 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_macroses.sql
index 06e83eddff..07e83a1adb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_macroses.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_offline_trade.sql
index 0fd9522890..69b18fbfdf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_offline_trade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_offline_trade_items.sql
index 5fcd5653e8..317fc42bf7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_pet_skills_save.sql
index 98a58b9c62..e01871070e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_premium_items.sql
index 8c90e3e55e..6007e11d28 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_premium_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_quests.sql
index c683185655..e33ff5ba97 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_quests.sql
@@ -4,4 +4,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_raid_points.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_raid_points.sql
index 0ba8ff2c75..bfcc537fd3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_raid_points.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_raid_points.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_raid_points` (
   `boss_id` INT UNSIGNED NOT NULL DEFAULT 0,
   `points` INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_recipebook.sql
index 6edd20fd88..2acaa26250 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_recipebook.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_recipeshoplist.sql
index 3b6aed2a9c..4ea37c5249 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_reco_bonus.sql
index 551416d653..6a90c76467 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_shortcuts.sql
index 06a3f14d72..a2349f79c3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_shortcuts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_skills.sql
index ca20cda6a6..a26b62cfcc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_skills.sql
@@ -4,4 +4,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_level` INT(3) NOT NULL DEFAULT 1,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_skills_save.sql
index 23297a4724..ab821f45de 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_skills_save.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_subclasses.sql
index a2bdbb93b8..af152623f7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_subclasses.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `level` int(2) NOT NULL DEFAULT 40,
   `class_index` int(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_summon_skills_save.sql
index 69f5f276b1..7dbb8268d6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_summons.sql
index bde6cd28bf..500cd4363a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_summons.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_tpbookmark.sql
index 6438919eb1..89a2326080 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_ui_actions.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_ui_actions.sql
index d0e76f04c0..f88c1be333 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_ui_actions.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_ui_actions.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_ui_actions` (
   `tgKey2` int(8) DEFAULT NULL,
   `show` tinyint(4) NOT NULL,
   PRIMARY KEY (`charId`,`cat`,`cmd`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_ui_categories.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_ui_categories.sql
index 9a138348dc..d21982ad83 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_ui_categories.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_ui_categories.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_ui_categories` (
   `order` tinyint(4) NOT NULL,
   `cmdId` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`catId`,`order`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_variables.sql
index e843d01ebd..f42eaecdbc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/character_variables.sql
@@ -2,4 +2,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/characters.sql
index 958756242d..1ec2023f50 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/characters.sql
@@ -62,4 +62,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_data.sql
index 70d48ca49f..c9f8f13cb1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_data.sql
@@ -22,4 +22,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_notices.sql
index b28a79dd62..e725586084 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_notices.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_privs.sql
index 6da0d19b15..57461b9e54 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_privs.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_skills.sql
index 0bc644e66e..be13835749 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_skills.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_subpledges.sql
index cf8144cbf2..3bee2d38f8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_subpledges.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_wars.sql
index 59492a6542..31ee2db1f4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clan_wars.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `wantspeace1` decimal(1,0) NOT NULL DEFAULT '0',
   `wantspeace2` decimal(1,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clanhall.sql
index 41a06cac48..f55afb8c14 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clanhall.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paid` int( 1 ) NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `clanhall` VALUES
 ('22','Moonstone Hall','0','500000','Clan hall located in the Town of Gludio','Gludio','0','2','0'),
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clanhall_functions.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clanhall_functions.sql
index 28cf4d0a8e..7ebed4ca53 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clanhall_functions.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clanhall_functions.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`hall_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clanhall_siege_attackers.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clanhall_siege_attackers.sql
index 16c4216bfe..dc27ded096 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clanhall_siege_attackers.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clanhall_siege_attackers.sql
@@ -1,4 +1,4 @@
 CREATE TABLE IF NOT EXISTS `clanhall_siege_attackers` (
   `clanhall_id` int(3) NOT NULL DEFAULT '0',
   `attacker_id` int(10) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clanhall_siege_guards.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clanhall_siege_guards.sql
index b334f13a9e..60d14d1640 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clanhall_siege_guards.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/clanhall_siege_guards.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `clanhall_siege_guards` (
   `respawnDelay` mediumint(5) NOT NULL DEFAULT '0',
   `isSiegeBoss` enum('false','true') NOT NULL DEFAULT 'false',
   KEY `clanHallId` (`clanHallId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `clanhall_siege_guards` VALUES
 -- Devasted Castle
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/crests.sql
index b3e6dd8b67..04146da77a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/crests.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/cursed_weapons.sql
index dc7a921a83..c18f76bbee 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/cursed_weapons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/custom_teleport.sql
index 96dad1f9fc..c472e6d75b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/custom_teleport.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/dimensional_rift.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/dimensional_rift.sql
index 1e01f688cf..4e2f248d62 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/dimensional_rift.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/dimensional_rift.sql
@@ -13,7 +13,7 @@ CREATE TABLE `dimensional_rift` (
   `zT` mediumint(6) NOT NULL,
   `boss` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`type`,`room_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `dimensional_rift` VALUES
 (0, 0, -115440, -114160, -182160, -178048, -6816, -6240, -114790, -180576, -6752, 0),	-- peace zone (waiting room)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fishing_championship.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fishing_championship.sql
index aa9ffef1ee..646424bd2b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fishing_championship.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fishing_championship.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fishing_championship` (
   `player_name` VARCHAR(35) NOT NULL,
   `fish_length` DOUBLE(10,3) NOT NULL,
   `rewarded` INT(1) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort.sql
index 4839495ef4..3c0a7da931 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort_doorupgrade.sql
index 033953be32..8d88f03d2c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort_functions.sql
index 18282939af..9360e19315 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort_functions.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort_siege_guards.sql
index a3dc91e468..aae71b4c1f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_siege_guards` VALUES
 -- Shanty Guards
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort_spawnlist.sql
index 038038ca63..38cb3a63ab 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,7 +11,7 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `fort_spawnlist` VALUES
 (101,null,35658,-53273,156650,-1896,62000,0,0),
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fortsiege_clans.sql
index 7caa95162d..2267d9e32d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/forums.sql
index fede0432b9..f565baebfa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/forums.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql
index 4ae82c0039..ef44b39cf4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/four_sepulchers_spawnlist.sql
@@ -14,7 +14,7 @@ CREATE TABLE `four_sepulchers_spawnlist` (
   `key_npc_id` smallint(5) unsigned NOT NULL DEFAULT '0',
   `spawntype` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `four_sepulchers_spawnlist` VALUES
 ('1', '', '1', '31468', '182074', '-85579', '-7216', '0', '0', '-32600', '3600', '31921', '0'),
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/global_tasks.sql
index 33fe875e44..8be95c521f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/global_tasks.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/global_variables.sql
index 86cabd2d0f..b5f04d1339 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/global_variables.sql
@@ -2,6 +2,6 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 REPLACE INTO `global_variables` VALUES ('HBLevel', '11');
 REPLACE INTO `global_variables` VALUES ('HBTrust', '4000000');
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/grandboss_data.sql
index c0666646a9..726901699f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/grandboss_data.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant (40)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/grandboss_list.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/grandboss_list.sql
index 3de82ecdb8..cba2ad418e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/grandboss_list.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/grandboss_list.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `grandboss_list` (
   `player_id` decimal(11,0) NOT NULL,
   `zone` decimal(11,0) NOT NULL,
   PRIMARY KEY (`player_id`,`zone`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/herb_droplist_groups.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/herb_droplist_groups.sql
index 91029fb985..a5e524415c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/herb_droplist_groups.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/herb_droplist_groups.sql
@@ -24,7 +24,7 @@ CREATE TABLE `herb_droplist_groups` (
   `chance` mediumint(7) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`groupId`,`itemId`,`category`),
   KEY `key_mobId` (`groupId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `herb_droplist_groups` VALUES
 -- default group
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/heroes.sql
index 593b5b3c72..f66ed313ee 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/heroes.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/heroes_diary.sql
index 3540726e4b..b87f1ec2b3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/heroes_diary.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/item_attributes.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/item_attributes.sql
index 787e4e6c07..933267af4e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/item_attributes.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/item_attributes.sql
@@ -2,4 +2,6 @@ CREATE TABLE IF NOT EXISTS `item_attributes` (
   `itemId` int(11) NOT NULL DEFAULT 0,
   `augAttributes` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_attributes (itemId);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/item_auction.sql
index 6ac2d3deb9..49a9229f57 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/item_auction.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/item_auction_bid.sql
index 5ac2a00221..283ccfad6e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/item_auction_bid.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/item_elementals.sql
index c6b07a116c..7d1bbe1c2a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/item_elementals.sql
@@ -3,4 +3,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/items.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/items.sql
index 3fc23ea75b..64c3a59c5e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/items.sql
@@ -16,4 +16,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/itemsonground.sql
index d87a1f6777..71962e9cdd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/itemsonground.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/lottery.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/lottery.sql
index e9f02cd64a..1bd9f73b19 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/lottery.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/lottery.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `lottery` (
   `enddate` bigint(13) unsigned NOT NULL DEFAULT '0',
   `finished` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`idnr`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/merchant_lease.sql
index 931744d3ce..7b74a60806 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/merchant_lease.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/messages.sql
index 1af8e44845..381e442e41 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/messages.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `sendBySystem` tinyint(1) NOT NULL DEFAULT 0,
   `isReturned` enum('true','false') DEFAULT 'false' NOT NULL,
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/mods_wedding.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/mods_wedding.sql
index 3d9f409d69..01c6506ca6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/mods_wedding.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/mods_wedding.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `mods_wedding` (
   PRIMARY KEY (`id`),
   KEY `player1Id` (`player1Id`),
   KEY `player2Id` (`player2Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/olympiad_data.sql
index 4a4edfb193..852ab89513 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/olympiad_data.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/olympiad_fights.sql
index d0016dcd28..9a9f98bfac 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/olympiad_fights.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(1) unsigned NOT NULL DEFAULT '0',
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/olympiad_nobles.sql
index c27f865f7e..32c51a1a40 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_done_week_non_classed` tinyint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week_team` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index 37edc72e90..1020356e67 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/petition_feedback.sql
index a00d9d507a..096d2429f3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/petition_feedback.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/pets.sql
index 7f36bc7498..b83073d6fe 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/pets.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/posts.sql
index d11bf6aa92..aec8325bdd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/posts.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/prime_shop_transactions.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/prime_shop_transactions.sql
index 5cd9ceb4cd..96cb20bdf4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/prime_shop_transactions.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/prime_shop_transactions.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `prime_shop_transactions` (
   `productId` INT NOT NULL DEFAULT 0,
   `quantity` INT NOT NULL DEFAULT 1,
   `transactionTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/punishments.sql
index 30a22f0e5f..ce5130fc23 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/punishments.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/raidboss_spawnlist.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/raidboss_spawnlist.sql
index 61ff85a6cc..b58c540197 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/raidboss_spawnlist.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/raidboss_spawnlist.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `raidboss_spawnlist` (
   `currentHp` decimal(8,0) DEFAULT NULL,
   `currentMp` decimal(8,0) DEFAULT NULL,
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `raidboss_spawnlist` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`respawn_delay`,`respawn_random`,`currentHp`,`currentMp`) VALUES
 (25001,-54416,146480,-2887,0,86400,43200,95986,514), -- Greyclaw Kutus (23)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/rainbowsprings_attacker_list.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/rainbowsprings_attacker_list.sql
index ec166bff70..03250f25e7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/rainbowsprings_attacker_list.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/rainbowsprings_attacker_list.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `rainbowsprings_attacker_list` (
   `clanId` int(10) DEFAULT NULL,
   `war_decrees_count` double(20,0) DEFAULT NULL,
   KEY `clanid` (`clanid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/random_spawn.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/random_spawn.sql
index fd99673627..bdec18101e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/random_spawn.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/random_spawn.sql
@@ -9,7 +9,7 @@ CREATE TABLE `random_spawn` (
   `broadcastSpawn` enum('true','false') NOT NULL DEFAULT 'false',
   `randomSpawn` enum('true','false') NOT NULL DEFAULT 'true',
   PRIMARY KEY (`groupId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `random_spawn` VALUES
 (11,31113,1,-1,-1,-1,'true','true'), -- Merchant of Mammon
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/random_spawn_loc.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/random_spawn_loc.sql
index 86f7dd77fe..471d8df84d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/random_spawn_loc.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/random_spawn_loc.sql
@@ -6,7 +6,7 @@ CREATE TABLE `random_spawn_loc` (
   `z` mediumint(6) NOT NULL,
   `heading` mediumint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`groupId`,`x`,`y`,`z`,`heading`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `random_spawn_loc` VALUES
 -- Merchant of Mammon
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/seven_signs.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/seven_signs.sql
index ef94a10582..cec3ff4a4d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/seven_signs.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/seven_signs.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `seven_signs` (
   `ancient_adena_amount` DECIMAL(20,0) NOT NULL DEFAULT 0,
   `contribution_score` DECIMAL(20,0) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/seven_signs_festival.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/seven_signs_festival.sql
index 7683fa8467..5d2925a98f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/seven_signs_festival.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/seven_signs_festival.sql
@@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS `seven_signs_festival` (
   `score` int(5) NOT NULL DEFAULT '0',
   `members` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`festivalId`,`cabal`,`cycle`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `seven_signs_festival` VALUES
 (0, "dawn", 1, 0, 0, ""),
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/seven_signs_status.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/seven_signs_status.sql
index bf65f25901..3cc137bec4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/seven_signs_status.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/seven_signs_status.sql
@@ -24,7 +24,7 @@ CREATE TABLE IF NOT EXISTS `seven_signs_status` (
   `accumulated_bonus3` int(10) NOT NULL DEFAULT '0',
   `accumulated_bonus4` int(10) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `seven_signs_status` VALUES
 (0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siegable_clanhall.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siegable_clanhall.sql
index e38b1792ee..a49e90db7a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siegable_clanhall.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siegable_clanhall.sql
@@ -17,7 +17,7 @@ CREATE TABLE IF NOT EXISTS `siegable_clanhall` (
   `schedule_config` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`clanHallId`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `siegable_clanhall` (`clanHallId`, `name`, `ownerId`, `desc`, `location`, `nextSiege`, `siegeLength`, `schedule_config`) VALUES
 (21, 'Fortress of Resistance', 0, 'Contestable Clan Hall', 'Dion', 0, 3600000, '14;0;0;12;00'),
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siegable_hall_flagwar_attackers.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siegable_hall_flagwar_attackers.sql
index 2d5a1d60c4..9ce6060577 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siegable_hall_flagwar_attackers.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siegable_hall_flagwar_attackers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `siegable_hall_flagwar_attackers` (
   PRIMARY KEY (`flag`),
   KEY `hall_id` (`hall_id`),
   KEY `clan_id` (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siegable_hall_flagwar_attackers_members.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siegable_hall_flagwar_attackers_members.sql
index 63e0270430..566a64fb10 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siegable_hall_flagwar_attackers_members.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siegable_hall_flagwar_attackers_members.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siegable_hall_flagwar_attackers_members` (
   KEY `hall_id` (`hall_id`),
   KEY `clan_id` (`clan_id`),
   KEY `object_id` (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siege_clans.sql
index a583deb0a7..65b7738285 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siege_clans.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/teleport.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/teleport.sql
index c4eeb54210..ff155e8a83 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/teleport.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/teleport.sql
@@ -10,7 +10,7 @@ CREATE TABLE `teleport` (
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `teleport` VALUES
 ('DE Village -> Town of Gludio',1,-12787,122779,-3112,10000,0,57),
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/territories.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/territories.sql
index 803612f942..0ed370f4f8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/territories.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/territories.sql
@@ -4,7 +4,7 @@ CREATE TABLE IF NOT EXISTS `territories` (
   `fortId` INT NOT NULL DEFAULT 0,
   `ownedWardIds` varchar(30) NOT NULL DEFAULT '',
   PRIMARY KEY (`territoryId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `territories` VALUES
 (81,1,101,'81;'),
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/territory_registrations.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/territory_registrations.sql
index 9a7308f0a9..26def83e6d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/territory_registrations.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/territory_registrations.sql
@@ -2,4 +2,4 @@ CREATE TABLE IF NOT EXISTS `territory_registrations` (
   `castleId` int(1) NOT NULL DEFAULT '0',
   `registeredId` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`castleId`,`registeredId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/territory_spawnlist.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/territory_spawnlist.sql
index 3444cf5ae1..cefdc2ce6a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/territory_spawnlist.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/territory_spawnlist.sql
@@ -10,7 +10,7 @@ CREATE TABLE `territory_spawnlist` (
   `spawnType` tinyint(1) unsigned NOT NULL DEFAULT '0', -- 0-spawned when castle have owner, 1-fortress spawns in TW time, 2-Castle spawns in TW time, 3-Ward spawn places
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `territory_spawnlist` VALUES
 (1,null,36481,-15094,124113,-3119,50948,0),
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/topic.sql
index 005d87b4e0..d7147c830f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/topic.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom/AutoPlay.ini b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom/AutoPlay.ini
index 9a4fd4bf2e..6e9d9628be 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom/AutoPlay.ini
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # Enable .play command only for premium players.
 # Premium System must be enabled.
 # Default: False
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini
index ffa9c90db7..ede0227cb7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini
@@ -427,8 +427,8 @@ ChatFilterChars = ^_^
 # MPCC_ROOM
 # NPC_GENERAL
 # NPC_SHOUT
-# Default: GENERAL;SHOUT;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
index 2dbddb7d68..53cf0d9b9f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
@@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.GrandBoss;
@@ -50,6 +51,10 @@ public class DrChaos extends AbstractNpcAI
 	private static final byte NORMAL = 0; // Dr. Chaos is in NPC form.
 	private static final byte CRAZY = 1; // Dr. Chaos entered on golem form.
 	private static final byte DEAD = 2; // Dr. Chaos has been killed and has not yet spawned.
+	private static final int CHAOS_X = 96320;
+	private static final int CHAOS_Y = -110912;
+	private static final int CHAOS_Z = -3328;
+	private static final int CHAOS_HEAD = 8191;
 	
 	private long _lastAttackVsGolem = 0;
 	private int _pissedOffTimer;
@@ -76,7 +81,7 @@ public class DrChaos extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Delete the saved time and
 				// immediately spawn Dr. Chaos. Also the state need to be changed for NORMAL
-				addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false);
+				addSpawn(DOCTOR_CHAOS, CHAOS_X, CHAOS_Y, CHAOS_Z, CHAOS_HEAD, false, 0, false);
 				GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
 			}
 		}
@@ -109,84 +114,115 @@ public class DrChaos extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)
 	{
-		if (event.equalsIgnoreCase("reset_drchaos"))
+		switch (event)
 		{
-			GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
-			addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false);
-		}
-		// despawn the live Dr. Chaos after 30 minutes of inactivity
-		else if (event.equalsIgnoreCase("golem_despawn"))
-		{
-			if ((npc.getId() == CHAOS_GOLEM) && ((_lastAttackVsGolem + 1800000) < System.currentTimeMillis()))
+			case "reset_drchaos":
 			{
-				final Npc chaos = addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false); // spawn Dr. Chaos
-				GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
-				cancelQuestTimer("golem_despawn", chaos, null);
+				GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
+				addSpawn(DOCTOR_CHAOS, CHAOS_X, CHAOS_Y, CHAOS_Z, CHAOS_HEAD, false, 0, false);
+				break;
+			}
+			case "golem_despawn": // despawn the live Dr. Chaos after 30 minutes of inactivity
+			{
+				if ((npc.getId() == CHAOS_GOLEM) && ((_lastAttackVsGolem + 1800000) < System.currentTimeMillis()))
+				{
+					final Npc chaos = addSpawn(DOCTOR_CHAOS, CHAOS_X, CHAOS_Y, CHAOS_Z, CHAOS_HEAD, false, 0, false); // spawn Dr. Chaos
+					GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
+					cancelQuestTimer("golem_despawn", chaos, null);
+					cancelQuestTimers("DISTANCE_CHECK");
+					
+					// Despawn the war golem.
+					npc.deleteMe();
+				}
+				break;
+			}
+			case "1":
+			{
+				npc.broadcastPacket(new SocialAction(npc.getObjectId(), 2));
+				npc.broadcastPacket(new SpecialCamera(npc, 1, -200, 15, 5500, 1000, 13500, 0, 0, 0, 0, 0));
+				break;
+			}
+			case "2":
+			{
+				npc.broadcastPacket(new SocialAction(npc.getObjectId(), 3));
+				break;
+			}
+			case "3":
+			{
+				npc.broadcastPacket(new SocialAction(npc.getObjectId(), 1));
+				break;
+			}
+			case "4":
+			{
+				npc.broadcastPacket(new SpecialCamera(npc, 1, -150, 10, 3500, 1000, 5000, 0, 0, 0, 0, 0));
+				npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(95928, -110671, -3340, 0));
+				break;
+			}
+			case "5":
+			{
+				final GrandBoss golem = (GrandBoss) addSpawn(CHAOS_GOLEM, 96080, -110822, -3343, 0, false, 0, false);
+				GrandBossManager.getInstance().addBoss(golem);
+				startQuestTimer("DISTANCE_CHECK", 10000, golem, null, true);
+				golem.broadcastPacket(new SpecialCamera(npc, 30, 200, 20, 6000, 700, 8000, 0, 0, 0, 0, 0));
+				golem.broadcastPacket(new SocialAction(npc.getObjectId(), 1));
+				golem.broadcastPacket(new PlaySound(1, "Rm03_A", 0, 0, 0, 0, 0));
 				
-				// Despawn the war golem.
+				// start monitoring Dr. Chaos's inactivity
+				_lastAttackVsGolem = System.currentTimeMillis();
+				startQuestTimer("golem_despawn", 60000, golem, null, true);
+				
+				// Delete Dr. Chaos after spawned the war golem.
 				npc.deleteMe();
+				break;
 			}
-		}
-		else if (event.equalsIgnoreCase("1"))
-		{
-			npc.broadcastPacket(new SocialAction(npc.getObjectId(), 2));
-			npc.broadcastPacket(new SpecialCamera(npc, 1, -200, 15, 5500, 1000, 13500, 0, 0, 0, 0, 0));
-		}
-		else if (event.equalsIgnoreCase("2"))
-		{
-			npc.broadcastPacket(new SocialAction(npc.getObjectId(), 3));
-		}
-		else if (event.equalsIgnoreCase("3"))
-		{
-			npc.broadcastPacket(new SocialAction(npc.getObjectId(), 1));
-		}
-		else if (event.equalsIgnoreCase("4"))
-		{
-			npc.broadcastPacket(new SpecialCamera(npc, 1, -150, 10, 3500, 1000, 5000, 0, 0, 0, 0, 0));
-			npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(95928, -110671, -3340, 0));
-		}
-		else if (event.equalsIgnoreCase("5"))
-		{
-			final GrandBoss golem = (GrandBoss) addSpawn(CHAOS_GOLEM, 96080, -110822, -3343, 0, false, 0, false);
-			GrandBossManager.getInstance().addBoss(golem);
-			
-			golem.broadcastPacket(new SpecialCamera(npc, 30, 200, 20, 6000, 700, 8000, 0, 0, 0, 0, 0));
-			golem.broadcastPacket(new SocialAction(npc.getObjectId(), 1));
-			golem.broadcastPacket(new PlaySound(1, "Rm03_A", 0, 0, 0, 0, 0));
-			
-			// start monitoring Dr. Chaos's inactivity
-			_lastAttackVsGolem = System.currentTimeMillis();
-			startQuestTimer("golem_despawn", 60000, golem, null, true);
-			
-			// Delete Dr. Chaos after spawned the war golem.
-			npc.deleteMe();
-		}
-		// Check every sec if someone is in range, if found, launch one task to decrease the timer.
-		else if (event.equalsIgnoreCase("paranoia_activity") && (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL))
-		{
-			for (Player obj : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 500))
+			case "paranoia_activity":
 			{
-				if (obj.isDead())
+				if (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL)
 				{
-					continue;
+					for (Player obj : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 500))
+					{
+						if (obj.isDead())
+						{
+							continue;
+						}
+						
+						_pissedOffTimer -= 1;
+						
+						// Make him speak.
+						if (_pissedOffTimer == 15)
+						{
+							npc.broadcastSay(ChatType.NPC_GENERAL, "How dare you trespass into my territory! Have you no fear?");
+						}
+						
+						// That was "too much" for that time.
+						if (_pissedOffTimer <= 0)
+						{
+							crazyMidgetBecomesAngry(npc);
+						}
+					}
 				}
-				
-				_pissedOffTimer -= 1;
-				
-				// Make him speak.
-				if (_pissedOffTimer == 15)
+				if (npc.calculateDistance2D(CHAOS_X, CHAOS_Y, CHAOS_Z) > 2000)
 				{
-					npc.broadcastSay(ChatType.NPC_GENERAL, "How dare you trespass into my territory! Have you no fear?");
+					((Attackable) npc).clearAggroList();
+					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(CHAOS_X, CHAOS_Y, CHAOS_Z, 0));
 				}
-				
-				// That was "too much" for that time.
-				if (_pissedOffTimer <= 0)
+				break;
+			}
+			case "DISTANCE_CHECK":
+			{
+				if ((npc == null) || npc.isDead())
 				{
-					crazyMidgetBecomesAngry(npc);
+					cancelQuestTimers("DISTANCE_CHECK");
 				}
+				else if (npc.calculateDistance2D(npc.getSpawn()) > 10000)
+				{
+					((Attackable) npc).clearAggroList();
+					// npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(CHAOS_X, CHAOS_Y, CHAOS_Z, 0));
+					npc.teleToLocation(npc.getSpawn(), false);
+				}
+				break;
 			}
 		}
-		
 		return super.onAdvEvent(event, npc, player);
 	}
 	
@@ -225,6 +261,10 @@ public class DrChaos extends AbstractNpcAI
 		
 		// Initialization of the paranoia.
 		startQuestTimer("paranoia_activity", 1000, npc, null, true);
+		
+		cancelQuestTimer("DISTANCE_CHECK", npc, null);
+		startQuestTimer("DISTANCE_CHECK", 10000, npc, null, true);
+		
 		return null;
 	}
 	
@@ -243,6 +283,10 @@ public class DrChaos extends AbstractNpcAI
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CHAOS_GOLEM);
 		info.set("respawn_time", System.currentTimeMillis() + respawnTime);
 		GrandBossManager.getInstance().setStatSet(CHAOS_GOLEM, info);
+		
+		// Stop distance check task.
+		cancelQuestTimers("DISTANCE_CHECK");
+		
 		return null;
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.java
index a87d477061..3df4e5bd81 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.java
@@ -240,7 +240,7 @@ public class CabaleBuffer extends AbstractNpcAI
 		 */
 		private boolean handleCast(Player player, int skillId)
 		{
-			if (player.isDead() || !player.isSpawned() || !_npc.isInsideRadius2D(player, DISTANCE_TO_WATCH_OBJECT))
+			if (player.isDead() || !player.isSpawned() || !_npc.isInsideRadius3D(player, DISTANCE_TO_WATCH_OBJECT))
 			{
 				return false;
 			}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index f40046bdf6..4a961d4660 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -261,6 +262,8 @@ public class TvT extends Event
 				world.setInstance(InstanceManager.getInstance().createDynamicInstance(INSTANCE_ID));
 				InstanceManager.getInstance().addWorld(world);
 				PVP_WORLD = world;
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
index 28391d6a41..2b8f04bba2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
@@ -377,8 +377,8 @@ public class DropSearchBoard implements IParseBoardHandler
 				icon = "icon.etc_question_mark_i00";
 			}
 			
-			builder.append("<td>");
-			builder.append("<button value=\".\" action=\"bypass _bbs_search_drop " + item.getId() + " 1 $order $level\" width=32 height=32 back=\"" + icon + "\" fore=\"" + icon + "\">");
+			builder.append("<td width=30 background=\"" + icon + "\">");
+			builder.append("<button value=\" \" action=\"bypass _bbs_search_drop " + item.getId() + " 1 $order $level\" width=30 height=30 back=\"\" fore=\"\">");
 			builder.append("</td>");
 			builder.append("<td width=200>");
 			builder.append("&#").append(item.getId()).append(";");
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
index ccfcb2282d..e5407abd3f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
@@ -17,10 +17,10 @@
 package quests.Q00604_DaimonTheWhiteEyedPart2;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.enums.QuestSound;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.Quest;
@@ -265,6 +265,6 @@ public class Q00604_DaimonTheWhiteEyedPart2 extends Quest
 	
 	private static boolean isDaimonSpawned()
 	{
-		return SpawnTable.getInstance().getAnySpawn(DAIMON_THE_WHITE_EYED) != null;
+		return World.getInstance().getVisibleObjects().stream().anyMatch(object -> object.getId() == DAIMON_THE_WHITE_EYED);
 	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
index 96dbacaa97..f68f98dee6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
@@ -17,9 +17,9 @@
 package quests.Q00625_TheFinestIngredientsPart2;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.data.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -121,7 +121,7 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 						{
 							rewardItems(player, GREATER_DYE_OF_DEX_2);
 						}
-						qs.exitQuest(false, true);
+						qs.exitQuest(true, true);
 						htmltext = event;
 					}
 					else
@@ -137,12 +137,11 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 				{
 					if (hasItem(player, FOOD_FOR_BUMBALUMP))
 					{
+						qs.setCond(2, true);
 						if (!isBumbalumpSpawned())
 						{
-							qs.setCond(2, true);
 							takeItem(player, FOOD_FOR_BUMBALUMP);
-							final Npc umpaloopa = addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
-							umpaloopa.setSummoner(player);
+							addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
 							htmltext = event;
 						}
 						else
@@ -155,6 +154,18 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 						htmltext = "31542-04.html";
 					}
 				}
+				else if (qs.isCond(2))
+				{
+					if (!isBumbalumpSpawned())
+					{
+						addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
+						htmltext = event;
+					}
+					else
+					{
+						htmltext = "31542-03.html";
+					}
+				}
 				break;
 			}
 			case "NPC_TALK":
@@ -182,7 +193,7 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 				{
 					if (talker.getLevel() >= MIN_LEVEL)
 					{
-						htmltext = (hasItem(talker, SOY_SOURCE_JAR)) ? "31521-01.htm" : "31521-02.htm";
+						htmltext = hasItem(talker, SOY_SOURCE_JAR) ? "31521-01.htm" : "31521-02.htm";
 					}
 					else
 					{
@@ -222,18 +233,14 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 				{
 					case 1:
 					{
-						if (hasItem(talker, FOOD_FOR_BUMBALUMP))
-						{
-							htmltext = "31542-01.html";
-						}
+						htmltext = "31542-01.html";
 						break;
 					}
 					case 2:
 					{
 						if (!isBumbalumpSpawned())
 						{
-							final Npc umpaloopa = addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
-							umpaloopa.setSummoner(talker);
+							addSpawn(ICICLE_EMPEROR_BUMBALUMP, ICICLE_EMPEROR_BUMBALUMP_LOC);
 							htmltext = "31542-02.html";
 						}
 						else
@@ -265,17 +272,23 @@ public class Q00625_TheFinestIngredientsPart2 extends Quest
 	@Override
 	public String onKill(Npc npc, Player killer, boolean isSummon)
 	{
-		final QuestState qs = getRandomPartyMemberState(killer, 1, 2, npc);
-		if ((qs != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, killer, true) && (npc.getSummoner() == killer))
+		executeForEachPlayer(killer, npc, isSummon, true, false);
+		return super.onKill(npc, killer, isSummon);
+	}
+	
+	@Override
+	public void actionForEachPlayer(Player player, Npc npc, boolean isSummon)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if ((qs != null) && qs.isCond(2) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, true))
 		{
 			qs.setCond(3, true);
-			giveItems(qs.getPlayer(), SPECIAL_YETI_MEAT);
+			giveItems(player, SPECIAL_YETI_MEAT);
 		}
-		return super.onKill(npc, killer, isSummon);
 	}
 	
 	private static boolean isBumbalumpSpawned()
 	{
-		return SpawnTable.getInstance().getAnySpawn(ICICLE_EMPEROR_BUMBALUMP) != null;
+		return World.getInstance().getVisibleObjects().stream().anyMatch(object -> object.getId() == ICICLE_EMPEROR_BUMBALUMP);
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
index cb2825c12a..750958df2b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
@@ -218,7 +218,7 @@ public class Q00638_SeekersOfTheHolyGrail extends Quest
 			final DropInfo info = MOBS_DROP_CHANCES.get(npc.getId());
 			if (giveItemRandomly(qs.getPlayer(), npc, info.getId(), 1, 0, info.getChance(), true) && (info.getKeyId() > 0) && (getRandom(100) < info.getKeyChance()))
 			{
-				npc.dropItem(qs.getPlayer(), info.getKeyId(), info.getKeyCount());
+				giveItems(qs.getPlayer(), info.getKeyId(), info.getKeyCount());
 			}
 		}
 		return super.onKill(npc, killer, isSummon);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
index 6601debad4..846079bb62 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
@@ -17,6 +17,7 @@
 package quests.Q00655_AGrandPlanForTamingWildBeasts;
 
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 
 import org.l2jmobius.gameserver.cache.HtmCache;
 import org.l2jmobius.gameserver.enums.QuestSound;
@@ -181,7 +182,15 @@ public class Q00655_AGrandPlanForTamingWildBeasts extends Quest
 	private static String getSiegeDate()
 	{
 		final SiegableHall hall = CHSiegeManager.getInstance().getSiegableHall(ClanHallSiegeEngine.BEAST_FARM);
-		return hall != null ? new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(hall.getSiegeDate()) : "Error in date.";
+		if (hall != null)
+		{
+			final Calendar calendar = hall.getSiegeDate();
+			if (calendar != null)
+			{
+				return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(calendar.getTime());
+			}
+		}
+		return "Unknown date.";
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/stats/items/01000-01099.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/stats/items/01000-01099.xml
index 9e00af5841..0a998d8c30 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/stats/items/01000-01099.xml
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/stats/items/01000-01099.xml
@@ -564,6 +564,7 @@
 		<set name="material" val="PAPER" />
 		<set name="weight" val="120" />
 		<set name="price" val="100" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="1048" type="EtcItem" name="Spellbook: Might">
 		<!-- Spellbook needed to learn Might. Used by Human Mystics, Elven Mystics and Dark Mystics. Required level: 7 -->
@@ -653,6 +654,7 @@
 		<set name="material" val="PAPER" />
 		<set name="weight" val="120" />
 		<set name="price" val="500" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="1058" type="EtcItem" name="Spellbook: Shield">
 		<!-- Spellbook needed to learn Shield. Used by Human Mystics, Elven Mystics and Dark Mystics. Required level: 7 -->
@@ -670,6 +672,7 @@
 		<set name="material" val="PAPER" />
 		<set name="weight" val="120" />
 		<set name="price" val="500" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="1060" type="EtcItem" name="Lesser Healing Potion">
 		<!-- A magical potion that slowly restores HP. Low endurance. -->
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/stats/items/01300-01399.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/stats/items/01300-01399.xml
index ad11e99d1f..17b3e43cad 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/stats/items/01300-01399.xml
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/stats/items/01300-01399.xml
@@ -1349,6 +1349,7 @@
 		<set name="material" val="PAPER" />
 		<set name="weight" val="120" />
 		<set name="price" val="1250" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="1396" type="EtcItem" name="Spellbook: Surrender to Wind">
 		<!-- Spellbook needed to learn Surrender to Water -->
@@ -1357,6 +1358,7 @@
 		<set name="material" val="PAPER" />
 		<set name="weight" val="120" />
 		<set name="price" val="1250" />
+		<set name="is_stackable" val="true" />
 	</item>
 	<item id="1397" type="EtcItem" name="Spellbook: Peace">
 		<!-- Spellbook needed to learn Peace. Used by Clerics. Required level: 35 -->
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java
index 7caa50c428..89617b6af3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java
@@ -1262,6 +1262,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static boolean AUTO_PLAY_PREMIUM;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
@@ -1334,6 +1335,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2681,6 +2683,7 @@ public class Config
 			ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 			AUTO_PLAY_PREMIUM = autoPlayConfig.getBoolean("AutoPlayPremium", false);
 			DISABLED_AUTO_SKILLS.clear();
 			final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
@@ -2926,6 +2929,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
index 005e745357..526adbdd51 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
@@ -424,7 +424,7 @@ public class MultisellData implements IXmlReader
 		}
 	}
 	
-	private final boolean verifyIngredient(Ingredient ing)
+	private boolean verifyIngredient(Ingredient ing)
 	{
 		switch (ing.getItemId())
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 054eda7379..825becc694 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1171,7 +1171,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				_attackEndTime = currentTime + TimeUnit.MILLISECONDS.toNanos(Integer.MAX_VALUE);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2019,7 +2019,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 			}
 			
-			sendPacket(sm);
+			if (sm != null)
+			{
+				sendPacket(sm);
+			}
 		}
 		
 		if (skill.hasEffects(EffectScope.START))
@@ -6094,7 +6097,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 							}
 						}
 					}
-					if (target.isFakePlayer())
+					if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 					{
 						player.updatePvPStatus();
 					}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java
index 3db3160124..53e43e58ff 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4490,7 +4490,7 @@ public class Player extends Playable
 	{
 		super.doAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -5146,7 +5146,7 @@ public class Player extends Playable
 					}
 					
 					// Should not penalize player when lucky, in a non siege PvP zone, has advent blessing or is in an event.
-					if (!isLucky() && (insideSiegeZone || !insidePvpZone) && !_nevitSystem.isAdventBlessingActive() && !isOnEvent())
+					if (Config.PLAYER_DELEVEL && !isLucky() && (insideSiegeZone || !insidePvpZone) && !_nevitSystem.isAdventBlessingActive() && !isOnEvent())
 					{
 						calculateDeathExpPenalty(killer, isAtWarWith(pk));
 					}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 23b289999e..b2993238e5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -960,7 +960,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index d046d54685..9e00f1afd3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -657,12 +657,12 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				player.sendPacket(new OnEventTrigger(this, _open));
 			}
-			
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
@@ -706,16 +706,25 @@ public class Door extends Creature
 	
 	private void startAutoCloseTask()
 	{
-		if ((getTemplate().getCloseTime() < 0) || isOpenableByTime())
+		final DoorTemplate template = getTemplate();
+		if ((template.getCloseTime() < 0) || isOpenableByTime())
 		{
 			return;
 		}
+		
+		// Clanhall doors should not auto close.
+		if (template.getClanHallId() > 0)
+		{
+			return;
+		}
+		
 		final Future<?> oldTask = _autoCloseTask;
 		if (oldTask != null)
 		{
 			_autoCloseTask = null;
 			oldTask.cancel(false);
 		}
+		
 		_autoCloseTask = ThreadPool.schedule(new AutoClose(), getTemplate().getCloseTime() * 1000);
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index a246af3484..41dcdd3843 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -62,7 +62,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 7b67ac9b8f..9fb6e35b40 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -1904,6 +1904,17 @@ public abstract class AbstractScript extends ManagedScript
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java
index 6627c6db2d..7da9743f9b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java
@@ -355,6 +355,15 @@ public class InstanceWorld
 		}
 	}
 	
+	/**
+	 * Get all doors spawned inside instance world.
+	 * @return collection of spawned doors
+	 */
+	public Collection<Door> getDoors()
+	{
+		return _instance.getDoors();
+	}
+	
 	/**
 	 * Get spawned door by template ID.
 	 * @param doorId template ID of door
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index 4cbc83314f..364722f4ab 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -1601,7 +1601,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 882e792670..6564ac8098 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -396,9 +396,6 @@ public class EnterWorld implements ClientPacket
 		// Send Macro List
 		player.getMacros().sendUpdate();
 		
-		// Apply item skills.
-		player.getInventory().applyItemSkills();
-		
 		// Send Item List
 		player.sendPacket(new ItemList(player, false));
 		
@@ -411,9 +408,6 @@ public class EnterWorld implements ClientPacket
 		// Send Action list
 		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		
-		// Send Skill list
-		player.sendSkillList();
-		
 		// Send Dye Information
 		player.sendPacket(new HennaInfo(player));
 		Quest.playerEnter(player);
@@ -524,6 +518,12 @@ public class EnterWorld implements ClientPacket
 		
 		player.onPlayerEnter();
 		
+		// Apply item skills.
+		player.getInventory().applyItemSkills();
+		
+		// Send Skill list
+		player.sendSkillList();
+		
 		player.sendPacket(new SkillCoolTime(player));
 		if (Config.NEVIT_ENABLED)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index bc4f3a64b7..1bd2943546 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,10 +25,12 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
@@ -39,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -94,6 +98,12 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							final Summon summon = player.getSummon();
+							if ((summon != null) && summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+							{
+								summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+							}
 							continue PLAY;
 						}
 						
@@ -119,23 +129,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getTemplate().getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getTemplate().getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -143,6 +162,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -177,32 +199,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !(player.hasSummon() && (player.getSummon().getObjectId() == nearby.getTarget().getObjectId())))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceId()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !(player.hasSummon() && (player.getSummon().getObjectId() == nearby.getTarget().getObjectId())))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceId()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -294,6 +339,7 @@ public class AutoPlayTaskManager
 				{
 					player.getSummon().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Util.java
index 8796da8853..32312c6c2b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Util.java
@@ -27,6 +27,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.StringJoiner;
 import java.util.StringTokenizer;
 import java.util.logging.Logger;
@@ -969,13 +970,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/readme.txt b/L2J_Mobius_CT_2.6_HighFive/readme.txt
index d5da584490..2ee2bc4d7f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/readme.txt
+++ b/L2J_Mobius_CT_2.6_HighFive/readme.txt
@@ -36,7 +36,6 @@ What is done
 -New script loader
 -New ThreadPool
 -New XML reader
--Replaced MMOCore with Netty
 -Dropped SQL spawnlist
 -Sell buffs command
 -Dropped knownlists
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/buffer_schemes.sql
index 1784421092..bd964c8cc2 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/buffer_schemes.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL,
     PRIMARY KEY (`object_id`,`scheme_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle.sql
index 0109cb8ab4..082a199079 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/characters.sql
index ea2aace011..60e1a786a2 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/characters.sql
@@ -60,4 +60,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort.sql
index 43de96f562..b4c76f8a7d 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort_siege_guards.sql
index 19df57a3b9..43763210b4 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort_spawnlist.sql
index 22303a9b09..144979acd9 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,4 +11,4 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/grandboss_data.sql
index 34ccc4dd7f..68450c97b9 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/heroes.sql
index 2fc8753f90..49a371cbd5 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/heroes.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/items.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/olympiad_fights.sql
index ccd4ac94ec..f25cc4c1fa 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(4) NOT NULL DEFAULT 0,
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_Classic_1.0/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_Classic_1.0/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_Classic_1.0/dist/game/config/Character.ini b/L2J_Mobius_Classic_1.0/dist/game/config/Character.ini
index 8870f1e6ec..388f33fd7c 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/config/Character.ini
+++ b/L2J_Mobius_Classic_1.0/dist/game/config/Character.ini
@@ -285,8 +285,8 @@ MaxMAtk = 999999
 MaxPCritRate = 500
 
 # Maximum character Magic Critical Rate. (10 = 1%)
-# Default: 200
-MaxMCritRate = 200
+# Classic Default: 320
+MaxMCritRate = 320
 
 # Maximum character Attack Speed.
 # Default: 1500
diff --git a/L2J_Mobius_Classic_1.0/dist/game/config/Custom/AutoPlay.ini b/L2J_Mobius_Classic_1.0/dist/game/config/Custom/AutoPlay.ini
index 9a4fd4bf2e..6e9d9628be 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/config/Custom/AutoPlay.ini
+++ b/L2J_Mobius_Classic_1.0/dist/game/config/Custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # Enable .play command only for premium players.
 # Premium System must be enabled.
 # Default: False
diff --git a/L2J_Mobius_Classic_1.0/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_Classic_1.0/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_Classic_1.0/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_Classic_1.0/dist/game/config/General.ini b/L2J_Mobius_Classic_1.0/dist/game/config/General.ini
index ce2871f4da..2c053b17ad 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_1.0/dist/game/config/General.ini
@@ -430,8 +430,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/ActionData.xml b/L2J_Mobius_Classic_1.0/dist/game/data/ActionData.xml
index b287bbf8fd..5e76f243f9 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/ActionData.xml
@@ -1,218 +1,236 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
-	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
-	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
-	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
-	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
-	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
-	<action id="70" handler="AirshipAction" option="4" /> <!-- Exit Airship -->
-	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
-	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
-	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
-	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
-	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Nightshade - Shade Sacrifice -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
-	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="0" handler="SitStand" /> <!-- Toggle Sit/Stand. (/sit, /stand) -->
+	<action id="1" handler="RunWalk" /> <!-- Toggle Walk/Run. (/walk, /run) -->
+	<action id="2" handler="None" /> <!-- Attacks selected target(s), or takes a general action if the target cannot be attacked. Hold down the Ctrl key and click to attack by force. (/attack, /attackforce) -->
+	<action id="3" handler="None" /> <!-- Request a trade from the selected target. (/trade) -->
+	<action id="4" handler="None" /> <!-- Select the nearest attackable target. (/targetnext) -->
+	<action id="5" handler="None" /> <!-- Pick up items that are scattered nearby. (/pickup) -->
+	<action id="6" handler="None" /> <!-- Change to the target of the currently selected player. (/assist) -->
+	<action id="7" handler="None" /> <!-- Invite the selected person to your party. (/invite) -->
+	<action id="8" handler="None" /> <!-- Leave the party. (/leave) -->
+	<action id="9" handler="None" /> <!-- If you are the leader of the party, dismiss selected members from your party. (/dismiss) -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Sets up a private store to sell your items. (/vendor) -->
+	<action id="11" handler="None" /> <!-- Display the party matching window to search for parties or to add members to your party. (/partymatching) -->
+	<action id="12" handler="SocialAction" option="2" /> <!-- Emote: Greet others with a kind "hello." (/socialhello) -->
+	<action id="13" handler="SocialAction" option="3" /> <!-- Emote: Let everyone know that you or someone else is victorious! (/socialvictory) -->
+	<action id="14" handler="SocialAction" option="4" /> <!-- Emote: Rouse your allies and charge! (/socialcharge) -->
+	<action id="15" handler="PetHold" /> <!-- Have your pet follow you or stay and hold its ground. -->
+	<action id="16" handler="PetAttack" /> <!-- Attack target. -->
+	<action id="17" handler="PetStop" /> <!-- Stop current action. -->
+	<action id="18" handler="None" /> <!-- Pick up nearby items. -->
+	<action id="19" handler="UnsummonPet" /> <!-- Returns your pet back to its home. -->
+	<action id="20" handler="None" /> <!-- Use special skill. -->
+	<action id="21" handler="ServitorHold" /> <!-- Have your summons follow you or stay and hold its ground. -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attack target. -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="24" handler="SocialAction" option="6" /> <!-- Emote: Respond positively. (/socialyes) -->
+	<action id="25" handler="SocialAction" option="5" /> <!-- Emote: Respond negatively. (/socialno) -->
+	<action id="26" handler="SocialAction" option="7" /> <!-- Emote: Show your respect and bow. (/socialbow) -->
+	<action id="27" handler="None" /> <!-- Use special skill. -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Sets up a private store to purchase items. (/buy) -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Emote: You have no idea what's going on. (/socialunaware) -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Emote: I'm waiting... (/socialwaiting) -->
+	<action id="31" handler="SocialAction" option="10" /> <!-- Emote: Have a good laugh. (/sociallaugh) -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Toggle between Attack/Move modes. -->
+	<action id="33" handler="SocialAction" option="11" /> <!-- Emote: Applaud. (/socialapplause) -->
+	<action id="34" handler="SocialAction" option="12" /> <!-- Emote: Serve them up your best dance moves. (/socialdance) -->
+	<action id="35" handler="SocialAction" option="13" /> <!-- Emote: Show grief. (/socialsad) -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Poison gas attack. -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Set up a private workshop that creates items by using Dwarven recipes in exchange for a fee. (/dwarvenmanufacture) -->
+	<action id="38" handler="Ride" /> <!-- Toggle mount/dismount when near or on an NPC that can be ridden. (/mount, /dismount, /mountdismount) -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Exploding corpse attack. -->
+	<action id="40" handler="None" /> <!-- Enhances a target's evaluation score. (/evaluate) -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Attacks castle gates, walls, or headquarters by shooting a cannon. -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Reflects damage back to an enemy. -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Attacks an enemy by creating a whirling surge of water. -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Attacks an enemy with a powerful explosion. -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Restores the summoner's MP. -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Attacks an enemy by summoning up a devastating storm. -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Damages an enemy and heals the servitor at the same time. -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Attacks the enemy by shooting a cannon. -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Attack with a fit of rage. -->
+	<action id="50" handler="None" /> <!-- The selected party member will become the new party leader. (/changepartyleader) -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Removes the bonds from the summons and releases it. -->
+	<action id="53" handler="ServitorMove" /> <!-- Move to the target. -->
+	<action id="54" handler="PetMove" /> <!-- Move to the target. -->
+	<action id="55" handler="None" /> <!-- Toggle recording and stop recording of replay files. (/start_replayrecording, /stop_replayrecording, /startstop_replayrecording) -->
+	<action id="56" handler="None" /> <!-- Invite the selected target to a command channel. (/channelinvite) -->
+	<action id="57" handler="None" /> <!-- Highlights private store and private workshop messages that contain the search word. (/findprivatestore) -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Open a personal store for package sale. (/packagesale) -->
+	<action id="62" handler="SocialAction" option="14" /> <!-- Charm Pose (Command: /charm) -->
+	<action id="65" handler="BotReport" /> <!-- Reports the targeted player as a suspected bot. -->
+	<action id="66" handler="SocialAction" option="15" /> <!-- Allows character to strike shy pose. (command: /shyness) -->
+	<action id="67" handler="AirshipAction" option="1" /> <!-- Allows you to control the Airship. -->
+	<action id="68" handler="AirshipAction" option="2" /> <!-- Relinquishes control of the Airship. -->
+	<action id="69" handler="AirshipAction" option="3" /> <!-- Choose from pre-designated locations. -->
+	<action id="70" handler="AirshipAction" option="4" /> <!-- Disembarks from the Airship. -->
+	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange bows with another person. (command: /two-personbow) -->
+	<action id="72" handler="SocialAction" option="17" /> <!-- High Five another person. (command: /hi-five) -->
+	<action id="73" handler="SocialAction" option="18" /> <!-- Dance with another player. (command: /coupledance) -->
+	<action id="76" handler="None" /> <!-- Invite the selected target as friends. (Commands: /friendinvite, /addfriend, /registerfriend) -->
+	<action id="77" handler="None" /> <!-- Start or end recording videos. (Commands: /startrecording, /stoprecording, /startstoprecording) -->
+	<action id="87" handler="SocialAction" option="28" /> <!-- Gesture of Proposal (Command: /Propose) -->
+	<action id="88" handler="SocialAction" option="29" /> <!-- Gesture of Provocation (Command: /Provoke) -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off (Command: /showoff) -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Attacks castle gates, walls, or headquarters with a powerful strike. -->
+	<action id="1001" handler="None" /> <!-- A reckless yet powerful attack that must be used with extreme caution. -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Incites those around the summon to attack you. -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Instantly increases P. Def. and M. Def. significantly. Character is immovable while this skill is in effect. -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- A magical attack. -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Recovers the pet's HP. -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Temporarily increases your party's chance to land a critical attack and also increases the power of the attack if successful. -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Temporarily increases your party's P. Atk and accuracy. -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Has a chance to remove curses from party members. -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Temporarily increases your party's MP regeneration. -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Temporarily shortens your party's spell re-use timer. -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Remove a curse from your party. -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Provokes an opponent to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Provokes multiple enemies around the caster to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Sacrifice HP in order to regenerate the HP of a selected target. -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Attempt a powerful, critical attack on an opponent. -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- A stunning blow that inflicts damage and instantly throws an enemy into a state of stun. -->
+	
+	<!-- Actions 1018 to 1030 are present in the Client, but are not used in Classic. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Inflict a deadly curse on an enemy that absorbs their HP. -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kat the Cat -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mew the Cat -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kai the Cat -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Boxer the Unicorn -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mirage the Unicorn -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Merrow the Unicorn -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Shadow -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by Shadow -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Silhouette -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by reanimated man -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by reanimated man -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by corrupted man -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King: A powerful slashing attack. Over-hit is possible. -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King: Slashes at surrounding enemies while spinning in the air. Over-hit is possible. -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King: Immobilizes all nearby enemies. -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn: Powerful rear kicks that stun and damage an enemy. Over-hit is possible. -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn: Pounds multiple enemies with a tremendous onrush of water. -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord: Detonates a corpse, inflicting damage to nearby enemies. -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord: Blades attached to each arm slash out in a devastating attack. Over-hit is possible. -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord: Curses nearby enemies, poisoning them and reducing their Atk. Spd. -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon: Fires a projectile a short distance. Consumes 4 Flash Gunpowder. -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon: Fires a projectile a long distance. Consumes 5 Flash Gunpowder. -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Viciously bite an enemy. -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Scratch an enemy with both paws. Causes bleeding. -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awaken hidden powers. -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Decrease a nearby enemy's P. Atk./M. Atk. with a wolf cry. -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Decrease a nearby enemy's attack speed/magic speed with a strider roar. -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Viciously bite an enemy. -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Cause both damage and shock at the same time. Instantly stuns an enemy. -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Breath fire in front of you. -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Increases maximum HP temporarily. -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Increases maximum MP temporarily. -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Increases Atk. Spd. temporarily. -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Increases Casting Spd. temporarily. -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Temporarily decreases the target's MP consumption of skills. Consumes Spirit Ore. -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Increases M. Atk. power temporarily. -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Temporarily increases the critical rate of damage attack magic. -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Temporarily increases the critical attack power. -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Temporarily increases the probability of critical attack. -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Temporarily increases Accuracy. -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Rapidly attacks the enemy twice. -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Inflicts shock and damage to the enemy at the same time with a powerful spin attack. -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Attacks nearby enemies with a doll heap attack. -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakens a hidden ability. -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of thunder. -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack on nearby enemies when hit. -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Control put in place to prevent the use of a buff upon the master. 5-minute duration. -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Powerfully attacks the target. -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- A powerful attack that pierces through a target. -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies by spinning your own body like a whirlwind. -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Attacks a front-line enemy with a powerful lance thrust. -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Shouts a victory cry that increases your abilities. -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Gathers energy into your body, then releases it in a destructive blast. -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Hits enemies with a powerful wave of force. -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Emits a loud roar that amplifies your abilities. -->
+	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Charges toward the enemy and inflicts damage. -->
+	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Cancels the target's de-buff. -->
+	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Emits a spread of ring-shaped flames. -->
+	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Attacks the enemy with a powerful flaming beak. -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Toggles you between Attack and Support modes. -->
+	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Cancels more than one of the enemy's buffs. -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Decreases the enemy's Dark attribute by 25. -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Strike multiple enemies at the front with the tail. -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Bites the enemies at the front. -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Causes nearby enemies to flee in fear. -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Increases your speed. -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Greatly increases its master's speed. -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Increases the speed of its master and their party. -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Teleports its master to the Seed of Annihilation. -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Teleports its master and their party to the Seed of Annihilation. -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attack the target. -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move to a designated location. -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Make the servitor disappear by cancelling the summoning. -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Do not counter-attack. -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Counter-attack when the master or itself is attacked. -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Damages and provokes the target. -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Roll over and deliver a shock to the ground stunning nearby targets. -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Bites the target to inflict damage. -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Damages the target and absorbs some of its HP. -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Attack nearby enemies and block their physical skills. -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Flourishes claws and frontally attacks enemies. -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Dashes toward enemies to inflict damage and Stun them. -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Inflicts damage onto the enemies with a flame. -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Flies straight into the enemy. -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Purifies the master. -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Attack the enemy by darting a feather. -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Hurt the enemy by attacking them with sharp claws. -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Recover the targets near the tree and clear any debuff. -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Attacks nearby targets with a powerful punch. -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Provokes nearby enemies. -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Bites the enemy. -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Provokes nearby enemies. -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Bites the enemy. -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Provokes nearby enemies. -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Bites the enemy. -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Attacks nearby enemies and blocks their P. Skills. -->
+	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Rushes to the enemy to inflict damage and Stun. -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Can express affection to Rudolph. Affection Level rises by 25%. Warning: Can be used only when a Rudolph requests expression of affection, and cannot be used while transformed! -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Increases Max HP by 20%, Max MP by 20%, and the Speed by 20% for 5 minutes. Increases the Debuff Resistance by 10%. Reuse delay 10 minutes. Consumes 3 Rose Essence(s) during skill use. Doesn't overlap with other buffs except Critical Seduction. -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- For 30 minutes, increases party members' Max HP by 30%, Max MP by 30%, Max CP by 30%, P. Def. by 30%, magic M. Def. by 30%, Speed by 20, P. Atk. by 10%, and magic M. Atk. by 20%. Decreases MP consumption for skill use by 15%. Reuse delay 5 minutes. Consumes 10 Rose Essence(s) during skill use. -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of lightning. -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack upon contacted enemies nearby. -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Restricts to prevent the use of a buff upon the master. 5 minute duration. -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Inflicts a powerful attack that seems to pierce through the target. -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies. -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impales an enemy with a sword. -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Raises one's own abilities. -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Gathered energy within ones self can be focused and used to attack an enemy. -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Fires a shock wave to attack enemies at the front. -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Amplifies one's own abilities. -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switches between attack mode and support mode. -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Instantly restores the master's HP by 10%. Increases the master's Debuff Resistance by 80%, Buff-canceling Attack Resistance by 40%, Speed by 10, P. Def. by 20%, and M. Def. by 20%, and decreases MP consumption for all skills by 50% for 1 minute. -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 5b501b1f1b..bcc74a8afe 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -254,6 +255,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 2aae80bebf..9d715e668a 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -41,6 +41,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AreaDamage", AreaDamage::new);
@@ -222,7 +224,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index cd446ab812..2775ff29a4 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -182,6 +182,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()))
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index b7434abd2e..1ba322bbe3 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,55 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_PET_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..798a363468 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,46 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/stats/experience.xml b/L2J_Mobius_Classic_1.0/dist/game/data/stats/experience.xml
index a384f8af46..22de43a371 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/stats/experience.xml
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/stats/experience.xml
@@ -23,7 +23,7 @@
 	<experience level="21" tolevel="1023785" trainingRate="0.4" />
 	<experience level="22" tolevel="1439215" trainingRate="0.4" />
 	<experience level="23" tolevel="1948497" trainingRate="0.4" />
-	<experience level="24" tolevel="2658850" trainingRate="0.4" />
+	<experience level="24" tolevel="2568850" trainingRate="0.4" />
 	<experience level="25" tolevel="3320625" trainingRate="0.4" />
 	<experience level="26" tolevel="4227172" trainingRate="0.4" />
 	<experience level="27" tolevel="5315161" trainingRate="0.4" />
@@ -52,7 +52,7 @@
 	<experience level="50" tolevel="251805374" trainingRate="0.4" />
 	<experience level="51" tolevel="288635909" trainingRate="0.4" />
 	<experience level="52" tolevel="330338848" trainingRate="0.4" />
-	<experience level="53" tolevel="377407026" trainingRate="0.4" />
+	<experience level="53" tolevel="377507026" trainingRate="0.4" />
 	<experience level="54" tolevel="430790086" trainingRate="0.4" />
 	<experience level="55" tolevel="490916803" trainingRate="0.4" />
 	<experience level="56" tolevel="558693890" trainingRate="0.4" />
@@ -84,11 +84,7 @@
 	<experience level="82" tolevel="279783329566" trainingRate="0.025" />
 	<experience level="83" tolevel="454748284485" trainingRate="0.025" />
 	<experience level="84" tolevel="673468617187" trainingRate="0.025" />
-	<experience level="85" tolevel="946585988578" trainingRate="0.025" />
-	<experience level="86" tolevel="112334696174" trainingRate="0.02" />
-	<experience level="87" tolevel="142393691521" trainingRate="0.01" />
-	<experience level="88" tolevel="182393693217" trainingRate="0.01" />
-	<experience level="89" tolevel="242393691141" trainingRate="0.01" />
-	<experience level="90" tolevel="362393632116" trainingRate="0.01" />
-	<experience level="91" tolevel="412393696326" trainingRate="0.01" />
+	<experience level="85" tolevel="2020405851561" trainingRate="0.025" />
+	<experience level="86" tolevel="8755092023431" trainingRate="0.025" />
+	<experience level="87" tolevel="16836715429675" trainingRate="0.025" />
 </table>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20000-20099.xml b/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20000-20099.xml
index 4b4a711ab1..49a1006674 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20000-20099.xml
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20000-20099.xml
@@ -7,7 +7,7 @@
 		<acquire exp="44" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="20" />
@@ -84,7 +84,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -136,7 +136,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="60" />
@@ -188,7 +188,7 @@
 		<acquire exp="309" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="60" />
@@ -246,7 +246,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -5321,7 +5321,7 @@
 		<acquire exp="449" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -5377,7 +5377,7 @@
 		<acquire exp="441" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -5477,7 +5477,7 @@
 		<acquire exp="449" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20100-20199.xml b/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20100-20199.xml
index e04a87f26b..116da05221 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20100-20199.xml
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20100-20199.xml
@@ -1135,7 +1135,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -1179,7 +1179,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="50" />
@@ -1229,7 +1229,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -1289,7 +1289,7 @@
 		<acquire exp="308" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -4406,7 +4406,7 @@
 		<acquire exp="1612" sp="48" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="636.798" hpRegen="3.5" mp="365.715" mpRegen="1.5" />
-			<attack physical="92.64226" magical="63.26266" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="92.64226" magical="63.26266" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.46427" magical="86.68702" />
 			<speed>
 				<walk ground="35" />
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20300-20399.xml b/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20300-20399.xml
index 9fc89ae573..b977d29fa8 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20300-20399.xml
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20300-20399.xml
@@ -512,7 +512,7 @@
 		<acquire exp="265" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="60" />
@@ -569,7 +569,7 @@
 		<acquire exp="309" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="60" />
@@ -625,7 +625,7 @@
 		<acquire exp="442" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
@@ -808,7 +808,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="24" />
@@ -897,7 +897,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1002,7 +1002,7 @@
 		<acquire exp="441" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -1056,7 +1056,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -1158,7 +1158,7 @@
 		<acquire exp="441" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -1214,7 +1214,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1266,7 +1266,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -1316,7 +1316,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1527,7 +1527,7 @@
 		<acquire exp="453" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1733,7 +1733,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -2059,7 +2059,7 @@
 		<acquire exp="442" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="50" />
@@ -3004,7 +3004,7 @@
 		<acquire exp="449" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3225,7 +3225,7 @@
 		<acquire exp="353" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="70" />
@@ -3570,7 +3570,7 @@
 		<acquire exp="451" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3826,7 +3826,7 @@
 		<acquire exp="182" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="86.088" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -3880,7 +3880,7 @@
 		<acquire exp="183" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="40" />
@@ -4117,7 +4117,7 @@
 		<acquire exp="449" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -4281,7 +4281,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -4331,7 +4331,7 @@
 		<acquire exp="442" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20400-20499.xml b/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20400-20499.xml
index ddb6e26210..82ac3cd6cb 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20400-20499.xml
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20400-20499.xml
@@ -1254,7 +1254,7 @@
 		<acquire exp="438" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1318,7 +1318,7 @@
 		<acquire exp="291" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1547,7 +1547,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
@@ -2031,7 +2031,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="24" />
@@ -2198,7 +2198,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -2250,7 +2250,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -2301,7 +2301,7 @@
 		<acquire exp="308" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -2701,7 +2701,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -3274,7 +3274,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -3324,7 +3324,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -3376,7 +3376,7 @@
 		<acquire exp="308" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -3427,7 +3427,7 @@
 		<acquire exp="438" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3656,7 +3656,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -3760,7 +3760,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="24" />
@@ -3921,7 +3921,7 @@
 		<acquire exp="442" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
@@ -3979,7 +3979,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20500-20599.xml b/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20500-20599.xml
index f332d455ce..23e8a7fb18 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20500-20599.xml
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/20500-20599.xml
@@ -1311,7 +1311,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -1518,7 +1518,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1565,7 +1565,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1610,7 +1610,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1837,7 +1837,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1882,7 +1882,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1927,7 +1927,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1972,7 +1972,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2239,7 +2239,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2289,7 +2289,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/25200-25299.xml b/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/25200-25299.xml
index a7cc76888f..eb3017ea3b 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/25200-25299.xml
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/25200-25299.xml
@@ -3884,7 +3884,7 @@
 		<acquire exp="1008600000" sp="30258000" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="20782406.25" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="45" />
@@ -4023,7 +4023,7 @@
 		<acquire exp="1008600000" sp="30258000" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="20782406.25" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/29000-29099.xml
index 0e0a7280b1..ee25a4be14 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/stats/npcs/29000-29099.xml
@@ -11,8 +11,8 @@
 		<sex>FEMALE</sex>
 		<acquire exp="2179535" sp="65386" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="687245.8498023715" hpRegen="208" mp="196.2066710268149" mpRegen="2.1" />
-			<attack physical="105" magical="8" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="386384" hpRegen="208" mp="300.8" mpRegen="2.1" />
+			<attack physical="105" magical="8" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1252" magical="229" />
 			<speed>
 				<walk ground="80" />
@@ -21,11 +21,9 @@
 			<hitTime>370</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4019" level="1" /> <!-- Decrease Speed -->
-			<skill id="4021" level="1" /> <!-- Queen Ant -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -34,8 +32,11 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4021" level="1" /> <!-- Queen Ant -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4017" level="1" /> <!-- Queen Ant's Blow -->
+			<skill id="4018" level="1" /> <!-- Decrease Speed -->
+			<skill id="4019" level="1" /> <!-- Decrease Speed -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -50,114 +51,138 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="851" min="1" max="3" chance="34.67" /> <!-- Onyx Beast's Eye Earring -->
-				<item id="355" min="1" max="1" chance="34.47" /> <!-- Dwarven Chain Mail Shirt -->
-				<item id="2496" min="1" max="1" chance="34.07" /> <!-- Dwarven Chain Shield -->
-				<item id="914" min="1" max="1" chance="33.63" /> <!-- Dark Necklace -->
-				<item id="916" min="1" max="1" chance="33.55" /> <!-- Necklace of Protection -->
-				<item id="882" min="1" max="3" chance="33.34" /> <!-- Mithril Ring -->
-				<item id="852" min="1" max="3" chance="33.11" /> <!-- Moonstone Earring -->
-				<item id="883" min="1" max="3" chance="32.56" /> <!-- Aquastone Ring -->
-				<item id="853" min="1" max="3" chance="32.54" /> <!-- Earring of Protection -->
-				<item id="382" min="1" max="1" chance="32.12" /> <!-- Dwarven Chain Gaiters -->
-				<item id="884" min="1" max="3" chance="31.83" /> <!-- Ring of Protection -->
-				<item id="915" min="1" max="1" chance="31.77" /> <!-- Aquastone Necklace -->
-				<item id="399" min="1" max="1" chance="25.81" /> <!-- Rind Leather Armor -->
-				<item id="500" min="1" max="1" chance="25.63" /> <!-- Great Helmet -->
-				<item id="419" min="1" max="1" chance="24.75" /> <!-- Rind Leather Gaiters -->
-				<item id="440" min="1" max="1" chance="24.04" /> <!-- Robe of Seal -->
-				<item id="6660" min="1" max="1" chance="20.51" /> <!-- Queen Ant's Ring -->
-				<item id="498" min="1" max="3" chance="17.3" /> <!-- Steel Plate Helmet -->
-				<item id="2455" min="1" max="3" chance="17.21" /> <!-- Plated Leather Gloves -->
-				<item id="1126" min="1" max="3" chance="16.7" /> <!-- Crimson Boots -->
-				<item id="398" min="1" max="1" chance="16.59" /> <!-- Plated Leather Armor -->
-				<item id="418" min="1" max="1" chance="16.3" /> <!-- Plated Leather Gaiters -->
-				<item id="632" min="1" max="3" chance="16.2" /> <!-- Knight's Shield -->
-				<item id="1125" min="1" max="3" chance="7.218" /> <!-- Assault Boots -->
-				<item id="2412" min="1" max="3" chance="7.211" /> <!-- Plate Helmet -->
-				<item id="2451" min="1" max="3" chance="7.209" /> <!-- Sage's Worn Gloves -->
-				<item id="2427" min="1" max="3" chance="7.208" /> <!-- Salamander Skin Boots -->
-				<item id="297" min="1" max="1" chance="7.205" /> <!-- Glaive -->
-				<item id="187" min="1" max="1" chance="7.194" /> <!-- Atuba Hammer -->
-				<item id="188" min="1" max="1" chance="7.193" /> <!-- Ghost Staff -->
-				<item id="262" min="1" max="1" chance="7.189" /> <!-- Scallop Jamadhr -->
-				<item id="322" min="1" max="1" chance="7.184" /> <!-- Vajra Wand -->
-				<item id="396" min="1" max="1" chance="7.18" /> <!-- Salamander Skin Mail -->
-				<item id="321" min="1" max="1" chance="7.171" /> <!-- Demon's Fangs -->
-				<item id="225" min="1" max="1" chance="7.15" /> <!-- Mithril Dagger -->
-				<item id="380" min="1" max="1" chance="7.147" /> <!-- Plate Gaiters -->
-				<item id="438" min="1" max="3" chance="7.14" /> <!-- Sage's Rags -->
-				<item id="630" min="1" max="3" chance="7.133" /> <!-- Square Shield -->
-				<item id="61" min="1" max="3" chance="7.123" /> <!-- Mithril Gloves -->
-				<item id="189" min="1" max="1" chance="7.121" /> <!-- Staff of Life -->
-				<item id="2428" min="1" max="3" chance="7.116" /> <!-- Plate Boots -->
-				<item id="159" min="1" max="1" chance="7.114" /> <!-- Bonebreaker -->
-				<item id="320" min="1" max="1" chance="7.111" /> <!-- Blue Crystal Skull -->
-				<item id="190" min="1" max="1" chance="7.101" /> <!-- Atuba Mace -->
-				<item id="280" min="1" max="1" chance="7.1" /> <!-- Light Crossbow -->
-				<item id="2499" min="1" max="1" chance="7.086" /> <!-- Elven Long Sword -->
-				<item id="353" min="1" max="1" chance="7.091" /> <!-- Half Plate Armor -->
-				<item id="70" min="1" max="1" chance="7.088" /> <!-- Claymore -->
-				<item id="607" min="1" max="3" chance="7.086" /> <!-- Ogre Power Gauntlets -->
-				<item id="497" min="1" max="3" chance="7.083" /> <!-- Chain Helmet -->
-				<item id="2494" min="1" max="3" chance="6.983" /> <!-- Plate Shield -->
-				<item id="74" min="1" max="1" chance="6.432" /> <!-- Katana -->
-				<item id="282" min="1" max="1" chance="6.395" /> <!-- Elemental Bow -->
-				<item id="131" min="1" max="1" chance="6.388" /> <!-- Spirit Sword -->
-				<item id="94" min="1" max="1" chance="6.375" /> <!-- Bec de Corbin -->
-				<item id="242" min="1" max="1" chance="6.371" /> <!-- Soulfire Dirk -->
-				<item id="227" min="1" max="1" chance="6.356" /> <!-- Stiletto -->
-				<item id="195" min="1" max="1" chance="6.329" /> <!-- Cursed Staff -->
-				<item id="73" min="1" max="1" chance="6.312" /> <!-- Shamshir -->
-				<item id="325" min="1" max="1" chance="6.307" /> <!-- Horn of Glory -->
-				<item id="285" min="1" max="1" chance="6.301" /> <!-- Noble Elven Bow -->
-				<item id="133" min="1" max="1" chance="6.298" /> <!-- Raid Sword -->
-				<item id="631" min="1" max="3" chance="5.684" /> <!-- Eldarake -->
-				<item id="302" min="1" max="1" chance="5.67" /> <!-- Body Slasher -->
-				<item id="160" min="1" max="1" chance="5.62" /> <!-- Battle Axe -->
-				<item id="62" min="1" max="3" chance="5.618" /> <!-- Reinforced Mithril Boots -->
-				<item id="89" min="1" max="1" chance="5.615" /> <!-- Big Hammer -->
-				<item id="192" min="1" max="1" chance="5.614" /> <!-- Crystal Staff -->
-				<item id="2454" min="1" max="3" chance="5.613" /> <!-- Karmian Gloves -->
-				<item id="2429" min="1" max="3" chance="5.603" /> <!-- Chain Boots -->
-				<item id="2453" min="1" max="3" chance="5.597" /> <!-- Chain Gloves -->
-				<item id="72" min="1" max="1" chance="5.592" /> <!-- StormBringer -->
-				<item id="263" min="1" max="1" chance="5.585" /> <!-- Chakram -->
-				<item id="2431" min="1" max="3" chance="5.584" /> <!-- Plated Leather Boots -->
-				<item id="2432" min="1" max="3" chance="5.583" /> <!-- Dwarven Chain Boots -->
-				<item id="2430" min="1" max="3" chance="5.58" /> <!-- Karmian Boots -->
-				<item id="226" min="1" max="1" chance="5.578" /> <!-- Cursed Dagger -->
-				<item id="354" min="1" max="1" chance="5.547" /> <!-- Chain Mail Shirt -->
-				<item id="2452" min="1" max="3" chance="5.546" /> <!-- Reinforced Mithril Gloves -->
-				<item id="439" min="1" max="1" chance="5.545" /> <!-- Karmian Tunic -->
-				<item id="2433" min="1" max="3" chance="5.543" /> <!-- Boots of Seal -->
-				<item id="397" min="1" max="1" chance="5.542" /> <!-- Reinforced Mithril Shirt -->
-				<item id="71" min="1" max="1" chance="5.539" /> <!-- Flamberge -->
-				<item id="298" min="1" max="1" chance="5.538" /> <!-- Orcish Glaive -->
-				<item id="230" min="1" max="1" chance="5.531" /> <!-- Needle Wolverine -->
-				<item id="281" min="1" max="1" chance="5.53" /> <!-- Crystallized Ice Bow -->
-				<item id="471" min="1" max="1" chance="5.528" /> <!-- Karmian Stockings -->
-				<item id="193" min="1" max="1" chance="5.523" /> <!-- Stick of Faith -->
-				<item id="232" min="1" max="1" chance="5.522" /> <!-- Dark Elven Dagger -->
-				<item id="96" min="1" max="1" chance="5.521" /> <!-- Scythe -->
-				<item id="161" min="1" max="1" chance="5.521" /> <!-- Silver Axe -->
-				<item id="2495" min="1" max="3" chance="5.497" /> <!-- Chain Shield -->
-				<item id="191" min="1" max="1" chance="5.495" /> <!-- Heavy Doom Hammer -->
-				<item id="2387" min="1" max="1" chance="5.491" /> <!-- Reinforced Mithril Gaiters -->
-				<item id="381" min="1" max="1" chance="5.488" /> <!-- Chain Gaiters -->
-				<item id="173" min="1" max="1" chance="5.483" /> <!-- Skull Graver -->
-				<item id="194" min="1" max="1" chance="5.482" /> <!-- Heavy Doom Axe -->
-				<item id="2413" min="1" max="3" chance="5.481" /> <!-- Chain Hood -->
+				<group chance="100">
+					<item id="320" min="1" max="1" chance="7.15" /> <!-- Blue Crystal Skull -->
+					<item id="321" min="1" max="1" chance="7.15" /> <!-- Demon's Fangs -->
+					<item id="70" min="1" max="1" chance="7.15" /> <!-- Claymore -->
+					<item id="159" min="1" max="1" chance="7.15" /> <!-- Bonebreaker -->
+					<item id="187" min="1" max="1" chance="7.15" /> <!-- Atuba Hammer -->
+					<item id="188" min="1" max="1" chance="7.15" /> <!-- Ghost Staff -->
+					<item id="189" min="1" max="1" chance="7.15" /> <!-- Staff of Life -->
+					<item id="190" min="1" max="1" chance="7.15" /> <!-- Atuba Mace -->
+					<item id="225" min="1" max="1" chance="7.15" /> <!-- Mithril Dagger -->
+					<item id="262" min="1" max="1" chance="7.15" /> <!-- Scallop Jamadhr -->
+					<item id="280" min="1" max="1" chance="7.15" /> <!-- Light Crossbow -->
+					<item id="297" min="1" max="1" chance="7.15" /> <!-- Glaive -->
+					<item id="322" min="1" max="1" chance="7.15" /> <!-- Vajra Wand -->
+					<item id="2499" min="1" max="1" chance="7.05" /> <!-- Elven Long Sword -->
+				</group>
+				<group chance="100">
+					<item id="438" min="1" max="3" chance="7.15" /> <!-- Sage's Rags -->
+					<item id="61" min="1" max="3" chance="7.15" /> <!-- Mithril Gloves -->
+					<item id="353" min="1" max="1" chance="7.15" /> <!-- Half Plate Armor -->
+					<item id="380" min="1" max="1" chance="7.15" /> <!-- Plate Gaiters -->
+					<item id="396" min="1" max="1" chance="7.15" /> <!-- Salamander Skin Mail -->
+					<item id="497" min="1" max="3" chance="7.15" /> <!-- Chain Helmet -->
+					<item id="607" min="1" max="3" chance="7.15" /> <!-- Ogre Power Gauntlets -->
+					<item id="630" min="1" max="3" chance="7.15" /> <!-- Square Shield -->
+					<item id="1125" min="1" max="3" chance="7.15" /> <!-- Assault Boots -->
+					<item id="2412" min="1" max="3" chance="7.15" /> <!-- Plate Helmet -->
+					<item id="2427" min="1" max="3" chance="7.15" /> <!-- Salamander Skin Boots -->
+					<item id="2428" min="1" max="3" chance="7.15" /> <!-- Plate Boots -->
+					<item id="2451" min="1" max="3" chance="7.15" /> <!-- Sage's Worn Gloves -->
+					<item id="2494" min="1" max="3" chance="7.05" /> <!-- Plate Shield -->
+				</group>
+				<group chance="100">
+					<item id="851" min="1" max="3" chance="33.33" /> <!-- Omen Beast's Eye Earring -->
+					<item id="882" min="1" max="3" chance="33.33" /> <!-- Mithril Ring -->
+					<item id="914" min="1" max="1" chance="33.34" /> <!-- Necklace of Darkness -->
+				</group>
+				<group chance="100">
+					<item id="71" min="1" max="1" chance="5.55" /> <!-- Flamberge -->
+					<item id="72" min="1" max="1" chance="5.55" /> <!-- StormBringer -->
+					<item id="89" min="1" max="1" chance="5.55" /> <!-- Big Hammer -->
+					<item id="96" min="1" max="1" chance="5.55" /> <!-- Scythe -->
+					<item id="160" min="1" max="1" chance="5.55" /> <!-- Battle Axe -->
+					<item id="161" min="1" max="1" chance="5.55" /> <!-- Silver Axe -->
+					<item id="173" min="1" max="1" chance="5.55" /> <!-- Skull Graver -->
+					<item id="191" min="1" max="1" chance="5.55" /> <!-- Heavy Doom Hammer -->
+					<item id="192" min="1" max="1" chance="5.55" /> <!-- Crystal Staff -->
+					<item id="193" min="1" max="1" chance="5.55" /> <!-- Stick of Faith -->
+					<item id="194" min="1" max="1" chance="5.55" /> <!-- Heavy Doom Axe -->
+					<item id="226" min="1" max="1" chance="5.55" /> <!-- Cursed Dagger -->
+					<item id="230" min="1" max="1" chance="5.55" /> <!-- Wolverine Needle -->
+					<item id="232" min="1" max="1" chance="5.55" /> <!-- Dark Elven Dagger -->
+					<item id="263" min="1" max="1" chance="5.55" /> <!-- Chakram -->
+					<item id="281" min="1" max="1" chance="5.55" /> <!-- Crystallized Ice Bow -->
+					<item id="298" min="1" max="1" chance="5.55" /> <!-- Orcish Glaive -->
+					<item id="302" min="1" max="1" chance="5.65" /> <!-- Body Slasher -->
+				</group>
+				<group chance="100">
+					<item id="2387" min="1" max="1" chance="5.55" /> <!-- Reinforced Mithril Gaiters -->
+					<item id="2413" min="1" max="3" chance="5.55" /> <!-- Chain Hood -->
+					<item id="2429" min="1" max="3" chance="5.55" /> <!-- Chain Boots -->
+					<item id="2430" min="1" max="3" chance="5.55" /> <!-- Karmian Boots -->
+					<item id="2431" min="1" max="3" chance="5.55" /> <!-- Plated Leather Boots -->
+					<item id="2432" min="1" max="3" chance="5.55" /> <!-- Dwarven Chain Boots -->
+					<item id="2433" min="1" max="3" chance="5.55" /> <!-- Boots of Seal -->
+					<item id="2452" min="1" max="3" chance="5.55" /> <!-- Reinforced Mithril Gloves -->
+					<item id="2453" min="1" max="3" chance="5.55" /> <!-- Chain Gloves -->
+					<item id="2454" min="1" max="3" chance="5.55" /> <!-- Karmian Gloves -->
+					<item id="2495" min="1" max="3" chance="5.55" /> <!-- Chain Shield -->
+					<item id="62" min="1" max="3" chance="5.55" /> <!-- Reinforced Mithril Boots -->
+					<item id="354" min="1" max="1" chance="5.55" /> <!-- Chain Mail Shirt -->
+					<item id="381" min="1" max="1" chance="5.55" /> <!-- Chain Gaiters -->
+					<item id="397" min="1" max="1" chance="5.55" /> <!-- Reinforced Mithril Shirt -->
+					<item id="439" min="1" max="1" chance="5.55" /> <!-- Karmian Tunic -->
+					<item id="471" min="1" max="1" chance="5.55" /> <!-- Karmian Stockings -->
+					<item id="631" min="1" max="3" chance="5.65" /> <!-- Eldarake -->
+				</group>
+				<group chance="100">
+					<item id="852" min="1" max="3" chance="33.33" /> <!-- Moonstone Earring -->
+					<item id="883" min="1" max="3" chance="33.33" /> <!-- Aquastone Ring -->
+					<item id="915" min="1" max="1" chance="33.34" /> <!-- Aquastone Necklace -->
+				</group>
+				<group chance="70">
+					<item id="73" min="1" max="1" chance="9.09" /> <!-- Shamshir -->
+					<item id="74" min="1" max="1" chance="9.09" /> <!-- Katana -->
+					<item id="94" min="1" max="1" chance="9.09" /> <!-- Bec de Corbin -->
+					<item id="131" min="1" max="1" chance="9.09" /> <!-- Spirit Sword -->
+					<item id="133" min="1" max="1" chance="9.09" /> <!-- Raid Sword -->
+					<item id="195" min="1" max="1" chance="9.09" /> <!-- Cursed Staff -->
+					<item id="227" min="1" max="1" chance="9.09" /> <!-- Stiletto -->
+					<item id="242" min="1" max="1" chance="9.09" /> <!-- Soulfire Dirk -->
+					<item id="282" min="1" max="1" chance="9.09" /> <!-- Elemental Bow -->
+					<item id="285" min="1" max="1" chance="9.09" /> <!-- Noble Elven Bow -->
+					<item id="325" min="1" max="1" chance="9.1" /> <!-- Horn of Glory -->
+				</group>
+				<group chance="100">
+					<item id="355" min="1" max="1" chance="33.33" /> <!-- Dwarven Chain Mail Shirt -->
+					<item id="382" min="1" max="1" chance="33.33" /> <!-- Dwarven Chain Gaiters -->
+					<item id="2496" min="1" max="1" chance="33.34" /> <!-- Dwarven Chain Shield -->
+				</group>
+				<group chance="100">
+					<item id="399" min="1" max="1" chance="25" /> <!-- Rind Leather Armor -->
+					<item id="419" min="1" max="1" chance="25" /> <!-- Rind Leather Gaiters -->
+					<item id="440" min="1" max="1" chance="25" /> <!-- Robe of Seal -->
+					<item id="500" min="1" max="1" chance="25" /> <!-- Great Helmet -->
+				</group>
+				<group chance="100">
+					<item id="632" min="1" max="3" chance="16.66" /> <!-- Knight's Shield -->
+					<item id="1126" min="1" max="3" chance="16.66" /> <!-- Crimson Boots -->
+					<item id="498" min="1" max="3" chance="16.66" /> <!-- Steel Plate Helmet -->
+					<item id="398" min="1" max="1" chance="16.66" /> <!-- Plated Leather Armor -->
+					<item id="418" min="1" max="1" chance="16.66" /> <!-- Plated Leather Gaiters -->
+					<item id="2455" min="1" max="3" chance="16.7" /> <!-- Plated Leather Gloves -->
+				</group>
+				<group chance="100">
+					<item id="853" min="1" max="3" chance="33.33" /> <!-- Earring of Protection -->
+					<item id="884" min="1" max="3" chance="33.33" /> <!-- Ring of Protection -->
+					<item id="916" min="1" max="1" chance="33.34" /> <!-- Necklace of Protection -->
+				</group>
+				<group chance="20">
+					<item id="6660" min="1" max="1" chance="100" /> <!-- Queen Ant's Ring -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29002" level="29" type="Monster" name="Queen Ant Larva">
+	<npc id="29002" level="38" type="Monster" name="Queen Ant Larva">
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="591" hpRegen="3.5" mp="315" mpRegen="1.5" />
-			<attack physical="89.21" magical="59.01" random="30" critical="7" accuracy="40" attackSpeed="257" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="591.9" hpRegen="3.5" mp="315.1" mpRegen="1.5" />
+			<attack physical="89.21" magical="59.01" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.72" magical="84.16" />
 			<speed>
 				<walk ground="40" />
@@ -166,9 +191,9 @@
 			<hitTime>350</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="true" />
+		<status attackable="true" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -177,7 +202,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="4500" aggroRange="450">
@@ -194,9 +219,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4000" hpRegen="108" mp="402" mpRegen="1.8" />
-			<attack physical="637" magical="395" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="4000" hpRegen="108" mp="402.6" mpRegen="1.8" />
+			<attack physical="637" magical="395" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="547" magical="200" />
 			<speed>
 				<walk ground="40" />
@@ -205,9 +230,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -216,7 +241,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4020" level="1" /> <!-- Recovery -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
@@ -239,9 +264,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4343" hpRegen="115" mp="432" mpRegen="1.8" />
-			<attack physical="178" magical="27" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="4343" hpRegen="115" mp="432.7" mpRegen="1.8" />
+			<attack physical="178" magical="27" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="578" magical="211" />
 			<speed>
 				<walk ground="40" />
@@ -250,9 +275,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -261,7 +286,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="700" isAggressive="true">
@@ -283,9 +308,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="7051" hpRegen="122" mp="463" mpRegen="1.8" />
-			<attack physical="1190" magical="1074" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="7051" hpRegen="122" mp="463.3" mpRegen="1.8" />
+			<attack physical="1190" magical="1074" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="610" magical="223" />
 			<speed>
 				<walk ground="40" />
@@ -294,9 +319,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -305,7 +330,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="700" aggroRange="450">
@@ -330,18 +355,19 @@
 		<sex>MALE</sex>
 		<acquire exp="2041407" sp="61242" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="930422.1343873518" hpRegen="441.65" mp="1117.069980379333" mpRegen="20.0" />
-			<attack physical="722.31" magical="1398.68" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="523103.852" hpRegen="441.65" mp="1708.8" mpRegen="20" />
+			<attack physical="722.31" magical="1398.68" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1602" magical="293" />
 			<speed>
 				<walk ground="50" />
 				<run ground="110" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -350,7 +376,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>10</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -365,81 +391,107 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="608" min="1" max="3" chance="34.99" /> <!-- Mithril Gauntlets -->
-				<item id="854" min="1" max="3" chance="33.46" /> <!-- Earring of Seal -->
-				<item id="1127" min="1" max="3" chance="33.3" /> <!-- Forgotten Boots -->
-				<item id="885" min="1" max="3" chance="32.95" /> <!-- Ring of Ages -->
-				<item id="917" min="1" max="1" chance="32.52" /> <!-- Necklace of Mermaid -->
-				<item id="1149" min="1" max="3" chance="31.87" /> <!-- Shining Circlet -->
-				<item id="420" min="1" max="1" chance="26.08" /> <!-- Theca Leather Gaiters -->
-				<item id="472" min="1" max="1" chance="25.78" /> <!-- Demon's Stockings -->
-				<item id="400" min="1" max="1" chance="25.47" /> <!-- Theca Leather Armor -->
-				<item id="2460" min="1" max="1" chance="25.23" /> <!-- Theca Leather Gloves -->
-				<item id="2435" min="1" max="1" chance="25.04" /> <!-- Demon's Boots -->
-				<item id="2436" min="1" max="1" chance="24.9" /> <!-- Theca Leather Boots -->
-				<item id="441" min="1" max="1" chance="24.26" /> <!-- Demon's Tunic -->
-				<item id="2459" min="1" max="1" chance="24.03" /> <!-- Demon's Gloves -->
-				<item id="499" min="1" max="3" chance="20.88" /> <!-- Mithril Helmet -->
-				<item id="473" min="1" max="1" chance="20.74" /> <!-- Divine Stockings -->
-				<item id="401" min="1" max="1" chance="20.66" /> <!-- Drake Leather Armor -->
-				<item id="2437" min="1" max="1" chance="20.65" /> <!-- Drake Leather Boots -->
-				<item id="2462" min="1" max="1" chance="20.64" /> <!-- Full Plate Gauntlets -->
-				<item id="103" min="1" max="3" chance="20.48" /> <!-- Tower Shield -->
-				<item id="2468" min="1" max="3" chance="20.26" /> <!-- Blessed Gloves -->
-				<item id="356" min="1" max="1" chance="20.16" /> <!-- Full Plate Armor -->
-				<item id="2414" min="1" max="1" chance="20.08" /> <!-- Full Plate Helmet -->
-				<item id="6662" min="1" max="1" chance="20.05" /> <!-- Ring of Core -->
-				<item id="442" min="1" max="1" chance="19.81" /> <!-- Divine Tunic -->
-				<item id="2497" min="1" max="1" chance="19.76" /> <!-- Full Plate Shield -->
-				<item id="107" min="1" max="3" chance="19.74" /> <!-- Compound Shield -->
-				<item id="2438" min="1" max="1" chance="19.71" /> <!-- Full Plate Boots -->
-				<item id="60" min="1" max="1" chance="19.71" /> <!-- Compound Armor -->
-				<item id="2461" min="1" max="1" chance="19.52" /> <!-- Drake Leather Gloves -->
-				<item id="603" min="1" max="3" chance="19.51" /> <!-- Divine Boots -->
-				<item id="64" min="1" max="1" chance="19.47" /> <!-- Compound Boots -->
-				<item id="1128" min="1" max="3" chance="19.4" /> <!-- Adamantite Boots -->
-				<item id="517" min="1" max="3" chance="19.29" /> <!-- Compound Helmet -->
-				<item id="2463" min="1" max="1" chance="19.28" /> <!-- Divine Gloves -->
-				<item id="119" min="1" max="1" chance="17.35" /> <!-- Necklace of Seal -->
-				<item id="919" min="1" max="1" chance="17.23" /> <!-- Blessed Necklace -->
-				<item id="886" min="1" max="3" chance="17.2" /> <!-- Ring of Seal -->
-				<item id="857" min="1" max="3" chance="16.47" /> <!-- Holy Earring -->
-				<item id="855" min="1" max="3" chance="16.2" /> <!-- Nassen's Earring -->
-				<item id="888" min="1" max="3" chance="16.04" /> <!-- Blessed Ring -->
-				<item id="135" min="1" max="1" chance="11.58" /> <!-- Samurai Long Sword -->
-				<item id="299" min="1" max="1" chance="11.56" /> <!-- Orcish Poleaxe -->
-				<item id="206" min="1" max="1" chance="11.45" /> <!-- Demon's Staff -->
-				<item id="2503" min="1" max="1" chance="11.42" /> <!-- Yaksa Mace -->
-				<item id="205" min="1" max="1" chance="11.22" /> <!-- Ghoul's Staff -->
-				<item id="266" min="1" max="1" chance="11.2" /> <!-- Great Pata -->
-				<item id="204" min="1" max="1" chance="10.73" /> <!-- Deadman's Staff -->
-				<item id="228" min="1" max="1" chance="10.63" /> <!-- Crystal Dagger -->
-				<item id="286" min="1" max="1" chance="10.61" /> <!-- Eminence Bow -->
-				<item id="303" min="1" max="1" chance="4.364" /> <!-- Widow Maker -->
-				<item id="162" min="1" max="1" chance="4.23" /> <!-- War Axe -->
-				<item id="301" min="1" max="1" chance="4.227" /> <!-- scorpion -->
-				<item id="203" min="1" max="1" chance="4.22" /> <!-- Pa'agrio Axe -->
-				<item id="95" min="1" max="1" chance="4.219" /> <!-- Poleaxe -->
-				<item id="283" min="1" max="1" chance="4.205" /> <!-- Akat Longbow -->
-				<item id="202" min="1" max="1" chance="4.201" /> <!-- Mace of Underworld -->
-				<item id="199" min="1" max="1" chance="4.188" /> <!-- Pa'agrio Hammer -->
-				<item id="231" min="1" max="1" chance="4.184" /> <!-- Grace Dagger -->
-				<item id="134" min="1" max="1" chance="4.175" /> <!-- Sword of Nightmare -->
-				<item id="233" min="1" max="1" chance="4.171" /> <!-- Dark Screamer -->
-				<item id="174" min="1" max="1" chance="4.153" /> <!-- Nirvana Axe -->
-				<item id="265" min="1" max="1" chance="4.136" /> <!-- Fisted Blade -->
-				<item id="201" min="1" max="1" chance="4.131" /> <!-- Club of Nature -->
-				<item id="196" min="1" max="1" chance="4.13" /> <!-- Stick of Eternity -->
-				<item id="75" min="1" max="1" chance="4.129" /> <!-- Caliburs -->
-				<item id="197" min="1" max="1" chance="4.114" /> <!-- Paradia Staff -->
-				<item id="76" min="1" max="1" chance="4.113" /> <!-- Sword of Delusion -->
-				<item id="84" min="1" max="1" chance="4.109" /> <!-- Homunkulus' Sword -->
-				<item id="200" min="1" max="1" chance="4.108" /> <!-- Sage's Staff -->
-				<item id="132" min="1" max="1" chance="4.105" /> <!-- Ultimate Sword -->
-				<item id="77" min="1" max="1" chance="4.097" /> <!-- Tsurugi -->
-				<item id="198" min="1" max="1" chance="4.095" /> <!-- Inferno Staff -->
-				<item id="145" min="1" max="1" chance="4.093" /> <!-- Sword of Whispering Death -->
-				<item id="8620" min="1" max="3" chance="50.85" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				<group chance="100">
+					<item id="75" min="1" max="1" chance="4.16" /> <!-- Caliburs -->
+					<item id="76" min="1" max="1" chance="4.16" /> <!-- Sword of Delusion -->
+					<item id="77" min="1" max="1" chance="4.16" /> <!-- Tsurugi -->
+					<item id="84" min="1" max="1" chance="4.16" /> <!-- Homunkulus' Sword -->
+					<item id="95" min="1" max="1" chance="4.16" /> <!-- Poleaxe -->
+					<item id="132" min="1" max="1" chance="4.16" /> <!-- Sword of Limit -->
+					<item id="134" min="1" max="1" chance="4.16" /> <!-- Sword of Nightmare -->
+					<item id="145" min="1" max="1" chance="4.16" /> <!-- Sword of Whispering Death -->
+					<item id="162" min="1" max="1" chance="4.16" /> <!-- War Axe -->
+					<item id="174" min="1" max="1" chance="4.16" /> <!-- Nirvana Axe -->
+					<item id="196" min="1" max="1" chance="4.16" /> <!-- Stick of Eternity -->
+					<item id="197" min="1" max="1" chance="4.16" /> <!-- Paradia Staff -->
+					<item id="198" min="1" max="1" chance="4.16" /> <!-- Inferno Staff -->
+					<item id="199" min="1" max="1" chance="4.16" /> <!-- Pa'agrio Hammer -->
+					<item id="200" min="1" max="1" chance="4.16" /> <!-- Sage's Staff -->
+					<item id="201" min="1" max="1" chance="4.16" /> <!-- Club of Nature -->
+					<item id="202" min="1" max="1" chance="4.16" /> <!-- Mace of Underworld -->
+					<item id="231" min="1" max="1" chance="4.16" /> <!-- Grace Dagger -->
+					<item id="233" min="1" max="1" chance="4.16" /> <!-- Dark Screamer -->
+					<item id="265" min="1" max="1" chance="4.16" /> <!-- Fisted Blade -->
+					<item id="283" min="1" max="1" chance="4.16" /> <!-- Akat Longbow -->
+					<item id="203" min="1" max="1" chance="4.16" /> <!-- Pa'agrio Axe -->
+					<item id="301" min="1" max="1" chance="4.16" /> <!-- Scorpion -->
+					<item id="303" min="1" max="1" chance="4.32" /> <!-- Widow Maker -->
+				</group>
+				<group chance="100">
+					<item id="60" min="1" max="1" chance="20" /> <!-- Composite Armor -->
+					<item id="64" min="1" max="1" chance="20" /> <!-- Composite Boots -->
+					<item id="103" min="1" max="3" chance="20" /> <!-- Tower Shield -->
+					<item id="107" min="1" max="3" chance="20" /> <!-- Composite Shield -->
+					<item id="517" min="1" max="3" chance="20" /> <!-- Composite Helmet -->
+				</group>
+				<group chance="100">
+					<item id="608" min="1" max="3" chance="33.33" /> <!-- Mithril Gauntlets -->
+					<item id="1127" min="1" max="3" chance="33.33" /> <!-- Forgotten Boots -->
+					<item id="1149" min="1" max="3" chance="33.34" /> <!-- Shining Circlet -->
+				</group>
+				<group chance="100">
+					<item id="400" min="1" max="1" chance="25" /> <!-- Theca Leather Armor -->
+					<item id="420" min="1" max="1" chance="25" /> <!-- Theca Leather Gaiters -->
+					<item id="2436" min="1" max="1" chance="25" /> <!-- Theca Leather Boots -->
+					<item id="2460" min="1" max="1" chance="25" /> <!-- Theca Leather Gloves -->
+				</group>
+				<group chance="100">
+					<item id="441" min="1" max="1" chance="25" /> <!-- Demon's Tunic -->
+					<item id="472" min="1" max="1" chance="25" /> <!-- Demon's Stockings -->
+					<item id="2435" min="1" max="1" chance="25" /> <!-- Demon's Boots -->
+					<item id="2459" min="1" max="1" chance="25" /> <!-- Demon's Gloves -->
+				</group>
+				<group chance="100">
+					<item id="854" min="1" max="3" chance="33.33" /> <!-- Earrings of Binding -->
+					<item id="885" min="1" max="3" chance="33.33" /> <!-- Ring of Ages -->
+					<item id="917" min="1" max="1" chance="33.34" /> <!-- Necklace of Mermaid -->
+				</group>
+				<group chance="100">
+					<item id="135" min="1" max="1" chance="11.11" /> <!-- Samurai Long Sword -->
+					<item id="204" min="1" max="1" chance="11.11" /> <!-- Deadman's Staff -->
+					<item id="205" min="1" max="1" chance="11.11" /> <!-- Ghoul's Staff -->
+					<item id="206" min="1" max="1" chance="11.11" /> <!-- Demon's Staff -->
+					<item id="228" min="1" max="1" chance="11.11" /> <!-- Crystal Dagger -->
+					<item id="266" min="1" max="1" chance="11.11" /> <!-- Great Pata -->
+					<item id="286" min="1" max="1" chance="11.11" /> <!-- Eminence Bow -->
+					<item id="299" min="1" max="1" chance="11.11" /> <!-- Orcish Poleaxe -->
+					<item id="2503" min="1" max="1" chance="11.12" /> <!-- Yaksa Mace -->
+				</group>
+				<group chance="100">
+					<item id="356" min="1" max="1" chance="20" /> <!-- Full Plate Armor -->
+					<item id="2414" min="1" max="1" chance="20" /> <!-- Full Plate Helmet -->
+					<item id="2438" min="1" max="1" chance="20" /> <!-- Full Plate Boots -->
+					<item id="2462" min="1" max="1" chance="20" /> <!-- Full Plate Gauntlets -->
+					<item id="2497" min="1" max="1" chance="20" /> <!-- Full Plate Shield -->
+				</group>
+				<group chance="100">
+					<item id="401" min="1" max="1" chance="20" /> <!-- Drake Leather Armor -->
+					<item id="2437" min="1" max="1" chance="20" /> <!-- Drake Leather Boots -->
+					<item id="2461" min="1" max="1" chance="20" /> <!-- Drake Leather Gloves -->
+					<item id="499" min="1" max="3" chance="20" /> <!-- Mithril Helmet -->
+					<item id="1128" min="1" max="3" chance="20" /> <!-- Adamantite Boots -->
+				</group>
+				<group chance="100">
+					<item id="442" min="1" max="1" chance="20" /> <!-- Divine Tunic -->
+					<item id="473" min="1" max="1" chance="20" /> <!-- Divine Stockings -->
+					<item id="2463" min="1" max="1" chance="20" /> <!-- Divine Gloves -->
+					<item id="2468" min="1" max="3" chance="20" /> <!-- Blessed Gloves -->
+					<item id="603" min="1" max="3" chance="20" /> <!-- Divine Boots -->
+				</group>
+				<group chance="100">
+					<item id="119" min="1" max="1" chance="16.66" /> <!-- Necklace of Binding -->
+					<item id="855" min="1" max="3" chance="16.66" /> <!-- Nassen's Earring -->
+					<item id="857" min="1" max="3" chance="16.66" /> <!-- Holy Earring -->
+					<item id="886" min="1" max="3" chance="16.66" /> <!-- Ring of Binding -->
+					<item id="888" min="1" max="3" chance="16.66" /> <!-- Blessed Ring -->
+					<item id="919" min="1" max="1" chance="16.7" /> <!-- Blessed Necklace -->
+				</group>
+				<group chance="20">
+					<item id="6662" min="1" max="1" chance="100" /> <!-- Ring of Core -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -453,9 +505,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="75" /> <!-- Caliburs -->
 		<acquire exp="13947" sp="418" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="13817" hpRegen="166" mp="747" mpRegen="2.1" />
-			<attack physical="410" magical="69" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="13817" hpRegen="166" mp="747.8" mpRegen="2.1" />
+			<attack physical="410" magical="69" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="801" magical="293" />
 			<speed>
 				<walk ground="27" />
@@ -464,9 +516,9 @@
 			<hitTime>710</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -475,9 +527,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="2300" isAggressive="true">
@@ -489,40 +539,6 @@
 			<radius normal="12" grown="14.5" />
 			<height normal="31" grown="36" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="162" min="1" max="1" chance="0.003" /> <!-- War Axe -->
-				<item id="174" min="1" max="1" chance="0.003" /> <!-- Nirvana Axe -->
-				<item id="196" min="1" max="1" chance="0.003" /> <!-- Stick of Eternity -->
-				<item id="197" min="1" max="1" chance="0.003" /> <!-- Paradia Staff -->
-				<item id="199" min="1" max="1" chance="0.003" /> <!-- Pa'agrio Hammer -->
-				<item id="200" min="1" max="1" chance="0.003" /> <!-- Sage's Staff -->
-				<item id="201" min="1" max="1" chance="0.003" /> <!-- Club of Nature -->
-				<item id="202" min="1" max="1" chance="0.003" /> <!-- Mace of Underworld -->
-				<item id="57" min="1160" max="2714" chance="70" /> <!-- Adena -->
-				<item id="1872" min="1" max="3" chance="17.68" /> <!-- Animal Bone -->
-				<item id="1865" min="1" max="3" chance="8.461" /> <!-- Varnish -->
-				<item id="1882" min="1" max="1" chance="5.622" /> <!-- Leather -->
-				<item id="2508" min="2" max="6" chance="5.263" /> <!-- Cursed Bone -->
-				<item id="1876" min="1" max="1" chance="5.056" /> <!-- Mithril Ore -->
-				<item id="2952" min="1" max="1" chance="2.134" /> <!-- Demon's Boot Fabric -->
-				<item id="3005" min="1" max="1" chance="1.049" /> <!-- Recipe: Demon's Boots -->
-				<item id="2100" min="1" max="1" chance="0.3" /> <!-- Paradia Staff Head -->
-				<item id="2097" min="1" max="1" chance="0.3" /> <!-- War Axe Blade -->
-				<item id="2098" min="1" max="1" chance="0.3" /> <!-- Nirvana Axe Blade -->
-				<item id="2231" min="1" max="1" chance="0.3" /> <!-- Recipe: Full Plate Armor -->
-				<item id="2105" min="1" max="1" chance="0.3" /> <!-- Mace of Underworld Head -->
-				<item id="2104" min="1" max="1" chance="0.3" /> <!-- Club of Nature Head -->
-				<item id="2103" min="1" max="1" chance="0.3" /> <!-- Sage's Staff Head -->
-				<item id="2099" min="1" max="1" chance="0.3" /> <!-- Stick of Eternity Shaft -->
-				<item id="2102" min="1" max="1" chance="0.3" /> <!-- Pa'agrio Hammer Head -->
-				<item id="2360" min="1" max="1" chance="0.03" /> <!-- Recipe: Orcish Poleaxe -->
-			</drop>
-			<spoil>
-				<item id="1914" min="1" max="1" chance="45.39" /> <!-- Earring of Seal Gemstone -->
-				<item id="3011" min="1" max="1" chance="23.1" /> <!-- Recipe: Divine Boots -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29008" level="55" type="Monster" name="Doom Wraith">
 		<parameters>
@@ -535,9 +551,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="1472" /> <!-- Dreadbane -->
 		<acquire exp="15169" sp="501" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="16012" hpRegen="185" mp="889" mpRegen="2.4" />
-			<attack physical="470" magical="715" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="16012" hpRegen="185" mp="889.8" mpRegen="2.4" />
+			<attack physical="470" magical="715" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="895" magical="327" />
 			<speed>
 				<walk ground="100" />
@@ -546,21 +562,19 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="5" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="5" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="700" isAggressive="true">
@@ -583,9 +597,9 @@
 		<race>PLANT</race>
 		<sex>FEMALE</sex>
 		<acquire exp="11480" sp="344" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="12544" hpRegen="154" mp="665" mpRegen="2.1" />
-			<attack physical="354" magical="60" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<attack physical="354" magical="60" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="747" magical="273" />
 			<speed>
 				<walk ground="80" />
@@ -594,19 +608,19 @@
 			<hitTime>130</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4035" level="4" /> <!-- Poison -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4035" level="4" /> <!-- Poison -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="800" isAggressive="true">
@@ -618,34 +632,6 @@
 			<radius normal="12" />
 			<height normal="25.5" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="1126" min="1" max="1" chance="0.075" /> <!-- Crimson Boots -->
-				<item id="2434" min="1" max="1" chance="0.075" /> <!-- Rind Leather Boots -->
-				<item id="2455" min="1" max="1" chance="0.075" /> <!-- Plated Leather Gloves -->
-				<item id="2457" min="1" max="1" chance="0.075" /> <!-- Gloves of Seal -->
-				<item id="2458" min="1" max="1" chance="0.075" /> <!-- Rind Leather Gloves -->
-				<item id="57" min="996" max="2323" chance="70" /> <!-- Adena -->
-				<item id="1342" min="30" max="90" chance="13.49" /> <!-- Steel Arrow -->
-				<item id="1866" min="1" max="1" chance="13.18" /> <!-- Suede -->
-				<item id="1867" min="2" max="6" chance="6.42" /> <!-- Animal Skin -->
-				<item id="2948" min="1" max="1" chance="4.455" /> <!-- Rind Leather Boot Lining -->
-				<item id="2950" min="1" max="1" chance="4.366" /> <!-- Gloves of Seal Pattern -->
-				<item id="2951" min="1" max="1" chance="4.334" /> <!-- Rind Leather Glove Design -->
-				<item id="1882" min="1" max="1" chance="4.316" /> <!-- Leather -->
-				<item id="1868" min="5" max="15" chance="3.919" /> <!-- Thread -->
-				<item id="2946" min="1" max="1" chance="2.924" /> <!-- Plated Leather Glove Design -->
-				<item id="2508" min="3" max="9" chance="2.633" /> <!-- Cursed Bone -->
-				<item id="1974" min="1" max="3" chance="2.152" /> <!-- Crimson Boot Fabric -->
-				<item id="1885" min="1" max="1" chance="1.582" /> <!-- High-grade Suede -->
-				<item id="2339" min="1" max="1" chance="0.03" /> <!-- Recipe: Inferno Staff -->
-				<item id="2350" min="1" max="1" chance="0.03" /> <!-- Recipe: Pa'agrio Axe -->
-			</drop>
-			<spoil>
-				<item id="1895" min="1" max="5" chance="66.8" /> <!-- Metallic Fiber -->
-				<item id="2944" min="1" max="1" chance="63.4" /> <!-- Karmian Glove Fabric -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29010" level="46" type="Monster" name="Validus">
 		<parameters>
@@ -656,29 +642,29 @@
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<acquire exp="11032" sp="330" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="12130" hpRegen="150" mp="637" mpRegen="2.1" />
-			<attack physical="337" magical="58" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="12130" hpRegen="150" mp="637.8" mpRegen="2.1" />
+			<attack physical="337" magical="58" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="729" magical="267" />
 			<speed>
 				<walk ground="70" />
 				<run ground="110" />
 			</speed>
-			<hitTime>300</hitTime>
+			<hitTime>30</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="3" /> <!-- Beast -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="3" /> <!-- Beasts -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="1200" isAggressive="true">
@@ -690,29 +676,6 @@
 			<radius normal="15" />
 			<height normal="29" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="354" min="1" max="1" chance="0.03" /> <!-- Chain Mail Shirt -->
-				<item id="232" min="1" max="1" chance="0.0075" /> <!-- Dark Elven Dagger -->
-				<item id="281" min="1" max="1" chance="0.0075" /> <!-- Crystallized Ice Bow -->
-				<item id="57" min="914" max="2141" chance="70" /> <!-- Adena -->
-				<item id="1866" min="1" max="1" chance="15.87" /> <!-- Suede -->
-				<item id="1878" min="1" max="1" chance="9.238" /> <!-- Durable Braid -->
-				<item id="1864" min="3" max="9" chance="7.601" /> <!-- Stem -->
-				<item id="1865" min="2" max="6" chance="5.802" /> <!-- Varnish -->
-				<item id="2508" min="2" max="6" chance="3.833" /> <!-- Cursed Bone -->
-				<item id="1959" min="1" max="1" chance="2.156" /> <!-- Chain Mail Shirt Material -->
-				<item id="2072" min="1" max="1" chance="0.75" /> <!-- Dark Elven Dagger Edge -->
-				<item id="2074" min="1" max="1" chance="0.75" /> <!-- Crystallized Ice Bow Shaft -->
-				<item id="2319" min="1" max="1" chance="0.075" /> <!-- Recipe: Raid Sword -->
-				<item id="951" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Weapon (C-grade) -->
-			</drop>
-			<spoil>
-				<item id="1873" min="1" max="3" chance="87.19" /> <!-- Silver Nugget -->
-				<item id="2060" min="1" max="1" chance="3.433" /> <!-- StormBringer Blade -->
-				<item id="2067" min="1" max="1" chance="3.11" /> <!-- Crystal Staff Head -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29011" level="49" type="Monster" name="Susceptor">
 		<parameters>
@@ -723,10 +686,10 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="13389" hpRegen="162" mp="720" mpRegen="2.1" />
-			<attack physical="391" magical="66" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<attack physical="391" magical="66" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="783" magical="286" />
 			<speed>
 				<walk ground="27" />
@@ -735,10 +698,9 @@
 			<hitTime>430</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -747,7 +709,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="1500" isAggressive="true">
@@ -770,9 +733,9 @@
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<acquire exp="16035" sp="481" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="12964" hpRegen="158" mp="692" mpRegen="2.1" />
-			<attack physical="372" magical="63" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="12964" hpRegen="158" mp="692.4" mpRegen="2.1" />
+			<attack physical="372" magical="63" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="765" magical="280" />
 			<speed>
 				<walk ground="20" />
@@ -781,22 +744,22 @@
 			<hitTime>410</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4273" level="3" /> <!-- Resist Daggers/Rapier Weapon -->
-			<skill id="4274" level="1" /> <!-- Blunt Weapon Weak Point -->
-			<skill id="4408" level="12" /> <!-- HP Increase (4x) -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
-			<skill id="4444" level="2" /> <!-- Higher Resist Bow/Crossbow Weapons -->
+			<skill id="4444" level="2" /> <!-- Greater Bow/Crossbow Resistance -->
+			<skill id="4273" level="3" /> <!-- Dagger/Rapier Resistance -->
+			<skill id="4274" level="1" /> <!-- Blunt Weapon Vulnerability -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="800" isAggressive="true">
@@ -808,35 +771,6 @@
 			<radius normal="18" />
 			<height normal="34" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="1126" min="1" max="1" chance="0.075" /> <!-- Crimson Boots -->
-				<item id="2434" min="1" max="1" chance="0.075" /> <!-- Rind Leather Boots -->
-				<item id="2455" min="1" max="1" chance="0.075" /> <!-- Plated Leather Gloves -->
-				<item id="2457" min="1" max="1" chance="0.075" /> <!-- Gloves of Seal -->
-				<item id="2458" min="1" max="1" chance="0.075" /> <!-- Rind Leather Gloves -->
-				<item id="57" min="1447" max="3374" chance="70" /> <!-- Adena -->
-				<item id="1873" min="1" max="1" chance="13.28" /> <!-- Silver Nugget -->
-				<item id="1865" min="1" max="3" chance="10.19" /> <!-- Varnish -->
-				<item id="2508" min="2" max="6" chance="6.589" /> <!-- Cursed Bone -->
-				<item id="1965" min="1" max="1" chance="4.334" /> <!-- Metal Plate Helmet Material -->
-				<item id="2946" min="1" max="1" chance="3.6" /> <!-- Plated Leather Glove Design -->
-				<item id="1880" min="1" max="1" chance="3.203" /> <!-- Steel -->
-				<item id="1869" min="5" max="15" chance="3.137" /> <!-- Iron Ore -->
-				<item id="1974" min="1" max="3" chance="2.639" /> <!-- Crimson Boot Fabric -->
-				<item id="1874" min="1" max="1" chance="2.105" /> <!-- Oriharukon Ore -->
-				<item id="2948" min="1" max="3" chance="1.75" /> <!-- Rind Leather Boot Lining -->
-				<item id="2950" min="2" max="6" chance="1.289" /> <!-- Gloves of Seal Pattern -->
-				<item id="2951" min="2" max="6" chance="1.104" /> <!-- Rind Leather Glove Design -->
-				<item id="1973" min="3" max="9" chance="0.75" /> <!-- Pa'agrio Hand Design -->
-				<item id="2344" min="1" max="1" chance="0.075" /> <!-- Recipe: Grace Dagger -->
-				<item id="951" min="1" max="1" chance="0.075" /> <!-- Scroll: Enchant Weapon (C-grade) -->
-			</drop>
-			<spoil>
-				<item id="2073" min="1" max="1" chance="7.899" /> <!-- Chakram Edge -->
-				<item id="2352" min="1" max="1" chance="2.095" /> <!-- Recipe: Widow Maker -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29013" level="45" type="Monster" name="Premo">
 		<parameters>
@@ -847,9 +781,9 @@
 		<race>GIANT</race>
 		<sex>MALE</sex>
 		<acquire exp="10351" sp="310" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="11721" hpRegen="146" mp="610" mpRegen="2.1" />
-			<attack physical="320" magical="55" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="11721" hpRegen="146" mp="610.8" mpRegen="2.1" />
+			<attack physical="320" magical="55" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="711" magical="260" />
 			<speed>
 				<walk ground="55" />
@@ -858,10 +792,10 @@
 			<hitTime>610</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="11" /> <!-- Giants -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
@@ -869,7 +803,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="11" /> <!-- Giants -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="1200" aggroRange="450">
@@ -881,30 +815,6 @@
 			<radius normal="21" grown="25" />
 			<height normal="35" grown="43" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="631" min="1" max="1" chance="0.3" /> <!-- Eldarake -->
-				<item id="2495" min="1" max="1" chance="0.3" /> <!-- Chain Shield -->
-				<item id="2413" min="1" max="1" chance="0.075" /> <!-- Chain Hood -->
-				<item id="57" min="859" max="2006" chance="70" /> <!-- Adena -->
-				<item id="1868" min="1" max="3" chance="19.72" /> <!-- Thread -->
-				<item id="1866" min="1" max="1" chance="13.09" /> <!-- Suede -->
-				<item id="1867" min="1" max="3" chance="8.403" /> <!-- Animal Skin -->
-				<item id="1964" min="1" max="1" chance="6.104" /> <!-- Eldarake Temper -->
-				<item id="2945" min="1" max="1" chance="6.039" /> <!-- Chain Shield Fragment -->
-				<item id="2936" min="1" max="1" chance="5.482" /> <!-- Chain Hood Pattern -->
-				<item id="1882" min="1" max="1" chance="4.221" /> <!-- Leather -->
-				<item id="1885" min="1" max="1" chance="1.547" /> <!-- High-grade Suede -->
-				<item id="2207" min="1" max="1" chance="0.3" /> <!-- Recipe: Karmian Tunic -->
-				<item id="2323" min="1" max="1" chance="0.075" /> <!-- Recipe: Elemental Bow -->
-				<item id="2326" min="1" max="1" chance="0.075" /> <!-- Recipe: Horn of Glory -->
-			</drop>
-			<spoil>
-				<item id="1876" min="1" max="1" chance="79.85" /> <!-- Mithril Ore -->
-				<item id="1962" min="1" max="1" chance="13.14" /> <!-- Karmian Tunic Pattern -->
-				<item id="2073" min="1" max="1" chance="3.153" /> <!-- Chakram Edge -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29014" level="50" type="GrandBoss" name="Orfen">
 		<parameters>
@@ -915,13 +825,13 @@
 				<npc id="29016" count="4" respawnTime="360" weightPoint="1" />
 			</minions>
 		</parameters>
-		<race>ELEMENTAL</race>
+		<race>FAIRY</race>
 		<sex>FEMALE</sex>
 		<acquire exp="8872500" sp="266175" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="930422.1343873518" hpRegen="441.65" mp="1117.069980379333" mpRegen="20.0" />
-			<attack physical="722.31" magical="1398.68" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="1602" magical="293" />
+			<vitals hp="523103.852" hpRegen="441.65" mp="1708.8" mpRegen="20" />
+			<attack physical="3652" magical="1535" random="10" critical="4" accuracy="0" attackSpeed="253" type="SWORD" range="80" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -929,12 +839,9 @@
 			<hitTime>710</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4062" level="1" /> <!-- Orfen -->
-			<skill id="4063" level="1" /> <!-- Paralysis -->
-			<skill id="4064" level="1" /> <!-- Paralysis -->
+			<skill id="4416" level="13" /> <!-- Fairies -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -943,7 +850,10 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="13" /> <!-- Fairies -->
+			<skill id="4062" level="1" /> <!-- Orfen -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4063" level="1" /> <!-- Paralysis -->
+			<skill id="4064" level="1" /> <!-- Paralysis -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -958,55 +868,79 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="918" min="1" max="1" chance="33.35" /> <!-- Adamantite Necklace -->
-				<item id="856" min="1" max="3" chance="33.1" /> <!-- Adamantite Earring -->
-				<item id="887" min="1" max="3" chance="32.11" /> <!-- Adamantite Ring -->
-				<item id="673" min="1" max="1" chance="25.95" /> <!-- Avadon Shield -->
-				<item id="2379" min="1" max="1" chance="25.86" /> <!-- Avadon Gaiters -->
-				<item id="2376" min="1" max="1" chance="25.13" /> <!-- Avadon Breastplate -->
-				<item id="2415" min="1" max="1" chance="24.74" /> <!-- Avadon Circlet -->
-				<item id="2414" min="1" max="1" chance="20.98" /> <!-- Full Plate Helmet -->
-				<item id="603" min="1" max="3" chance="20.87" /> <!-- Divine Boots -->
-				<item id="2463" min="1" max="1" chance="20.81" /> <!-- Divine Gloves -->
-				<item id="356" min="1" max="1" chance="20.6" /> <!-- Full Plate Armor -->
-				<item id="1128" min="1" max="3" chance="20.45" /> <!-- Adamantite Boots -->
-				<item id="2438" min="1" max="1" chance="20.42" /> <!-- Full Plate Boots -->
-				<item id="6661" min="1" max="1" chance="20.12" /> <!-- Orfen's Earring -->
-				<item id="2437" min="1" max="1" chance="20.12" /> <!-- Drake Leather Boots -->
-				<item id="442" min="1" max="1" chance="20.08" /> <!-- Divine Tunic -->
-				<item id="2462" min="1" max="1" chance="19.79" /> <!-- Full Plate Gauntlets -->
-				<item id="499" min="1" max="3" chance="19.79" /> <!-- Mithril Helmet -->
-				<item id="401" min="1" max="1" chance="19.78" /> <!-- Drake Leather Armor -->
-				<item id="2461" min="1" max="1" chance="19.7" /> <!-- Drake Leather Gloves -->
-				<item id="2468" min="1" max="3" chance="19.32" /> <!-- Blessed Gloves -->
-				<item id="473" min="1" max="1" chance="19.15" /> <!-- Divine Stockings -->
-				<item id="2497" min="1" max="3" chance="19.15" /> <!-- Full Plate Shield -->
-				<item id="119" min="1" max="1" chance="16.97" /> <!-- Necklace of Seal -->
-				<item id="855" min="1" max="3" chance="16.5" /> <!-- Nassen's Earring -->
-				<item id="888" min="1" max="3" chance="16.16" /> <!-- Blessed Ring -->
-				<item id="857" min="1" max="3" chance="16.02" /> <!-- Holy Earring -->
-				<item id="919" min="1" max="1" chance="16.01" /> <!-- Blessed Necklace -->
-				<item id="886" min="1" max="3" chance="15.9" /> <!-- Ring of Seal -->
-				<item id="228" min="1" max="1" chance="11.59" /> <!-- Crystal Dagger -->
-				<item id="266" min="1" max="1" chance="11.58" /> <!-- Great Pata -->
-				<item id="299" min="1" max="1" chance="11.37" /> <!-- Orcish Poleaxe -->
-				<item id="204" min="1" max="1" chance="10.99" /> <!-- Deadman's Staff -->
-				<item id="286" min="1" max="1" chance="10.89" /> <!-- Eminence Bow -->
-				<item id="206" min="1" max="1" chance="10.83" /> <!-- Demon's Staff -->
-				<item id="2503" min="1" max="1" chance="10.7" /> <!-- Yaksa Mace -->
-				<item id="205" min="1" max="1" chance="10.62" /> <!-- Ghoul's Staff -->
-				<item id="135" min="1" max="1" chance="10.6" /> <!-- Samurai Long Sword -->
-				<item id="947" min="2" max="8" chance="100" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-				<item id="948" min="10" max="30" chance="100" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="8620" min="1" max="3" chance="50.1" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="4065" min="20" max="80" chance="13.09" /> <!-- Avadon Gaiter Material -->
-				<item id="4071" min="20" max="80" chance="12.62" /> <!-- Avadon Robe Fabric -->
-				<item id="4050" min="20" max="80" chance="12.62" /> <!-- Adamantite Ring Wire -->
-				<item id="4064" min="20" max="80" chance="12.61" /> <!-- Avadon Breastplate Part -->
-				<item id="4072" min="20" max="80" chance="12.6" /> <!-- Avadon Circlet Pattern -->
-				<item id="4049" min="20" max="80" chance="12.14" /> <!-- Adamantite Earring Gemstone -->
-				<item id="4051" min="20" max="80" chance="12.12" /> <!-- Adamantite Necklace Chain -->
-				<item id="4439" min="20" max="80" chance="11.89" /> <!-- Avadon Shield Fragment -->
+				<group chance="100">
+					<item id="135" min="1" max="1" chance="11.11" /> <!-- Samurai Long Sword -->
+					<item id="204" min="1" max="1" chance="11.11" /> <!-- Deadman's Staff -->
+					<item id="205" min="1" max="1" chance="11.11" /> <!-- Ghoul's Staff -->
+					<item id="206" min="1" max="1" chance="11.11" /> <!-- Demon's Staff -->
+					<item id="228" min="1" max="1" chance="11.11" /> <!-- Crystal Dagger -->
+					<item id="266" min="1" max="1" chance="11.11" /> <!-- Great Pata -->
+					<item id="286" min="1" max="1" chance="11.11" /> <!-- Eminence Bow -->
+					<item id="299" min="1" max="1" chance="11.11" /> <!-- Orcish Poleaxe -->
+					<item id="2503" min="1" max="1" chance="11.12" /> <!-- Yaksa Mace -->
+				</group>
+				<group chance="100">
+					<item id="356" min="1" max="1" chance="20" /> <!-- Full Plate Armor -->
+					<item id="2497" min="1" max="3" chance="20" /> <!-- Full Plate Shield -->
+					<item id="2414" min="1" max="1" chance="20" /> <!-- Full Plate Helmet -->
+					<item id="2438" min="1" max="1" chance="20" /> <!-- Full Plate Boots -->
+					<item id="2462" min="1" max="1" chance="20" /> <!-- Full Plate Gauntlets -->
+				</group>
+				<group chance="100">
+					<item id="2461" min="1" max="1" chance="20" /> <!-- Drake Leather Gloves -->
+					<item id="2437" min="1" max="1" chance="20" /> <!-- Drake Leather Boots -->
+					<item id="401" min="1" max="1" chance="20" /> <!-- Drake Leather Armor -->
+					<item id="603" min="1" max="3" chance="20" /> <!-- Divine Boots -->
+					<item id="1128" min="1" max="3" chance="20" /> <!-- Adamantite Boots -->
+				</group>
+				<group chance="100">
+					<item id="442" min="1" max="1" chance="20" /> <!-- Divine Tunic -->
+					<item id="473" min="1" max="1" chance="20" /> <!-- Divine Stockings -->
+					<item id="2463" min="1" max="1" chance="20" /> <!-- Divine Gloves -->
+					<item id="2468" min="1" max="3" chance="20" /> <!-- Blessed Gloves -->
+					<item id="499" min="1" max="3" chance="20" /> <!-- Mithril Helmet -->
+				</group>
+				<group chance="100">
+					<item id="119" min="1" max="1" chance="16.66" /> <!-- Necklace of Binding -->
+					<item id="855" min="1" max="3" chance="16.66" /> <!-- Nassen's Earring -->
+					<item id="857" min="1" max="3" chance="16.66" /> <!-- Holy Earring -->
+					<item id="886" min="1" max="3" chance="16.66" /> <!-- Ring of Binding -->
+					<item id="888" min="1" max="3" chance="16.66" /> <!-- Blessed Ring -->
+					<item id="919" min="1" max="1" chance="16.7" /> <!-- Blessed Necklace -->
+				</group>
+				<group chance="100">
+					<item id="2376" min="1" max="1" chance="25" /> <!-- Avadon Breastplate -->
+					<item id="2379" min="1" max="1" chance="25" /> <!-- Avadon Gaiters -->
+					<item id="2415" min="1" max="1" chance="25" /> <!-- Avadon Circlet -->
+					<item id="673" min="1" max="1" chance="25" /> <!-- Avadon Shield -->
+				</group>
+				<group chance="100">
+					<item id="856" min="1" max="3" chance="33.33" /> <!-- Adamantite Earring -->
+					<item id="887" min="1" max="3" chance="33.33" /> <!-- Adamantite Ring -->
+					<item id="918" min="1" max="1" chance="33.34" /> <!-- Adamantite Necklace -->
+				</group>
+				<group chance="100">
+					<item id="4049" min="20" max="80" chance="12.5" /> <!-- Adamantite Earring Gemstone -->
+					<item id="4050" min="20" max="80" chance="12.5" /> <!-- Adamantite Ring Wire -->
+					<item id="4051" min="20" max="80" chance="12.5" /> <!-- Adamantite Necklace Chain -->
+					<item id="4064" min="20" max="80" chance="12.5" /> <!-- Avadon Breastplate Part -->
+					<item id="4065" min="20" max="80" chance="12.5" /> <!-- Avadon Gaiter Material -->
+					<item id="4071" min="20" max="80" chance="12.5" /> <!-- Avadon Robe Fabric -->
+					<item id="4072" min="20" max="80" chance="12.5" /> <!-- Avadon Circlet Pattern -->
+					<item id="4439" min="20" max="80" chance="12.5" /> <!-- Avadon Shield Fragment -->
+				</group>
+				<group chance="20">
+					<item id="6661" min="1" max="1" chance="100" /> <!-- Orfen's Earring -->
+				</group>
+				<group chance="100">
+					<item id="947" min="2" max="8" chance="100" /> <!-- Scroll: Enchant Weapon (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="948" min="10" max="30" chance="100" /> <!-- Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -1016,13 +950,13 @@
 			<param name="MoveAroundSocial1" value="70" />
 			<param name="MoveAroundSocial2" value="70" />
 		</parameters>
-		<race>BEAST</race>
+		<race>BUG</race>
 		<sex>MALE</sex>
-		<acquire exp="16035" sp="481" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="16035" sp="481" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="158" mp="36936" mpRegen="2.1" />
-			<attack physical="298" magical="40" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="765" magical="280" />
+			<attack physical="298" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1030,9 +964,9 @@
 			<hitTime>540</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1041,7 +975,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="2500" aggroRange="450">
@@ -1060,13 +994,13 @@
 			<param name="MoveAroundSocial1" value="70" />
 			<param name="MoveAroundSocial2" value="70" />
 		</parameters>
-		<race>BEAST</race>
+		<race>BUG</race>
 		<sex>MALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="162" mp="36936" mpRegen="2.1" />
-			<attack physical="1058" magical="1563" random="30" critical="15" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="783" magical="286" />
+			<attack physical="1058" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1074,9 +1008,9 @@
 			<hitTime>540</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1085,7 +1019,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="2700" aggroRange="450">
@@ -1106,11 +1040,11 @@
 		</parameters>
 		<race>BUG</race>
 		<sex>FEMALE</sex>
-		<acquire exp="16035" sp="481" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="16035" sp="481" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="158" mp="36936" mpRegen="2.1" />
-			<attack physical="298" magical="40" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="765" magical="280" />
+			<attack physical="298" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1118,9 +1052,9 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1129,7 +1063,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="2700" aggroRange="450">
@@ -1145,11 +1079,11 @@
 	<npc id="29018" level="49" type="Monster" name="Riba Iren">
 		<race>BUG</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="162" mp="36936" mpRegen="2.1" />
-			<attack physical="1058" magical="1563" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="783" magical="286" />
+			<attack physical="1058" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1157,9 +1091,9 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bugs -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1168,8 +1102,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
-			<skill id="4516" level="1" /> <!-- Orfen Heal -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="2900" isAggressive="true">
@@ -1187,27 +1120,19 @@
 		<sex>MALE</sex>
 		<acquire exp="262720917" sp="63053" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="7500000" hpRegen="1000" mp="18000" mpRegen="99" />
-			<attack physical="3260" magical="1700" random="30" critical="4" accuracy="40" attackSpeed="206" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="440" magical="440" />
+			<vitals hp="7000000" hpRegen="1000" mp="18000" mpRegen="99" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3840" magical="825" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4106" level="1" /> <!-- Antharas Stun -->
-			<skill id="4108" level="1" /> <!-- Antharas Terror -->
-			<skill id="4109" level="1" /> <!-- Curse of Antharas -->
-			<skill id="4110" level="2" /> <!-- Breath Attack -->
-			<skill id="4111" level="1" /> <!-- Antharas Fossilization -->
-			<skill id="4112" level="1" /> <!-- Ordinary Attack -->
-			<skill id="4113" level="1" /> <!-- Animal doing ordinary attack -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1216,9 +1141,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5092" level="1" /> <!-- Antharas Terror -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1227,39 +1152,36 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists> <!-- CT2.5 -->
-			<drop>
-				<item id="8620" min="10" max="30" chance="50" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="1538" min="1" max="59" chance="100" /> <!-- Blessed Scroll of Escape -->
-				<item id="3936" min="1" max="39" chance="100" /> <!-- Blessed Scroll of Resurrection -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="9000000" max="13000000" chance="100" /> <!-- Adena -->
-			</drop>
-		</dropLists>
 	</npc>
-	<npc id="29020" level="75" type="GrandBoss" name="Baium">
+	<npc id="29020" level="80" type="GrandBoss" name="Baium">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<acquire exp="51267002" sp="1538010" raidPoints="450" />
+		<acquire exp="1024738848" sp="30742165" raidPoints="450" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="10334675.47262" hpRegen="310.756323" mp="15930" mpRegen="3" />
-			<attack physical="3374.18" magical="2200" random="30" critical="4" accuracy="40" attackSpeed="206" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3300" magical="2200" />
+			<vitals hp="133333333" hpRegen="6666" mp="18000" mpRegen="99" />
+			<attack physical="25931" magical="8204" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3202" magical="2134" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4127" level="1" /> <!-- Baium: General Attack -->
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4256" level="1" /> <!-- Stun Resistance -->
+			<skill id="4127" level="1" /> <!-- Baium: General Attack -->
 		</skillList>
 		<corpseTime>13</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1270,26 +1192,15 @@
 			<radius normal="65" />
 			<height normal="174" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="7900" min="1" max="1" chance="17.84" /> <!-- Ice Storm Hammer -->
-				<item id="7892" min="1" max="1" chance="17.25" /> <!-- Spell Breaker -->
-				<item id="7901" min="1" max="1" chance="16.71" /> <!-- Star Buster -->
-				<item id="7883" min="1" max="1" chance="16.74" /> <!-- Sword of Sentinel -->
-				<item id="7893" min="1" max="1" chance="16.48" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="15.31" /> <!-- Wizard's Tear -->
-				<item id="8621" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Version) -->
-			</drop>
-		</dropLists>
 	</npc>
-	<npc id="29021" level="74" type="Monster" name="Archangel">
+	<npc id="29021" level="80" type="Monster" name="Archangel">
 		<race>DIVINE</race>
 		<sex>MALE</sex>
 		<equipment rhand="93" /> <!-- Winged Spear -->
 		<acquire exp="11520" sp="2" />
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="186915" hpRegen="158" mp="1475" mpRegen="3" />
-			<attack physical="395" magical="371" random="30" critical="4" accuracy="40" attackSpeed="206" type="POLE" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="747660" hpRegen="158" mp="1475" mpRegen="3" />
+			<attack physical="4185" magical="371" random="10" critical="4" accuracy="0" attackSpeed="253" type="POLE" range="80" distance="80" width="120" />
 			<defence physical="5108" magical="1686" />
 			<speed>
 				<walk ground="50" />
@@ -1298,10 +1209,9 @@
 			<hitTime>760</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4132" level="1" /> <!-- Spear: Pound the Ground -->
+			<skill id="4416" level="8" /> <!-- Angels -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1309,9 +1219,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="11" /> <!-- Spears -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="4133" level="1" /> <!-- Heal -->
+			<skill id="4415" level="11" /> <!-- Spear -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="300" isAggressive="true">
@@ -1329,9 +1238,9 @@
 		<sex>MALE</sex>
 		<acquire exp="102487500" sp="3074625" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="7027579.47902" hpRegen="310.756323" mp="10832.4" mpRegen="3" />
-			<attack physical="33864" magical="42273" random="30" critical="4" accuracy="40" attackSpeed="206" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3680" magical="4661" />
+			<vitals hp="66666666.6666667" hpRegen="2981.0298102981" mp="12240" mpRegen="10" />
+			<attack physical="15182.9268292683" magical="6600.03819341452" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2692.68292682927" magical="1794.92939666239" />
 			<speed>
 				<walk ground="42" />
 				<run ground="190" />
@@ -1339,33 +1248,28 @@
 			<hitTime>590</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4221" level="1" /> <!-- Range Dual Attack -->
-			<skill id="4220" level="1" /> <!-- Dual Attack -->
-			<skill id="4218" level="1" /> <!-- Drain -->
-			<skill id="4219" level="1" /> <!-- Hold -->
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="3" /> <!-- Extremely Weak P. Atk. -->
+			<skill id="4411" level="3" /> <!-- Extremely Weak M. Atk. -->
+			<skill id="4412" level="3" /> <!-- Extremely Weak P. Def. -->
+			<skill id="4413" level="3" /> <!-- Extremely Weak M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="1000" clanHelpRange="300" isAggressive="true" />
 		<collision>
-			<radius normal="16" />
-			<height normal="32" />
+			<radius normal="19.2" />
+			<height normal="39" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="7893" min="1" max="1" chance="6.864" /> <!-- Kaim Vanul's Bones -->
-				<item id="7883" min="1" max="1" chance="6.834" /> <!-- Sword of Sentinel -->
-				<item id="7892" min="1" max="1" chance="6.82" /> <!-- Spell Breaker -->
-				<item id="7900" min="1" max="1" chance="6.795" /> <!-- Ice Storm Hammer -->
-				<item id="7889" min="1" max="1" chance="6.401" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="6.35" /> <!-- Star Buster -->
-			</drop>
-		</dropLists>
 	</npc>
-	<npc id="29023" level="74" type="Monster" name="Doll Blader">
+	<npc id="29023" level="58" type="Monster" name="Maiden Doll">
 		<parameters>
 			<param name="MoveAroundSocial" value="50" />
 			<param name="MoveAroundSocial1" value="50" />
@@ -1376,33 +1280,31 @@
 		<equipment rhand="5129" /> <!-- Doll Knife -->
 		<acquire exp="129198" sp="3875" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1828" hpRegen="6.5" mp="832" mpRegen="2.4" />
-			<attack physical="442" magical="302" random="30" critical="4" accuracy="40" attackSpeed="253" type="DUAL" range="40" distance="80" width="120" />
+			<vitals hp="1828" hpRegen="6.5" mp="832.4" mpRegen="2.4" />
+			<attack physical="442" magical="302" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="DUAL" range="40" distance="80" width="120" />
 			<defence physical="261" magical="191" />
 			<speed>
 				<walk ground="22" />
 				<run ground="150" />
 			</speed>
-			<hitTime>500</hitTime>
+			<hitTime>50</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="5" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4085" level="1" /> <!-- Critical Damage -->
-			<skill id="4086" level="1" /> <!-- Critical Chance -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="9" /> <!-- Average M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="19" /> <!-- Dual-Sword Weapons -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4333" level="5" /> <!-- Dark Attack Resistance -->
-			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4415" level="19" /> <!-- Dualsword -->
+			<skill id="4071" level="5" /> <!-- Bow/Crossbow Resistance -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1410,22 +1312,8 @@
 			<radius normal="6" />
 			<height normal="12" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="97" min="1" max="1" chance="0.0075" /> <!-- Lance -->
-				<item id="268" min="1" max="1" chance="0.0075" /> <!-- Bellion Cestus -->
-				<item id="57" min="2433" max="5685" chance="70" /> <!-- Adena -->
-				<item id="1887" min="1" max="1" chance="10.07" /> <!-- Varnish of Purity -->
-				<item id="4115" min="1" max="1" chance="1.689" /> <!-- Lance Blade -->
-				<item id="4120" min="1" max="1" chance="1.621" /> <!-- Bellion Cestus Edge -->
-			</drop>
-			<spoil>
-				<item id="948" min="1" max="1" chance="4.291" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="947" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-			</spoil>
-		</dropLists>
 	</npc>
-	<npc id="29024" level="74" type="Monster" name="Veil Master">
+	<npc id="29024" level="59" type="Monster" name="Veil Master">
 		<parameters>
 			<param name="MoveAroundSocial" value="114" />
 			<param name="MoveAroundSocial1" value="114" />
@@ -1436,7 +1324,7 @@
 		<acquire exp="90904" sp="2727" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1880" hpRegen="6.5" mp="861" mpRegen="2.4" />
-			<attack physical="461" magical="315" random="30" critical="4" accuracy="40" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="461" magical="315" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="267" magical="195" />
 			<speed>
 				<walk ground="70" />
@@ -1445,66 +1333,9 @@
 			<hitTime>740</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="5" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4085" level="1" /> <!-- Critical Damage -->
-			<skill id="4086" level="1" /> <!-- Critical Chance -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4333" level="5" /> <!-- Dark Attack Resistance -->
 			<skill id="4416" level="9" /> <!-- Demons -->
-		</skillList>
-		<exCrtEffect>true</exCrtEffect>
-		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
-		<collision>
-			<radius normal="12" />
-			<height normal="40" />
-		</collision>
-		<dropLists>
-			<drop>
-				<item id="79" min="1" max="1" chance="0.003" /> <!-- Damascus Sword -->
-				<item id="171" min="1" max="1" chance="0.003" /> <!-- Deadman's Glory -->
-				<item id="57" min="1372" max="3205" chance="70" /> <!-- Adena -->
-				<item id="1895" min="1" max="1" chance="11.72" /> <!-- Metallic Fiber -->
-				<item id="1876" min="1" max="1" chance="8.039" /> <!-- Mithril Ore -->
-				<item id="1866" min="2" max="6" chance="6.721" /> <!-- Suede -->
-				<item id="1879" min="1" max="1" chance="6.667" /> <!-- Cokes -->
-				<item id="1870" min="5" max="15" chance="4.008" /> <!-- Coal -->
-				<item id="1871" min="9" max="27" chance="2.214" /> <!-- Charcoal -->
-				<item id="4114" min="1" max="1" chance="0.75" /> <!-- Damascus Sword Blade -->
-				<item id="4116" min="1" max="1" chance="0.75" /> <!-- Deadman's Glory Stone -->
-			</drop>
-			<spoil>
-				<item id="948" min="1" max="1" chance="2.451" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="947" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-			</spoil>
-		</dropLists>
-	</npc>
-	<npc id="29025" level="75" type="Folk" name="Baium">
-		<race>HUMANOID</race>
-		<sex>MALE</sex>
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="1709400" hpRegen="8.5" mp="18000" mpRegen="3" />
-			<attack physical="874.18" magical="596.95" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="233.61" magical="233.61" />
-			<speed>
-				<walk ground="50" />
-				<run ground="120" />
-			</speed>
-			<abnormalResist physical="230" magical="230" />
-		</stats>
-		<status attackable="false" undying="true" />
-		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1513,7 +1344,44 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4071" level="5" /> <!-- Bow/Crossbow Resistance -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+		</skillList>
+		<exCrtEffect>true</exCrtEffect>
+		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="29025" level="75" type="Folk" name="Baium">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="1709400" hpRegen="718" mp="18000" mpRegen="99" />
+			<attack physical="1874.18" magical="1596.95" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3300" magical="2200" />
+			<speed>
+				<walk ground="50" />
+				<run ground="120" />
+			</speed>
+			<hitTime>60</hitTime>
+			<abnormalResist physical="230" magical="230" />
+		</stats>
+		<status attackable="false" undying="true" />
+		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="300" aggroRange="4296" />
@@ -1533,7 +1401,7 @@
 		<equipment rhand="232" /> <!-- Dark Elven Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1933" hpRegen="6.5" mp="804" mpRegen="2.4" />
-			<attack physical="420" magical="328" random="10" critical="8" accuracy="40" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
+			<attack physical="420" magical="328" random="5" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="272" magical="199" />
 			<speed>
 				<walk ground="14" />
@@ -1542,9 +1410,9 @@
 			<hitTime>760</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1552,10 +1420,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="7" /> <!-- Daggers -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4415" level="7" /> <!-- Dagger -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1575,7 +1441,7 @@
 		<equipment rhand="225" /> <!-- Mithril Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1776" hpRegen="6.5" mp="584" mpRegen="2.1" />
-			<attack physical="371" magical="289" random="10" critical="8" accuracy="40" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
+			<attack physical="371" magical="289" random="5" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="256" magical="187" />
 			<speed>
 				<walk ground="11" />
@@ -1584,9 +1450,9 @@
 			<hitTime>740</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1594,10 +1460,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="7" /> <!-- Daggers -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4415" level="7" /> <!-- Dagger -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1606,28 +1470,27 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="29066" level="1" type="GrandBoss" name="Antharas">
+	<npc id="29066" level="75" type="GrandBoss" name="Antharas">
 		<parameters>
 			<param name="ultra_respawn_time" value="8" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<acquire exp="262720917" sp="63053" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="6100000" hpRegen="2" mp="1800000" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="6100000" hpRegen="1100" mp="1800000" mpRegen="1000" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3456" magical="862.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1636,8 +1499,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1648,22 +1512,29 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists> <!-- CT2.5 -->
-			<drop>
-				<item id="8620" min="10" max="30" chance="50" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="1538" min="1" max="59" chance="100" /> <!-- Blessed Scroll of Escape -->
-				<item id="3936" min="1" max="39" chance="100" /> <!-- Blessed Scroll of Resurrection -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="9000000" max="13000000" chance="100" /> <!-- Adena -->
-			</drop>
-		</dropLists>
 	</npc>
-	<npc id="29067" level="1" type="GrandBoss" name="Antharas">
+	<npc id="29061" displayId="31842" level="70" type="Teleporter" name="Teleportation Cubic">
+		<race>ETC</race>
+		<sex>ETC</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2444" hpRegen="7.5" mp="1345" mpRegen="2.7" />
+			<attack physical="688.86373" magical="470.40463" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="295.91597" magical="216.53847" />
+			<speed>
+				<walk ground="50" />
+				<run ground="120" />
+			</speed>
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="false" />
+		<exCrtEffect>true</exCrtEffect>
+		<ai type="BALANCED" clanHelpRange="300" isAggressive="true" aggroRange="500" />
+		<collision>
+			<radius normal="40" />
+			<height normal="80" />
+		</collision>
+	</npc>
+	<npc id="29067" level="75" type="GrandBoss" name="Antharas">
 		<parameters>
 			<param name="ultra_respawn_time" value="5" />
 		</parameters>
@@ -1672,19 +1543,18 @@
 		<acquire exp="262720918" sp="29116376" raidPoints="30780" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="6800000" hpRegen="1100" mp="1800000" mpRegen="1000" />
-			<attack physical="4900" magical="2550" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3456" magical="862.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1693,8 +1563,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1705,41 +1576,29 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="7900" min="1" max="1" chance="17.8" /> <!-- Ice Storm Hammer -->
-				<item id="7892" min="1" max="1" chance="17.72" /> <!-- Spell Breaker -->
-				<item id="7883" min="1" max="1" chance="16.92" /> <!-- Sword of Sentinel -->
-				<item id="7893" min="1" max="1" chance="16.91" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="16.68" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="15.89" /> <!-- Star Buster -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29068" level="84" type="GrandBoss" name="Antharas" title="Land Dragon">
-		<!-- Todo: CT2.5 -->
 		<parameters>
 			<param name="ultra_respawn_time" value="3" />
 		</parameters>
 		<race>DRAGON</race>
 		<sex>MALE</sex>
-		<acquire exp="538538584" sp="63323403" raidPoints="38248" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="689482245" hpRegen="1830" mp="2025740" mpRegen="1000" />
-			<attack physical="4799.20533" magical="263.60854" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3974.13793" magical="496.01325" />
+		<acquire exp="40664236032" sp="9759416" raidPoints="1000" />
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="355555555" hpRegen="385356.45" mp="2025740" mpRegen="1000" />
+			<attack physical="35810" magical="3783.6" random="5" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2505.43352601156" magical="1452.04745968969" />
 			<speed>
 				<walk ground="50" />
 				<run ground="279" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
+		<status attackable="true" noSleepMode="true" isDeathPenalty="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4112" level="1" /> <!-- Ordinary Attack -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1748,9 +1607,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1761,19 +1620,8 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="7900" min="1" max="1" chance="17.8" /> <!-- Ice Storm Hammer -->
-				<item id="7892" min="1" max="1" chance="17.72" /> <!-- Spell Breaker -->
-				<item id="7883" min="1" max="1" chance="16.92" /> <!-- Sword of Sentinel -->
-				<item id="7893" min="1" max="1" chance="16.91" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="16.68" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="15.89" /> <!-- Star Buster -->
-			</drop>
-		</dropLists>
 	</npc>
-	<npc id="29069" level="79" type="Monster" name="Behemoth Dragon">
-		<!-- Todo: CT2.5 -->
+	<npc id="29069" level="84" type="Monster" name="Behemoth Dragon">
 		<parameters>
 			<param name="RootingManage" value="0" />
 			<skill name="PhysicalSpecial" id="5095" level="1" />
@@ -1782,18 +1630,20 @@
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="292335" hpRegen="76.71" mp="22800" mpRegen="3" />
-			<attack physical="3584.56902102981" magical="1386.66000087809" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="1071.29474264312" magical="522.626863116263" evasion="-18" />
+			<vitals hp="949367" hpRegen="22" mp="22800" mpRegen="30" />
+			<attack physical="14519" magical="11667" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="1370" magical="851" />
 			<speed>
-				<walk ground="180" />
+				<walk ground="55" />
 				<run ground="180" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" isDeathPenalty="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1802,10 +1652,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5095" level="1" /> <!-- Antharas Subordinate Melee Attack -->
 			<skill id="5096" level="1" /> <!-- Antharas Subordinate Remote Attack -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="300" isAggressive="true">
@@ -1816,26 +1665,27 @@
 			<height normal="54" />
 		</collision>
 	</npc>
-	<npc id="29070" level="79" type="Monster" name="Dragon Bomber">
-		<!-- Todo: CT2.5 -->
+	<npc id="29070" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1353" hpRegen="8.5" mp="1809" mpRegen="3" />
-			<attack physical="1094.11758465172" magical="4902.24" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<vitals hp="1353.6766" hpRegen="8.5" mp="1809" mpRegen="3" />
+			<attack physical="1094.11758465172" magical="4902.24" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.098247547707" magical="261.308998696584" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="250" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1844,10 +1694,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -1856,25 +1704,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29071" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29071" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="245" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1883,9 +1732,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -1894,25 +1742,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29072" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29072" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="255" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1921,9 +1770,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -1932,25 +1780,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29073" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29073" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="247" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1959,9 +1808,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -1970,25 +1818,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29074" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29074" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="252" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1997,9 +1846,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2008,25 +1856,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29075" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29075" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="243" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2035,9 +1884,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2046,25 +1894,27 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29076" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29076" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1353" hpRegen="2" mp="1809" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1353.6766" hpRegen="8.5" mp="1809" mpRegen="3" />
+			<attack physical="1094.11758465172" magical="4902.24" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="357.098247547707" magical="261.308998696584" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="250" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2073,9 +1923,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="200" clanHelpRange="300" isAggressive="true" />
@@ -2084,7 +1933,7 @@
 			<height normal="34.5" />
 		</collision>
 	</npc>
-	<npc id="29077" level="78" type="Monster" name="">
+	<npc id="29077" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="177456" />
 			<param name="suicide2_x" value="177120" />
@@ -2104,19 +1953,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2125,7 +1975,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2134,7 +1984,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29078" level="78" type="Monster" name="">
+	<npc id="29078" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175952" />
 			<param name="suicide2_x" value="175712" />
@@ -2154,19 +2004,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2175,7 +2026,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2184,7 +2035,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29079" level="78" type="Monster" name="">
+	<npc id="29079" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175120" />
 			<param name="suicide2_x" value="175024" />
@@ -2204,19 +2055,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2225,7 +2077,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2234,7 +2086,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29080" level="78" type="Monster" name="">
+	<npc id="29080" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="174640" />
 			<param name="suicide2_x" value="174576" />
@@ -2254,19 +2106,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2275,7 +2128,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2284,7 +2137,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29081" level="78" type="Monster" name="">
+	<npc id="29081" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="173968" />
 			<param name="suicide2_x" value="173856" />
@@ -2304,19 +2157,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2325,7 +2179,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2334,7 +2188,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29082" level="78" type="Monster" name="">
+	<npc id="29082" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="173920" />
 			<param name="suicide2_x" value="174064" />
@@ -2354,19 +2208,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2375,7 +2230,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2384,7 +2239,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29083" level="78" type="Monster" name="">
+	<npc id="29083" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="174704" />
 			<param name="suicide2_x" value="174800" />
@@ -2404,19 +2259,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2425,7 +2281,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2434,7 +2290,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29084" level="78" type="Monster" name="">
+	<npc id="29084" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175424" />
 			<param name="suicide2_x" value="175632" />
@@ -2454,19 +2310,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2475,7 +2332,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2484,7 +2341,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29085" level="78" type="Monster" name="">
+	<npc id="29085" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="176880" />
 			<param name="suicide2_x" value="177200" />
@@ -2504,19 +2361,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2525,7 +2383,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2534,7 +2392,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29086" level="78" type="Monster" name="">
+	<npc id="29086" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="178368" />
 			<param name="suicide2_x" value="178592" />
@@ -2554,19 +2412,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2575,7 +2434,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2584,7 +2443,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29087" level="78" type="Monster" name="">
+	<npc id="29087" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="179696" />
 			<param name="suicide2_x" value="179920" />
@@ -2604,19 +2463,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2625,7 +2485,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2634,7 +2494,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29088" level="78" type="Monster" name="">
+	<npc id="29088" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180592" />
 			<param name="suicide2_x" value="180752" />
@@ -2654,19 +2514,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2675,7 +2536,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2684,7 +2545,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29089" level="78" type="Monster" name="">
+	<npc id="29089" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180896" />
 			<param name="suicide2_x" value="180784" />
@@ -2704,19 +2565,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2725,7 +2587,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2734,7 +2596,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29090" level="78" type="Monster" name="">
+	<npc id="29090" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180496" />
 			<param name="suicide2_x" value="180512" />
@@ -2754,19 +2616,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2775,7 +2638,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2784,7 +2647,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29091" level="78" type="Monster" name="">
+	<npc id="29091" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180896" />
 			<param name="suicide2_x" value="181040" />
@@ -2804,19 +2667,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2825,7 +2689,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2834,7 +2698,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29092" level="78" type="Monster" name="">
+	<npc id="29092" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180720" />
 			<param name="suicide2_x" value="180640" />
@@ -2854,19 +2718,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2875,7 +2740,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2884,7 +2749,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29093" level="78" type="Monster" name="">
+	<npc id="29093" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180048" />
 			<param name="suicide2_x" value="179920" />
@@ -2904,19 +2769,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2925,7 +2791,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2934,7 +2800,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29094" level="78" type="Monster" name="">
+	<npc id="29094" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="178848" />
 			<param name="suicide2_x" value="178560" />
@@ -2954,19 +2820,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2975,7 +2842,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_1.0/dist/game/data/stats/skills/documentation.txt
index cc90f472b8..68a4c3b798 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/stats/skills/documentation.txt
@@ -10,6 +10,8 @@ AddHate: Instant effect that increases target's hate towards you.
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -193,7 +195,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/Config.java
index b8a7bd683a..2536ac2ec9 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/Config.java
@@ -1185,6 +1185,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static boolean AUTO_PLAY_PREMIUM;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
@@ -1260,6 +1261,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2471,6 +2473,7 @@ public class Config
 			ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 			AUTO_PLAY_PREMIUM = autoPlayConfig.getBoolean("AutoPlayPremium", false);
 			DISABLED_AUTO_SKILLS.clear();
 			final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
@@ -3227,6 +3230,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index a50cbb8033..8378c362cb 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index 603e7d33be..dd968ed772 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -549,9 +549,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 2260001e17..380989e049 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 36f3461010..efc07efb38 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -230,7 +230,7 @@ public class ShortCuts implements IRestorable
 			if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL))
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 55f0ee03a0..f5cc7704ae 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1288,7 +1288,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2816,7 +2816,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2829,178 +2829,140 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						player.refreshExpertisePenalty();
-						sendPacket(info);
+					}
+					player.refreshExpertisePenalty();
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Player.java
index 8414f3c1c2..e6c46dd4e3 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4524,7 +4524,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8218,9 +8218,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Summon.java
index d3f774596c..66a299ce8e 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -846,7 +847,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -867,7 +868,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -892,7 +900,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -900,7 +908,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -946,7 +961,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index ea1abbff9b..074a4ae995 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -863,15 +862,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -882,8 +879,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -892,7 +893,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -965,33 +966,6 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
@@ -1001,9 +975,17 @@ public class CreatureStat
 		// Notify recalculation to child classes.
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 438e73d4cc..a2436eebf0 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0b6092b2d9..1e393ec4bf 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2216,6 +2216,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index 3a95187bd8..3e55250658 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -38,6 +38,7 @@ import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
 import org.l2jmobius.gameserver.enums.AttributeType;
@@ -50,6 +51,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -67,12 +69,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDr
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPickup;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -80,11 +84,13 @@ import org.l2jmobius.gameserver.model.options.EnchantOptions;
 import org.l2jmobius.gameserver.model.options.Options;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.SkillConditionScope;
 import org.l2jmobius.gameserver.model.variables.ItemVariables;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1580,7 +1586,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2210,6 +2218,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2234,6 +2247,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2259,6 +2274,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index bddb8ba55d..4cd00cba42 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -738,7 +738,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -890,7 +891,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index e7c37a9ae6..cc8e010ff3 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -652,7 +652,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -675,7 +675,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -710,7 +710,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 66517b74da..ec5f458641 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -128,7 +128,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index c305987ba6..c29c9ba398 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -93,6 +93,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index c5257ff589..1aff35bfd5 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 402d33c717..d6c765a2a0 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -701,7 +701,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList(false);
 		player.updateShortCuts(_id, _level, 0);
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 272b2a4e6e..d8e61aaa3e 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -61,6 +61,6 @@ public class RequestShortCutReg implements ClientPacket
 		
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, 0, _characterType);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 	}
 }
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index 93f16169bc..07ed7641a9 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,127 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 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, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index dcc44cb9f3..2e152e2e29 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -207,7 +207,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		ServerPackets.EX_PET_INFO.writeId(this);
 		writeInt(_summon.getObjectId());
-		writeByte(_value); // // 0=teleported 1=default 2=summoned
+		writeByte(_value); // 0=teleported 1=default 2=summoned
 		writeShort(37); // mask_bits_37
 		writeBytes(_masks);
 		// Block 1
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index f93c9e5e69..03909a2746 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
deleted file mode 100644
index 52a4032d14..0000000000
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
new file mode 100644
index 0000000000..62bb425a5a
--- /dev/null
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -0,0 +1,182 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeByte(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 8872c0cf63..13222999d6 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,19 +17,25 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
 	private final Shortcut _shortcut;
+	private final Player _player;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
 		_shortcut = shortcut;
+		_player = player;
 	}
 	
 	@Override
@@ -42,13 +48,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -59,8 +68,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 68ca369edf..37f3211b0a 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1f54b5040f..0d5d066d25 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,6 +25,7 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -95,6 +98,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							if (player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -120,23 +134,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -144,6 +167,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -178,32 +204,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -302,6 +351,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 7cd7dd9696..c56221841f 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
@@ -51,7 +52,6 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +381,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/buffer_schemes.sql
index 1784421092..bd964c8cc2 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/buffer_schemes.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL,
     PRIMARY KEY (`object_id`,`scheme_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle.sql
index 0109cb8ab4..082a199079 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/characters.sql
index ea2aace011..60e1a786a2 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/characters.sql
@@ -60,4 +60,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort.sql
index 43de96f562..b4c76f8a7d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort_siege_guards.sql
index 19df57a3b9..43763210b4 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort_spawnlist.sql
index 22303a9b09..144979acd9 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,4 +11,4 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/grandboss_data.sql
index 84fc95310b..04cee95d8f 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/heroes.sql
index 2fc8753f90..49a371cbd5 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/heroes.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/items.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/olympiad_fights.sql
index ccd4ac94ec..f25cc4c1fa 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(4) NOT NULL DEFAULT 0,
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/Character.ini b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/Character.ini
index 9836e22f22..8397b333ff 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/Character.ini
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/Character.ini
@@ -285,8 +285,8 @@ MaxMAtk = 999999
 MaxPCritRate = 500
 
 # Maximum character Magic Critical Rate. (10 = 1%)
-# Default: 200
-MaxMCritRate = 200
+# Classic Default: 320
+MaxMCritRate = 320
 
 # Maximum character Attack Speed.
 # Default: 1500
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/Custom/AutoPlay.ini b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/Custom/AutoPlay.ini
index 9a4fd4bf2e..6e9d9628be 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/Custom/AutoPlay.ini
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/Custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # Enable .play command only for premium players.
 # Premium System must be enabled.
 # Default: False
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/General.ini b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/General.ini
index d9d3618e9a..bf3ad3d4e3 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/General.ini
@@ -430,8 +430,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/ActionData.xml b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/ActionData.xml
index b287bbf8fd..fea10516bd 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/ActionData.xml
@@ -1,218 +1,237 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
-	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
-	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
-	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
-	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
-	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
-	<action id="70" handler="AirshipAction" option="4" /> <!-- Exit Airship -->
-	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
-	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
-	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
-	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
-	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Nightshade - Shade Sacrifice -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
-	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="0" handler="SitStand" /> <!-- Toggle Sit/Stand. (/sit, /stand) -->
+	<action id="1" handler="RunWalk" /> <!-- Toggle Walk/Run. (/walk, /run) -->
+	<action id="2" handler="None" /> <!-- Attacks selected target(s), or takes a general action if the target cannot be attacked. Hold down the Ctrl key and click to attack by force. (/attack, /attackforce) -->
+	<action id="3" handler="None" /> <!-- Request a trade from the selected target. (/trade) -->
+	<action id="4" handler="None" /> <!-- Select the nearest attackable target. (/targetnext) -->
+	<action id="5" handler="None" /> <!-- Pick up items that are scattered nearby. (/pickup) -->
+	<action id="6" handler="None" /> <!-- Change to the target of the currently selected player. (/assist) -->
+	<action id="7" handler="None" /> <!-- Invite the selected person to your party. (/invite) -->
+	<action id="8" handler="None" /> <!-- Leave the party. (/leave) -->
+	<action id="9" handler="None" /> <!-- If you are the leader of the party, dismiss selected members from your party. (/dismiss) -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Sets up a private store to sell your items. (/vendor) -->
+	<action id="11" handler="None" /> <!-- Display the party matching window to search for parties or to add members to your party. (/partymatching) -->
+	<action id="12" handler="SocialAction" option="2" /> <!-- Emote: Greet others with a kind "hello." (/socialhello) -->
+	<action id="13" handler="SocialAction" option="3" /> <!-- Emote: Let everyone know that you or someone else is victorious! (/socialvictory) -->
+	<action id="14" handler="SocialAction" option="4" /> <!-- Emote: Rouse your allies and charge! (/socialcharge) -->
+	<action id="15" handler="PetHold" /> <!-- Have your pet follow you or stay and hold its ground. -->
+	<action id="16" handler="PetAttack" /> <!-- Attack target. -->
+	<action id="17" handler="PetStop" /> <!-- Stop current action. -->
+	<action id="18" handler="None" /> <!-- Pick up nearby items. -->
+	<action id="19" handler="UnsummonPet" /> <!-- Returns your pet back to its home. -->
+	<action id="20" handler="None" /> <!-- Use special skill. -->
+	<action id="21" handler="ServitorHold" /> <!-- Have your summons follow you or stay and hold its ground. -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attack target. -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="24" handler="SocialAction" option="6" /> <!-- Emote: Respond positively. (/socialyes) -->
+	<action id="25" handler="SocialAction" option="5" /> <!-- Emote: Respond negatively. (/socialno) -->
+	<action id="26" handler="SocialAction" option="7" /> <!-- Emote: Show your respect and bow. (/socialbow) -->
+	<action id="27" handler="None" /> <!-- Use special skill. -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Sets up a private store to purchase items. (/buy) -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Emote: You have no idea what's going on. (/socialunaware) -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Emote: I'm waiting... (/socialwaiting) -->
+	<action id="31" handler="SocialAction" option="10" /> <!-- Emote: Have a good laugh. (/sociallaugh) -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Toggle between Attack/Move modes. -->
+	<action id="33" handler="SocialAction" option="11" /> <!-- Emote: Applaud. (/socialapplause) -->
+	<action id="34" handler="SocialAction" option="12" /> <!-- Emote: Serve them up your best dance moves. (/socialdance) -->
+	<action id="35" handler="SocialAction" option="13" /> <!-- Emote: Show grief. (/socialsad) -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Poison gas attack. -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Set up a private workshop that creates items by using Dwarven recipes in exchange for a fee. (/dwarvenmanufacture) -->
+	<action id="38" handler="Ride" /> <!-- Toggle mount/dismount when near or on an NPC that can be ridden. (/mount, /dismount, /mountdismount) -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Exploding corpse attack. -->
+	<action id="40" handler="None" /> <!-- Enhances a target's evaluation score. (/evaluate) -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Attacks castle gates, walls, or headquarters by shooting a cannon. -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Reflects damage back to an enemy. -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Attacks an enemy by creating a whirling surge of water. -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Attacks an enemy with a powerful explosion. -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Restores the summoner's MP. -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Attacks an enemy by summoning up a devastating storm. -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Damages an enemy and heals the servitor at the same time. -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Attacks the enemy by shooting a cannon. -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Attack with a fit of rage. -->
+	<action id="50" handler="None" /> <!-- The selected party member will become the new party leader. (/changepartyleader) -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Removes shackles from the Servitor and sets him free. -->
+	<action id="53" handler="ServitorMove" /> <!-- Move to the target. -->
+	<action id="54" handler="PetMove" /> <!-- Move to the target. -->
+	<action id="55" handler="None" /> <!-- Toggle recording and stop recording of replay files. (/start_replayrecording, /stop_replayrecording, /startstop_replayrecording) -->
+	<action id="56" handler="None" /> <!-- Invite the selected target to a command channel. (/channelinvite) -->
+	<action id="57" handler="None" /> <!-- Highlights private store and private workshop messages that contain the search word. (/findprivatestore) -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Open a personal store for package sale. (/packagesale) -->
+	<action id="62" handler="SocialAction" option="14" /> <!-- Charm Pose (Command: /charm) -->
+	<action id="64" handler="TeleportBookmark" /> <!-- Opens the window of an Unoccupied Teleport Device that enables to move freely from one location with a Teleport Device to another. (Command: /teleportbookmark) -->
+	<action id="65" handler="BotReport" /> <!-- Reports the targeted player as a suspected bot. -->
+	<action id="66" handler="SocialAction" option="15" /> <!-- Allows character to strike shy pose. (command: /shyness) -->
+	<action id="67" handler="AirshipAction" option="1" /> <!-- Allows you to control the Airship. -->
+	<action id="68" handler="AirshipAction" option="2" /> <!-- Relinquishes control of the Airship. -->
+	<action id="69" handler="AirshipAction" option="3" /> <!-- Choose from pre-designated locations. -->
+	<action id="70" handler="AirshipAction" option="4" /> <!-- Disembarks from the Airship. -->
+	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange bows with another person. (command: /two-personbow) -->
+	<action id="72" handler="SocialAction" option="17" /> <!-- High Five another person. (command: /hi-five) -->
+	<action id="73" handler="SocialAction" option="18" /> <!-- Dance with another player. (command: /coupledance) -->
+	<action id="76" handler="None" /> <!-- Invite the selected target as friends. (Commands: /friendinvite, /addfriend, /registerfriend) -->
+	<action id="77" handler="None" /> <!-- Start or end recording videos. (Commands: /startrecording, /stoprecording, /startstoprecording) -->
+	<action id="87" handler="SocialAction" option="28" /> <!-- Gesture of Proposal (Command: /Propose) -->
+	<action id="88" handler="SocialAction" option="29" /> <!-- Gesture of Provocation (Command: /Provoke) -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off (Command: /showoff) -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Attacks castle gates, walls, or headquarters with a powerful strike. -->
+	<action id="1001" handler="None" /> <!-- A reckless yet powerful attack that must be used with extreme caution. -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Incites those around the summon to attack you. -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Instantly increases P. Def. and M. Def. significantly. Character is immovable while this skill is in effect. -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- A magical attack. -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Recovers the pet's HP. -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Temporarily increases your party's chance to land a critical attack and also increases the power of the attack if successful. -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Temporarily increases your party's P. Atk and accuracy. -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Has a chance to remove curses from party members. -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Temporarily increases your party's MP regeneration. -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Temporarily shortens your party's spell re-use timer. -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Remove a curse from your party. -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Provokes an opponent to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Provokes multiple enemies around the caster to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Sacrifice HP in order to regenerate the HP of a selected target. -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Attempt a powerful, critical attack on an opponent. -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- A stunning blow that inflicts damage and instantly throws an enemy into a state of stun. -->
+	
+	<!-- Actions 1018 to 1030 are present in the Client, but are not used in Classic. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Inflict a deadly curse on an enemy that absorbs their HP. -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kat the Cat -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mew the Cat -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kai the Cat -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Boxer the Unicorn -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mirage the Unicorn -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Merrow the Unicorn -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Shadow -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by Shadow -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Silhouette -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by reanimated man -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by reanimated man -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by corrupted man -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King: A powerful slashing attack. Over-hit is possible. -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King: Slashes at surrounding enemies while spinning in the air. Over-hit is possible. -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King: Immobilizes all nearby enemies. -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn: Powerful rear kicks that stun and damage an enemy. Over-hit is possible. -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn: Pounds multiple enemies with a tremendous onrush of water. -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord: Detonates a corpse, inflicting damage to nearby enemies. -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord: Blades attached to each arm slash out in a devastating attack. Over-hit is possible. -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord: Curses nearby enemies, poisoning them and reducing their Atk. Spd. -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon: Fires a projectile a short distance. Consumes 4 Flash Gunpowder. -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon: Fires a projectile a long distance. Consumes 5 Flash Gunpowder. -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Viciously bite an enemy. -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Scratch an enemy with both paws. Causes bleeding. -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awaken hidden powers. -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Decrease a nearby enemy's P. Atk./M. Atk. with a wolf cry. -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Decrease a nearby enemy's attack speed/magic speed with a strider roar. -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Viciously bite an enemy. -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Cause both damage and shock at the same time. Instantly stuns an enemy. -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Breath fire in front of you. -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Increases maximum HP temporarily. -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Increases maximum MP temporarily. -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Increases Atk. Spd. temporarily. -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Increases Casting Spd. temporarily. -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Temporarily decreases the target's MP consumption of skills. Consumes Spirit Ore. -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Increases M. Atk. power temporarily. -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Temporarily increases the critical rate of damage attack magic. -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Temporarily increases the critical attack power. -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Temporarily increases the probability of critical attack. -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Temporarily increases Accuracy. -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Rapidly attacks the enemy twice. -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Inflicts shock and damage to the enemy at the same time with a powerful spin attack. -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Attacks nearby enemies with a doll heap attack. -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakens a hidden ability. -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of thunder. -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack on nearby enemies when hit. -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Control put in place to prevent the use of a buff upon the master. 5-minute duration. -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Powerfully attacks the target. -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- A powerful attack that pierces through a target. -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies by spinning your own body like a whirlwind. -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Attacks a front-line enemy with a powerful lance thrust. -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Shouts a victory cry that increases your abilities. -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Powerfully attacks the target. -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Gathers energy into your body, then releases it in a destructive blast. -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Hits enemies with a powerful wave of force. -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Emits a loud roar that amplifies your abilities. -->
+	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Charges toward the enemy and inflicts damage. -->
+	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Cancels the target's de-buff. -->
+	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Emits a spread of ring-shaped flames. -->
+	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Attacks the enemy with a powerful flaming beak. -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Toggles you between Attack and Support modes. -->
+	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Cancels more than one of the enemy's buffs. -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Decreases the enemy's Dark attribute by 25. -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Strike multiple enemies at the front with the tail. -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Viciously bite an enemy. -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Causes nearby enemies to flee in fear. -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Increases your speed. -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Greatly increases its master's speed. -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Increases the speed of its master and their party. -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Teleports its master to the Seed of Annihilation. -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Teleports its master and their party to the Seed of Annihilation. -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attack the target. -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move to a designated location. -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Make the servitor disappear by cancelling the summoning. -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Do not counter-attack. -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Counter-attack when the master or itself is attacked. -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Damages and provokes the target. -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Roll over and deliver a shock to the ground stunning nearby targets. -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Bites the target to inflict damage. -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Damages the target and absorbs some of its HP. -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Attack nearby enemies and block their physical skills. -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Flourishes claws and frontally attacks enemies. -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Dashes toward enemies to inflict damage and Stun them. -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Inflicts damage onto the enemies with a flame. -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Flies straight into the enemy. -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Purifies the master. -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Attack the enemy by darting a feather. -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Hurt the enemy by attacking them with sharp claws. -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Recover the targets near the tree and clear any debuff. -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Attacks nearby targets with a powerful punch. -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Provokes nearby enemies. -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Bites the enemy. -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Provokes nearby enemies. -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Bites the enemy. -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Provokes nearby enemies. -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Bites the enemy. -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Attacks nearby enemies and blocks their P. Skills. -->
+	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Rushes to the enemy to inflict damage and Stun. -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Can express affection to Rudolph. Affection Level rises by 25%. Warning: Can be used only when a Rudolph requests expression of affection, and cannot be used while transformed! -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Increases Max HP by 20%, Max MP by 20%, and the Speed by 20% for 5 minutes. Increases the Debuff Resistance by 10%. Reuse delay 10 minutes. Consumes 3 Rose Essence(s) during skill use. Doesn't overlap with other buffs except Critical Seduction. -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- For 30 minutes, increases party members' Max HP by 30%, Max MP by 30%, Max CP by 30%, P. Def. by 30%, magic M. Def. by 30%, Speed by 20, P. Atk. by 10%, and magic M. Atk. by 20%. Decreases MP consumption for skill use by 15%. Reuse delay 5 minutes. Consumes 10 Rose Essence(s) during skill use. -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of lightning. -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack upon contacted enemies nearby. -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Restricts to prevent the use of a buff upon the master. 5 minute duration. -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Inflicts a powerful attack that seems to pierce through the target. -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies. -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impales an enemy with a sword. -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Raises one's own abilities. -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Gathered energy within ones self can be focused and used to attack an enemy. -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Fires a shock wave to attack enemies at the front. -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Raises one's own abilities. -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switches between attack mode and support mode. -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Instantly restores the master's HP by 10%. Increases the master's Debuff Resistance by 80%, Buff-canceling Attack Resistance by 40%, Speed by 10, P. Def. by 20%, and M. Def. by 20%, and decreases MP consumption for all skills by 50% for 1 minute. -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 5b501b1f1b..bcc74a8afe 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -254,6 +255,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 396055ec7b..f2fc8e94a6 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -41,6 +41,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AreaDamage", AreaDamage::new);
@@ -222,7 +224,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index cd446ab812..2775ff29a4 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -182,6 +182,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()))
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 43be5cfc4a..ae0fba5834 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,55 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..798a363468 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,46 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/experience.xml b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/experience.xml
index a384f8af46..22de43a371 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/experience.xml
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/experience.xml
@@ -23,7 +23,7 @@
 	<experience level="21" tolevel="1023785" trainingRate="0.4" />
 	<experience level="22" tolevel="1439215" trainingRate="0.4" />
 	<experience level="23" tolevel="1948497" trainingRate="0.4" />
-	<experience level="24" tolevel="2658850" trainingRate="0.4" />
+	<experience level="24" tolevel="2568850" trainingRate="0.4" />
 	<experience level="25" tolevel="3320625" trainingRate="0.4" />
 	<experience level="26" tolevel="4227172" trainingRate="0.4" />
 	<experience level="27" tolevel="5315161" trainingRate="0.4" />
@@ -52,7 +52,7 @@
 	<experience level="50" tolevel="251805374" trainingRate="0.4" />
 	<experience level="51" tolevel="288635909" trainingRate="0.4" />
 	<experience level="52" tolevel="330338848" trainingRate="0.4" />
-	<experience level="53" tolevel="377407026" trainingRate="0.4" />
+	<experience level="53" tolevel="377507026" trainingRate="0.4" />
 	<experience level="54" tolevel="430790086" trainingRate="0.4" />
 	<experience level="55" tolevel="490916803" trainingRate="0.4" />
 	<experience level="56" tolevel="558693890" trainingRate="0.4" />
@@ -84,11 +84,7 @@
 	<experience level="82" tolevel="279783329566" trainingRate="0.025" />
 	<experience level="83" tolevel="454748284485" trainingRate="0.025" />
 	<experience level="84" tolevel="673468617187" trainingRate="0.025" />
-	<experience level="85" tolevel="946585988578" trainingRate="0.025" />
-	<experience level="86" tolevel="112334696174" trainingRate="0.02" />
-	<experience level="87" tolevel="142393691521" trainingRate="0.01" />
-	<experience level="88" tolevel="182393693217" trainingRate="0.01" />
-	<experience level="89" tolevel="242393691141" trainingRate="0.01" />
-	<experience level="90" tolevel="362393632116" trainingRate="0.01" />
-	<experience level="91" tolevel="412393696326" trainingRate="0.01" />
+	<experience level="85" tolevel="2020405851561" trainingRate="0.025" />
+	<experience level="86" tolevel="8755092023431" trainingRate="0.025" />
+	<experience level="87" tolevel="16836715429675" trainingRate="0.025" />
 </table>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/items/49000-49099.xml b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/items/49000-49099.xml
index 44b4ea3a24..5ec5f3a6c7 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/items/49000-49099.xml
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/items/49000-49099.xml
@@ -1230,7 +1230,7 @@
 		<set name="handler" val="ItemSkills" />
 		<set name="commissionItemType" val="SCROLL_OTHER" />
 		<skills>
-			<skill id="39075" level="1" /> <!-- Improved Scroll of Escape -->
+			<skill id="2013" level="2" /> <!-- Improved Scroll of Escape -->
 		</skills>
 	</item>
 	<item id="49088" name="Gold Medal" type="EtcItem">
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/items/49400-49499.xml
index 1233206d7e..3344909f1f 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/items/49400-49499.xml
@@ -1468,14 +1468,23 @@
 	<item id="49489" name="Parts of Enchantment Scrolls Chest" type="EtcItem">
 		<!-- Double-click to receive a Part of Enchantment Scroll. Cannot be exchanged, dropped, or sold. Can be stored in a private warehouse. <Attention>. Be careful before opening the items as their relocation is restricted. -->
 		<set name="icon" val="icon.etc_treasure_box_i08" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="default_action" val="PEEL" />
+		<set name="material" val="FISH" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="49474" min="1" max="1" chance="20" /> <!-- Scroll Part: Enchant Weapon -->
+			<item id="49475" min="1" max="1" chance="50" /> <!-- Scroll Part: Enchant Armor -->
+			<item id="49476" min="1" max="1" chance="2" /> <!-- Refined Scroll Part: Enchant Weapon -->
+			<item id="49478" min="1" max="1" chance="13" /> <!-- Refined Scroll Part: Enchant Armor -->
+			<item id="49479" min="1" max="1" chance="2" /> <!-- Solid Scroll Part: Enchant Weapon -->
+			<item id="49480" min="1" max="1" chance="13" /> <!-- Solid Scroll Part: Enchant Armor -->
+		</capsuled_items>
 	</item>
 	<item id="49490" name="Fishing kit" type="EtcItem">
 		<!-- Double-click to receive 1 Fishing Rod (1-day), Bait (720 pcs), 1 Hero's Dual Swords, 1 Soulshot Ticket. Cannot be exchanged, dropped, or sold. Can be stored in a private warehouse. <Attention>. Be careful before opening the items as their relocation is restricted. -->
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/items/49500-49599.xml
index 169d1e737f..2896ac1890 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/items/49500-49599.xml
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/items/49500-49599.xml
@@ -8,6 +8,13 @@
 		<set name="weight" val="120" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="commissionItemType" val="SCROLL_OTHER" />
+		<skills>
+			<skill id="39075" level="1" /> <!-- Improved Scroll of Escape -->
+		</skills>
 	</item>
 	<item id="49501" name="Fish Stew. The guild's gratitude." type="EtcItem">
 		<!-- Increases XP/SP gain + 10% for 20 minutes. The item cannot be dropped. -->
@@ -418,14 +425,21 @@
 		<!-- Magic potion that quickly restores HP. Instant cooldown. Cannot be used when HP is full. Cannot be exchanged, dropped, or sold. Can be stored in a private warehouse. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
 		<set name="weight" val="180" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="is_event_restricted" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<skills>
+			<skill id="39103" level="1" /> <!-- Quick Hero Healing Potion -->
+		</skills>
 	</item>
 	<item id="49534" name="Hero Cube" additionalName="7-day" type="EtcItem">
 		<!-- 7-day item. Available at level 20 or higher. Double-click the Cube to receive Soulshot Ticket, Buff Scrolls Chest, Major Healing Potion, Warrior's Quick Healing Potion, Warrior's Quick Healing Potion, Angel Cat's Blessing, Improved Scroll of Resurrection, Parts of Enchantment Scrolls Chest, Fishing kit chest, My Teleport to the Base Package, Blade Spirit, Spellbook Box. (Can be used only once per day.) Cannot be exchanged, dropped, destroyed, or sold. Can be stored in a private warehouse. -->
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20000-20099.xml b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20000-20099.xml
index 4fb27c7a7c..e2acfc9377 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20000-20099.xml
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20000-20099.xml
@@ -7,7 +7,7 @@
 		<acquire exp="44" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="20" />
@@ -84,7 +84,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -136,7 +136,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="60" />
@@ -188,7 +188,7 @@
 		<acquire exp="309" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="60" />
@@ -246,7 +246,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -5321,7 +5321,7 @@
 		<acquire exp="449" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -5377,7 +5377,7 @@
 		<acquire exp="441" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -5477,7 +5477,7 @@
 		<acquire exp="449" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20100-20199.xml b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20100-20199.xml
index 506a5ba46d..11f4469e55 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20100-20199.xml
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20100-20199.xml
@@ -1135,7 +1135,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -1179,7 +1179,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="50" />
@@ -1229,7 +1229,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -1289,7 +1289,7 @@
 		<acquire exp="308" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -4406,7 +4406,7 @@
 		<acquire exp="1612" sp="48" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="636.798" hpRegen="3.5" mp="365.715" mpRegen="1.5" />
-			<attack physical="92.64226" magical="63.26266" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="92.64226" magical="63.26266" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.46427" magical="86.68702" />
 			<speed>
 				<walk ground="35" />
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20300-20399.xml b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20300-20399.xml
index 884e6abd94..d9c907dce4 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20300-20399.xml
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20300-20399.xml
@@ -512,7 +512,7 @@
 		<acquire exp="265" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="60" />
@@ -569,7 +569,7 @@
 		<acquire exp="309" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="60" />
@@ -625,7 +625,7 @@
 		<acquire exp="442" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
@@ -808,7 +808,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="24" />
@@ -897,7 +897,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1002,7 +1002,7 @@
 		<acquire exp="441" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -1056,7 +1056,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -1158,7 +1158,7 @@
 		<acquire exp="441" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -1214,7 +1214,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1266,7 +1266,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -1316,7 +1316,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1527,7 +1527,7 @@
 		<acquire exp="453" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1733,7 +1733,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -2059,7 +2059,7 @@
 		<acquire exp="442" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="50" />
@@ -3004,7 +3004,7 @@
 		<acquire exp="449" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3225,7 +3225,7 @@
 		<acquire exp="353" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="70" />
@@ -3570,7 +3570,7 @@
 		<acquire exp="451" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3826,7 +3826,7 @@
 		<acquire exp="182" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="86.088" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -3880,7 +3880,7 @@
 		<acquire exp="183" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="40" />
@@ -4117,7 +4117,7 @@
 		<acquire exp="449" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -4281,7 +4281,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -4331,7 +4331,7 @@
 		<acquire exp="442" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20400-20499.xml b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20400-20499.xml
index 549f5754cb..948577f96a 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20400-20499.xml
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20400-20499.xml
@@ -1254,7 +1254,7 @@
 		<acquire exp="438" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1318,7 +1318,7 @@
 		<acquire exp="291" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1547,7 +1547,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
@@ -2031,7 +2031,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="24" />
@@ -2198,7 +2198,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -2250,7 +2250,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -2301,7 +2301,7 @@
 		<acquire exp="308" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -2701,7 +2701,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -3274,7 +3274,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -3324,7 +3324,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -3376,7 +3376,7 @@
 		<acquire exp="308" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -3427,7 +3427,7 @@
 		<acquire exp="438" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3656,7 +3656,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -3760,7 +3760,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="24" />
@@ -3921,7 +3921,7 @@
 		<acquire exp="442" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
@@ -3979,7 +3979,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20500-20599.xml b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20500-20599.xml
index 9216090edd..b7846aa7f0 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20500-20599.xml
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/20500-20599.xml
@@ -1311,7 +1311,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -1518,7 +1518,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1565,7 +1565,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1610,7 +1610,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1837,7 +1837,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1882,7 +1882,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1927,7 +1927,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1972,7 +1972,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2239,7 +2239,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2289,7 +2289,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/25200-25299.xml b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/25200-25299.xml
index a7cc76888f..eb3017ea3b 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/25200-25299.xml
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/25200-25299.xml
@@ -3884,7 +3884,7 @@
 		<acquire exp="1008600000" sp="30258000" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="20782406.25" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="45" />
@@ -4023,7 +4023,7 @@
 		<acquire exp="1008600000" sp="30258000" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="20782406.25" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/29000-29099.xml
index 7866043fa6..cc19975f56 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/npcs/29000-29099.xml
@@ -11,8 +11,8 @@
 		<sex>FEMALE</sex>
 		<acquire exp="2179535" sp="65386" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="687245.8498023715" hpRegen="208" mp="196.2066710268149" mpRegen="2.1" />
-			<attack physical="105" magical="8" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="386384" hpRegen="208" mp="300.8" mpRegen="2.1" />
+			<attack physical="105" magical="8" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1252" magical="229" />
 			<speed>
 				<walk ground="80" />
@@ -21,11 +21,9 @@
 			<hitTime>370</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4019" level="1" /> <!-- Decrease Speed -->
-			<skill id="4021" level="1" /> <!-- Queen Ant -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -34,8 +32,11 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4021" level="1" /> <!-- Queen Ant -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4017" level="1" /> <!-- Queen Ant's Blow -->
+			<skill id="4018" level="1" /> <!-- Decrease Speed -->
+			<skill id="4019" level="1" /> <!-- Decrease Speed -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -50,114 +51,138 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="851" min="1" max="3" chance="34.67" /> <!-- Onyx Beast's Eye Earring -->
-				<item id="355" min="1" max="1" chance="34.47" /> <!-- Dwarven Chain Mail Shirt -->
-				<item id="2496" min="1" max="1" chance="34.07" /> <!-- Dwarven Chain Shield -->
-				<item id="914" min="1" max="1" chance="33.63" /> <!-- Dark Necklace -->
-				<item id="916" min="1" max="1" chance="33.55" /> <!-- Necklace of Protection -->
-				<item id="882" min="1" max="3" chance="33.34" /> <!-- Mithril Ring -->
-				<item id="852" min="1" max="3" chance="33.11" /> <!-- Moonstone Earring -->
-				<item id="883" min="1" max="3" chance="32.56" /> <!-- Aquastone Ring -->
-				<item id="853" min="1" max="3" chance="32.54" /> <!-- Earring of Protection -->
-				<item id="382" min="1" max="1" chance="32.12" /> <!-- Dwarven Chain Gaiters -->
-				<item id="884" min="1" max="3" chance="31.83" /> <!-- Ring of Protection -->
-				<item id="915" min="1" max="1" chance="31.77" /> <!-- Aquastone Necklace -->
-				<item id="399" min="1" max="1" chance="25.81" /> <!-- Rind Leather Armor -->
-				<item id="500" min="1" max="1" chance="25.63" /> <!-- Great Helmet -->
-				<item id="419" min="1" max="1" chance="24.75" /> <!-- Rind Leather Gaiters -->
-				<item id="440" min="1" max="1" chance="24.04" /> <!-- Robe of Seal -->
-				<item id="6660" min="1" max="1" chance="20.51" /> <!-- Queen Ant's Ring -->
-				<item id="498" min="1" max="3" chance="17.3" /> <!-- Steel Plate Helmet -->
-				<item id="2455" min="1" max="3" chance="17.21" /> <!-- Plated Leather Gloves -->
-				<item id="1126" min="1" max="3" chance="16.7" /> <!-- Crimson Boots -->
-				<item id="398" min="1" max="1" chance="16.59" /> <!-- Plated Leather Armor -->
-				<item id="418" min="1" max="1" chance="16.3" /> <!-- Plated Leather Gaiters -->
-				<item id="632" min="1" max="3" chance="16.2" /> <!-- Knight's Shield -->
-				<item id="1125" min="1" max="3" chance="7.218" /> <!-- Assault Boots -->
-				<item id="2412" min="1" max="3" chance="7.211" /> <!-- Plate Helmet -->
-				<item id="2451" min="1" max="3" chance="7.209" /> <!-- Sage's Worn Gloves -->
-				<item id="2427" min="1" max="3" chance="7.208" /> <!-- Salamander Skin Boots -->
-				<item id="297" min="1" max="1" chance="7.205" /> <!-- Glaive -->
-				<item id="187" min="1" max="1" chance="7.194" /> <!-- Atuba Hammer -->
-				<item id="188" min="1" max="1" chance="7.193" /> <!-- Ghost Staff -->
-				<item id="262" min="1" max="1" chance="7.189" /> <!-- Scallop Jamadhr -->
-				<item id="322" min="1" max="1" chance="7.184" /> <!-- Vajra Wand -->
-				<item id="396" min="1" max="1" chance="7.18" /> <!-- Salamander Skin Mail -->
-				<item id="321" min="1" max="1" chance="7.171" /> <!-- Demon's Fangs -->
-				<item id="225" min="1" max="1" chance="7.15" /> <!-- Mithril Dagger -->
-				<item id="380" min="1" max="1" chance="7.147" /> <!-- Plate Gaiters -->
-				<item id="438" min="1" max="3" chance="7.14" /> <!-- Sage's Rags -->
-				<item id="630" min="1" max="3" chance="7.133" /> <!-- Square Shield -->
-				<item id="61" min="1" max="3" chance="7.123" /> <!-- Mithril Gloves -->
-				<item id="189" min="1" max="1" chance="7.121" /> <!-- Staff of Life -->
-				<item id="2428" min="1" max="3" chance="7.116" /> <!-- Plate Boots -->
-				<item id="159" min="1" max="1" chance="7.114" /> <!-- Bonebreaker -->
-				<item id="320" min="1" max="1" chance="7.111" /> <!-- Blue Crystal Skull -->
-				<item id="190" min="1" max="1" chance="7.101" /> <!-- Atuba Mace -->
-				<item id="280" min="1" max="1" chance="7.1" /> <!-- Light Crossbow -->
-				<item id="2499" min="1" max="1" chance="7.086" /> <!-- Elven Long Sword -->
-				<item id="353" min="1" max="1" chance="7.091" /> <!-- Half Plate Armor -->
-				<item id="70" min="1" max="1" chance="7.088" /> <!-- Claymore -->
-				<item id="607" min="1" max="3" chance="7.086" /> <!-- Ogre Power Gauntlets -->
-				<item id="497" min="1" max="3" chance="7.083" /> <!-- Chain Helmet -->
-				<item id="2494" min="1" max="3" chance="6.983" /> <!-- Plate Shield -->
-				<item id="74" min="1" max="1" chance="6.432" /> <!-- Katana -->
-				<item id="282" min="1" max="1" chance="6.395" /> <!-- Elemental Bow -->
-				<item id="131" min="1" max="1" chance="6.388" /> <!-- Spirit Sword -->
-				<item id="94" min="1" max="1" chance="6.375" /> <!-- Bec de Corbin -->
-				<item id="242" min="1" max="1" chance="6.371" /> <!-- Soulfire Dirk -->
-				<item id="227" min="1" max="1" chance="6.356" /> <!-- Stiletto -->
-				<item id="195" min="1" max="1" chance="6.329" /> <!-- Cursed Staff -->
-				<item id="73" min="1" max="1" chance="6.312" /> <!-- Shamshir -->
-				<item id="325" min="1" max="1" chance="6.307" /> <!-- Horn of Glory -->
-				<item id="285" min="1" max="1" chance="6.301" /> <!-- Noble Elven Bow -->
-				<item id="133" min="1" max="1" chance="6.298" /> <!-- Raid Sword -->
-				<item id="631" min="1" max="3" chance="5.684" /> <!-- Eldarake -->
-				<item id="302" min="1" max="1" chance="5.67" /> <!-- Body Slasher -->
-				<item id="160" min="1" max="1" chance="5.62" /> <!-- Battle Axe -->
-				<item id="62" min="1" max="3" chance="5.618" /> <!-- Reinforced Mithril Boots -->
-				<item id="89" min="1" max="1" chance="5.615" /> <!-- Big Hammer -->
-				<item id="192" min="1" max="1" chance="5.614" /> <!-- Crystal Staff -->
-				<item id="2454" min="1" max="3" chance="5.613" /> <!-- Karmian Gloves -->
-				<item id="2429" min="1" max="3" chance="5.603" /> <!-- Chain Boots -->
-				<item id="2453" min="1" max="3" chance="5.597" /> <!-- Chain Gloves -->
-				<item id="72" min="1" max="1" chance="5.592" /> <!-- StormBringer -->
-				<item id="263" min="1" max="1" chance="5.585" /> <!-- Chakram -->
-				<item id="2431" min="1" max="3" chance="5.584" /> <!-- Plated Leather Boots -->
-				<item id="2432" min="1" max="3" chance="5.583" /> <!-- Dwarven Chain Boots -->
-				<item id="2430" min="1" max="3" chance="5.58" /> <!-- Karmian Boots -->
-				<item id="226" min="1" max="1" chance="5.578" /> <!-- Cursed Dagger -->
-				<item id="354" min="1" max="1" chance="5.547" /> <!-- Chain Mail Shirt -->
-				<item id="2452" min="1" max="3" chance="5.546" /> <!-- Reinforced Mithril Gloves -->
-				<item id="439" min="1" max="1" chance="5.545" /> <!-- Karmian Tunic -->
-				<item id="2433" min="1" max="3" chance="5.543" /> <!-- Boots of Seal -->
-				<item id="397" min="1" max="1" chance="5.542" /> <!-- Reinforced Mithril Shirt -->
-				<item id="71" min="1" max="1" chance="5.539" /> <!-- Flamberge -->
-				<item id="298" min="1" max="1" chance="5.538" /> <!-- Orcish Glaive -->
-				<item id="230" min="1" max="1" chance="5.531" /> <!-- Needle Wolverine -->
-				<item id="281" min="1" max="1" chance="5.53" /> <!-- Crystallized Ice Bow -->
-				<item id="471" min="1" max="1" chance="5.528" /> <!-- Karmian Stockings -->
-				<item id="193" min="1" max="1" chance="5.523" /> <!-- Stick of Faith -->
-				<item id="232" min="1" max="1" chance="5.522" /> <!-- Dark Elven Dagger -->
-				<item id="96" min="1" max="1" chance="5.521" /> <!-- Scythe -->
-				<item id="161" min="1" max="1" chance="5.521" /> <!-- Silver Axe -->
-				<item id="2495" min="1" max="3" chance="5.497" /> <!-- Chain Shield -->
-				<item id="191" min="1" max="1" chance="5.495" /> <!-- Heavy Doom Hammer -->
-				<item id="2387" min="1" max="1" chance="5.491" /> <!-- Reinforced Mithril Gaiters -->
-				<item id="381" min="1" max="1" chance="5.488" /> <!-- Chain Gaiters -->
-				<item id="173" min="1" max="1" chance="5.483" /> <!-- Skull Graver -->
-				<item id="194" min="1" max="1" chance="5.482" /> <!-- Heavy Doom Axe -->
-				<item id="2413" min="1" max="3" chance="5.481" /> <!-- Chain Hood -->
+				<group chance="100">
+					<item id="320" min="1" max="1" chance="7.15" /> <!-- Blue Crystal Skull -->
+					<item id="321" min="1" max="1" chance="7.15" /> <!-- Demon's Fangs -->
+					<item id="70" min="1" max="1" chance="7.15" /> <!-- Claymore -->
+					<item id="159" min="1" max="1" chance="7.15" /> <!-- Bonebreaker -->
+					<item id="187" min="1" max="1" chance="7.15" /> <!-- Atuba Hammer -->
+					<item id="188" min="1" max="1" chance="7.15" /> <!-- Ghost Staff -->
+					<item id="189" min="1" max="1" chance="7.15" /> <!-- Staff of Life -->
+					<item id="190" min="1" max="1" chance="7.15" /> <!-- Atuba Mace -->
+					<item id="225" min="1" max="1" chance="7.15" /> <!-- Mithril Dagger -->
+					<item id="262" min="1" max="1" chance="7.15" /> <!-- Scallop Jamadhr -->
+					<item id="280" min="1" max="1" chance="7.15" /> <!-- Light Crossbow -->
+					<item id="297" min="1" max="1" chance="7.15" /> <!-- Glaive -->
+					<item id="322" min="1" max="1" chance="7.15" /> <!-- Vajra Wand -->
+					<item id="2499" min="1" max="1" chance="7.05" /> <!-- Elven Long Sword -->
+				</group>
+				<group chance="100">
+					<item id="438" min="1" max="3" chance="7.15" /> <!-- Sage's Rags -->
+					<item id="61" min="1" max="3" chance="7.15" /> <!-- Mithril Gloves -->
+					<item id="353" min="1" max="1" chance="7.15" /> <!-- Half Plate Armor -->
+					<item id="380" min="1" max="1" chance="7.15" /> <!-- Plate Gaiters -->
+					<item id="396" min="1" max="1" chance="7.15" /> <!-- Salamander Skin Mail -->
+					<item id="497" min="1" max="3" chance="7.15" /> <!-- Chain Helmet -->
+					<item id="607" min="1" max="3" chance="7.15" /> <!-- Ogre Power Gauntlets -->
+					<item id="630" min="1" max="3" chance="7.15" /> <!-- Square Shield -->
+					<item id="1125" min="1" max="3" chance="7.15" /> <!-- Assault Boots -->
+					<item id="2412" min="1" max="3" chance="7.15" /> <!-- Plate Helmet -->
+					<item id="2427" min="1" max="3" chance="7.15" /> <!-- Salamander Skin Boots -->
+					<item id="2428" min="1" max="3" chance="7.15" /> <!-- Plate Boots -->
+					<item id="2451" min="1" max="3" chance="7.15" /> <!-- Sage's Worn Gloves -->
+					<item id="2494" min="1" max="3" chance="7.05" /> <!-- Plate Shield -->
+				</group>
+				<group chance="100">
+					<item id="851" min="1" max="3" chance="33.33" /> <!-- Onyx Beast's Eye Earring -->
+					<item id="882" min="1" max="3" chance="33.33" /> <!-- Mithril Ring -->
+					<item id="914" min="1" max="1" chance="33.34" /> <!-- Dark Necklace -->
+				</group>
+				<group chance="100">
+					<item id="71" min="1" max="1" chance="5.55" /> <!-- Flamberge -->
+					<item id="72" min="1" max="1" chance="5.55" /> <!-- StormBringer -->
+					<item id="89" min="1" max="1" chance="5.55" /> <!-- Big Hammer -->
+					<item id="96" min="1" max="1" chance="5.55" /> <!-- Scythe -->
+					<item id="160" min="1" max="1" chance="5.55" /> <!-- Battle Axe -->
+					<item id="161" min="1" max="1" chance="5.55" /> <!-- Silver Axe -->
+					<item id="173" min="1" max="1" chance="5.55" /> <!-- Skull Graver -->
+					<item id="191" min="1" max="1" chance="5.55" /> <!-- Heavy Doom Hammer -->
+					<item id="192" min="1" max="1" chance="5.55" /> <!-- Crystal Staff -->
+					<item id="193" min="1" max="1" chance="5.55" /> <!-- Stick of Faith -->
+					<item id="194" min="1" max="1" chance="5.55" /> <!-- Heavy Doom Axe -->
+					<item id="226" min="1" max="1" chance="5.55" /> <!-- Cursed Dagger -->
+					<item id="230" min="1" max="1" chance="5.55" /> <!-- Needle Wolverine -->
+					<item id="232" min="1" max="1" chance="5.55" /> <!-- Dark Elven Dagger -->
+					<item id="263" min="1" max="1" chance="5.55" /> <!-- Chakram -->
+					<item id="281" min="1" max="1" chance="5.55" /> <!-- Crystallized Ice Bow -->
+					<item id="298" min="1" max="1" chance="5.55" /> <!-- Orcish Glaive -->
+					<item id="302" min="1" max="1" chance="5.65" /> <!-- Body Slasher -->
+				</group>
+				<group chance="100">
+					<item id="2387" min="1" max="1" chance="5.55" /> <!-- Reinforced Mithril Gaiters -->
+					<item id="2413" min="1" max="3" chance="5.55" /> <!-- Chain Hood -->
+					<item id="2429" min="1" max="3" chance="5.55" /> <!-- Chain Boots -->
+					<item id="2430" min="1" max="3" chance="5.55" /> <!-- Karmian Boots -->
+					<item id="2431" min="1" max="3" chance="5.55" /> <!-- Plated Leather Boots -->
+					<item id="2432" min="1" max="3" chance="5.55" /> <!-- Dwarven Chain Boots -->
+					<item id="2433" min="1" max="3" chance="5.55" /> <!-- Boots of Seal -->
+					<item id="2452" min="1" max="3" chance="5.55" /> <!-- Reinforced Mithril Gloves -->
+					<item id="2453" min="1" max="3" chance="5.55" /> <!-- Chain Gloves -->
+					<item id="2454" min="1" max="3" chance="5.55" /> <!-- Karmian Gloves -->
+					<item id="2495" min="1" max="3" chance="5.55" /> <!-- Chain Shield -->
+					<item id="62" min="1" max="3" chance="5.55" /> <!-- Reinforced Mithril Boots -->
+					<item id="354" min="1" max="1" chance="5.55" /> <!-- Chain Mail Shirt -->
+					<item id="381" min="1" max="1" chance="5.55" /> <!-- Chain Gaiters -->
+					<item id="397" min="1" max="1" chance="5.55" /> <!-- Reinforced Mithril Shirt -->
+					<item id="439" min="1" max="1" chance="5.55" /> <!-- Karmian Tunic -->
+					<item id="471" min="1" max="1" chance="5.55" /> <!-- Karmian Stockings -->
+					<item id="631" min="1" max="3" chance="5.65" /> <!-- Eldarake -->
+				</group>
+				<group chance="100">
+					<item id="852" min="1" max="3" chance="33.33" /> <!-- Moonstone Earring -->
+					<item id="883" min="1" max="3" chance="33.33" /> <!-- Aquastone Ring -->
+					<item id="915" min="1" max="1" chance="33.34" /> <!-- Aquastone Necklace -->
+				</group>
+				<group chance="70">
+					<item id="73" min="1" max="1" chance="9.09" /> <!-- Shamshir -->
+					<item id="74" min="1" max="1" chance="9.09" /> <!-- Katana -->
+					<item id="94" min="1" max="1" chance="9.09" /> <!-- Bec de Corbin -->
+					<item id="131" min="1" max="1" chance="9.09" /> <!-- Spirit Sword -->
+					<item id="133" min="1" max="1" chance="9.09" /> <!-- Raid Sword -->
+					<item id="195" min="1" max="1" chance="9.09" /> <!-- Cursed Staff -->
+					<item id="227" min="1" max="1" chance="9.09" /> <!-- Stiletto -->
+					<item id="242" min="1" max="1" chance="9.09" /> <!-- Soulfire Dirk -->
+					<item id="282" min="1" max="1" chance="9.09" /> <!-- Elemental Bow -->
+					<item id="285" min="1" max="1" chance="9.09" /> <!-- Noble Elven Bow -->
+					<item id="325" min="1" max="1" chance="9.1" /> <!-- Horn of Glory -->
+				</group>
+				<group chance="100">
+					<item id="355" min="1" max="1" chance="33.33" /> <!-- Dwarven Chain Mail Shirt -->
+					<item id="382" min="1" max="1" chance="33.33" /> <!-- Dwarven Chain Gaiters -->
+					<item id="2496" min="1" max="1" chance="33.34" /> <!-- Dwarven Chain Shield -->
+				</group>
+				<group chance="100">
+					<item id="399" min="1" max="1" chance="25" /> <!-- Rind Leather Armor -->
+					<item id="419" min="1" max="1" chance="25" /> <!-- Rind Leather Gaiters -->
+					<item id="440" min="1" max="1" chance="25" /> <!-- Robe of Seal -->
+					<item id="500" min="1" max="1" chance="25" /> <!-- Great Helmet -->
+				</group>
+				<group chance="100">
+					<item id="632" min="1" max="3" chance="16.66" /> <!-- Knight's Shield -->
+					<item id="1126" min="1" max="3" chance="16.66" /> <!-- Crimson Boots -->
+					<item id="498" min="1" max="3" chance="16.66" /> <!-- Steel Plate Helmet -->
+					<item id="398" min="1" max="1" chance="16.66" /> <!-- Plated Leather Armor -->
+					<item id="418" min="1" max="1" chance="16.66" /> <!-- Plated Leather Gaiters -->
+					<item id="2455" min="1" max="3" chance="16.7" /> <!-- Plated Leather Gloves -->
+				</group>
+				<group chance="100">
+					<item id="853" min="1" max="3" chance="33.33" /> <!-- Earring of Protection -->
+					<item id="884" min="1" max="3" chance="33.33" /> <!-- Ring of Protection -->
+					<item id="916" min="1" max="1" chance="33.34" /> <!-- Necklace of Protection -->
+				</group>
+				<group chance="20">
+					<item id="6660" min="1" max="1" chance="100" /> <!-- Queen Ant's Ring -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29002" level="29" type="Monster" name="Queen Ant Larva">
+	<npc id="29002" level="38" type="Monster" name="Queen Ant Larva">
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="591" hpRegen="3.5" mp="315" mpRegen="1.5" />
-			<attack physical="89.21" magical="59.01" random="30" critical="7" accuracy="40" attackSpeed="257" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="591.9" hpRegen="3.5" mp="315.1" mpRegen="1.5" />
+			<attack physical="89.21" magical="59.01" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.72" magical="84.16" />
 			<speed>
 				<walk ground="40" />
@@ -166,9 +191,9 @@
 			<hitTime>350</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="true" />
+		<status attackable="true" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -177,7 +202,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="4500" aggroRange="450">
@@ -194,9 +219,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4000" hpRegen="108" mp="402" mpRegen="1.8" />
-			<attack physical="637" magical="395" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="4000" hpRegen="108" mp="402.6" mpRegen="1.8" />
+			<attack physical="637" magical="395" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="547" magical="200" />
 			<speed>
 				<walk ground="40" />
@@ -205,9 +230,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -216,7 +241,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4020" level="1" /> <!-- Recovery -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
@@ -239,9 +264,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4343" hpRegen="115" mp="432" mpRegen="1.8" />
-			<attack physical="178" magical="27" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="4343" hpRegen="115" mp="432.7" mpRegen="1.8" />
+			<attack physical="178" magical="27" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="578" magical="211" />
 			<speed>
 				<walk ground="40" />
@@ -250,9 +275,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -261,7 +286,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="700" isAggressive="true">
@@ -283,9 +308,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="7051" hpRegen="122" mp="463" mpRegen="1.8" />
-			<attack physical="1190" magical="1074" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="7051" hpRegen="122" mp="463.3" mpRegen="1.8" />
+			<attack physical="1190" magical="1074" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="610" magical="223" />
 			<speed>
 				<walk ground="40" />
@@ -294,9 +319,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -305,7 +330,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="700" aggroRange="450">
@@ -330,18 +355,19 @@
 		<sex>MALE</sex>
 		<acquire exp="2041407" sp="61242" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="930422.1343873518" hpRegen="441.65" mp="1117.069980379333" mpRegen="20.0" />
-			<attack physical="722.31" magical="1398.68" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="523103.852" hpRegen="441.65" mp="1708.8" mpRegen="20" />
+			<attack physical="722.31" magical="1398.68" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1602" magical="293" />
 			<speed>
 				<walk ground="50" />
 				<run ground="110" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -350,7 +376,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>10</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -365,81 +391,107 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="608" min="1" max="3" chance="34.99" /> <!-- Mithril Gauntlets -->
-				<item id="854" min="1" max="3" chance="33.46" /> <!-- Earring of Seal -->
-				<item id="1127" min="1" max="3" chance="33.3" /> <!-- Forgotten Boots -->
-				<item id="885" min="1" max="3" chance="32.95" /> <!-- Ring of Ages -->
-				<item id="917" min="1" max="1" chance="32.52" /> <!-- Necklace of Mermaid -->
-				<item id="1149" min="1" max="3" chance="31.87" /> <!-- Shining Circlet -->
-				<item id="420" min="1" max="1" chance="26.08" /> <!-- Theca Leather Gaiters -->
-				<item id="472" min="1" max="1" chance="25.78" /> <!-- Demon's Stockings -->
-				<item id="400" min="1" max="1" chance="25.47" /> <!-- Theca Leather Armor -->
-				<item id="2460" min="1" max="1" chance="25.23" /> <!-- Theca Leather Gloves -->
-				<item id="2435" min="1" max="1" chance="25.04" /> <!-- Demon's Boots -->
-				<item id="2436" min="1" max="1" chance="24.9" /> <!-- Theca Leather Boots -->
-				<item id="441" min="1" max="1" chance="24.26" /> <!-- Demon's Tunic -->
-				<item id="2459" min="1" max="1" chance="24.03" /> <!-- Demon's Gloves -->
-				<item id="499" min="1" max="3" chance="20.88" /> <!-- Mithril Helmet -->
-				<item id="473" min="1" max="1" chance="20.74" /> <!-- Divine Stockings -->
-				<item id="401" min="1" max="1" chance="20.66" /> <!-- Drake Leather Armor -->
-				<item id="2437" min="1" max="1" chance="20.65" /> <!-- Drake Leather Boots -->
-				<item id="2462" min="1" max="1" chance="20.64" /> <!-- Full Plate Gauntlets -->
-				<item id="103" min="1" max="3" chance="20.48" /> <!-- Tower Shield -->
-				<item id="2468" min="1" max="3" chance="20.26" /> <!-- Blessed Gloves -->
-				<item id="356" min="1" max="1" chance="20.16" /> <!-- Full Plate Armor -->
-				<item id="2414" min="1" max="1" chance="20.08" /> <!-- Full Plate Helmet -->
-				<item id="6662" min="1" max="1" chance="20.05" /> <!-- Ring of Core -->
-				<item id="442" min="1" max="1" chance="19.81" /> <!-- Divine Tunic -->
-				<item id="2497" min="1" max="1" chance="19.76" /> <!-- Full Plate Shield -->
-				<item id="107" min="1" max="3" chance="19.74" /> <!-- Compound Shield -->
-				<item id="2438" min="1" max="1" chance="19.71" /> <!-- Full Plate Boots -->
-				<item id="60" min="1" max="1" chance="19.71" /> <!-- Compound Armor -->
-				<item id="2461" min="1" max="1" chance="19.52" /> <!-- Drake Leather Gloves -->
-				<item id="603" min="1" max="3" chance="19.51" /> <!-- Divine Boots -->
-				<item id="64" min="1" max="1" chance="19.47" /> <!-- Compound Boots -->
-				<item id="1128" min="1" max="3" chance="19.4" /> <!-- Adamantite Boots -->
-				<item id="517" min="1" max="3" chance="19.29" /> <!-- Compound Helmet -->
-				<item id="2463" min="1" max="1" chance="19.28" /> <!-- Divine Gloves -->
-				<item id="119" min="1" max="1" chance="17.35" /> <!-- Necklace of Seal -->
-				<item id="919" min="1" max="1" chance="17.23" /> <!-- Blessed Necklace -->
-				<item id="886" min="1" max="3" chance="17.2" /> <!-- Ring of Seal -->
-				<item id="857" min="1" max="3" chance="16.47" /> <!-- Holy Earring -->
-				<item id="855" min="1" max="3" chance="16.2" /> <!-- Nassen's Earring -->
-				<item id="888" min="1" max="3" chance="16.04" /> <!-- Blessed Ring -->
-				<item id="135" min="1" max="1" chance="11.58" /> <!-- Samurai Long Sword -->
-				<item id="299" min="1" max="1" chance="11.56" /> <!-- Orcish Poleaxe -->
-				<item id="206" min="1" max="1" chance="11.45" /> <!-- Demon's Staff -->
-				<item id="2503" min="1" max="1" chance="11.42" /> <!-- Yaksa Mace -->
-				<item id="205" min="1" max="1" chance="11.22" /> <!-- Ghoul's Staff -->
-				<item id="266" min="1" max="1" chance="11.2" /> <!-- Great Pata -->
-				<item id="204" min="1" max="1" chance="10.73" /> <!-- Deadman's Staff -->
-				<item id="228" min="1" max="1" chance="10.63" /> <!-- Crystal Dagger -->
-				<item id="286" min="1" max="1" chance="10.61" /> <!-- Eminence Bow -->
-				<item id="303" min="1" max="1" chance="4.364" /> <!-- Widow Maker -->
-				<item id="162" min="1" max="1" chance="4.23" /> <!-- War Axe -->
-				<item id="301" min="1" max="1" chance="4.227" /> <!-- scorpion -->
-				<item id="203" min="1" max="1" chance="4.22" /> <!-- Pa'agrio Axe -->
-				<item id="95" min="1" max="1" chance="4.219" /> <!-- Poleaxe -->
-				<item id="283" min="1" max="1" chance="4.205" /> <!-- Akat Longbow -->
-				<item id="202" min="1" max="1" chance="4.201" /> <!-- Mace of Underworld -->
-				<item id="199" min="1" max="1" chance="4.188" /> <!-- Pa'agrio Hammer -->
-				<item id="231" min="1" max="1" chance="4.184" /> <!-- Grace Dagger -->
-				<item id="134" min="1" max="1" chance="4.175" /> <!-- Sword of Nightmare -->
-				<item id="233" min="1" max="1" chance="4.171" /> <!-- Dark Screamer -->
-				<item id="174" min="1" max="1" chance="4.153" /> <!-- Nirvana Axe -->
-				<item id="265" min="1" max="1" chance="4.136" /> <!-- Fisted Blade -->
-				<item id="201" min="1" max="1" chance="4.131" /> <!-- Club of Nature -->
-				<item id="196" min="1" max="1" chance="4.13" /> <!-- Stick of Eternity -->
-				<item id="75" min="1" max="1" chance="4.129" /> <!-- Caliburs -->
-				<item id="197" min="1" max="1" chance="4.114" /> <!-- Paradia Staff -->
-				<item id="76" min="1" max="1" chance="4.113" /> <!-- Sword of Delusion -->
-				<item id="84" min="1" max="1" chance="4.109" /> <!-- Homunkulus' Sword -->
-				<item id="200" min="1" max="1" chance="4.108" /> <!-- Sage's Staff -->
-				<item id="132" min="1" max="1" chance="4.105" /> <!-- Ultimate Sword -->
-				<item id="77" min="1" max="1" chance="4.097" /> <!-- Tsurugi -->
-				<item id="198" min="1" max="1" chance="4.095" /> <!-- Inferno Staff -->
-				<item id="145" min="1" max="1" chance="4.093" /> <!-- Sword of Whispering Death -->
-				<item id="8620" min="1" max="3" chance="50.85" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				<group chance="100">
+					<item id="75" min="1" max="1" chance="4.16" /> <!-- Caliburs -->
+					<item id="76" min="1" max="1" chance="4.16" /> <!-- Sword of Delusion -->
+					<item id="77" min="1" max="1" chance="4.16" /> <!-- Tsurugi -->
+					<item id="84" min="1" max="1" chance="4.16" /> <!-- Homunkulus' Sword -->
+					<item id="95" min="1" max="1" chance="4.16" /> <!-- Poleaxe -->
+					<item id="132" min="1" max="1" chance="4.16" /> <!-- Ultimate Sword -->
+					<item id="134" min="1" max="1" chance="4.16" /> <!-- Sword of Nightmare -->
+					<item id="145" min="1" max="1" chance="4.16" /> <!-- Sword of Whispering Death -->
+					<item id="162" min="1" max="1" chance="4.16" /> <!-- War Axe -->
+					<item id="174" min="1" max="1" chance="4.16" /> <!-- Nirvana Axe -->
+					<item id="196" min="1" max="1" chance="4.16" /> <!-- Stick of Eternity -->
+					<item id="197" min="1" max="1" chance="4.16" /> <!-- Paradia Staff -->
+					<item id="198" min="1" max="1" chance="4.16" /> <!-- Inferno Staff -->
+					<item id="199" min="1" max="1" chance="4.16" /> <!-- Pa'agrio Hammer -->
+					<item id="200" min="1" max="1" chance="4.16" /> <!-- Sage's Staff -->
+					<item id="201" min="1" max="1" chance="4.16" /> <!-- Club of Nature -->
+					<item id="202" min="1" max="1" chance="4.16" /> <!-- Mace of Underworld -->
+					<item id="231" min="1" max="1" chance="4.16" /> <!-- Grace Dagger -->
+					<item id="233" min="1" max="1" chance="4.16" /> <!-- Dark Screamer -->
+					<item id="265" min="1" max="1" chance="4.16" /> <!-- Fisted Blade -->
+					<item id="283" min="1" max="1" chance="4.16" /> <!-- Akat Longbow -->
+					<item id="203" min="1" max="1" chance="4.16" /> <!-- Pa'agrio Axe -->
+					<item id="301" min="1" max="1" chance="4.16" /> <!-- Scorpion -->
+					<item id="303" min="1" max="1" chance="4.32" /> <!-- Widow Maker -->
+				</group>
+				<group chance="100">
+					<item id="60" min="1" max="1" chance="20" /> <!-- Compound Armor -->
+					<item id="64" min="1" max="1" chance="20" /> <!-- Compound Boots -->
+					<item id="103" min="1" max="3" chance="20" /> <!-- Tower Shield -->
+					<item id="107" min="1" max="3" chance="20" /> <!-- Compound Shield -->
+					<item id="517" min="1" max="3" chance="20" /> <!-- Compound Helmet -->
+				</group>
+				<group chance="100">
+					<item id="608" min="1" max="3" chance="33.33" /> <!-- Mithril Gauntlets -->
+					<item id="1127" min="1" max="3" chance="33.33" /> <!-- Forgotten Boots -->
+					<item id="1149" min="1" max="3" chance="33.34" /> <!-- Shining Circlet -->
+				</group>
+				<group chance="100">
+					<item id="400" min="1" max="1" chance="25" /> <!-- Theca Leather Armor -->
+					<item id="420" min="1" max="1" chance="25" /> <!-- Theca Leather Gaiters -->
+					<item id="2436" min="1" max="1" chance="25" /> <!-- Theca Leather Boots -->
+					<item id="2460" min="1" max="1" chance="25" /> <!-- Theca Leather Gloves -->
+				</group>
+				<group chance="100">
+					<item id="441" min="1" max="1" chance="25" /> <!-- Demon's Tunic -->
+					<item id="472" min="1" max="1" chance="25" /> <!-- Demon's Stockings -->
+					<item id="2435" min="1" max="1" chance="25" /> <!-- Demon's Boots -->
+					<item id="2459" min="1" max="1" chance="25" /> <!-- Demon's Gloves -->
+				</group>
+				<group chance="100">
+					<item id="854" min="1" max="3" chance="33.33" /> <!-- Earring of Seal -->
+					<item id="885" min="1" max="3" chance="33.33" /> <!-- Ring of Ages -->
+					<item id="917" min="1" max="1" chance="33.34" /> <!-- Necklace of Mermaid -->
+				</group>
+				<group chance="100">
+					<item id="135" min="1" max="1" chance="11.11" /> <!-- Samurai Long Sword -->
+					<item id="204" min="1" max="1" chance="11.11" /> <!-- Deadman's Staff -->
+					<item id="205" min="1" max="1" chance="11.11" /> <!-- Ghoul's Staff -->
+					<item id="206" min="1" max="1" chance="11.11" /> <!-- Demon's Staff -->
+					<item id="228" min="1" max="1" chance="11.11" /> <!-- Crystal Dagger -->
+					<item id="266" min="1" max="1" chance="11.11" /> <!-- Great Pata -->
+					<item id="286" min="1" max="1" chance="11.11" /> <!-- Eminence Bow -->
+					<item id="299" min="1" max="1" chance="11.11" /> <!-- Orcish Poleaxe -->
+					<item id="2503" min="1" max="1" chance="11.12" /> <!-- Yaksa Mace -->
+				</group>
+				<group chance="100">
+					<item id="356" min="1" max="1" chance="20" /> <!-- Full Plate Armor -->
+					<item id="2414" min="1" max="1" chance="20" /> <!-- Full Plate Helmet -->
+					<item id="2438" min="1" max="1" chance="20" /> <!-- Full Plate Boots -->
+					<item id="2462" min="1" max="1" chance="20" /> <!-- Full Plate Gauntlets -->
+					<item id="2497" min="1" max="1" chance="20" /> <!-- Full Plate Shield -->
+				</group>
+				<group chance="100">
+					<item id="401" min="1" max="1" chance="20" /> <!-- Drake Leather Armor -->
+					<item id="2437" min="1" max="1" chance="20" /> <!-- Drake Leather Boots -->
+					<item id="2461" min="1" max="1" chance="20" /> <!-- Drake Leather Gloves -->
+					<item id="499" min="1" max="3" chance="20" /> <!-- Mithril Helmet -->
+					<item id="1128" min="1" max="3" chance="20" /> <!-- Adamantite Boots -->
+				</group>
+				<group chance="100">
+					<item id="442" min="1" max="1" chance="20" /> <!-- Divine Tunic -->
+					<item id="473" min="1" max="1" chance="20" /> <!-- Divine Stockings -->
+					<item id="2463" min="1" max="1" chance="20" /> <!-- Divine Gloves -->
+					<item id="2468" min="1" max="3" chance="20" /> <!-- Blessed Gloves -->
+					<item id="603" min="1" max="3" chance="20" /> <!-- Divine Boots -->
+				</group>
+				<group chance="100">
+					<item id="119" min="1" max="1" chance="16.66" /> <!-- Necklace of Seal -->
+					<item id="855" min="1" max="3" chance="16.66" /> <!-- Nassen's Earring -->
+					<item id="857" min="1" max="3" chance="16.66" /> <!-- Holy Earring -->
+					<item id="886" min="1" max="3" chance="16.66" /> <!-- Ring of Seal -->
+					<item id="888" min="1" max="3" chance="16.66" /> <!-- Blessed Ring -->
+					<item id="919" min="1" max="1" chance="16.7" /> <!-- Blessed Necklace -->
+				</group>
+				<group chance="20">
+					<item id="6662" min="1" max="1" chance="100" /> <!-- Ring of Core -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -453,9 +505,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="75" /> <!-- Caliburs -->
 		<acquire exp="13947" sp="418" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="13817" hpRegen="166" mp="747" mpRegen="2.1" />
-			<attack physical="410" magical="69" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="13817" hpRegen="166" mp="747.8" mpRegen="2.1" />
+			<attack physical="410" magical="69" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="801" magical="293" />
 			<speed>
 				<walk ground="27" />
@@ -464,9 +516,9 @@
 			<hitTime>710</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -475,9 +527,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="2300" isAggressive="true">
@@ -489,40 +539,6 @@
 			<radius normal="12" grown="14.5" />
 			<height normal="31" grown="36" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="162" min="1" max="1" chance="0.003" /> <!-- War Axe -->
-				<item id="174" min="1" max="1" chance="0.003" /> <!-- Nirvana Axe -->
-				<item id="196" min="1" max="1" chance="0.003" /> <!-- Stick of Eternity -->
-				<item id="197" min="1" max="1" chance="0.003" /> <!-- Paradia Staff -->
-				<item id="199" min="1" max="1" chance="0.003" /> <!-- Pa'agrio Hammer -->
-				<item id="200" min="1" max="1" chance="0.003" /> <!-- Sage's Staff -->
-				<item id="201" min="1" max="1" chance="0.003" /> <!-- Club of Nature -->
-				<item id="202" min="1" max="1" chance="0.003" /> <!-- Mace of Underworld -->
-				<item id="57" min="1160" max="2714" chance="70" /> <!-- Adena -->
-				<item id="1872" min="1" max="3" chance="17.68" /> <!-- Animal Bone -->
-				<item id="1865" min="1" max="3" chance="8.461" /> <!-- Varnish -->
-				<item id="1882" min="1" max="1" chance="5.622" /> <!-- Leather -->
-				<item id="2508" min="2" max="6" chance="5.263" /> <!-- Cursed Bone -->
-				<item id="1876" min="1" max="1" chance="5.056" /> <!-- Mithril Ore -->
-				<item id="2952" min="1" max="1" chance="2.134" /> <!-- Demon's Boot Fabric -->
-				<item id="3005" min="1" max="1" chance="1.049" /> <!-- Recipe: Demon's Boots -->
-				<item id="2100" min="1" max="1" chance="0.3" /> <!-- Paradia Staff Head -->
-				<item id="2097" min="1" max="1" chance="0.3" /> <!-- War Axe Blade -->
-				<item id="2098" min="1" max="1" chance="0.3" /> <!-- Nirvana Axe Blade -->
-				<item id="2231" min="1" max="1" chance="0.3" /> <!-- Recipe: Full Plate Armor -->
-				<item id="2105" min="1" max="1" chance="0.3" /> <!-- Mace of Underworld Head -->
-				<item id="2104" min="1" max="1" chance="0.3" /> <!-- Club of Nature Head -->
-				<item id="2103" min="1" max="1" chance="0.3" /> <!-- Sage's Staff Head -->
-				<item id="2099" min="1" max="1" chance="0.3" /> <!-- Stick of Eternity Shaft -->
-				<item id="2102" min="1" max="1" chance="0.3" /> <!-- Pa'agrio Hammer Head -->
-				<item id="2360" min="1" max="1" chance="0.03" /> <!-- Recipe: Orcish Poleaxe -->
-			</drop>
-			<spoil>
-				<item id="1914" min="1" max="1" chance="45.39" /> <!-- Earring of Seal Gemstone -->
-				<item id="3011" min="1" max="1" chance="23.1" /> <!-- Recipe: Divine Boots -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29008" level="55" type="Monster" name="Doom Wraith">
 		<parameters>
@@ -535,9 +551,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="1472" /> <!-- Dreadbane -->
 		<acquire exp="15169" sp="501" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="16012" hpRegen="185" mp="889" mpRegen="2.4" />
-			<attack physical="470" magical="715" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="16012" hpRegen="185" mp="889.8" mpRegen="2.4" />
+			<attack physical="470" magical="715" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="895" magical="327" />
 			<speed>
 				<walk ground="100" />
@@ -546,21 +562,19 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="5" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="5" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="700" isAggressive="true">
@@ -583,9 +597,9 @@
 		<race>PLANT</race>
 		<sex>FEMALE</sex>
 		<acquire exp="11480" sp="344" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="12544" hpRegen="154" mp="665" mpRegen="2.1" />
-			<attack physical="354" magical="60" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<attack physical="354" magical="60" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="747" magical="273" />
 			<speed>
 				<walk ground="80" />
@@ -594,19 +608,19 @@
 			<hitTime>130</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4035" level="4" /> <!-- Poison -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="5" /> <!-- Plant -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4035" level="4" /> <!-- Poison -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="800" isAggressive="true">
@@ -618,34 +632,6 @@
 			<radius normal="12" />
 			<height normal="25.5" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="1126" min="1" max="1" chance="0.075" /> <!-- Crimson Boots -->
-				<item id="2434" min="1" max="1" chance="0.075" /> <!-- Rind Leather Boots -->
-				<item id="2455" min="1" max="1" chance="0.075" /> <!-- Plated Leather Gloves -->
-				<item id="2457" min="1" max="1" chance="0.075" /> <!-- Gloves of Seal -->
-				<item id="2458" min="1" max="1" chance="0.075" /> <!-- Rind Leather Gloves -->
-				<item id="57" min="996" max="2323" chance="70" /> <!-- Adena -->
-				<item id="1342" min="30" max="90" chance="13.49" /> <!-- Steel Arrow -->
-				<item id="1866" min="1" max="1" chance="13.18" /> <!-- Suede -->
-				<item id="1867" min="2" max="6" chance="6.42" /> <!-- Animal Skin -->
-				<item id="2948" min="1" max="1" chance="4.455" /> <!-- Rind Leather Boot Lining -->
-				<item id="2950" min="1" max="1" chance="4.366" /> <!-- Gloves of Seal Pattern -->
-				<item id="2951" min="1" max="1" chance="4.334" /> <!-- Rind Leather Glove Design -->
-				<item id="1882" min="1" max="1" chance="4.316" /> <!-- Leather -->
-				<item id="1868" min="5" max="15" chance="3.919" /> <!-- Thread -->
-				<item id="2946" min="1" max="1" chance="2.924" /> <!-- Plated Leather Glove Design -->
-				<item id="2508" min="3" max="9" chance="2.633" /> <!-- Cursed Bone -->
-				<item id="1974" min="1" max="3" chance="2.152" /> <!-- Crimson Boot Fabric -->
-				<item id="1885" min="1" max="1" chance="1.582" /> <!-- High-grade Suede -->
-				<item id="2339" min="1" max="1" chance="0.03" /> <!-- Recipe: Inferno Staff -->
-				<item id="2350" min="1" max="1" chance="0.03" /> <!-- Recipe: Pa'agrio Axe -->
-			</drop>
-			<spoil>
-				<item id="1895" min="1" max="5" chance="66.8" /> <!-- Metallic Fiber -->
-				<item id="2944" min="1" max="1" chance="63.4" /> <!-- Karmian Glove Fabric -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29010" level="46" type="Monster" name="Validus">
 		<parameters>
@@ -656,29 +642,29 @@
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<acquire exp="11032" sp="330" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="12130" hpRegen="150" mp="637" mpRegen="2.1" />
-			<attack physical="337" magical="58" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="12130" hpRegen="150" mp="637.8" mpRegen="2.1" />
+			<attack physical="337" magical="58" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="729" magical="267" />
 			<speed>
 				<walk ground="70" />
 				<run ground="110" />
 			</speed>
-			<hitTime>300</hitTime>
+			<hitTime>30</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="3" /> <!-- Beast -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="3" /> <!-- Beasts -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="1200" isAggressive="true">
@@ -690,29 +676,6 @@
 			<radius normal="15" />
 			<height normal="29" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="354" min="1" max="1" chance="0.03" /> <!-- Chain Mail Shirt -->
-				<item id="232" min="1" max="1" chance="0.0075" /> <!-- Dark Elven Dagger -->
-				<item id="281" min="1" max="1" chance="0.0075" /> <!-- Crystallized Ice Bow -->
-				<item id="57" min="914" max="2141" chance="70" /> <!-- Adena -->
-				<item id="1866" min="1" max="1" chance="15.87" /> <!-- Suede -->
-				<item id="1878" min="1" max="1" chance="9.238" /> <!-- Durable Braid -->
-				<item id="1864" min="3" max="9" chance="7.601" /> <!-- Stem -->
-				<item id="1865" min="2" max="6" chance="5.802" /> <!-- Varnish -->
-				<item id="2508" min="2" max="6" chance="3.833" /> <!-- Cursed Bone -->
-				<item id="1959" min="1" max="1" chance="2.156" /> <!-- Chain Mail Shirt Material -->
-				<item id="2072" min="1" max="1" chance="0.75" /> <!-- Dark Elven Dagger Edge -->
-				<item id="2074" min="1" max="1" chance="0.75" /> <!-- Crystallized Ice Bow Shaft -->
-				<item id="2319" min="1" max="1" chance="0.075" /> <!-- Recipe: Raid Sword -->
-				<item id="951" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Weapon (C-grade) -->
-			</drop>
-			<spoil>
-				<item id="1873" min="1" max="3" chance="87.19" /> <!-- Silver Nugget -->
-				<item id="2060" min="1" max="1" chance="3.433" /> <!-- StormBringer Blade -->
-				<item id="2067" min="1" max="1" chance="3.11" /> <!-- Crystal Staff Head -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29011" level="49" type="Monster" name="Susceptor">
 		<parameters>
@@ -723,10 +686,10 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="13389" hpRegen="162" mp="720" mpRegen="2.1" />
-			<attack physical="391" magical="66" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<attack physical="391" magical="66" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="783" magical="286" />
 			<speed>
 				<walk ground="27" />
@@ -735,10 +698,9 @@
 			<hitTime>430</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -747,7 +709,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="1500" isAggressive="true">
@@ -770,9 +733,9 @@
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<acquire exp="16035" sp="481" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="12964" hpRegen="158" mp="692" mpRegen="2.1" />
-			<attack physical="372" magical="63" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="12964" hpRegen="158" mp="692.4" mpRegen="2.1" />
+			<attack physical="372" magical="63" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="765" magical="280" />
 			<speed>
 				<walk ground="20" />
@@ -781,22 +744,22 @@
 			<hitTime>410</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4273" level="3" /> <!-- Resist Daggers/Rapier Weapon -->
-			<skill id="4274" level="1" /> <!-- Blunt Weapon Weak Point -->
-			<skill id="4408" level="12" /> <!-- HP Increase (4x) -->
+			<skill id="4416" level="2" /> <!-- Construct -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
-			<skill id="4444" level="2" /> <!-- Higher Resist Bow/Crossbow Weapons -->
+			<skill id="4444" level="2" /> <!-- Greater Bow/Crossbow Resistance -->
+			<skill id="4273" level="3" /> <!-- Dagger/Rapier Resistance -->
+			<skill id="4274" level="1" /> <!-- Blunt Weapon Vulnerability -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="800" isAggressive="true">
@@ -808,35 +771,6 @@
 			<radius normal="18" />
 			<height normal="34" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="1126" min="1" max="1" chance="0.075" /> <!-- Crimson Boots -->
-				<item id="2434" min="1" max="1" chance="0.075" /> <!-- Rind Leather Boots -->
-				<item id="2455" min="1" max="1" chance="0.075" /> <!-- Plated Leather Gloves -->
-				<item id="2457" min="1" max="1" chance="0.075" /> <!-- Gloves of Seal -->
-				<item id="2458" min="1" max="1" chance="0.075" /> <!-- Rind Leather Gloves -->
-				<item id="57" min="1447" max="3374" chance="70" /> <!-- Adena -->
-				<item id="1873" min="1" max="1" chance="13.28" /> <!-- Silver Nugget -->
-				<item id="1865" min="1" max="3" chance="10.19" /> <!-- Varnish -->
-				<item id="2508" min="2" max="6" chance="6.589" /> <!-- Cursed Bone -->
-				<item id="1965" min="1" max="1" chance="4.334" /> <!-- Metal Plate Helmet Material -->
-				<item id="2946" min="1" max="1" chance="3.6" /> <!-- Plated Leather Glove Design -->
-				<item id="1880" min="1" max="1" chance="3.203" /> <!-- Steel -->
-				<item id="1869" min="5" max="15" chance="3.137" /> <!-- Iron Ore -->
-				<item id="1974" min="1" max="3" chance="2.639" /> <!-- Crimson Boot Fabric -->
-				<item id="1874" min="1" max="1" chance="2.105" /> <!-- Oriharukon Ore -->
-				<item id="2948" min="1" max="3" chance="1.75" /> <!-- Rind Leather Boot Lining -->
-				<item id="2950" min="2" max="6" chance="1.289" /> <!-- Gloves of Seal Pattern -->
-				<item id="2951" min="2" max="6" chance="1.104" /> <!-- Rind Leather Glove Design -->
-				<item id="1973" min="3" max="9" chance="0.75" /> <!-- Pa'agrio Hand Design -->
-				<item id="2344" min="1" max="1" chance="0.075" /> <!-- Recipe: Grace Dagger -->
-				<item id="951" min="1" max="1" chance="0.075" /> <!-- Scroll: Enchant Weapon (C-grade) -->
-			</drop>
-			<spoil>
-				<item id="2073" min="1" max="1" chance="7.899" /> <!-- Chakram Edge -->
-				<item id="2352" min="1" max="1" chance="2.095" /> <!-- Recipe: Widow Maker -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29013" level="45" type="Monster" name="Premo">
 		<parameters>
@@ -847,9 +781,9 @@
 		<race>GIANT</race>
 		<sex>MALE</sex>
 		<acquire exp="10351" sp="310" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="11721" hpRegen="146" mp="610" mpRegen="2.1" />
-			<attack physical="320" magical="55" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="11721" hpRegen="146" mp="610.8" mpRegen="2.1" />
+			<attack physical="320" magical="55" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="711" magical="260" />
 			<speed>
 				<walk ground="55" />
@@ -858,10 +792,10 @@
 			<hitTime>610</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="11" /> <!-- Giant -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
@@ -869,7 +803,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="11" /> <!-- Giants -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="1200" aggroRange="450">
@@ -881,30 +815,6 @@
 			<radius normal="21" grown="25" />
 			<height normal="35" grown="43" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="631" min="1" max="1" chance="0.3" /> <!-- Eldarake -->
-				<item id="2495" min="1" max="1" chance="0.3" /> <!-- Chain Shield -->
-				<item id="2413" min="1" max="1" chance="0.075" /> <!-- Chain Hood -->
-				<item id="57" min="859" max="2006" chance="70" /> <!-- Adena -->
-				<item id="1868" min="1" max="3" chance="19.72" /> <!-- Thread -->
-				<item id="1866" min="1" max="1" chance="13.09" /> <!-- Suede -->
-				<item id="1867" min="1" max="3" chance="8.403" /> <!-- Animal Skin -->
-				<item id="1964" min="1" max="1" chance="6.104" /> <!-- Eldarake Temper -->
-				<item id="2945" min="1" max="1" chance="6.039" /> <!-- Chain Shield Fragment -->
-				<item id="2936" min="1" max="1" chance="5.482" /> <!-- Chain Hood Pattern -->
-				<item id="1882" min="1" max="1" chance="4.221" /> <!-- Leather -->
-				<item id="1885" min="1" max="1" chance="1.547" /> <!-- High-grade Suede -->
-				<item id="2207" min="1" max="1" chance="0.3" /> <!-- Recipe: Karmian Tunic -->
-				<item id="2323" min="1" max="1" chance="0.075" /> <!-- Recipe: Elemental Bow -->
-				<item id="2326" min="1" max="1" chance="0.075" /> <!-- Recipe: Horn of Glory -->
-			</drop>
-			<spoil>
-				<item id="1876" min="1" max="1" chance="79.85" /> <!-- Mithril Ore -->
-				<item id="1962" min="1" max="1" chance="13.14" /> <!-- Karmian Tunic Pattern -->
-				<item id="2073" min="1" max="1" chance="3.153" /> <!-- Chakram Edge -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29014" level="50" type="GrandBoss" name="Orfen">
 		<parameters>
@@ -915,13 +825,13 @@
 				<npc id="29016" count="4" respawnTime="360" weightPoint="1" />
 			</minions>
 		</parameters>
-		<race>ELEMENTAL</race>
+		<race>FAIRY</race>
 		<sex>FEMALE</sex>
 		<acquire exp="8872500" sp="266175" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="930422.1343873518" hpRegen="441.65" mp="1117.069980379333" mpRegen="20.0" />
-			<attack physical="722.31" magical="1398.68" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="1602" magical="293" />
+			<vitals hp="523103.852" hpRegen="441.65" mp="1708.8" mpRegen="20" />
+			<attack physical="3652" magical="1535" random="10" critical="4" accuracy="0" attackSpeed="253" type="SWORD" range="80" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -929,12 +839,9 @@
 			<hitTime>710</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4062" level="1" /> <!-- Orfen -->
-			<skill id="4063" level="1" /> <!-- Paralysis -->
-			<skill id="4064" level="1" /> <!-- Paralysis -->
+			<skill id="4416" level="13" /> <!-- Fairy -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -943,7 +850,10 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="13" /> <!-- Fairies -->
+			<skill id="4062" level="1" /> <!-- Orfen -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4063" level="1" /> <!-- Paralysis -->
+			<skill id="4064" level="1" /> <!-- Paralysis -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -958,55 +868,79 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="918" min="1" max="1" chance="33.35" /> <!-- Adamantite Necklace -->
-				<item id="856" min="1" max="3" chance="33.1" /> <!-- Adamantite Earring -->
-				<item id="887" min="1" max="3" chance="32.11" /> <!-- Adamantite Ring -->
-				<item id="673" min="1" max="1" chance="25.95" /> <!-- Avadon Shield -->
-				<item id="2379" min="1" max="1" chance="25.86" /> <!-- Avadon Gaiters -->
-				<item id="2376" min="1" max="1" chance="25.13" /> <!-- Avadon Breastplate -->
-				<item id="2415" min="1" max="1" chance="24.74" /> <!-- Avadon Circlet -->
-				<item id="2414" min="1" max="1" chance="20.98" /> <!-- Full Plate Helmet -->
-				<item id="603" min="1" max="3" chance="20.87" /> <!-- Divine Boots -->
-				<item id="2463" min="1" max="1" chance="20.81" /> <!-- Divine Gloves -->
-				<item id="356" min="1" max="1" chance="20.6" /> <!-- Full Plate Armor -->
-				<item id="1128" min="1" max="3" chance="20.45" /> <!-- Adamantite Boots -->
-				<item id="2438" min="1" max="1" chance="20.42" /> <!-- Full Plate Boots -->
-				<item id="6661" min="1" max="1" chance="20.12" /> <!-- Orfen's Earring -->
-				<item id="2437" min="1" max="1" chance="20.12" /> <!-- Drake Leather Boots -->
-				<item id="442" min="1" max="1" chance="20.08" /> <!-- Divine Tunic -->
-				<item id="2462" min="1" max="1" chance="19.79" /> <!-- Full Plate Gauntlets -->
-				<item id="499" min="1" max="3" chance="19.79" /> <!-- Mithril Helmet -->
-				<item id="401" min="1" max="1" chance="19.78" /> <!-- Drake Leather Armor -->
-				<item id="2461" min="1" max="1" chance="19.7" /> <!-- Drake Leather Gloves -->
-				<item id="2468" min="1" max="3" chance="19.32" /> <!-- Blessed Gloves -->
-				<item id="473" min="1" max="1" chance="19.15" /> <!-- Divine Stockings -->
-				<item id="2497" min="1" max="3" chance="19.15" /> <!-- Full Plate Shield -->
-				<item id="119" min="1" max="1" chance="16.97" /> <!-- Necklace of Seal -->
-				<item id="855" min="1" max="3" chance="16.5" /> <!-- Nassen's Earring -->
-				<item id="888" min="1" max="3" chance="16.16" /> <!-- Blessed Ring -->
-				<item id="857" min="1" max="3" chance="16.02" /> <!-- Holy Earring -->
-				<item id="919" min="1" max="1" chance="16.01" /> <!-- Blessed Necklace -->
-				<item id="886" min="1" max="3" chance="15.9" /> <!-- Ring of Seal -->
-				<item id="228" min="1" max="1" chance="11.59" /> <!-- Crystal Dagger -->
-				<item id="266" min="1" max="1" chance="11.58" /> <!-- Great Pata -->
-				<item id="299" min="1" max="1" chance="11.37" /> <!-- Orcish Poleaxe -->
-				<item id="204" min="1" max="1" chance="10.99" /> <!-- Deadman's Staff -->
-				<item id="286" min="1" max="1" chance="10.89" /> <!-- Eminence Bow -->
-				<item id="206" min="1" max="1" chance="10.83" /> <!-- Demon's Staff -->
-				<item id="2503" min="1" max="1" chance="10.7" /> <!-- Yaksa Mace -->
-				<item id="205" min="1" max="1" chance="10.62" /> <!-- Ghoul's Staff -->
-				<item id="135" min="1" max="1" chance="10.6" /> <!-- Samurai Long Sword -->
-				<item id="947" min="2" max="8" chance="100" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-				<item id="948" min="10" max="30" chance="100" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="8620" min="1" max="3" chance="50.1" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="4065" min="20" max="80" chance="13.09" /> <!-- Avadon Gaiter Material -->
-				<item id="4071" min="20" max="80" chance="12.62" /> <!-- Avadon Robe Fabric -->
-				<item id="4050" min="20" max="80" chance="12.62" /> <!-- Adamantite Ring Wire -->
-				<item id="4064" min="20" max="80" chance="12.61" /> <!-- Avadon Breastplate Part -->
-				<item id="4072" min="20" max="80" chance="12.6" /> <!-- Avadon Circlet Pattern -->
-				<item id="4049" min="20" max="80" chance="12.14" /> <!-- Adamantite Earring Gemstone -->
-				<item id="4051" min="20" max="80" chance="12.12" /> <!-- Adamantite Necklace Chain -->
-				<item id="4439" min="20" max="80" chance="11.89" /> <!-- Avadon Shield Fragment -->
+				<group chance="100">
+					<item id="135" min="1" max="1" chance="11.11" /> <!-- Samurai Long Sword -->
+					<item id="204" min="1" max="1" chance="11.11" /> <!-- Deadman's Staff -->
+					<item id="205" min="1" max="1" chance="11.11" /> <!-- Ghoul's Staff -->
+					<item id="206" min="1" max="1" chance="11.11" /> <!-- Demon's Staff -->
+					<item id="228" min="1" max="1" chance="11.11" /> <!-- Crystal Dagger -->
+					<item id="266" min="1" max="1" chance="11.11" /> <!-- Great Pata -->
+					<item id="286" min="1" max="1" chance="11.11" /> <!-- Eminence Bow -->
+					<item id="299" min="1" max="1" chance="11.11" /> <!-- Orcish Poleaxe -->
+					<item id="2503" min="1" max="1" chance="11.12" /> <!-- Yaksa Mace -->
+				</group>
+				<group chance="100">
+					<item id="356" min="1" max="1" chance="20" /> <!-- Full Plate Armor -->
+					<item id="2497" min="1" max="3" chance="20" /> <!-- Full Plate Shield -->
+					<item id="2414" min="1" max="1" chance="20" /> <!-- Full Plate Helmet -->
+					<item id="2438" min="1" max="1" chance="20" /> <!-- Full Plate Boots -->
+					<item id="2462" min="1" max="1" chance="20" /> <!-- Full Plate Gauntlets -->
+				</group>
+				<group chance="100">
+					<item id="2461" min="1" max="1" chance="20" /> <!-- Drake Leather Gloves -->
+					<item id="2437" min="1" max="1" chance="20" /> <!-- Drake Leather Boots -->
+					<item id="401" min="1" max="1" chance="20" /> <!-- Drake Leather Armor -->
+					<item id="603" min="1" max="3" chance="20" /> <!-- Divine Boots -->
+					<item id="1128" min="1" max="3" chance="20" /> <!-- Adamantite Boots -->
+				</group>
+				<group chance="100">
+					<item id="442" min="1" max="1" chance="20" /> <!-- Divine Tunic -->
+					<item id="473" min="1" max="1" chance="20" /> <!-- Divine Stockings -->
+					<item id="2463" min="1" max="1" chance="20" /> <!-- Divine Gloves -->
+					<item id="2468" min="1" max="3" chance="20" /> <!-- Blessed Gloves -->
+					<item id="499" min="1" max="3" chance="20" /> <!-- Mithril Helmet -->
+				</group>
+				<group chance="100">
+					<item id="119" min="1" max="1" chance="16.66" /> <!-- Necklace of Seal -->
+					<item id="855" min="1" max="3" chance="16.66" /> <!-- Nassen's Earring -->
+					<item id="857" min="1" max="3" chance="16.66" /> <!-- Holy Earring -->
+					<item id="886" min="1" max="3" chance="16.66" /> <!-- Ring of Seal -->
+					<item id="888" min="1" max="3" chance="16.66" /> <!-- Blessed Ring -->
+					<item id="919" min="1" max="1" chance="16.7" /> <!-- Blessed Necklace -->
+				</group>
+				<group chance="100">
+					<item id="2376" min="1" max="1" chance="25" /> <!-- Avadon Breastplate -->
+					<item id="2379" min="1" max="1" chance="25" /> <!-- Avadon Gaiters -->
+					<item id="2415" min="1" max="1" chance="25" /> <!-- Avadon Circlet -->
+					<item id="673" min="1" max="1" chance="25" /> <!-- Avadon Shield -->
+				</group>
+				<group chance="100">
+					<item id="856" min="1" max="3" chance="33.33" /> <!-- Adamantite Earring -->
+					<item id="887" min="1" max="3" chance="33.33" /> <!-- Adamantite Ring -->
+					<item id="918" min="1" max="1" chance="33.34" /> <!-- Adamantite Necklace -->
+				</group>
+				<group chance="100">
+					<item id="4049" min="20" max="80" chance="12.5" /> <!-- Adamantite Earring Gemstone -->
+					<item id="4050" min="20" max="80" chance="12.5" /> <!-- Adamantite Ring Wire -->
+					<item id="4051" min="20" max="80" chance="12.5" /> <!-- Adamantite Necklace Chain -->
+					<item id="4064" min="20" max="80" chance="12.5" /> <!-- Avadon Breastplate Part -->
+					<item id="4065" min="20" max="80" chance="12.5" /> <!-- Avadon Gaiter Material -->
+					<item id="4071" min="20" max="80" chance="12.5" /> <!-- Avadon Robe Fabric -->
+					<item id="4072" min="20" max="80" chance="12.5" /> <!-- Avadon Circlet Pattern -->
+					<item id="4439" min="20" max="80" chance="12.5" /> <!-- Avadon Shield Fragment -->
+				</group>
+				<group chance="20">
+					<item id="6661" min="1" max="1" chance="100" /> <!-- Orfen's Earring -->
+				</group>
+				<group chance="100">
+					<item id="947" min="2" max="8" chance="100" /> <!-- Scroll: Enchant Weapon (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="948" min="10" max="30" chance="100" /> <!-- Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -1016,13 +950,13 @@
 			<param name="MoveAroundSocial1" value="70" />
 			<param name="MoveAroundSocial2" value="70" />
 		</parameters>
-		<race>BEAST</race>
+		<race>BUG</race>
 		<sex>MALE</sex>
-		<acquire exp="16035" sp="481" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="16035" sp="481" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="158" mp="36936" mpRegen="2.1" />
-			<attack physical="298" magical="40" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="765" magical="280" />
+			<attack physical="298" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1030,9 +964,9 @@
 			<hitTime>540</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1041,7 +975,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="2500" aggroRange="450">
@@ -1060,13 +994,13 @@
 			<param name="MoveAroundSocial1" value="70" />
 			<param name="MoveAroundSocial2" value="70" />
 		</parameters>
-		<race>BEAST</race>
+		<race>BUG</race>
 		<sex>MALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="162" mp="36936" mpRegen="2.1" />
-			<attack physical="1058" magical="1563" random="30" critical="15" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="783" magical="286" />
+			<attack physical="1058" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1074,9 +1008,9 @@
 			<hitTime>540</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1085,7 +1019,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="2700" aggroRange="450">
@@ -1106,11 +1040,11 @@
 		</parameters>
 		<race>BUG</race>
 		<sex>FEMALE</sex>
-		<acquire exp="16035" sp="481" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="16035" sp="481" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="158" mp="36936" mpRegen="2.1" />
-			<attack physical="298" magical="40" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="765" magical="280" />
+			<attack physical="298" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1118,9 +1052,9 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1129,7 +1063,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="2700" aggroRange="450">
@@ -1145,11 +1079,11 @@
 	<npc id="29018" level="49" type="Monster" name="Riba Iren">
 		<race>BUG</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="162" mp="36936" mpRegen="2.1" />
-			<attack physical="1058" magical="1563" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="783" magical="286" />
+			<attack physical="1058" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1157,9 +1091,9 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1168,8 +1102,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
-			<skill id="4516" level="1" /> <!-- Orfen Heal -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="2900" isAggressive="true">
@@ -1187,27 +1120,19 @@
 		<sex>MALE</sex>
 		<acquire exp="262720917" sp="63053" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="7500000" hpRegen="1000" mp="18000" mpRegen="99" />
-			<attack physical="3260" magical="1700" random="30" critical="4" accuracy="40" attackSpeed="206" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="440" magical="440" />
+			<vitals hp="7000000" hpRegen="1000" mp="18000" mpRegen="99" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3840" magical="825" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4106" level="1" /> <!-- Antharas Stun -->
-			<skill id="4108" level="1" /> <!-- Antharas Terror -->
-			<skill id="4109" level="1" /> <!-- Curse of Antharas -->
-			<skill id="4110" level="2" /> <!-- Breath Attack -->
-			<skill id="4111" level="1" /> <!-- Antharas Fossilization -->
-			<skill id="4112" level="1" /> <!-- Ordinary Attack -->
-			<skill id="4113" level="1" /> <!-- Animal doing ordinary attack -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragon -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1216,9 +1141,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5092" level="1" /> <!-- Antharas Terror -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1227,39 +1152,36 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists> <!-- CT2.5 -->
-			<drop>
-				<item id="8620" min="10" max="30" chance="50" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="1538" min="1" max="59" chance="100" /> <!-- Blessed Scroll of Escape -->
-				<item id="3936" min="1" max="39" chance="100" /> <!-- Blessed Scroll of Resurrection -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="9000000" max="13000000" chance="100" /> <!-- Adena -->
-			</drop>
-		</dropLists>
 	</npc>
-	<npc id="29020" level="75" type="GrandBoss" name="Baium">
+	<npc id="29020" level="80" type="GrandBoss" name="Baium">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<acquire exp="51267002" sp="1538010" raidPoints="450" />
+		<acquire exp="1024738848" sp="30742165" raidPoints="450" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="10334675.47262" hpRegen="310.756323" mp="15930" mpRegen="3" />
-			<attack physical="3374.18" magical="2200" random="30" critical="4" accuracy="40" attackSpeed="206" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3300" magical="2200" />
+			<vitals hp="133333333" hpRegen="6666" mp="18000" mpRegen="99" />
+			<attack physical="25931" magical="8204" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3202" magical="2134" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4127" level="1" /> <!-- Baium: General Attack -->
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4256" level="1" /> <!-- Stun Resistance -->
+			<skill id="4127" level="1" /> <!-- Baium: General Attack -->
 		</skillList>
 		<corpseTime>13</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1270,28 +1192,15 @@
 			<radius normal="65" />
 			<height normal="174" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="7900" min="1" max="1" chance="17.84" /> <!-- Ice Storm Hammer -->
-				<item id="7892" min="1" max="1" chance="17.25" /> <!-- Spell Breaker -->
-				<item id="7901" min="1" max="1" chance="16.71" /> <!-- Star Buster -->
-				<item id="7883" min="1" max="1" chance="16.74" /> <!-- Sword of Sentinel -->
-				<item id="7893" min="1" max="1" chance="16.48" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="15.31" /> <!-- Wizard's Tear -->
-				<item id="8621" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Version) -->
-				<item id="33814" min="2" max="4" chance="50.42" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33808" min="1" max="1" chance="49.96" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-			</drop>
-		</dropLists>
 	</npc>
-	<npc id="29021" level="74" type="Monster" name="Archangel">
+	<npc id="29021" level="80" type="Monster" name="Archangel">
 		<race>DIVINE</race>
 		<sex>MALE</sex>
 		<equipment rhand="93" /> <!-- Winged Spear -->
 		<acquire exp="11520" sp="2" />
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="186915" hpRegen="158" mp="1475" mpRegen="3" />
-			<attack physical="395" magical="371" random="30" critical="4" accuracy="40" attackSpeed="206" type="POLE" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="747660" hpRegen="158" mp="1475" mpRegen="3" />
+			<attack physical="4185" magical="371" random="10" critical="4" accuracy="0" attackSpeed="253" type="POLE" range="80" distance="80" width="120" />
 			<defence physical="5108" magical="1686" />
 			<speed>
 				<walk ground="50" />
@@ -1300,10 +1209,9 @@
 			<hitTime>760</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4132" level="1" /> <!-- Spear: Pound the Ground -->
+			<skill id="4416" level="8" /> <!-- Divine -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1311,9 +1219,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="11" /> <!-- Spears -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="4133" level="1" /> <!-- Heal -->
+			<skill id="4415" level="11" /> <!-- Spear -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="300" isAggressive="true">
@@ -1331,9 +1238,9 @@
 		<sex>MALE</sex>
 		<acquire exp="102487500" sp="3074625" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="7027579.47902" hpRegen="310.756323" mp="10832.4" mpRegen="3" />
-			<attack physical="33864" magical="42273" random="30" critical="4" accuracy="40" attackSpeed="206" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3680" magical="4661" />
+			<vitals hp="66666666.6666667" hpRegen="2981.0298102981" mp="12240" mpRegen="10" />
+			<attack physical="15182.9268292683" magical="6600.03819341452" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2692.68292682927" magical="1794.92939666239" />
 			<speed>
 				<walk ground="42" />
 				<run ground="190" />
@@ -1341,35 +1248,28 @@
 			<hitTime>590</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4221" level="1" /> <!-- Range Dual Attack -->
-			<skill id="4220" level="1" /> <!-- Dual Attack -->
-			<skill id="4218" level="1" /> <!-- Drain -->
-			<skill id="4219" level="1" /> <!-- Hold -->
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="3" /> <!-- Extremely Weak P. Atk. -->
+			<skill id="4411" level="3" /> <!-- Extremely Weak M. Atk. -->
+			<skill id="4412" level="3" /> <!-- Extremely Weak P. Def. -->
+			<skill id="4413" level="3" /> <!-- Extremely Weak M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="1000" clanHelpRange="300" isAggressive="true" />
 		<collision>
-			<radius normal="16" />
-			<height normal="32" />
+			<radius normal="19.2" />
+			<height normal="39" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="7893" min="1" max="1" chance="6.864" /> <!-- Kaim Vanul's Bones -->
-				<item id="7883" min="1" max="1" chance="6.834" /> <!-- Sword of Sentinel -->
-				<item id="7892" min="1" max="1" chance="6.82" /> <!-- Spell Breaker -->
-				<item id="7900" min="1" max="1" chance="6.795" /> <!-- Ice Storm Hammer -->
-				<item id="7889" min="1" max="1" chance="6.401" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="6.35" /> <!-- Star Buster -->
-				<item id="33814" min="1" max="1" chance="34.82" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33808" min="1" max="1" chance="34.45" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-			</drop>
-		</dropLists>
 	</npc>
-	<npc id="29023" level="74" type="Monster" name="Maiden Doll">
+	<npc id="29023" level="58" type="Monster" name="Maiden Doll">
 		<parameters>
 			<param name="MoveAroundSocial" value="50" />
 			<param name="MoveAroundSocial1" value="50" />
@@ -1380,33 +1280,31 @@
 		<equipment rhand="5129" /> <!-- Doll Knife -->
 		<acquire exp="129198" sp="3875" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1828" hpRegen="6.5" mp="832" mpRegen="2.4" />
-			<attack physical="442" magical="302" random="30" critical="4" accuracy="40" attackSpeed="253" type="DUAL" range="40" distance="80" width="120" />
+			<vitals hp="1828" hpRegen="6.5" mp="832.4" mpRegen="2.4" />
+			<attack physical="442" magical="302" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="DUAL" range="40" distance="80" width="120" />
 			<defence physical="261" magical="191" />
 			<speed>
 				<walk ground="22" />
 				<run ground="150" />
 			</speed>
-			<hitTime>500</hitTime>
+			<hitTime>50</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="5" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4085" level="1" /> <!-- Critical Damage -->
-			<skill id="4086" level="1" /> <!-- Critical Chance -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="9" /> <!-- Demon -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="9" /> <!-- Average M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="19" /> <!-- Dual-Sword Weapons -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4333" level="5" /> <!-- Dark Attack Resistance -->
-			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4415" level="19" /> <!-- Dualsword -->
+			<skill id="4071" level="5" /> <!-- Bow/Crossbow Resistance -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1414,22 +1312,8 @@
 			<radius normal="6" />
 			<height normal="12" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="97" min="1" max="1" chance="0.0075" /> <!-- Lance -->
-				<item id="268" min="1" max="1" chance="0.0075" /> <!-- Bellion Cestus -->
-				<item id="57" min="2433" max="5685" chance="70" /> <!-- Adena -->
-				<item id="1887" min="1" max="1" chance="10.07" /> <!-- Varnish of Purity -->
-				<item id="4115" min="1" max="1" chance="1.689" /> <!-- Lance Blade -->
-				<item id="4120" min="1" max="1" chance="1.621" /> <!-- Bellion Cestus Edge -->
-			</drop>
-			<spoil>
-				<item id="948" min="1" max="1" chance="4.291" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="947" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-			</spoil>
-		</dropLists>
 	</npc>
-	<npc id="29024" level="74" type="Monster" name="Veil Master">
+	<npc id="29024" level="59" type="Monster" name="Veil Master">
 		<parameters>
 			<param name="MoveAroundSocial" value="114" />
 			<param name="MoveAroundSocial1" value="114" />
@@ -1440,7 +1324,7 @@
 		<acquire exp="90904" sp="2727" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1880" hpRegen="6.5" mp="861" mpRegen="2.4" />
-			<attack physical="461" magical="315" random="30" critical="4" accuracy="40" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="461" magical="315" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="267" magical="195" />
 			<speed>
 				<walk ground="70" />
@@ -1449,66 +1333,9 @@
 			<hitTime>740</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="5" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4085" level="1" /> <!-- Critical Damage -->
-			<skill id="4086" level="1" /> <!-- Critical Chance -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4333" level="5" /> <!-- Dark Attack Resistance -->
-			<skill id="4416" level="9" /> <!-- Demons -->
-		</skillList>
-		<exCrtEffect>true</exCrtEffect>
-		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
-		<collision>
-			<radius normal="12" />
-			<height normal="40" />
-		</collision>
-		<dropLists>
-			<drop>
-				<item id="79" min="1" max="1" chance="0.003" /> <!-- Damascus Sword -->
-				<item id="171" min="1" max="1" chance="0.003" /> <!-- Deadman's Glory -->
-				<item id="57" min="1372" max="3205" chance="70" /> <!-- Adena -->
-				<item id="1895" min="1" max="1" chance="11.72" /> <!-- Metallic Fiber -->
-				<item id="1876" min="1" max="1" chance="8.039" /> <!-- Mithril Ore -->
-				<item id="1866" min="2" max="6" chance="6.721" /> <!-- Suede -->
-				<item id="1879" min="1" max="1" chance="6.667" /> <!-- Cokes -->
-				<item id="1870" min="5" max="15" chance="4.008" /> <!-- Coal -->
-				<item id="1871" min="9" max="27" chance="2.214" /> <!-- Charcoal -->
-				<item id="4114" min="1" max="1" chance="0.75" /> <!-- Damascus Sword Blade -->
-				<item id="4116" min="1" max="1" chance="0.75" /> <!-- Deadman's Glory Stone -->
-			</drop>
-			<spoil>
-				<item id="948" min="1" max="1" chance="2.451" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="947" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-			</spoil>
-		</dropLists>
-	</npc>
-	<npc id="29025" level="75" type="Folk" name="Baium">
-		<race>HUMANOID</race>
-		<sex>MALE</sex>
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="1709400" hpRegen="8.5" mp="18000" mpRegen="3" />
-			<attack physical="874.18" magical="596.95" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="233.61" magical="233.61" />
-			<speed>
-				<walk ground="50" />
-				<run ground="120" />
-			</speed>
-			<abnormalResist physical="230" magical="230" />
-		</stats>
-		<status attackable="false" undying="true" />
-		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="9" /> <!-- Demon -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1517,7 +1344,44 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4071" level="5" /> <!-- Bow/Crossbow Resistance -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+		</skillList>
+		<exCrtEffect>true</exCrtEffect>
+		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="29025" level="75" type="Folk" name="Baium">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="1709400" hpRegen="718" mp="18000" mpRegen="99" />
+			<attack physical="1874.18" magical="1596.95" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3300" magical="2200" />
+			<speed>
+				<walk ground="50" />
+				<run ground="120" />
+			</speed>
+			<hitTime>60</hitTime>
+			<abnormalResist physical="230" magical="230" />
+		</stats>
+		<status attackable="false" undying="true" />
+		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="300" aggroRange="4296" />
@@ -1537,7 +1401,7 @@
 		<equipment rhand="232" /> <!-- Dark Elven Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1933" hpRegen="6.5" mp="804" mpRegen="2.4" />
-			<attack physical="420" magical="328" random="10" critical="8" accuracy="40" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
+			<attack physical="420" magical="328" random="5" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="272" magical="199" />
 			<speed>
 				<walk ground="14" />
@@ -1546,9 +1410,9 @@
 			<hitTime>760</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1556,10 +1420,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="7" /> <!-- Daggers -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4415" level="7" /> <!-- Dagger -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1579,7 +1441,7 @@
 		<equipment rhand="225" /> <!-- Mithril Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1776" hpRegen="6.5" mp="584" mpRegen="2.1" />
-			<attack physical="371" magical="289" random="10" critical="8" accuracy="40" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
+			<attack physical="371" magical="289" random="5" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="256" magical="187" />
 			<speed>
 				<walk ground="11" />
@@ -1588,9 +1450,9 @@
 			<hitTime>740</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1598,10 +1460,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="7" /> <!-- Daggers -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4415" level="7" /> <!-- Dagger -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1610,28 +1470,27 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="29066" level="1" type="GrandBoss" name="Antharas">
+	<npc id="29066" level="75" type="GrandBoss" name="Antharas">
 		<parameters>
 			<param name="ultra_respawn_time" value="8" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<acquire exp="262720917" sp="63053" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="6100000" hpRegen="2" mp="1800000" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="6100000" hpRegen="1100" mp="1800000" mpRegen="1000" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3456" magical="862.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragon -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1640,8 +1499,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1652,22 +1512,29 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists> <!-- CT2.5 -->
-			<drop>
-				<item id="8620" min="10" max="30" chance="50" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="1538" min="1" max="59" chance="100" /> <!-- Blessed Scroll of Escape -->
-				<item id="3936" min="1" max="39" chance="100" /> <!-- Blessed Scroll of Resurrection -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="9000000" max="13000000" chance="100" /> <!-- Adena -->
-			</drop>
-		</dropLists>
 	</npc>
-	<npc id="29067" level="1" type="GrandBoss" name="Antharas">
+	<npc id="29061" displayId="31842" level="70" type="Teleporter" name="Teleportation Cubic">
+		<race>ETC</race>
+		<sex>ETC</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2444" hpRegen="7.5" mp="1345" mpRegen="2.7" />
+			<attack physical="688.86373" magical="470.40463" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="295.91597" magical="216.53847" />
+			<speed>
+				<walk ground="50" />
+				<run ground="120" />
+			</speed>
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="false" />
+		<exCrtEffect>true</exCrtEffect>
+		<ai type="BALANCED" clanHelpRange="300" isAggressive="true" aggroRange="500" />
+		<collision>
+			<radius normal="40" />
+			<height normal="80" />
+		</collision>
+	</npc>
+	<npc id="29067" level="75" type="GrandBoss" name="Antharas">
 		<parameters>
 			<param name="ultra_respawn_time" value="5" />
 		</parameters>
@@ -1676,19 +1543,18 @@
 		<acquire exp="262720918" sp="29116376" raidPoints="30780" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="6800000" hpRegen="1100" mp="1800000" mpRegen="1000" />
-			<attack physical="4900" magical="2550" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3456" magical="862.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragon -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1697,8 +1563,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1709,45 +1576,29 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="7900" min="1" max="1" chance="17.8" /> <!-- Ice Storm Hammer -->
-				<item id="7892" min="1" max="1" chance="17.72" /> <!-- Spell Breaker -->
-				<item id="7883" min="1" max="1" chance="16.92" /> <!-- Sword of Sentinel -->
-				<item id="7893" min="1" max="1" chance="16.91" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="16.68" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="15.89" /> <!-- Star Buster -->
-				<item id="33814" min="2" max="4" chance="49.99" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33807" min="2" max="4" chance="49.36" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
-				<item id="33813" min="2" max="4" chance="48.95" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
-				<item id="33808" min="2" max="4" chance="48.94" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29068" level="84" type="GrandBoss" name="Antharas" title="Land Dragon">
-		<!-- Todo: CT2.5 -->
 		<parameters>
 			<param name="ultra_respawn_time" value="3" />
 		</parameters>
 		<race>DRAGON</race>
 		<sex>MALE</sex>
-		<acquire exp="538538584" sp="63323403" raidPoints="38248" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="689482245" hpRegen="1830" mp="2025740" mpRegen="1000" />
-			<attack physical="4799.20533" magical="263.60854" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3974.13793" magical="496.01325" />
+		<acquire exp="40664236032" sp="9759416" raidPoints="1000" />
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="355555555" hpRegen="385356.45" mp="2025740" mpRegen="1000" />
+			<attack physical="35810" magical="3783.6" random="5" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2505.43352601156" magical="1452.04745968969" />
 			<speed>
 				<walk ground="50" />
 				<run ground="279" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
+		<status attackable="true" noSleepMode="true" isDeathPenalty="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4112" level="1" /> <!-- Ordinary Attack -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragon -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1756,9 +1607,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1769,23 +1620,8 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="7900" min="1" max="1" chance="17.8" /> <!-- Ice Storm Hammer -->
-				<item id="7892" min="1" max="1" chance="17.72" /> <!-- Spell Breaker -->
-				<item id="7883" min="1" max="1" chance="16.92" /> <!-- Sword of Sentinel -->
-				<item id="7893" min="1" max="1" chance="16.91" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="16.68" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="15.89" /> <!-- Star Buster -->
-				<item id="33814" min="2" max="4" chance="49.99" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33807" min="2" max="4" chance="49.36" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
-				<item id="33813" min="2" max="4" chance="48.95" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
-				<item id="33808" min="2" max="4" chance="48.94" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-			</drop>
-		</dropLists>
 	</npc>
-	<npc id="29069" level="79" type="Monster" name="Behemoth Dragon">
-		<!-- Todo: CT2.5 -->
+	<npc id="29069" level="84" type="Monster" name="Behemoth Dragon">
 		<parameters>
 			<param name="RootingManage" value="0" />
 			<skill name="PhysicalSpecial" id="5095" level="1" />
@@ -1794,18 +1630,20 @@
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="292335" hpRegen="76.71" mp="22800" mpRegen="3" />
-			<attack physical="3584.56902102981" magical="1386.66000087809" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="1071.29474264312" magical="522.626863116263" evasion="-18" />
+			<vitals hp="949367" hpRegen="22" mp="22800" mpRegen="30" />
+			<attack physical="14519" magical="11667" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="1370" magical="851" />
 			<speed>
-				<walk ground="180" />
+				<walk ground="55" />
 				<run ground="180" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" isDeathPenalty="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragon -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1814,10 +1652,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5095" level="1" /> <!-- Antharas Subordinate Melee Attack -->
 			<skill id="5096" level="1" /> <!-- Antharas Subordinate Remote Attack -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="300" isAggressive="true">
@@ -1828,26 +1665,27 @@
 			<height normal="54" />
 		</collision>
 	</npc>
-	<npc id="29070" level="79" type="Monster" name="Dragon Bomber">
-		<!-- Todo: CT2.5 -->
+	<npc id="29070" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1353" hpRegen="8.5" mp="1809" mpRegen="3" />
-			<attack physical="1094.11758465172" magical="4902.24" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<vitals hp="1353.6766" hpRegen="8.5" mp="1809" mpRegen="3" />
+			<attack physical="1094.11758465172" magical="4902.24" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.098247547707" magical="261.308998696584" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="250" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragon -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1856,10 +1694,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -1868,25 +1704,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29071" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29071" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="245" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragon -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1895,9 +1732,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -1906,25 +1742,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29072" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29072" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="255" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragon -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1933,9 +1770,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -1944,25 +1780,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29073" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29073" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="247" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragon -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1971,9 +1808,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -1982,25 +1818,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29074" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29074" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="252" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragon -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2009,9 +1846,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2020,25 +1856,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29075" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29075" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="243" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragon -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2047,9 +1884,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2058,25 +1894,27 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29076" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29076" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1353" hpRegen="2" mp="1809" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1353.6766" hpRegen="8.5" mp="1809" mpRegen="3" />
+			<attack physical="1094.11758465172" magical="4902.24" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="357.098247547707" magical="261.308998696584" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="250" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragon -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2085,9 +1923,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="200" clanHelpRange="300" isAggressive="true" />
@@ -2096,7 +1933,7 @@
 			<height normal="34.5" />
 		</collision>
 	</npc>
-	<npc id="29077" level="78" type="Monster" name="">
+	<npc id="29077" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="177456" />
 			<param name="suicide2_x" value="177120" />
@@ -2116,19 +1953,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2137,7 +1975,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2146,7 +1984,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29078" level="78" type="Monster" name="">
+	<npc id="29078" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175952" />
 			<param name="suicide2_x" value="175712" />
@@ -2166,19 +2004,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2187,7 +2026,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2196,7 +2035,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29079" level="78" type="Monster" name="">
+	<npc id="29079" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175120" />
 			<param name="suicide2_x" value="175024" />
@@ -2216,19 +2055,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2237,7 +2077,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2246,7 +2086,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29080" level="78" type="Monster" name="">
+	<npc id="29080" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="174640" />
 			<param name="suicide2_x" value="174576" />
@@ -2266,19 +2106,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2287,7 +2128,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2296,7 +2137,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29081" level="78" type="Monster" name="">
+	<npc id="29081" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="173968" />
 			<param name="suicide2_x" value="173856" />
@@ -2316,19 +2157,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2337,7 +2179,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2346,7 +2188,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29082" level="78" type="Monster" name="">
+	<npc id="29082" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="173920" />
 			<param name="suicide2_x" value="174064" />
@@ -2366,19 +2208,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2387,7 +2230,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2396,7 +2239,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29083" level="78" type="Monster" name="">
+	<npc id="29083" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="174704" />
 			<param name="suicide2_x" value="174800" />
@@ -2416,19 +2259,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2437,7 +2281,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2446,7 +2290,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29084" level="78" type="Monster" name="">
+	<npc id="29084" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175424" />
 			<param name="suicide2_x" value="175632" />
@@ -2466,19 +2310,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2487,7 +2332,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2496,7 +2341,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29085" level="78" type="Monster" name="">
+	<npc id="29085" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="176880" />
 			<param name="suicide2_x" value="177200" />
@@ -2516,19 +2361,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2537,7 +2383,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2546,7 +2392,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29086" level="78" type="Monster" name="">
+	<npc id="29086" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="178368" />
 			<param name="suicide2_x" value="178592" />
@@ -2566,19 +2412,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2587,7 +2434,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2596,7 +2443,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29087" level="78" type="Monster" name="">
+	<npc id="29087" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="179696" />
 			<param name="suicide2_x" value="179920" />
@@ -2616,19 +2463,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2637,7 +2485,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2646,7 +2494,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29088" level="78" type="Monster" name="">
+	<npc id="29088" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180592" />
 			<param name="suicide2_x" value="180752" />
@@ -2666,19 +2514,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2687,7 +2536,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2696,7 +2545,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29089" level="78" type="Monster" name="">
+	<npc id="29089" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180896" />
 			<param name="suicide2_x" value="180784" />
@@ -2716,19 +2565,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2737,7 +2587,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2746,7 +2596,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29090" level="78" type="Monster" name="">
+	<npc id="29090" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180496" />
 			<param name="suicide2_x" value="180512" />
@@ -2766,19 +2616,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2787,7 +2638,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2796,7 +2647,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29091" level="78" type="Monster" name="">
+	<npc id="29091" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180896" />
 			<param name="suicide2_x" value="181040" />
@@ -2816,19 +2667,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2837,7 +2689,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2846,7 +2698,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29092" level="78" type="Monster" name="">
+	<npc id="29092" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180720" />
 			<param name="suicide2_x" value="180640" />
@@ -2866,19 +2718,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2887,7 +2740,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2896,7 +2749,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29093" level="78" type="Monster" name="">
+	<npc id="29093" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180048" />
 			<param name="suicide2_x" value="179920" />
@@ -2916,19 +2769,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2937,7 +2791,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2946,7 +2800,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29094" level="78" type="Monster" name="">
+	<npc id="29094" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="178848" />
 			<param name="suicide2_x" value="178560" />
@@ -2966,19 +2820,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Construct -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2987,7 +2842,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/skills/02000-02099.xml
index a77c3ccf70..6b8d051d46 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/skills/02000-02099.xml
@@ -211,10 +211,16 @@
 	</skill>
 	<skill id="2013" toLevel="2" name="Scroll of Escape">
 		<icon>icon.skill0000</icon>
-		<hitTime>20000</hitTime>
+		<hitTime>
+			<value level="1">20000</value>
+			<value level="2">1000</value>
+		</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>736</itemConsumeId> <!-- Scroll of Escape -->
+		<itemConsumeId>
+			<value level="1">736</value> <!-- Scroll of Escape -->
+			<value level="2">49087</value> <!-- Improved Scroll of Escape -->
+		</itemConsumeId>
 		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/skills/39000-39099.xml b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/skills/39000-39099.xml
index 618886db8a..bc9ae70dc4 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/skills/39000-39099.xml
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/skills/39000-39099.xml
@@ -1247,7 +1247,7 @@
 		<hitTime>1000</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>49087</itemConsumeId> <!-- Improved Scroll of Escape -->
+		<itemConsumeId>49500</itemConsumeId> <!-- Greater Scroll of Escape -->
 		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/skills/39100-39199.xml
index 88a08dd805..db76ff159d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/skills/39100-39199.xml
@@ -57,7 +57,19 @@
 	</skill>
 	<skill id="39103" toLevel="1" name="Warrior's Quick Healing Potion">
 		<icon>icon.etc_reagent_white_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<amount>500</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39104" toLevel="1" name="Hero Cube - 7 days">
 		<icon>icon.sa_cube</icon>
@@ -91,7 +103,7 @@
 		<icon>icon.etc_scroll_of_resurrection_i01</icon>
 		<castRange>400</castRange>
 		<effectPoint>1</effectPoint>
-		<effectRange>600</effectRange>
+		<effectRange>900</effectRange>
 		<hitTime>1000</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
@@ -104,6 +116,9 @@
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpResurrection" />
+			<condition name="TargetMyParty">
+				<includeMe>false</includeMe>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="Resurrection">
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/skills/documentation.txt
index cc90f472b8..68a4c3b798 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/stats/skills/documentation.txt
@@ -10,6 +10,8 @@ AddHate: Instant effect that increases target's hate towards you.
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -193,7 +195,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/Config.java
index 78f9874dc7..83a13b4a2b 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/Config.java
@@ -1195,6 +1195,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static boolean AUTO_PLAY_PREMIUM;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
@@ -1270,6 +1271,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2500,6 +2502,7 @@ public class Config
 			ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 			AUTO_PLAY_PREMIUM = autoPlayConfig.getBoolean("AutoPlayPremium", false);
 			DISABLED_AUTO_SKILLS.clear();
 			final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
@@ -3256,6 +3259,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index a50cbb8033..8378c362cb 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index 603e7d33be..dd968ed772 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -549,9 +549,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 2260001e17..380989e049 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 36f3461010..efc07efb38 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -230,7 +230,7 @@ public class ShortCuts implements IRestorable
 			if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL))
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 55f0ee03a0..f5cc7704ae 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1288,7 +1288,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2816,7 +2816,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2829,178 +2829,140 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						player.refreshExpertisePenalty();
-						sendPacket(info);
+					}
+					player.refreshExpertisePenalty();
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Player.java
index 2a17b672b3..94385df2a6 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4533,7 +4533,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8229,9 +8229,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Summon.java
index cc23c2a6f2..98b7163e50 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -846,7 +847,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -867,7 +868,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -892,7 +900,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -900,7 +908,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -946,7 +961,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index ea1abbff9b..074a4ae995 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -863,15 +862,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -882,8 +879,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -892,7 +893,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -965,33 +966,6 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
@@ -1001,9 +975,17 @@ public class CreatureStat
 		// Notify recalculation to child classes.
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 438e73d4cc..a2436eebf0 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0b6092b2d9..1e393ec4bf 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2216,6 +2216,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index 3a95187bd8..3e55250658 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -38,6 +38,7 @@ import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
 import org.l2jmobius.gameserver.enums.AttributeType;
@@ -50,6 +51,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -67,12 +69,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDr
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPickup;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -80,11 +84,13 @@ import org.l2jmobius.gameserver.model.options.EnchantOptions;
 import org.l2jmobius.gameserver.model.options.Options;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.SkillConditionScope;
 import org.l2jmobius.gameserver.model.variables.ItemVariables;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1580,7 +1586,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2210,6 +2218,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2234,6 +2247,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2259,6 +2274,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index bddb8ba55d..4cd00cba42 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -738,7 +738,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -890,7 +891,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 1692c9fcd7..ec97ae1f75 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -652,7 +652,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -675,7 +675,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -710,7 +710,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 66517b74da..ec5f458641 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -128,7 +128,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index c305987ba6..c29c9ba398 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -93,6 +93,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index c5257ff589..1aff35bfd5 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index c6fd6dc758..9f04d53165 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -701,7 +701,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList(false);
 		player.updateShortCuts(_id, _level, 0);
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 50c8e2816f..aaf2725444 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -63,6 +63,6 @@ public class RequestShortCutReg implements ClientPacket
 		
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 	}
 }
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index 93f16169bc..07ed7641a9 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,127 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 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, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index dcc44cb9f3..2e152e2e29 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -207,7 +207,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		ServerPackets.EX_PET_INFO.writeId(this);
 		writeInt(_summon.getObjectId());
-		writeByte(_value); // // 0=teleported 1=default 2=summoned
+		writeByte(_value); // 0=teleported 1=default 2=summoned
 		writeShort(37); // mask_bits_37
 		writeBytes(_masks);
 		// Block 1
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index f93c9e5e69..03909a2746 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
deleted file mode 100644
index 52a4032d14..0000000000
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
new file mode 100644
index 0000000000..62bb425a5a
--- /dev/null
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -0,0 +1,182 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeByte(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 83e29f7bed..3ee2b1ef96 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,19 +19,19 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
 	}
 	
@@ -53,8 +53,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 8872c0cf63..c2b8c8f51a 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -42,13 +48,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -59,8 +68,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 68ca369edf..37f3211b0a 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1f54b5040f..0d5d066d25 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,6 +25,7 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -95,6 +98,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							if (player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -120,23 +134,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -144,6 +167,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -178,32 +204,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -302,6 +351,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 7cd7dd9696..c56221841f 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
@@ -51,7 +52,6 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +381,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/buffer_schemes.sql
index 1784421092..bd964c8cc2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/buffer_schemes.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL,
     PRIMARY KEY (`object_id`,`scheme_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle.sql
index 0109cb8ab4..082a199079 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/characters.sql
index ea2aace011..60e1a786a2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/characters.sql
@@ -60,4 +60,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort.sql
index 43de96f562..b4c76f8a7d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort_siege_guards.sql
index 19df57a3b9..43763210b4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort_spawnlist.sql
index 22303a9b09..144979acd9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,4 +11,4 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/grandboss_data.sql
index b1cc1a00cd..d151b34f92 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/heroes.sql
index 2fc8753f90..49a371cbd5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/heroes.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/items.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/olympiad_fights.sql
index ccd4ac94ec..f25cc4c1fa 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(4) NOT NULL DEFAULT 0,
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Character.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Character.ini
index a658921e75..b1e883bcab 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Character.ini
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Character.ini
@@ -285,8 +285,8 @@ MaxMAtk = 999999
 MaxPCritRate = 500
 
 # Maximum character Magic Critical Rate. (10 = 1%)
-# Default: 200
-MaxMCritRate = 200
+# Classic Default: 320
+MaxMCritRate = 320
 
 # Maximum character Attack Speed.
 # Default: 1500
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/AutoPlay.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/AutoPlay.ini
index 9a4fd4bf2e..6e9d9628be 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/AutoPlay.ini
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # Enable .play command only for premium players.
 # Premium System must be enabled.
 # Default: False
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini
index 978c3fce97..659ece7db8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini
@@ -430,8 +430,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/ActionData.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/ActionData.xml
index b287bbf8fd..2061786b7f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/ActionData.xml
@@ -1,218 +1,248 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
-	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
-	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
-	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
-	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
-	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
-	<action id="70" handler="AirshipAction" option="4" /> <!-- Exit Airship -->
-	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
-	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
-	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
-	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
-	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Nightshade - Shade Sacrifice -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
-	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="0" handler="SitStand" /> <!-- Toggle Sit/Stand. (/sit, /stand) -->
+	<action id="1" handler="RunWalk" /> <!-- Toggle Walk/Run. (/walk, /run) -->
+	<action id="2" handler="None" /> <!-- Attacks selected target(s), or takes a general action if the target cannot be attacked. Hold down the Ctrl key and click to attack by force. (/attack, /attackforce) -->
+	<action id="3" handler="None" /> <!-- Request a trade from the selected target. (/trade) -->
+	<action id="4" handler="None" /> <!-- Select the nearest attackable target. (/targetnext) -->
+	<action id="5" handler="None" /> <!-- Pick up items that are scattered nearby. (/pickup) -->
+	<action id="6" handler="None" /> <!-- Change to the target of the currently selected player. (/assist) -->
+	<action id="7" handler="None" /> <!-- Invite the selected person to your party. (/invite) -->
+	<action id="8" handler="None" /> <!-- Leave the party. (/leave) -->
+	<action id="9" handler="None" /> <!-- If you are the leader of the party, dismiss selected members from your party. (/dismiss) -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Sets up a private store to sell your items. (/vendor) -->
+	<action id="11" handler="None" /> <!-- Display the party matching window to search for parties or to add members to your party. (/partymatching) -->
+	<action id="12" handler="SocialAction" option="2" /> <!-- Emote: Greet others with a kind "hello." (/socialhello) -->
+	<action id="13" handler="SocialAction" option="3" /> <!-- Emote: Let everyone know that you or someone else is victorious! (/socialvictory) -->
+	<action id="14" handler="SocialAction" option="4" /> <!-- Emote: Rouse your allies and charge! (/socialcharge) -->
+	<action id="15" handler="PetHold" /> <!-- Have your pet follow you or stay and hold its ground. -->
+	<action id="16" handler="PetAttack" /> <!-- Attack target. -->
+	<action id="17" handler="PetStop" /> <!-- Stop current action. -->
+	<action id="18" handler="None" /> <!-- Pick up nearby items. -->
+	<action id="19" handler="UnsummonPet" /> <!-- Returns your pet back to its home. -->
+	<action id="20" handler="None" /> <!-- Use special skill. -->
+	<action id="21" handler="ServitorHold" /> <!-- Have your summons follow you or stay and hold its ground. -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attack target. -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="24" handler="SocialAction" option="6" /> <!-- Emote: Respond positively. (/socialyes) -->
+	<action id="25" handler="SocialAction" option="5" /> <!-- Emote: Respond negatively. (/socialno) -->
+	<action id="26" handler="SocialAction" option="7" /> <!-- Emote: Show your respect and bow. (/socialbow) -->
+	<action id="27" handler="None" /> <!-- Use special skill. -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Sets up a private store to purchase items. (/buy) -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Emote: You have no idea what's going on. (/socialunaware) -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Emote: I'm waiting... (/socialwaiting) -->
+	<action id="31" handler="SocialAction" option="10" /> <!-- Emote: Have a good laugh. (/sociallaugh) -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Toggle between Attack/Move modes. -->
+	<action id="33" handler="SocialAction" option="11" /> <!-- Emote: Applaud. (/socialapplause) -->
+	<action id="34" handler="SocialAction" option="12" /> <!-- Emote: Serve them up your best dance moves. (/socialdance) -->
+	<action id="35" handler="SocialAction" option="13" /> <!-- Emote: Show grief. (/socialsad) -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Poison gas attack. -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Set up a private workshop that creates items by using Dwarven recipes in exchange for a fee. (/dwarvenmanufacture) -->
+	<action id="38" handler="Ride" /> <!-- Toggle mount/dismount when near or on an NPC that can be ridden. (/mount, /dismount, /mountdismount) -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Exploding corpse attack. -->
+	<action id="40" handler="None" /> <!-- Enhances a target's evaluation score. (/evaluate) -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Attacks castle gates, walls, or headquarters by shooting a cannon. -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Reflects damage back to an enemy. -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Attacks target and nearby enemies by creating a whirling surge of water. -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Attacks an enemy with a powerful explosion. -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Restores the summoner's MP. -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Attacks an enemy by summoning up a devastating storm. -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Damages an enemy and heals the servitor at the same time. -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Attacks the enemy by shooting a cannon. -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Attack with a fit of rage. -->
+	<action id="50" handler="None" /> <!-- The selected party member will become the new party leader. (/changepartyleader) -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Removes shackles from the Servitor and sets him free. -->
+	<action id="53" handler="ServitorMove" /> <!-- Move to the target. -->
+	<action id="54" handler="PetMove" /> <!-- Move to the target. -->
+	<action id="55" handler="None" /> <!-- Toggle recording and stop recording of replay files. (/start_replayrecording, /stop_replayrecording, /startstop_replayrecording) -->
+	<action id="56" handler="None" /> <!-- Invite the selected target to a command channel. (/channelinvite) -->
+	<action id="57" handler="None" /> <!-- Highlights private store and private workshop messages that contain the search word. (/findprivatestore) -->
+	<action id="58" handler="None" /> <!-- Challenges another character to a duel. (Command: /duel) -->
+	<action id="59" handler="None" /> <!-- Withdrawing from a duel means losing it. (Command: /withdraw) -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Open a personal store for package sale. (/packagesale) -->
+	<action id="62" handler="SocialAction" option="14" /> <!-- Charm Pose (Command: /charm) -->
+	<action id="64" handler="TeleportBookmark" /> <!-- Opens the window of an Unoccupied Teleport Device that enables to move freely from one location with a Teleport Device to another. (Command: /teleportbookmark) -->
+	<action id="65" handler="BotReport" /> <!-- Reports the targeted player as a suspected bot.(Command: /botreport) -->
+	<action id="66" handler="SocialAction" option="15" /> <!-- Allows character to strike shy pose. (command: /shyness) -->
+	<action id="67" handler="AirshipAction" option="1" /> <!-- Allows you to control the Airship. -->
+	<action id="68" handler="AirshipAction" option="2" /> <!-- Relinquishes control of the Airship. -->
+	<action id="69" handler="AirshipAction" option="3" /> <!-- Choose from pre-designated locations. -->
+	<action id="70" handler="AirshipAction" option="4" /> <!-- Disembarks from the Airship. -->
+	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange bows with another person. (command: /two-personbow) -->
+	<action id="72" handler="SocialAction" option="17" /> <!-- High Five another person. (command: /hi-five) -->
+	<action id="73" handler="SocialAction" option="18" /> <!-- Dance with another player. (command: /coupledance) -->
+	<action id="76" handler="None" /> <!-- Invite the selected target as friends. (Commands: /friendinvite, /addfriend, /registerfriend) -->
+	<action id="77" handler="None" /> <!-- Start or end recording videos. (Commands: /startrecording, /stoprecording, /startstoprecording) -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Applies Token 1 to the target. Can be only used in a group. (Command: /tacticalsign1) -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Applies Token 2 to the target. Can be only used in a group. (Command: /tacticalsign2) -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Applies Token 3 to the target. Can be only used in a group. (Command: /tacticalsign3) -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Applies Token 4 to the target. Can be only used in a group. (Command: /tacticalsign4) -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Automatically focuses on the target marked with Token 1. Can be only used in a group. (Command: /targettacticalsign1) -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Automatically focuses on the target marked with Token 2. Can be only used in a group. (Command: /targettacticalsign2) -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Automatically focuses on the target marked with Token 3. Can be only used in a group. (Command: /targettacticalsign3) -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Automatically focuses on the target marked with Token 4. Can be only used in a group. (Command: /targettacticalsign4) -->
+	<action id="87" handler="SocialAction" option="28" /> <!-- Gesture of Proposal (Command: /Socialpropose) -->
+	<action id="88" handler="SocialAction" option="29" /> <!-- Gesture of Provocation (Command: /Socialprovocation) -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off (Command: /Socialbeauty) -->
+	<action id="92" handler="None" /> <!-- Selects the previous target. (Command: /targetprev) -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Attacks castle gates, walls, or headquarters with a powerful strike. -->
+	<action id="1001" handler="None" /> <!-- A reckless yet powerful attack that must be used with extreme caution. -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Incites those around the summon to attack you. -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Instantly increases P. Def. and M. Def. significantly. Character is immovable while this skill is in effect. -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- A magical attack. -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Recovers the pet's HP. -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Temporarily increases your party's chance to land a critical attack and also increases the power of the attack if successful. -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Temporarily increases your party's P. Atk and accuracy. -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Has a chance to remove curses from party members. -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Temporarily increases your party's MP regeneration. -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Temporarily shortens your party's spell re-use timer. -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Remove a curse from your party. -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Provokes an opponent to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Provokes multiple enemies around the caster to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Sacrifice HP in order to regenerate the HP of a selected target. -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- A powerful blow on the enemy's vital points -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- A stunning blow that inflicts damage and instantly throws an enemy into a state of stun. -->
+	
+	<!-- Actions 1018 to 1030 are present in the Client, but are not used in Classic. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Inflict a deadly curse on an enemy that absorbs their HP. -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kat the Cat -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mew the Cat -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kai the Cat -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Boxer the Unicorn -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mirage the Unicorn -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Merrow the Unicorn -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Shadow -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by Shadow -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Silhouette -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by reanimated man -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by reanimated man -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by corrupted man -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King: A powerful slashing attack. Over-hit is possible. -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King: Slashes at surrounding enemies while spinning in the air. Over-hit is possible. -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King: Immobilizes the surrounding enemies. -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn: Powerful rear kicks that stun and damage an enemy. Over-hit is possible. -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn: Pounds the target and surrounding enemies with a tremendous onrush of water. -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord: Detonates a corpse, inflicting damage to nearby enemies. -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord: Blades attached to each arm slash out in a devastating attack. Over-hit is possible. -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord: Curses nearby enemies, poisoning them and reducing their Atk. Spd. -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon: Fires a projectile a short distance. Consumes 4 Flash Gunpowder. -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon: Fires a projectile a long distance. Consumes 5 Flash Gunpowder. -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Viciously bite an enemy. -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Scratch an enemy with both paws. Causes bleeding. -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awaken hidden powers. -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Decrease a nearby enemy's P. Atk./M. Atk. with a wolf cry. -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Decrease a nearby enemy's attack speed/magic speed with a strider roar. -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Viciously bite an enemy. -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Cause both damage and shock at the same time. Instantly stuns an enemy. -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Breath fire in front of you. -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Increases maximum HP temporarily. -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Increases maximum MP temporarily. -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Increases Atk. Spd. temporarily. -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Increases Casting Spd. temporarily. -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Temporarily decreases the target's MP consumption of skills. Consumes Spirit Ore. -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Increases M. Atk. power temporarily. -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Temporarily increases the critical rate of damage attack magic. -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Temporarily increases the critical attack power. -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Temporarily increases the probability of critical attack. -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Temporarily increases Accuracy. -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Rapidly attacks the enemy twice. -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Inflicts shock and damage to the enemy at the same time with a powerful spin attack. -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Attacks nearby enemies with a doll heap attack. -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakens a hidden ability. -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of thunder. -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack on nearby enemies when hit. -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Control put in place to prevent the use of a buff upon the master. 5-minute duration. -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Powerfully attacks the target. -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- A powerful attack that pierces through a target. -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies by spinning your own body like a whirlwind. -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Attacks a front-line enemy with a powerful lance thrust. -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Shouts a victory cry that increases your abilities. -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Powerfully attacks the target. -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Gathers energy into your body, then releases it in a destructive blast. -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Hits enemies with a powerful wave of force. -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Emits a loud roar that amplifies your abilities. -->
+	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Charges toward the enemy and inflicts damage. -->
+	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Cancels the target's de-buff. -->
+	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Emits a spread of ring-shaped flames. -->
+	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Attacks the enemy with a powerful flaming beak. -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Toggles you between Attack and Support modes. -->
+	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- At a certain probability, removes one or several buffs from an enemy. -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Decreases the enemy's Dark attribute by 25. -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Strike multiple enemies at the front with the tail. -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Viciously bite an enemy. -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Causes nearby enemies to flee in fear. -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Increases your speed. -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Greatly increases its master's speed. -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Increases the speed of its master and their party. -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Teleports its master to the Seed of Annihilation. -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Teleports its master and their party to the Seed of Annihilation. -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attack the target. -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move to a designated location. -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Make the servitor disappear by cancelling the summoning. -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Do not counter-attack. -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Counter-attack when the master or itself is attacked. -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Damages and provokes the target. -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Rolls over and delivers a shock to the ground stunning the surrounding targets. -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Bites the target to inflict damage. -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Damages the target and absorbs some of its HP. -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Attacks the surrounding enemies and blocks their physical skills. -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Flourishes claws and frontally attacks enemies. -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Dashes toward enemies to inflict damage and Stun them. -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Inflicts damage onto the enemies with a flame. -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Flies straight into the enemy. -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Purifies the master. -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Attack the enemy by darting a feather. -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Hurt the enemy by attacking them with sharp claws. -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Recover the targets near the tree and clear any debuff. -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Attacks nearby targets with a powerful punch. -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Provokes nearby enemies. -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Bites the enemy. -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Provokes nearby enemies. -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Bites the enemy. -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Provokes nearby enemies. -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Bites the enemy. -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Attacks nearby enemies and blocks their P. Skills. -->
+	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Rushes to the enemy to inflict damage and Stun. -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Can express affection to Rudolph. Affection Level rises by 25%. Warning: Can be used only when a Rudolph requests expression of affection, and cannot be used while transformed! -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Increases Max HP by 20%, Max MP by 20%, and the Speed by 20% for 5 minutes. Increases the Debuff Resistance by 10%. Reuse delay 10 minutes. Consumes 3 Rose Essence(s) during skill use. Doesn't overlap with other buffs except Critical Seduction. -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- For 30 minutes, increases party members' Max HP by 30%, Max MP by 30%, Max CP by 30%, P. Def. by 30%, magic M. Def. by 30%, Speed by 20, P. Atk. by 10%, and magic M. Atk. by 20%. Decreases MP consumption for skill use by 15%. Reuse delay 5 minutes. Consumes 10 Rose Essence(s) during skill use. -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of lightning. -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack upon contacted enemies nearby. -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Restricts to prevent the use of a buff upon the master. 5 minute duration. -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Inflicts a powerful attack that seems to pierce through the target. -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies. -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impales an enemy with a sword. -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Raises one's own abilities. -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Gathered energy within ones self can be focused and used to attack an enemy. -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Fires a shock wave to attack enemies at the front. -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Raises one's own abilities. -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switches between attack mode and support mode. -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Instantly restores the master's HP by 10%. Increases the master's Debuff Resistance by 80%, Buff-canceling Attack Resistance by 40%, Speed by 10, P. Def. by 20%, and M. Def. by 20%, and decreases MP consumption for all skills by 50% for 1 minute. -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/AttendanceRewards.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/AttendanceRewards.xml
index a0e71cbdea..8af1ecd126 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/AttendanceRewards.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/AttendanceRewards.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/AttendanceRewards.xsd">
-	<item id="29564" count="50" /> <!-- Attendance Coin -->
-	<item id="29553" count="3" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29565" count="3" /> <!-- XP/SP Scroll -->
-	<item id="29584" count="2" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29585" count="1" /> <!-- Refined Romantic Chapeau -->
+	<item id="49490" count="1" /> <!-- Fishing Kit -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49488" count="5" /> <!-- Major Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49500" count="1" /> <!-- Greater Scroll of Escape -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="100" /> <!-- Attendance Coin -->
-	<item id="29553" count="3" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29519" count="3" /> <!-- XP/SP Scroll - Medium -->
-	<item id="29584" count="2" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="49512" count="1" /> <!-- Amulet: Prosperity -->
+	<item id="90007" count="1" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49533" count="5" /> <!-- Quick Hero Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49500" count="1" /> <!-- Greater Scroll of Escape -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="150" /> <!-- Attendance Coin -->
-	<item id="29553" count="6" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29519" count="3" /> <!-- XP/SP Scroll - Medium -->
-	<item id="29584" count="4" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29578" count="1" /> <!-- Rare Accessory Pack -->
+	<item id="90007" count="2" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49488" count="5" /> <!-- Major Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49542" count="1" /> <!-- Improved Scroll of Resurrection -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="300" /> <!-- Attendance Coin -->
-	<item id="29553" count="6" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29650" count="5" /> <!-- XP/SP Scroll - High -->
-	<item id="29584" count="4" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29587" count="1" /> <!-- Agathion - Singer & Dancer -->
+	<item id="90007" count="3" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49533" count="5" /> <!-- Quick Hero Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49542" count="1" /> <!-- Improved Scroll of Resurrection -->
+	<item id="49860" count="1" /> <!-- Hero's Wondrous Cubic (7-day) -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 5b501b1f1b..bcc74a8afe 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -254,6 +255,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 396055ec7b..f2fc8e94a6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -41,6 +41,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AreaDamage", AreaDamage::new);
@@ -222,7 +224,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index cd446ab812..2775ff29a4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -182,6 +182,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 43be5cfc4a..ae0fba5834 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,55 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..798a363468 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,46 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/armorsets/Sets.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/armorsets/Sets.xml
index 7f8559d24c..919e4572c3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/armorsets/Sets.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/armorsets/Sets.xml
@@ -703,7 +703,7 @@
 			<item id="70184" /> <!-- Devil's Earring -->
 		</requiredItems>
 		<skills>
-			<skill id="55292" level="1" minimumPieces="2" /> <!-- Devi’s Earring -->
+			<skill id="55292" level="1" minimumPieces="2" /> <!-- Devil's Earring -->
 		</skills>
 	</set>
 	<set id="49" minimumPieces="3">
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/experience.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/experience.xml
index 0320015a53..9ef9e70e83 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/experience.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/experience.xml
@@ -23,7 +23,7 @@
 	<experience level="21" tolevel="1023785" trainingRate="0.4" />
 	<experience level="22" tolevel="1439215" trainingRate="0.4" />
 	<experience level="23" tolevel="1948497" trainingRate="0.4" />
-	<experience level="24" tolevel="2658850" trainingRate="0.4" />
+	<experience level="24" tolevel="2568850" trainingRate="0.4" />
 	<experience level="25" tolevel="3320625" trainingRate="0.4" />
 	<experience level="26" tolevel="4227172" trainingRate="0.4" />
 	<experience level="27" tolevel="5315161" trainingRate="0.4" />
@@ -52,7 +52,7 @@
 	<experience level="50" tolevel="251805374" trainingRate="0.4" />
 	<experience level="51" tolevel="288635909" trainingRate="0.4" />
 	<experience level="52" tolevel="330338848" trainingRate="0.4" />
-	<experience level="53" tolevel="377407026" trainingRate="0.4" />
+	<experience level="53" tolevel="377507026" trainingRate="0.4" />
 	<experience level="54" tolevel="430790086" trainingRate="0.4" />
 	<experience level="55" tolevel="490916803" trainingRate="0.4" />
 	<experience level="56" tolevel="558693890" trainingRate="0.4" />
@@ -84,29 +84,7 @@
 	<experience level="82" tolevel="279783329566" trainingRate="0.025" />
 	<experience level="83" tolevel="454748284485" trainingRate="0.025" />
 	<experience level="84" tolevel="673468617187" trainingRate="0.025" />
-	<experience level="85" tolevel="946585988578" trainingRate="0.025" />
-	<!-- There is no information on L2Wiki after level 85. -->
-	<experience level="86" tolevel="112334696174" trainingRate="0.02" />
-	<experience level="87" tolevel="142393691521" trainingRate="0.01" />
-	<experience level="88" tolevel="182393693217" trainingRate="0.01" />
-	<experience level="89" tolevel="242393691141" trainingRate="0.01" />
-	<experience level="90" tolevel="362393632116" trainingRate="0.01" />
-	<experience level="91" tolevel="412393696326" trainingRate="0.01" />
-	<experience level="92" tolevel="564329787685" trainingRate="0.005" />
-	<experience level="93" tolevel="683542856665" trainingRate="0.005" />
-	<experience level="94" tolevel="741881875436" trainingRate="0.004" />
-	<experience level="95" tolevel="859555499437" trainingRate="0.003" />
-	<experience level="96" tolevel="922840015388" trainingRate="0.0025" />
-	<experience level="97" tolevel="976451834408" trainingRate="0.0018" />
-	<experience level="98" tolevel="1149904090077" trainingRate="0.001" />
-	<experience level="99" tolevel="1798492743100" trainingRate="0.0005" />
-	<experience level="100" tolevel="6019956790712" trainingRate="0.0002" />
-	<experience level="101" tolevel="16946124602908" trainingRate="0.0001" />
-	<experience level="102" tolevel="43523955372407" trainingRate="0.0001" />
-	<experience level="103" tolevel="84422086452639" trainingRate="0.0001" />
-	<experience level="104" tolevel="188752303396110" trainingRate="0.0001" />
-	<experience level="105" tolevel="358035537321346" trainingRate="0.0001" />
-	<experience level="106" tolevel="3514822095225670" trainingRate="0.0001" />
-	<experience level="107" tolevel="7302965964710870" trainingRate="0.0001" />
-	<experience level="108" tolevel="12302965964710870" trainingRate="0.0001" />
+	<experience level="85" tolevel="2020405851561" trainingRate="0.025" />
+	<experience level="86" tolevel="8755092023431" trainingRate="0.025" />
+	<experience level="87" tolevel="16836715429675" trainingRate="0.025" />
 </table>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49000-49099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49000-49099.xml
index 654bf60761..e5cf281773 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49000-49099.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49000-49099.xml
@@ -1230,7 +1230,7 @@
 		<set name="handler" val="ItemSkills" />
 		<set name="commissionItemType" val="SCROLL_OTHER" />
 		<skills>
-			<skill id="39075" level="1" /> <!-- Improved Scroll of Escape -->
+			<skill id="2013" level="2" /> <!-- Improved Scroll of Escape -->
 		</skills>
 	</item>
 	<item id="49088" name="Gold Medal" type="EtcItem">
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49400-49499.xml
index a4772ad64e..d7b6759fb4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49400-49499.xml
@@ -1468,14 +1468,23 @@
 	<item id="49489" name="Parts of Enchantment Scrolls Chest" type="EtcItem">
 		<!-- Double-click to receive a Part of Enchantment Scroll. Cannot be exchanged, dropped, or sold in a private store. Can be stored in a private warehouse. <Note>. Be careful before opening the items as their relocation is restricted. -->
 		<set name="icon" val="icon.etc_treasure_box_i08" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="default_action" val="PEEL" />
+		<set name="material" val="FISH" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="49474" min="1" max="1" chance="20" /> <!-- Scroll Part: Enchant Weapon -->
+			<item id="49475" min="1" max="1" chance="50" /> <!-- Scroll Part: Enchant Armor -->
+			<item id="49476" min="1" max="1" chance="2" /> <!-- Refined Scroll Part: Enchant Weapon -->
+			<item id="49478" min="1" max="1" chance="13" /> <!-- Refined Scroll Part: Enchant Armor -->
+			<item id="49479" min="1" max="1" chance="2" /> <!-- Solid Scroll Part: Enchant Weapon -->
+			<item id="49480" min="1" max="1" chance="13" /> <!-- Solid Scroll Part: Enchant Armor -->
+		</capsuled_items>
 	</item>
 	<item id="49490" name="Fishing kit" type="EtcItem">
 		<!-- Double-click to receive 1 Fishing Rod (1-day), Bait (720 pcs), 1 Hero's Dual Swords, 1 Soulshot Ticket. Cannot be exchanged, dropped, or sold in a private store. Can be stored in a private warehouse. <Note>. Be careful before opening the items as their relocation is restricted. -->
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49500-49599.xml
index 261c32609e..59eb9b2eeb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49500-49599.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49500-49599.xml
@@ -8,6 +8,13 @@
 		<set name="weight" val="120" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="commissionItemType" val="SCROLL_OTHER" />
+		<skills>
+			<skill id="39075" level="1" /> <!-- Improved Scroll of Escape -->
+		</skills>
 	</item>
 	<item id="49501" name="Fish Stew. The guild's gratitude." type="EtcItem">
 		<!-- Increases XP/SP gain + 10% for 20 minutes. The item cannot be dropped. -->
@@ -418,14 +425,21 @@
 		<!-- Magic potion that quickly restores HP. Instant cooldown. Cannot be used when HP is full. Cannot be exchanged, dropped, or sold. Can be stored in a private warehouse. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
 		<set name="weight" val="180" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="is_event_restricted" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<skills>
+			<skill id="39103" level="1" /> <!-- Quick Hero Healing Potion -->
+		</skills>
 	</item>
 	<item id="49534" name="Hero Cube" additionalName="7-day" type="EtcItem">
 		<!-- 7-day item. Available at level 20 or higher. Double-click the Cube to receive Soulshot Ticket, Buff Scrolls Chest, Major Healing Potion, Warrior's Quick Healing Potion, Warrior's Quick Healing Potion, Angel Cat's Blessing, Improved Scroll of Resurrection, Parts of Enchantment Scrolls Chest, Fishing kit chest, My Teleport to the Base Package, Blade Spirit, Spellbook Box. (Can be used only once per day.) Cannot be exchanged, dropped, destroyed, or sold. Can be stored in a private warehouse. -->
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49800-49899.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49800-49899.xml
index 49c471e23a..02127d4d9b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49800-49899.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49800-49899.xml
@@ -679,6 +679,10 @@
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="time" val="10080" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39199" level="1" /> <!-- Hero's Wondrous Cubic -->
+		</skills>
 	</item>
 	<item id="49861" name="Life Stone - Tester" additionalName="Tester" type="EtcItem">
 		<!-- A test item. -->
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20000-20099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20000-20099.xml
index 95f4fbbe39..eb39715580 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20000-20099.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20000-20099.xml
@@ -7,7 +7,7 @@
 		<acquire exp="44" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="20" />
@@ -84,7 +84,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -136,7 +136,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="60" />
@@ -188,7 +188,7 @@
 		<acquire exp="309" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="60" />
@@ -246,7 +246,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -5375,7 +5375,7 @@
 		<acquire exp="449" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -5431,7 +5431,7 @@
 		<acquire exp="441" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -5531,7 +5531,7 @@
 		<acquire exp="449" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20100-20199.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20100-20199.xml
index 9dba2509d6..b1b8de930e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20100-20199.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20100-20199.xml
@@ -1135,7 +1135,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -1179,7 +1179,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="50" />
@@ -1229,7 +1229,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -1289,7 +1289,7 @@
 		<acquire exp="308" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -4407,7 +4407,7 @@
 		<acquire exp="1612" sp="48" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="636.798" hpRegen="3.5" mp="365.715" mpRegen="1.5" />
-			<attack physical="92.64226" magical="63.26266" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="92.64226" magical="63.26266" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.46427" magical="86.68702" />
 			<speed>
 				<walk ground="35" />
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20300-20399.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20300-20399.xml
index 08c5a2a78b..98bf8b66b5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20300-20399.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20300-20399.xml
@@ -512,7 +512,7 @@
 		<acquire exp="265" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="60" />
@@ -569,7 +569,7 @@
 		<acquire exp="309" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="60" />
@@ -625,7 +625,7 @@
 		<acquire exp="442" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
@@ -808,7 +808,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="24" />
@@ -897,7 +897,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1002,7 +1002,7 @@
 		<acquire exp="441" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -1056,7 +1056,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -1158,7 +1158,7 @@
 		<acquire exp="441" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -1214,7 +1214,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1266,7 +1266,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -1316,7 +1316,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1527,7 +1527,7 @@
 		<acquire exp="453" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1733,7 +1733,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -2059,7 +2059,7 @@
 		<acquire exp="442" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="50" />
@@ -3004,7 +3004,7 @@
 		<acquire exp="449" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3225,7 +3225,7 @@
 		<acquire exp="353" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="70" />
@@ -3570,7 +3570,7 @@
 		<acquire exp="451" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3826,7 +3826,7 @@
 		<acquire exp="182" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="86.088" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -3880,7 +3880,7 @@
 		<acquire exp="183" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="40" />
@@ -4117,7 +4117,7 @@
 		<acquire exp="449" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -4281,7 +4281,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -4331,7 +4331,7 @@
 		<acquire exp="442" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20400-20499.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20400-20499.xml
index cfc2fe24d8..2c24227315 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20400-20499.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20400-20499.xml
@@ -1282,7 +1282,7 @@
 		<acquire exp="438" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1346,7 +1346,7 @@
 		<acquire exp="291" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1575,7 +1575,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
@@ -2059,7 +2059,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="24" />
@@ -2226,7 +2226,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -2278,7 +2278,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -2329,7 +2329,7 @@
 		<acquire exp="308" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -2729,7 +2729,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -3320,7 +3320,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -3370,7 +3370,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -3422,7 +3422,7 @@
 		<acquire exp="308" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -3473,7 +3473,7 @@
 		<acquire exp="438" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3702,7 +3702,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -3806,7 +3806,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="24" />
@@ -3967,7 +3967,7 @@
 		<acquire exp="442" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
@@ -4025,7 +4025,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20500-20599.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20500-20599.xml
index 09d5e6f379..c5bf7fbc43 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20500-20599.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20500-20599.xml
@@ -1348,7 +1348,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -1555,7 +1555,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1602,7 +1602,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1647,7 +1647,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1874,7 +1874,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1919,7 +1919,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1964,7 +1964,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2009,7 +2009,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2276,7 +2276,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2326,7 +2326,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/21600-21699.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/21600-21699.xml
index f8ba839133..bd08af33d5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/21600-21699.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/21600-21699.xml
@@ -2185,7 +2185,7 @@
 		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
-			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="22" />
@@ -2242,7 +2242,7 @@
 		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
-			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="60" />
@@ -2279,7 +2279,7 @@
 		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
-			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="80" />
@@ -2327,7 +2327,7 @@
 		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
-			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="80" />
@@ -2374,7 +2374,7 @@
 		<acquire exp="2711" sp="82" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1201.434" hpRegen="5.5" mp="650.16" mpRegen="2.1" />
-			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="173.43552" magical="126.91259" />
 			<speed>
 				<walk ground="100" />
@@ -2423,7 +2423,7 @@
 		<acquire exp="2835" sp="86" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1248.276" hpRegen="5.5" mp="679.056" mpRegen="2.1" />
-			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="177.78746" magical="130.09715" />
 			<speed>
 				<walk ground="45" />
@@ -2472,7 +2472,7 @@
 		<acquire exp="2963" sp="89" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1297.017" hpRegen="5.5" mp="708.855" mpRegen="2.1" />
-			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="182.18816" magical="133.31739" />
 			<speed>
 				<walk ground="80" />
@@ -2521,7 +2521,7 @@
 		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
-			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="27" />
@@ -2570,7 +2570,7 @@
 		<acquire exp="3226" sp="97" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1396.398" hpRegen="5.5" mp="770.259" mpRegen="2.1" />
-			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="191.12803" magical="139.8592" />
 			<speed>
 				<walk ground="60" />
@@ -2614,7 +2614,7 @@
 		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
-			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="80" />
@@ -2701,7 +2701,7 @@
 		<acquire exp="3362" sp="101" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1447.038" hpRegen="5.5" mp="800.961" mpRegen="2.1" />
-			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="195.66302" magical="143.17771" />
 			<speed>
 				<walk ground="70" />
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/25200-25299.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/25200-25299.xml
index 6dde863722..968532a4df 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/25200-25299.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/25200-25299.xml
@@ -3899,7 +3899,7 @@
 		<acquire exp="1008600000" sp="30258000" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="20782406.25" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="45" />
@@ -4038,7 +4038,7 @@
 		<acquire exp="1008600000" sp="30258000" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="20782406.25" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/29000-29099.xml
index a3120a678c..3bd86a61bd 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/29000-29099.xml
@@ -11,8 +11,8 @@
 		<sex>FEMALE</sex>
 		<acquire exp="2179535" sp="65386" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="687245.8498023715" hpRegen="208" mp="196.2066710268149" mpRegen="2.1" />
-			<attack physical="105" magical="8" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="386384" hpRegen="208" mp="300.8" mpRegen="2.1" />
+			<attack physical="105" magical="8" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1252" magical="229" />
 			<speed>
 				<walk ground="80" />
@@ -21,11 +21,9 @@
 			<hitTime>370</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4019" level="1" /> <!-- Decrease Speed -->
-			<skill id="4021" level="1" /> <!-- Queen Ant -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -34,8 +32,11 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4021" level="1" /> <!-- Queen Ant -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4017" level="1" /> <!-- Queen Ant's Blow -->
+			<skill id="4018" level="1" /> <!-- Decrease Speed -->
+			<skill id="4019" level="1" /> <!-- Decrease Speed -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -50,115 +51,138 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="851" min="1" max="3" chance="34.67" /> <!-- Onyx Beast's Eye Earring -->
-				<item id="355" min="1" max="1" chance="34.47" /> <!-- Dwarven Chain Mail Shirt -->
-				<item id="2496" min="1" max="1" chance="34.07" /> <!-- Dwarven Chain Shield -->
-				<item id="914" min="1" max="1" chance="33.63" /> <!-- Dark Necklace -->
-				<item id="916" min="1" max="1" chance="33.55" /> <!-- Necklace of Protection -->
-				<item id="882" min="1" max="3" chance="33.34" /> <!-- Mithril Ring -->
-				<item id="852" min="1" max="3" chance="33.11" /> <!-- Moonstone Earring -->
-				<item id="883" min="1" max="3" chance="32.56" /> <!-- Aquastone Ring -->
-				<item id="853" min="1" max="3" chance="32.54" /> <!-- Earring of Protection -->
-				<item id="382" min="1" max="1" chance="32.12" /> <!-- Dwarven Chain Gaiters -->
-				<item id="884" min="1" max="3" chance="31.83" /> <!-- Ring of Protection -->
-				<item id="915" min="1" max="1" chance="31.77" /> <!-- Aquastone Necklace -->
-				<item id="399" min="1" max="1" chance="25.81" /> <!-- Rind Leather Armor -->
-				<item id="500" min="1" max="1" chance="25.63" /> <!-- Great Helmet -->
-				<item id="419" min="1" max="1" chance="24.75" /> <!-- Rind Leather Gaiters -->
-				<item id="440" min="1" max="1" chance="24.04" /> <!-- Robe of Seal -->
-				<item id="6660" min="1" max="1" chance="20.51" /> <!-- Queen Ant's Ring -->
-				<item id="498" min="1" max="3" chance="17.3" /> <!-- Steel Plate Helmet -->
-				<item id="2455" min="1" max="3" chance="17.21" /> <!-- Plated Leather Gloves -->
-				<item id="1126" min="1" max="3" chance="16.7" /> <!-- Crimson Boots -->
-				<item id="398" min="1" max="1" chance="16.59" /> <!-- Plated Leather Armor -->
-				<item id="418" min="1" max="1" chance="16.3" /> <!-- Plated Leather Gaiters -->
-				<item id="632" min="1" max="3" chance="16.2" /> <!-- Knight's Shield -->
-				<item id="1125" min="1" max="3" chance="7.218" /> <!-- Assault Boots -->
-				<item id="2412" min="1" max="3" chance="7.211" /> <!-- Plate Helmet -->
-				<item id="2451" min="1" max="3" chance="7.209" /> <!-- Sage's Worn Gloves -->
-				<item id="2427" min="1" max="3" chance="7.208" /> <!-- Salamander Skin Boots -->
-				<item id="297" min="1" max="1" chance="7.205" /> <!-- Glaive -->
-				<item id="187" min="1" max="1" chance="7.194" /> <!-- Atuba Hammer -->
-				<item id="188" min="1" max="1" chance="7.193" /> <!-- Ghost Staff -->
-				<item id="262" min="1" max="1" chance="7.189" /> <!-- Scallop Jamadhr -->
-				<item id="322" min="1" max="1" chance="7.184" /> <!-- Vajra Wand -->
-				<item id="396" min="1" max="1" chance="7.18" /> <!-- Salamander Skin Mail -->
-				<item id="321" min="1" max="1" chance="7.171" /> <!-- Demon's Fangs -->
-				<item id="225" min="1" max="1" chance="7.15" /> <!-- Mithril Dagger -->
-				<item id="380" min="1" max="1" chance="7.147" /> <!-- Plate Gaiters -->
-				<item id="438" min="1" max="3" chance="7.14" /> <!-- Sage's Rags -->
-				<item id="630" min="1" max="3" chance="7.133" /> <!-- Square Shield -->
-				<item id="61" min="1" max="3" chance="7.123" /> <!-- Mithril Gloves -->
-				<item id="189" min="1" max="1" chance="7.121" /> <!-- Staff of Life -->
-				<item id="2428" min="1" max="3" chance="7.116" /> <!-- Plate Boots -->
-				<item id="159" min="1" max="1" chance="7.114" /> <!-- Bonebreaker -->
-				<item id="320" min="1" max="1" chance="7.111" /> <!-- Blue Crystal Skull -->
-				<item id="190" min="1" max="1" chance="7.101" /> <!-- Atuba Mace -->
-				<item id="280" min="1" max="1" chance="7.1" /> <!-- Light Crossbow -->
-				<item id="2499" min="1" max="1" chance="7.086" /> <!-- Elven Long Sword -->
-				<item id="353" min="1" max="1" chance="7.091" /> <!-- Half Plate Armor -->
-				<item id="70" min="1" max="1" chance="7.088" /> <!-- Claymore -->
-				<item id="607" min="1" max="3" chance="7.086" /> <!-- Ogre Power Gauntlets -->
-				<item id="497" min="1" max="3" chance="7.083" /> <!-- Chain Helmet -->
-				<item id="2494" min="1" max="3" chance="6.983" /> <!-- Plate Shield -->
-				<item id="74" min="1" max="1" chance="6.432" /> <!-- Katana -->
-				<item id="282" min="1" max="1" chance="6.395" /> <!-- Elemental Bow -->
-				<item id="131" min="1" max="1" chance="6.388" /> <!-- Spirit Sword -->
-				<item id="94" min="1" max="1" chance="6.375" /> <!-- Bec de Corbin -->
-				<item id="242" min="1" max="1" chance="6.371" /> <!-- Soulfire Dirk -->
-				<item id="227" min="1" max="1" chance="6.356" /> <!-- Stiletto -->
-				<item id="195" min="1" max="1" chance="6.329" /> <!-- Cursed Staff -->
-				<item id="73" min="1" max="1" chance="6.312" /> <!-- Shamshir -->
-				<item id="325" min="1" max="1" chance="6.307" /> <!-- Horn of Glory -->
-				<item id="285" min="1" max="1" chance="6.301" /> <!-- Noble Elven Bow -->
-				<item id="133" min="1" max="1" chance="6.298" /> <!-- Raid Sword -->
-				<item id="631" min="1" max="3" chance="5.684" /> <!-- Eldarake -->
-				<item id="302" min="1" max="1" chance="5.67" /> <!-- Body Slasher -->
-				<item id="160" min="1" max="1" chance="5.62" /> <!-- Battle Axe -->
-				<item id="62" min="1" max="3" chance="5.618" /> <!-- Reinforced Mithril Boots -->
-				<item id="89" min="1" max="1" chance="5.615" /> <!-- Big Hammer -->
-				<item id="192" min="1" max="1" chance="5.614" /> <!-- Crystal Staff -->
-				<item id="2454" min="1" max="3" chance="5.613" /> <!-- Karmian Gloves -->
-				<item id="2429" min="1" max="3" chance="5.603" /> <!-- Chain Boots -->
-				<item id="2453" min="1" max="3" chance="5.597" /> <!-- Chain Gloves -->
-				<item id="72" min="1" max="1" chance="5.592" /> <!-- StormBringer -->
-				<item id="263" min="1" max="1" chance="5.585" /> <!-- Chakram -->
-				<item id="2431" min="1" max="3" chance="5.584" /> <!-- Plated Leather Boots -->
-				<item id="2432" min="1" max="3" chance="5.583" /> <!-- Dwarven Chain Boots -->
-				<item id="2430" min="1" max="3" chance="5.58" /> <!-- Karmian Boots -->
-				<item id="226" min="1" max="1" chance="5.578" /> <!-- Cursed Dagger -->
-				<item id="354" min="1" max="1" chance="5.547" /> <!-- Chain Mail Shirt -->
-				<item id="2452" min="1" max="3" chance="5.546" /> <!-- Reinforced Mithril Gloves -->
-				<item id="439" min="1" max="1" chance="5.545" /> <!-- Karmian Tunic -->
-				<item id="2433" min="1" max="3" chance="5.543" /> <!-- Boots of Seal -->
-				<item id="397" min="1" max="1" chance="5.542" /> <!-- Reinforced Mithril Shirt -->
-				<item id="71" min="1" max="1" chance="5.539" /> <!-- Flamberge -->
-				<item id="298" min="1" max="1" chance="5.538" /> <!-- Orcish Glaive -->
-				<item id="230" min="1" max="1" chance="5.531" /> <!-- Needle Wolverine -->
-				<item id="281" min="1" max="1" chance="5.53" /> <!-- Crystallized Ice Bow -->
-				<item id="471" min="1" max="1" chance="5.528" /> <!-- Karmian Stockings -->
-				<item id="193" min="1" max="1" chance="5.523" /> <!-- Stick of Faith -->
-				<item id="232" min="1" max="1" chance="5.522" /> <!-- Dark Elven Dagger -->
-				<item id="96" min="1" max="1" chance="5.521" /> <!-- Scythe -->
-				<item id="161" min="1" max="1" chance="5.521" /> <!-- Silver Axe -->
-				<item id="2495" min="1" max="3" chance="5.497" /> <!-- Chain Shield -->
-				<item id="191" min="1" max="1" chance="5.495" /> <!-- Heavy Doom Hammer -->
-				<item id="2387" min="1" max="1" chance="5.491" /> <!-- Reinforced Mithril Gaiters -->
-				<item id="381" min="1" max="1" chance="5.488" /> <!-- Chain Gaiters -->
-				<item id="173" min="1" max="1" chance="5.483" /> <!-- Skull Graver -->
-				<item id="194" min="1" max="1" chance="5.482" /> <!-- Heavy Doom Axe -->
-				<item id="2413" min="1" max="3" chance="5.481" /> <!-- Chain Hood -->
-				<item id="70000" min="76" max="228" chance="100" /> <!-- Sealed Rune - Lv. 1 -->
+				<group chance="100">
+					<item id="320" min="1" max="1" chance="7.15" /> <!-- Blue Crystal Skull -->
+					<item id="321" min="1" max="1" chance="7.15" /> <!-- Demon's Fangs -->
+					<item id="70" min="1" max="1" chance="7.15" /> <!-- Claymore -->
+					<item id="159" min="1" max="1" chance="7.15" /> <!-- Bonebreaker -->
+					<item id="187" min="1" max="1" chance="7.15" /> <!-- Atuba Hammer -->
+					<item id="188" min="1" max="1" chance="7.15" /> <!-- Ghost Staff -->
+					<item id="189" min="1" max="1" chance="7.15" /> <!-- Staff of Life -->
+					<item id="190" min="1" max="1" chance="7.15" /> <!-- Atuba Mace -->
+					<item id="225" min="1" max="1" chance="7.15" /> <!-- Mithril Dagger -->
+					<item id="262" min="1" max="1" chance="7.15" /> <!-- Scallop Jamadhr -->
+					<item id="280" min="1" max="1" chance="7.15" /> <!-- Light Crossbow -->
+					<item id="297" min="1" max="1" chance="7.15" /> <!-- Glaive -->
+					<item id="322" min="1" max="1" chance="7.15" /> <!-- Vajra Wand -->
+					<item id="2499" min="1" max="1" chance="7.05" /> <!-- Elven Long Sword -->
+				</group>
+				<group chance="100">
+					<item id="438" min="1" max="3" chance="7.15" /> <!-- Sage's Rags -->
+					<item id="61" min="1" max="3" chance="7.15" /> <!-- Mithril Gloves -->
+					<item id="353" min="1" max="1" chance="7.15" /> <!-- Half Plate Armor -->
+					<item id="380" min="1" max="1" chance="7.15" /> <!-- Plate Gaiters -->
+					<item id="396" min="1" max="1" chance="7.15" /> <!-- Salamander Skin Mail -->
+					<item id="497" min="1" max="3" chance="7.15" /> <!-- Chain Helmet -->
+					<item id="607" min="1" max="3" chance="7.15" /> <!-- Ogre Power Gauntlets -->
+					<item id="630" min="1" max="3" chance="7.15" /> <!-- Square Shield -->
+					<item id="1125" min="1" max="3" chance="7.15" /> <!-- Assault Boots -->
+					<item id="2412" min="1" max="3" chance="7.15" /> <!-- Plate Helmet -->
+					<item id="2427" min="1" max="3" chance="7.15" /> <!-- Salamander Skin Boots -->
+					<item id="2428" min="1" max="3" chance="7.15" /> <!-- Plate Boots -->
+					<item id="2451" min="1" max="3" chance="7.15" /> <!-- Sage's Worn Gloves -->
+					<item id="2494" min="1" max="3" chance="7.05" /> <!-- Plate Shield -->
+				</group>
+				<group chance="100">
+					<item id="851" min="1" max="3" chance="33.33" /> <!-- Onyx Beast's Eye Earring -->
+					<item id="882" min="1" max="3" chance="33.33" /> <!-- Mithril Ring -->
+					<item id="914" min="1" max="1" chance="33.34" /> <!-- Dark Necklace -->
+				</group>
+				<group chance="100">
+					<item id="71" min="1" max="1" chance="5.55" /> <!-- Flamberge -->
+					<item id="72" min="1" max="1" chance="5.55" /> <!-- Stormbringer -->
+					<item id="89" min="1" max="1" chance="5.55" /> <!-- Big Hammer -->
+					<item id="96" min="1" max="1" chance="5.55" /> <!-- Scythe -->
+					<item id="160" min="1" max="1" chance="5.55" /> <!-- Battle Axe -->
+					<item id="161" min="1" max="1" chance="5.55" /> <!-- Silver Axe -->
+					<item id="173" min="1" max="1" chance="5.55" /> <!-- Skull Graver -->
+					<item id="191" min="1" max="1" chance="5.55" /> <!-- Heavy Doom Hammer -->
+					<item id="192" min="1" max="1" chance="5.55" /> <!-- Crystal Staff -->
+					<item id="193" min="1" max="1" chance="5.55" /> <!-- Stick of Faith -->
+					<item id="194" min="1" max="1" chance="5.55" /> <!-- Heavy Doom Axe -->
+					<item id="226" min="1" max="1" chance="5.55" /> <!-- Cursed Dagger -->
+					<item id="230" min="1" max="1" chance="5.55" /> <!-- Needle Wolverine -->
+					<item id="232" min="1" max="1" chance="5.55" /> <!-- Dark Elven Dagger -->
+					<item id="263" min="1" max="1" chance="5.55" /> <!-- Chakram -->
+					<item id="281" min="1" max="1" chance="5.55" /> <!-- Crystallized Ice Bow -->
+					<item id="298" min="1" max="1" chance="5.55" /> <!-- Orcish Glaive -->
+					<item id="302" min="1" max="1" chance="5.65" /> <!-- Body Slasher -->
+				</group>
+				<group chance="100">
+					<item id="2387" min="1" max="1" chance="5.55" /> <!-- Reinforced Mithril Gaiters -->
+					<item id="2413" min="1" max="3" chance="5.55" /> <!-- Chain Hood -->
+					<item id="2429" min="1" max="3" chance="5.55" /> <!-- Chain Boots -->
+					<item id="2430" min="1" max="3" chance="5.55" /> <!-- Karmian Boots -->
+					<item id="2431" min="1" max="3" chance="5.55" /> <!-- Plated Leather Boots -->
+					<item id="2432" min="1" max="3" chance="5.55" /> <!-- Dwarven Chain Boots -->
+					<item id="2433" min="1" max="3" chance="5.55" /> <!-- Boots of Seal -->
+					<item id="2452" min="1" max="3" chance="5.55" /> <!-- Reinforced Mithril Gloves -->
+					<item id="2453" min="1" max="3" chance="5.55" /> <!-- Chain Gloves -->
+					<item id="2454" min="1" max="3" chance="5.55" /> <!-- Karmian Gloves -->
+					<item id="2495" min="1" max="3" chance="5.55" /> <!-- Chain Shield -->
+					<item id="62" min="1" max="3" chance="5.55" /> <!-- Reinforced Mithril Boots -->
+					<item id="354" min="1" max="1" chance="5.55" /> <!-- Chain Mail Shirt -->
+					<item id="381" min="1" max="1" chance="5.55" /> <!-- Chain Gaiters -->
+					<item id="397" min="1" max="1" chance="5.55" /> <!-- Reinforced Mithril Shirt -->
+					<item id="439" min="1" max="1" chance="5.55" /> <!-- Karmian Tunic -->
+					<item id="471" min="1" max="1" chance="5.55" /> <!-- Karmian Stockings -->
+					<item id="631" min="1" max="3" chance="5.65" /> <!-- Eldarake -->
+				</group>
+				<group chance="100">
+					<item id="852" min="1" max="3" chance="33.33" /> <!-- Moonstone Earring -->
+					<item id="883" min="1" max="3" chance="33.33" /> <!-- Aquastone Ring -->
+					<item id="915" min="1" max="1" chance="33.34" /> <!-- Aquastone Necklace -->
+				</group>
+				<group chance="70">
+					<item id="73" min="1" max="1" chance="9.09" /> <!-- Shamshir -->
+					<item id="74" min="1" max="1" chance="9.09" /> <!-- Katana -->
+					<item id="94" min="1" max="1" chance="9.09" /> <!-- Bec de Corbin -->
+					<item id="131" min="1" max="1" chance="9.09" /> <!-- Spirit Sword -->
+					<item id="133" min="1" max="1" chance="9.09" /> <!-- Raid Sword -->
+					<item id="195" min="1" max="1" chance="9.09" /> <!-- Cursed Staff -->
+					<item id="227" min="1" max="1" chance="9.09" /> <!-- Stiletto -->
+					<item id="242" min="1" max="1" chance="9.09" /> <!-- Soulfire Dirk -->
+					<item id="282" min="1" max="1" chance="9.09" /> <!-- Elemental Bow -->
+					<item id="285" min="1" max="1" chance="9.09" /> <!-- Noble Elven Bow -->
+					<item id="325" min="1" max="1" chance="9.1" /> <!-- Horn of Glory -->
+				</group>
+				<group chance="100">
+					<item id="355" min="1" max="1" chance="33.33" /> <!-- Dwarven Chain Mail Shirt -->
+					<item id="382" min="1" max="1" chance="33.33" /> <!-- Dwarven Chain Gaiters -->
+					<item id="2496" min="1" max="1" chance="33.34" /> <!-- Dwarven Chain Shield -->
+				</group>
+				<group chance="100">
+					<item id="399" min="1" max="1" chance="25" /> <!-- Rind Leather Armor -->
+					<item id="419" min="1" max="1" chance="25" /> <!-- Rind Leather Gaiters -->
+					<item id="440" min="1" max="1" chance="25" /> <!-- Robe of Seal -->
+					<item id="500" min="1" max="1" chance="25" /> <!-- Great Helmet -->
+				</group>
+				<group chance="100">
+					<item id="632" min="1" max="3" chance="16.66" /> <!-- Knight's Shield -->
+					<item id="1126" min="1" max="3" chance="16.66" /> <!-- Crimson Boots -->
+					<item id="498" min="1" max="3" chance="16.66" /> <!-- Steel Plate Helmet -->
+					<item id="398" min="1" max="1" chance="16.66" /> <!-- Plated Leather Armor -->
+					<item id="418" min="1" max="1" chance="16.66" /> <!-- Plated Leather Gaiters -->
+					<item id="2455" min="1" max="3" chance="16.7" /> <!-- Plated Leather Gloves -->
+				</group>
+				<group chance="100">
+					<item id="853" min="1" max="3" chance="33.33" /> <!-- Earring of Protection -->
+					<item id="884" min="1" max="3" chance="33.33" /> <!-- Ring of Protection -->
+					<item id="916" min="1" max="1" chance="33.34" /> <!-- Necklace of Protection -->
+				</group>
+				<group chance="20">
+					<item id="6660" min="1" max="1" chance="100" /> <!-- Queen Ant's Ring -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29002" level="29" type="Monster" name="Queen Ant Larva">
+	<npc id="29002" level="38" type="Monster" name="Queen Ant Larva">
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="591" hpRegen="3.5" mp="315" mpRegen="1.5" />
-			<attack physical="89.21" magical="59.01" random="30" critical="7" accuracy="40" attackSpeed="257" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="591.9" hpRegen="3.5" mp="315.1" mpRegen="1.5" />
+			<attack physical="89.21" magical="59.01" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.72" magical="84.16" />
 			<speed>
 				<walk ground="40" />
@@ -167,9 +191,9 @@
 			<hitTime>350</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="true" />
+		<status attackable="true" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -178,7 +202,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="4500" aggroRange="450">
@@ -195,9 +219,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4000" hpRegen="108" mp="402" mpRegen="1.8" />
-			<attack physical="637" magical="395" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="4000" hpRegen="108" mp="402.6" mpRegen="1.8" />
+			<attack physical="637" magical="395" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="547" magical="200" />
 			<speed>
 				<walk ground="40" />
@@ -206,9 +230,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -217,7 +241,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4020" level="1" /> <!-- Recovery -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
@@ -240,9 +264,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4343" hpRegen="115" mp="432" mpRegen="1.8" />
-			<attack physical="178" magical="27" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="4343" hpRegen="115" mp="432.7" mpRegen="1.8" />
+			<attack physical="178" magical="27" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="578" magical="211" />
 			<speed>
 				<walk ground="40" />
@@ -251,9 +275,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -262,7 +286,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="700" isAggressive="true">
@@ -284,9 +308,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="7051" hpRegen="122" mp="463" mpRegen="1.8" />
-			<attack physical="1190" magical="1074" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="7051" hpRegen="122" mp="463.3" mpRegen="1.8" />
+			<attack physical="1190" magical="1074" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="610" magical="223" />
 			<speed>
 				<walk ground="40" />
@@ -295,9 +319,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -306,7 +330,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="700" aggroRange="450">
@@ -331,18 +355,19 @@
 		<sex>MALE</sex>
 		<acquire exp="2041407" sp="61242" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="930422.1343873518" hpRegen="441.65" mp="1117.069980379333" mpRegen="20.0" />
-			<attack physical="722.31" magical="1398.68" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="523103.852" hpRegen="441.65" mp="1708.8" mpRegen="20" />
+			<attack physical="722.31" magical="1398.68" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1602" magical="293" />
 			<speed>
 				<walk ground="50" />
 				<run ground="110" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -351,7 +376,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>10</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -366,82 +391,107 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="608" min="1" max="3" chance="34.99" /> <!-- Mithril Gauntlets -->
-				<item id="854" min="1" max="3" chance="33.46" /> <!-- Earring of Seal -->
-				<item id="1127" min="1" max="3" chance="33.3" /> <!-- Forgotten Boots -->
-				<item id="885" min="1" max="3" chance="32.95" /> <!-- Ring of Ages -->
-				<item id="917" min="1" max="1" chance="32.52" /> <!-- Necklace of Mermaid -->
-				<item id="1149" min="1" max="3" chance="31.87" /> <!-- Shining Circlet -->
-				<item id="420" min="1" max="1" chance="26.08" /> <!-- Theca Leather Gaiters -->
-				<item id="472" min="1" max="1" chance="25.78" /> <!-- Demon's Stockings -->
-				<item id="400" min="1" max="1" chance="25.47" /> <!-- Theca Leather Armor -->
-				<item id="2460" min="1" max="1" chance="25.23" /> <!-- Theca Leather Gloves -->
-				<item id="2435" min="1" max="1" chance="25.04" /> <!-- Demon's Boots -->
-				<item id="2436" min="1" max="1" chance="24.9" /> <!-- Theca Leather Boots -->
-				<item id="441" min="1" max="1" chance="24.26" /> <!-- Demon's Tunic -->
-				<item id="2459" min="1" max="1" chance="24.03" /> <!-- Demon's Gloves -->
-				<item id="499" min="1" max="3" chance="20.88" /> <!-- Mithril Helmet -->
-				<item id="473" min="1" max="1" chance="20.74" /> <!-- Divine Stockings -->
-				<item id="401" min="1" max="1" chance="20.66" /> <!-- Drake Leather Armor -->
-				<item id="2437" min="1" max="1" chance="20.65" /> <!-- Drake Leather Boots -->
-				<item id="2462" min="1" max="1" chance="20.64" /> <!-- Full Plate Gauntlets -->
-				<item id="103" min="1" max="3" chance="20.48" /> <!-- Tower Shield -->
-				<item id="2468" min="1" max="3" chance="20.26" /> <!-- Blessed Gloves -->
-				<item id="356" min="1" max="1" chance="20.16" /> <!-- Full Plate Armor -->
-				<item id="2414" min="1" max="1" chance="20.08" /> <!-- Full Plate Helmet -->
-				<item id="6662" min="1" max="1" chance="20.05" /> <!-- Ring of Core -->
-				<item id="442" min="1" max="1" chance="19.81" /> <!-- Divine Tunic -->
-				<item id="2497" min="1" max="1" chance="19.76" /> <!-- Full Plate Shield -->
-				<item id="107" min="1" max="3" chance="19.74" /> <!-- Compound Shield -->
-				<item id="2438" min="1" max="1" chance="19.71" /> <!-- Full Plate Boots -->
-				<item id="60" min="1" max="1" chance="19.71" /> <!-- Compound Armor -->
-				<item id="2461" min="1" max="1" chance="19.52" /> <!-- Drake Leather Gloves -->
-				<item id="603" min="1" max="3" chance="19.51" /> <!-- Divine Boots -->
-				<item id="64" min="1" max="1" chance="19.47" /> <!-- Compound Boots -->
-				<item id="1128" min="1" max="3" chance="19.4" /> <!-- Adamantite Boots -->
-				<item id="517" min="1" max="3" chance="19.29" /> <!-- Compound Helmet -->
-				<item id="2463" min="1" max="1" chance="19.28" /> <!-- Divine Gloves -->
-				<item id="119" min="1" max="1" chance="17.35" /> <!-- Necklace of Seal -->
-				<item id="919" min="1" max="1" chance="17.23" /> <!-- Blessed Necklace -->
-				<item id="886" min="1" max="3" chance="17.2" /> <!-- Ring of Seal -->
-				<item id="857" min="1" max="3" chance="16.47" /> <!-- Holy Earring -->
-				<item id="855" min="1" max="3" chance="16.2" /> <!-- Nassen's Earring -->
-				<item id="888" min="1" max="3" chance="16.04" /> <!-- Blessed Ring -->
-				<item id="135" min="1" max="1" chance="11.58" /> <!-- Samurai Long Sword -->
-				<item id="299" min="1" max="1" chance="11.56" /> <!-- Orcish Poleaxe -->
-				<item id="206" min="1" max="1" chance="11.45" /> <!-- Demon's Staff -->
-				<item id="2503" min="1" max="1" chance="11.42" /> <!-- Yaksa Mace -->
-				<item id="205" min="1" max="1" chance="11.22" /> <!-- Ghoul's Staff -->
-				<item id="266" min="1" max="1" chance="11.2" /> <!-- Great Pata -->
-				<item id="204" min="1" max="1" chance="10.73" /> <!-- Deadman's Staff -->
-				<item id="228" min="1" max="1" chance="10.63" /> <!-- Crystal Dagger -->
-				<item id="286" min="1" max="1" chance="10.61" /> <!-- Eminence Bow -->
-				<item id="303" min="1" max="1" chance="4.364" /> <!-- Widow Maker -->
-				<item id="162" min="1" max="1" chance="4.23" /> <!-- War Axe -->
-				<item id="301" min="1" max="1" chance="4.227" /> <!-- scorpion -->
-				<item id="203" min="1" max="1" chance="4.22" /> <!-- Pa'agrio Axe -->
-				<item id="95" min="1" max="1" chance="4.219" /> <!-- Poleaxe -->
-				<item id="283" min="1" max="1" chance="4.205" /> <!-- Akat Longbow -->
-				<item id="202" min="1" max="1" chance="4.201" /> <!-- Mace of Underworld -->
-				<item id="199" min="1" max="1" chance="4.188" /> <!-- Pa'agrio Hammer -->
-				<item id="231" min="1" max="1" chance="4.184" /> <!-- Grace Dagger -->
-				<item id="134" min="1" max="1" chance="4.175" /> <!-- Sword of Nightmare -->
-				<item id="233" min="1" max="1" chance="4.171" /> <!-- Dark Screamer -->
-				<item id="174" min="1" max="1" chance="4.153" /> <!-- Nirvana Axe -->
-				<item id="265" min="1" max="1" chance="4.136" /> <!-- Fisted Blade -->
-				<item id="201" min="1" max="1" chance="4.131" /> <!-- Club of Nature -->
-				<item id="196" min="1" max="1" chance="4.13" /> <!-- Stick of Eternity -->
-				<item id="75" min="1" max="1" chance="4.129" /> <!-- Caliburs -->
-				<item id="197" min="1" max="1" chance="4.114" /> <!-- Paradia Staff -->
-				<item id="76" min="1" max="1" chance="4.113" /> <!-- Sword of Delusion -->
-				<item id="84" min="1" max="1" chance="4.109" /> <!-- Homunkulus' Sword -->
-				<item id="200" min="1" max="1" chance="4.108" /> <!-- Sage's Staff -->
-				<item id="132" min="1" max="1" chance="4.105" /> <!-- Ultimate Sword -->
-				<item id="77" min="1" max="1" chance="4.097" /> <!-- Tsurugi -->
-				<item id="198" min="1" max="1" chance="4.095" /> <!-- Inferno Staff -->
-				<item id="145" min="1" max="1" chance="4.093" /> <!-- Sword of Whispering Death -->
-				<item id="70000" min="297" max="891" chance="100" /> <!-- Sealed Rune - Lv. 1 -->
-				<item id="8620" min="1" max="3" chance="50.85" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				<group chance="100">
+					<item id="75" min="1" max="1" chance="4.16" /> <!-- Caliburs -->
+					<item id="76" min="1" max="1" chance="4.16" /> <!-- Sword of Delusion -->
+					<item id="77" min="1" max="1" chance="4.16" /> <!-- Tsurugi -->
+					<item id="84" min="1" max="1" chance="4.16" /> <!-- Homunkulus' Sword -->
+					<item id="95" min="1" max="1" chance="4.16" /> <!-- Poleaxe -->
+					<item id="132" min="1" max="1" chance="4.16" /> <!-- Ultimate Sword -->
+					<item id="134" min="1" max="1" chance="4.16" /> <!-- Sword of Nightmare -->
+					<item id="145" min="1" max="1" chance="4.16" /> <!-- Sword of Whispering Death -->
+					<item id="162" min="1" max="1" chance="4.16" /> <!-- War Axe -->
+					<item id="174" min="1" max="1" chance="4.16" /> <!-- Nirvana Axe -->
+					<item id="196" min="1" max="1" chance="4.16" /> <!-- Stick of Eternity -->
+					<item id="197" min="1" max="1" chance="4.16" /> <!-- Paradia Staff -->
+					<item id="198" min="1" max="1" chance="4.16" /> <!-- Inferno Staff -->
+					<item id="199" min="1" max="1" chance="4.16" /> <!-- Pa'agrio Hammer -->
+					<item id="200" min="1" max="1" chance="4.16" /> <!-- Sage's Staff -->
+					<item id="201" min="1" max="1" chance="4.16" /> <!-- Club of Nature -->
+					<item id="202" min="1" max="1" chance="4.16" /> <!-- Mace of Underworld -->
+					<item id="231" min="1" max="1" chance="4.16" /> <!-- Grace Dagger -->
+					<item id="233" min="1" max="1" chance="4.16" /> <!-- Dark Screamer -->
+					<item id="265" min="1" max="1" chance="4.16" /> <!-- Fisted Blade -->
+					<item id="283" min="1" max="1" chance="4.16" /> <!-- Akat Longbow -->
+					<item id="203" min="1" max="1" chance="4.16" /> <!-- Pa'agrio Axe -->
+					<item id="301" min="1" max="1" chance="4.16" /> <!-- scorpion -->
+					<item id="303" min="1" max="1" chance="4.32" /> <!-- Widow Maker -->
+				</group>
+				<group chance="100">
+					<item id="60" min="1" max="1" chance="20" /> <!-- Compound Armor -->
+					<item id="64" min="1" max="1" chance="20" /> <!-- Compound Boots -->
+					<item id="103" min="1" max="3" chance="20" /> <!-- Tower Shield -->
+					<item id="107" min="1" max="3" chance="20" /> <!-- Compound Shield -->
+					<item id="517" min="1" max="3" chance="20" /> <!-- Compound Helmet -->
+				</group>
+				<group chance="100">
+					<item id="608" min="1" max="3" chance="33.33" /> <!-- Mithril Gauntlets -->
+					<item id="1127" min="1" max="3" chance="33.33" /> <!-- Forgotten Boots -->
+					<item id="1149" min="1" max="3" chance="33.34" /> <!-- Shining Circlet -->
+				</group>
+				<group chance="100">
+					<item id="400" min="1" max="1" chance="25" /> <!-- Theca Leather Armor -->
+					<item id="420" min="1" max="1" chance="25" /> <!-- Theca Leather Gaiters -->
+					<item id="2436" min="1" max="1" chance="25" /> <!-- Theca Leather Boots -->
+					<item id="2460" min="1" max="1" chance="25" /> <!-- Theca Leather Gloves -->
+				</group>
+				<group chance="100">
+					<item id="441" min="1" max="1" chance="25" /> <!-- Demon's Tunic -->
+					<item id="472" min="1" max="1" chance="25" /> <!-- Demon's Stockings -->
+					<item id="2435" min="1" max="1" chance="25" /> <!-- Demon's Boots -->
+					<item id="2459" min="1" max="1" chance="25" /> <!-- Demon's Gloves -->
+				</group>
+				<group chance="100">
+					<item id="854" min="1" max="3" chance="33.33" /> <!-- Earring of Seal -->
+					<item id="885" min="1" max="3" chance="33.33" /> <!-- Ring of Ages -->
+					<item id="917" min="1" max="1" chance="33.34" /> <!-- Necklace of Mermaid -->
+				</group>
+				<group chance="100">
+					<item id="135" min="1" max="1" chance="11.11" /> <!-- Samurai Long Sword -->
+					<item id="204" min="1" max="1" chance="11.11" /> <!-- Deadman's Staff -->
+					<item id="205" min="1" max="1" chance="11.11" /> <!-- Ghoul's Staff -->
+					<item id="206" min="1" max="1" chance="11.11" /> <!-- Demon's Staff -->
+					<item id="228" min="1" max="1" chance="11.11" /> <!-- Crystal Dagger -->
+					<item id="266" min="1" max="1" chance="11.11" /> <!-- Great Pata -->
+					<item id="286" min="1" max="1" chance="11.11" /> <!-- Eminence Bow -->
+					<item id="299" min="1" max="1" chance="11.11" /> <!-- Orcish Poleaxe -->
+					<item id="2503" min="1" max="1" chance="11.12" /> <!-- Yaksa Mace -->
+				</group>
+				<group chance="100">
+					<item id="356" min="1" max="1" chance="20" /> <!-- Full Plate Armor -->
+					<item id="2414" min="1" max="1" chance="20" /> <!-- Full Plate Helmet -->
+					<item id="2438" min="1" max="1" chance="20" /> <!-- Full Plate Boots -->
+					<item id="2462" min="1" max="1" chance="20" /> <!-- Full Plate Gauntlets -->
+					<item id="2497" min="1" max="1" chance="20" /> <!-- Full Plate Shield -->
+				</group>
+				<group chance="100">
+					<item id="401" min="1" max="1" chance="20" /> <!-- Drake Leather Armor -->
+					<item id="2437" min="1" max="1" chance="20" /> <!-- Drake Leather Boots -->
+					<item id="2461" min="1" max="1" chance="20" /> <!-- Drake Leather Gloves -->
+					<item id="499" min="1" max="3" chance="20" /> <!-- Mithril Helmet -->
+					<item id="1128" min="1" max="3" chance="20" /> <!-- Adamantite Boots -->
+				</group>
+				<group chance="100">
+					<item id="442" min="1" max="1" chance="20" /> <!-- Divine Tunic -->
+					<item id="473" min="1" max="1" chance="20" /> <!-- Divine Stockings -->
+					<item id="2463" min="1" max="1" chance="20" /> <!-- Divine Gloves -->
+					<item id="2468" min="1" max="3" chance="20" /> <!-- Blessed Gloves -->
+					<item id="603" min="1" max="3" chance="20" /> <!-- Divine Boots -->
+				</group>
+				<group chance="100">
+					<item id="119" min="1" max="1" chance="16.66" /> <!-- Necklace of Seal -->
+					<item id="855" min="1" max="3" chance="16.66" /> <!-- Nassen's Earring -->
+					<item id="857" min="1" max="3" chance="16.66" /> <!-- Holy Earring -->
+					<item id="886" min="1" max="3" chance="16.66" /> <!-- Ring of Seal -->
+					<item id="888" min="1" max="3" chance="16.66" /> <!-- Blessed Ring -->
+					<item id="919" min="1" max="1" chance="16.7" /> <!-- Blessed Necklace -->
+				</group>
+				<group chance="20">
+					<item id="6662" min="1" max="1" chance="100" /> <!-- Ring of Core -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -455,9 +505,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="75" /> <!-- Caliburs -->
 		<acquire exp="13947" sp="418" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="13817" hpRegen="166" mp="747" mpRegen="2.1" />
-			<attack physical="410" magical="69" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="13817" hpRegen="166" mp="747.8" mpRegen="2.1" />
+			<attack physical="410" magical="69" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="801" magical="293" />
 			<speed>
 				<walk ground="27" />
@@ -466,9 +516,9 @@
 			<hitTime>710</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -477,9 +527,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="2300" isAggressive="true">
@@ -491,40 +539,6 @@
 			<radius normal="12" grown="14.5" />
 			<height normal="31" grown="36" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="162" min="1" max="1" chance="0.003" /> <!-- War Axe -->
-				<item id="174" min="1" max="1" chance="0.003" /> <!-- Nirvana Axe -->
-				<item id="196" min="1" max="1" chance="0.003" /> <!-- Stick of Eternity -->
-				<item id="197" min="1" max="1" chance="0.003" /> <!-- Paradia Staff -->
-				<item id="199" min="1" max="1" chance="0.003" /> <!-- Pa'agrio Hammer -->
-				<item id="200" min="1" max="1" chance="0.003" /> <!-- Sage's Staff -->
-				<item id="201" min="1" max="1" chance="0.003" /> <!-- Club of Nature -->
-				<item id="202" min="1" max="1" chance="0.003" /> <!-- Mace of Underworld -->
-				<item id="57" min="1160" max="2714" chance="70" /> <!-- Adena -->
-				<item id="1872" min="1" max="3" chance="17.68" /> <!-- Animal Bone -->
-				<item id="1865" min="1" max="3" chance="8.461" /> <!-- Varnish -->
-				<item id="1882" min="1" max="1" chance="5.622" /> <!-- Leather -->
-				<item id="2508" min="2" max="6" chance="5.263" /> <!-- Cursed Bone -->
-				<item id="1876" min="1" max="1" chance="5.056" /> <!-- Mithril Ore -->
-				<item id="2952" min="1" max="1" chance="2.134" /> <!-- Demon's Boot Fabric -->
-				<item id="3005" min="1" max="1" chance="1.049" /> <!-- Recipe: Demon's Boots -->
-				<item id="2100" min="1" max="1" chance="0.3" /> <!-- Paradia Staff Head -->
-				<item id="2097" min="1" max="1" chance="0.3" /> <!-- War Axe Blade -->
-				<item id="2098" min="1" max="1" chance="0.3" /> <!-- Nirvana Axe Blade -->
-				<item id="2231" min="1" max="1" chance="0.3" /> <!-- Recipe: Full Plate Armor -->
-				<item id="2105" min="1" max="1" chance="0.3" /> <!-- Mace of Underworld Head -->
-				<item id="2104" min="1" max="1" chance="0.3" /> <!-- Club of Nature Head -->
-				<item id="2103" min="1" max="1" chance="0.3" /> <!-- Sage's Staff Head -->
-				<item id="2099" min="1" max="1" chance="0.3" /> <!-- Stick of Eternity Shaft -->
-				<item id="2102" min="1" max="1" chance="0.3" /> <!-- Pa'agrio Hammer Head -->
-				<item id="2360" min="1" max="1" chance="0.03" /> <!-- Recipe: Orcish Poleaxe -->
-			</drop>
-			<spoil>
-				<item id="1914" min="1" max="1" chance="45.39" /> <!-- Earring of Seal Gemstone -->
-				<item id="3011" min="1" max="1" chance="23.1" /> <!-- Recipe: Divine Boots -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29008" level="55" type="Monster" name="Doom Wraith">
 		<parameters>
@@ -537,9 +551,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="1472" /> <!-- Dreadbane -->
 		<acquire exp="15169" sp="501" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="16012" hpRegen="185" mp="889" mpRegen="2.4" />
-			<attack physical="470" magical="715" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="16012" hpRegen="185" mp="889.8" mpRegen="2.4" />
+			<attack physical="470" magical="715" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="895" magical="327" />
 			<speed>
 				<walk ground="100" />
@@ -548,21 +562,19 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="5" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="5" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="700" isAggressive="true">
@@ -585,9 +597,9 @@
 		<race>PLANT</race>
 		<sex>FEMALE</sex>
 		<acquire exp="11480" sp="344" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="12544" hpRegen="154" mp="665" mpRegen="2.1" />
-			<attack physical="354" magical="60" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<attack physical="354" magical="60" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="747" magical="273" />
 			<speed>
 				<walk ground="80" />
@@ -596,19 +608,19 @@
 			<hitTime>130</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4035" level="4" /> <!-- Poison -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4035" level="4" /> <!-- Poison -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="800" isAggressive="true">
@@ -620,34 +632,6 @@
 			<radius normal="12" />
 			<height normal="25.5" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="1126" min="1" max="1" chance="0.075" /> <!-- Crimson Boots -->
-				<item id="2434" min="1" max="1" chance="0.075" /> <!-- Rind Leather Boots -->
-				<item id="2455" min="1" max="1" chance="0.075" /> <!-- Plated Leather Gloves -->
-				<item id="2457" min="1" max="1" chance="0.075" /> <!-- Gloves of Seal -->
-				<item id="2458" min="1" max="1" chance="0.075" /> <!-- Rind Leather Gloves -->
-				<item id="57" min="996" max="2323" chance="70" /> <!-- Adena -->
-				<item id="1342" min="30" max="90" chance="13.49" /> <!-- Steel Arrow -->
-				<item id="1866" min="1" max="1" chance="13.18" /> <!-- Suede -->
-				<item id="1867" min="2" max="6" chance="6.42" /> <!-- Animal Skin -->
-				<item id="2948" min="1" max="1" chance="4.455" /> <!-- Rind Leather Boot Lining -->
-				<item id="2950" min="1" max="1" chance="4.366" /> <!-- Gloves of Seal Pattern -->
-				<item id="2951" min="1" max="1" chance="4.334" /> <!-- Rind Leather Glove Design -->
-				<item id="1882" min="1" max="1" chance="4.316" /> <!-- Leather -->
-				<item id="1868" min="5" max="15" chance="3.919" /> <!-- Thread -->
-				<item id="2946" min="1" max="1" chance="2.924" /> <!-- Plated Leather Glove Design -->
-				<item id="2508" min="3" max="9" chance="2.633" /> <!-- Cursed Bone -->
-				<item id="1974" min="1" max="3" chance="2.152" /> <!-- Crimson Boot Fabric -->
-				<item id="1885" min="1" max="1" chance="1.582" /> <!-- High-grade Suede -->
-				<item id="2339" min="1" max="1" chance="0.03" /> <!-- Recipe: Inferno Staff -->
-				<item id="2350" min="1" max="1" chance="0.03" /> <!-- Recipe: Pa'agrio Axe -->
-			</drop>
-			<spoil>
-				<item id="1895" min="1" max="5" chance="66.8" /> <!-- Metallic Fiber -->
-				<item id="2944" min="1" max="1" chance="63.4" /> <!-- Karmian Glove Fabric -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29010" level="46" type="Monster" name="Validus">
 		<parameters>
@@ -658,29 +642,29 @@
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<acquire exp="11032" sp="330" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="12130" hpRegen="150" mp="637" mpRegen="2.1" />
-			<attack physical="337" magical="58" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="12130" hpRegen="150" mp="637.8" mpRegen="2.1" />
+			<attack physical="337" magical="58" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="729" magical="267" />
 			<speed>
 				<walk ground="70" />
 				<run ground="110" />
 			</speed>
-			<hitTime>300</hitTime>
+			<hitTime>30</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="3" /> <!-- Beasts -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="3" /> <!-- Beasts -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="1200" isAggressive="true">
@@ -692,29 +676,6 @@
 			<radius normal="15" />
 			<height normal="29" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="354" min="1" max="1" chance="0.03" /> <!-- Chain Mail Shirt -->
-				<item id="232" min="1" max="1" chance="0.0075" /> <!-- Dark Elven Dagger -->
-				<item id="281" min="1" max="1" chance="0.0075" /> <!-- Crystallized Ice Bow -->
-				<item id="57" min="914" max="2141" chance="70" /> <!-- Adena -->
-				<item id="1866" min="1" max="1" chance="15.87" /> <!-- Suede -->
-				<item id="1878" min="1" max="1" chance="9.238" /> <!-- Durable Braid -->
-				<item id="1864" min="3" max="9" chance="7.601" /> <!-- Stem -->
-				<item id="1865" min="2" max="6" chance="5.802" /> <!-- Varnish -->
-				<item id="2508" min="2" max="6" chance="3.833" /> <!-- Cursed Bone -->
-				<item id="1959" min="1" max="1" chance="2.156" /> <!-- Chain Mail Shirt Material -->
-				<item id="2072" min="1" max="1" chance="0.75" /> <!-- Dark Elven Dagger Edge -->
-				<item id="2074" min="1" max="1" chance="0.75" /> <!-- Crystallized Ice Bow Shaft -->
-				<item id="2319" min="1" max="1" chance="0.075" /> <!-- Recipe: Raid Sword -->
-				<item id="951" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Weapon (C-grade) -->
-			</drop>
-			<spoil>
-				<item id="1873" min="1" max="3" chance="87.19" /> <!-- Silver Nugget -->
-				<item id="2060" min="1" max="1" chance="3.433" /> <!-- StormBringer Blade -->
-				<item id="2067" min="1" max="1" chance="3.11" /> <!-- Crystal Staff Head -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29011" level="49" type="Monster" name="Susceptor">
 		<parameters>
@@ -725,10 +686,10 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="13389" hpRegen="162" mp="720" mpRegen="2.1" />
-			<attack physical="391" magical="66" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<attack physical="391" magical="66" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="783" magical="286" />
 			<speed>
 				<walk ground="27" />
@@ -737,10 +698,9 @@
 			<hitTime>430</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -749,7 +709,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="1500" isAggressive="true">
@@ -772,9 +733,9 @@
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<acquire exp="16035" sp="481" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="12964" hpRegen="158" mp="692" mpRegen="2.1" />
-			<attack physical="372" magical="63" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="12964" hpRegen="158" mp="692.4" mpRegen="2.1" />
+			<attack physical="372" magical="63" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="765" magical="280" />
 			<speed>
 				<walk ground="20" />
@@ -783,22 +744,22 @@
 			<hitTime>410</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4273" level="3" /> <!-- Resist Daggers/Rapier Weapon -->
-			<skill id="4274" level="1" /> <!-- Blunt Weapon Weak Point -->
-			<skill id="4408" level="12" /> <!-- HP Increase (4x) -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
-			<skill id="4444" level="2" /> <!-- Higher Resist Bow/Crossbow Weapons -->
+			<skill id="4444" level="2" /> <!-- Greater Bow/Crossbow Resistance -->
+			<skill id="4273" level="3" /> <!-- Dagger/Rapier Resistance -->
+			<skill id="4274" level="1" /> <!-- Blunt Weapon Vulnerability -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="800" isAggressive="true">
@@ -810,35 +771,6 @@
 			<radius normal="18" />
 			<height normal="34" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="1126" min="1" max="1" chance="0.075" /> <!-- Crimson Boots -->
-				<item id="2434" min="1" max="1" chance="0.075" /> <!-- Rind Leather Boots -->
-				<item id="2455" min="1" max="1" chance="0.075" /> <!-- Plated Leather Gloves -->
-				<item id="2457" min="1" max="1" chance="0.075" /> <!-- Gloves of Seal -->
-				<item id="2458" min="1" max="1" chance="0.075" /> <!-- Rind Leather Gloves -->
-				<item id="57" min="1447" max="3374" chance="70" /> <!-- Adena -->
-				<item id="1873" min="1" max="1" chance="13.28" /> <!-- Silver Nugget -->
-				<item id="1865" min="1" max="3" chance="10.19" /> <!-- Varnish -->
-				<item id="2508" min="2" max="6" chance="6.589" /> <!-- Cursed Bone -->
-				<item id="1965" min="1" max="1" chance="4.334" /> <!-- Metal Plate Helmet Material -->
-				<item id="2946" min="1" max="1" chance="3.6" /> <!-- Plated Leather Glove Design -->
-				<item id="1880" min="1" max="1" chance="3.203" /> <!-- Steel -->
-				<item id="1869" min="5" max="15" chance="3.137" /> <!-- Iron Ore -->
-				<item id="1974" min="1" max="3" chance="2.639" /> <!-- Crimson Boot Fabric -->
-				<item id="1874" min="1" max="1" chance="2.105" /> <!-- Oriharukon Ore -->
-				<item id="2948" min="1" max="3" chance="1.75" /> <!-- Rind Leather Boot Lining -->
-				<item id="2950" min="2" max="6" chance="1.289" /> <!-- Gloves of Seal Pattern -->
-				<item id="2951" min="2" max="6" chance="1.104" /> <!-- Rind Leather Glove Design -->
-				<item id="1973" min="3" max="9" chance="0.75" /> <!-- Pa'agrio Hand Design -->
-				<item id="2344" min="1" max="1" chance="0.075" /> <!-- Recipe: Grace Dagger -->
-				<item id="951" min="1" max="1" chance="0.075" /> <!-- Scroll: Enchant Weapon (C-grade) -->
-			</drop>
-			<spoil>
-				<item id="2073" min="1" max="1" chance="7.899" /> <!-- Chakram Edge -->
-				<item id="2352" min="1" max="1" chance="2.095" /> <!-- Recipe: Widow Maker -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29013" level="45" type="Monster" name="Premo">
 		<parameters>
@@ -849,9 +781,9 @@
 		<race>GIANT</race>
 		<sex>MALE</sex>
 		<acquire exp="10351" sp="310" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="11721" hpRegen="146" mp="610" mpRegen="2.1" />
-			<attack physical="320" magical="55" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="11721" hpRegen="146" mp="610.8" mpRegen="2.1" />
+			<attack physical="320" magical="55" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="711" magical="260" />
 			<speed>
 				<walk ground="55" />
@@ -860,10 +792,10 @@
 			<hitTime>610</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="11" /> <!-- Giant -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
@@ -871,7 +803,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="11" /> <!-- Giants -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="1200" aggroRange="450">
@@ -883,30 +815,6 @@
 			<radius normal="21" grown="25" />
 			<height normal="35" grown="43" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="631" min="1" max="1" chance="0.3" /> <!-- Eldarake -->
-				<item id="2495" min="1" max="1" chance="0.3" /> <!-- Chain Shield -->
-				<item id="2413" min="1" max="1" chance="0.075" /> <!-- Chain Hood -->
-				<item id="57" min="859" max="2006" chance="70" /> <!-- Adena -->
-				<item id="1868" min="1" max="3" chance="19.72" /> <!-- Thread -->
-				<item id="1866" min="1" max="1" chance="13.09" /> <!-- Suede -->
-				<item id="1867" min="1" max="3" chance="8.403" /> <!-- Animal Skin -->
-				<item id="1964" min="1" max="1" chance="6.104" /> <!-- Eldarake Temper -->
-				<item id="2945" min="1" max="1" chance="6.039" /> <!-- Chain Shield Fragment -->
-				<item id="2936" min="1" max="1" chance="5.482" /> <!-- Chain Hood Pattern -->
-				<item id="1882" min="1" max="1" chance="4.221" /> <!-- Leather -->
-				<item id="1885" min="1" max="1" chance="1.547" /> <!-- High-grade Suede -->
-				<item id="2207" min="1" max="1" chance="0.3" /> <!-- Recipe: Karmian Tunic -->
-				<item id="2323" min="1" max="1" chance="0.075" /> <!-- Recipe: Elemental Bow -->
-				<item id="2326" min="1" max="1" chance="0.075" /> <!-- Recipe: Horn of Glory -->
-			</drop>
-			<spoil>
-				<item id="1876" min="1" max="1" chance="79.85" /> <!-- Mithril Ore -->
-				<item id="1962" min="1" max="1" chance="13.14" /> <!-- Karmian Tunic Pattern -->
-				<item id="2073" min="1" max="1" chance="3.153" /> <!-- Chakram Edge -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29014" level="50" type="GrandBoss" name="Orfen">
 		<parameters>
@@ -917,13 +825,13 @@
 				<npc id="29016" count="4" respawnTime="360" weightPoint="1" />
 			</minions>
 		</parameters>
-		<race>ELEMENTAL</race>
+		<race>FAIRY</race>
 		<sex>FEMALE</sex>
 		<acquire exp="8872500" sp="266175" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="930422.1343873518" hpRegen="441.65" mp="1117.069980379333" mpRegen="20.0" />
-			<attack physical="722.31" magical="1398.68" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="1602" magical="293" />
+			<vitals hp="523103.852" hpRegen="441.65" mp="1708.8" mpRegen="20" />
+			<attack physical="3652" magical="1535" random="10" critical="4" accuracy="0" attackSpeed="253" type="SWORD" range="80" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -931,12 +839,9 @@
 			<hitTime>710</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4062" level="1" /> <!-- Orfen -->
-			<skill id="4063" level="1" /> <!-- Paralysis -->
-			<skill id="4064" level="1" /> <!-- Paralysis -->
+			<skill id="4416" level="13" /> <!-- Fairies -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -945,7 +850,10 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="13" /> <!-- Fairies -->
+			<skill id="4062" level="1" /> <!-- Orfen -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4063" level="1" /> <!-- Paralysis -->
+			<skill id="4064" level="1" /> <!-- Paralysis -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -960,56 +868,79 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="918" min="1" max="1" chance="33.35" /> <!-- Adamantite Necklace -->
-				<item id="856" min="1" max="3" chance="33.1" /> <!-- Adamantite Earring -->
-				<item id="887" min="1" max="3" chance="32.11" /> <!-- Adamantite Ring -->
-				<item id="673" min="1" max="1" chance="25.95" /> <!-- Avadon Shield -->
-				<item id="2379" min="1" max="1" chance="25.86" /> <!-- Avadon Gaiters -->
-				<item id="2376" min="1" max="1" chance="25.13" /> <!-- Avadon Breastplate -->
-				<item id="2415" min="1" max="1" chance="24.74" /> <!-- Avadon Circlet -->
-				<item id="2414" min="1" max="1" chance="20.98" /> <!-- Full Plate Helmet -->
-				<item id="603" min="1" max="3" chance="20.87" /> <!-- Divine Boots -->
-				<item id="2463" min="1" max="1" chance="20.81" /> <!-- Divine Gloves -->
-				<item id="356" min="1" max="1" chance="20.6" /> <!-- Full Plate Armor -->
-				<item id="1128" min="1" max="3" chance="20.45" /> <!-- Adamantite Boots -->
-				<item id="2438" min="1" max="1" chance="20.42" /> <!-- Full Plate Boots -->
-				<item id="6661" min="1" max="1" chance="20.12" /> <!-- Orfen's Earring -->
-				<item id="2437" min="1" max="1" chance="20.12" /> <!-- Drake Leather Boots -->
-				<item id="442" min="1" max="1" chance="20.08" /> <!-- Divine Tunic -->
-				<item id="2462" min="1" max="1" chance="19.79" /> <!-- Full Plate Gauntlets -->
-				<item id="499" min="1" max="3" chance="19.79" /> <!-- Mithril Helmet -->
-				<item id="401" min="1" max="1" chance="19.78" /> <!-- Drake Leather Armor -->
-				<item id="2461" min="1" max="1" chance="19.7" /> <!-- Drake Leather Gloves -->
-				<item id="2468" min="1" max="3" chance="19.32" /> <!-- Blessed Gloves -->
-				<item id="473" min="1" max="1" chance="19.15" /> <!-- Divine Stockings -->
-				<item id="2497" min="1" max="3" chance="19.15" /> <!-- Full Plate Shield -->
-				<item id="119" min="1" max="1" chance="16.97" /> <!-- Necklace of Seal -->
-				<item id="855" min="1" max="3" chance="16.5" /> <!-- Nassen's Earring -->
-				<item id="888" min="1" max="3" chance="16.16" /> <!-- Blessed Ring -->
-				<item id="857" min="1" max="3" chance="16.02" /> <!-- Holy Earring -->
-				<item id="919" min="1" max="1" chance="16.01" /> <!-- Blessed Necklace -->
-				<item id="886" min="1" max="3" chance="15.9" /> <!-- Ring of Seal -->
-				<item id="228" min="1" max="1" chance="11.59" /> <!-- Crystal Dagger -->
-				<item id="266" min="1" max="1" chance="11.58" /> <!-- Great Pata -->
-				<item id="299" min="1" max="1" chance="11.37" /> <!-- Orcish Poleaxe -->
-				<item id="204" min="1" max="1" chance="10.99" /> <!-- Deadman's Staff -->
-				<item id="286" min="1" max="1" chance="10.89" /> <!-- Eminence Bow -->
-				<item id="206" min="1" max="1" chance="10.83" /> <!-- Demon's Staff -->
-				<item id="2503" min="1" max="1" chance="10.7" /> <!-- Yaksa Mace -->
-				<item id="205" min="1" max="1" chance="10.62" /> <!-- Ghoul's Staff -->
-				<item id="135" min="1" max="1" chance="10.6" /> <!-- Samurai Long Sword -->
-				<item id="947" min="2" max="8" chance="100" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-				<item id="70000" min="198" max="593" chance="100" /> <!-- Sealed Rune - Lv. 1 -->
-				<item id="948" min="10" max="30" chance="100" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="8620" min="1" max="3" chance="50.1" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="4065" min="20" max="80" chance="13.09" /> <!-- Avadon Gaiter Material -->
-				<item id="4071" min="20" max="80" chance="12.62" /> <!-- Avadon Robe Fabric -->
-				<item id="4050" min="20" max="80" chance="12.62" /> <!-- Adamantite Ring Wire -->
-				<item id="4064" min="20" max="80" chance="12.61" /> <!-- Avadon Breastplate Part -->
-				<item id="4072" min="20" max="80" chance="12.6" /> <!-- Avadon Circlet Pattern -->
-				<item id="4049" min="20" max="80" chance="12.14" /> <!-- Adamantite Earring Gemstone -->
-				<item id="4051" min="20" max="80" chance="12.12" /> <!-- Adamantite Necklace Chain -->
-				<item id="4439" min="20" max="80" chance="11.89" /> <!-- Avadon Shield Fragment -->
+				<group chance="100">
+					<item id="135" min="1" max="1" chance="11.11" /> <!-- Samurai Long Sword -->
+					<item id="204" min="1" max="1" chance="11.11" /> <!-- Deadman's Staff -->
+					<item id="205" min="1" max="1" chance="11.11" /> <!-- Ghoul's Staff -->
+					<item id="206" min="1" max="1" chance="11.11" /> <!-- Demon's Staff -->
+					<item id="228" min="1" max="1" chance="11.11" /> <!-- Crystal Dagger -->
+					<item id="266" min="1" max="1" chance="11.11" /> <!-- Great Pata -->
+					<item id="286" min="1" max="1" chance="11.11" /> <!-- Eminence Bow -->
+					<item id="299" min="1" max="1" chance="11.11" /> <!-- Orcish Poleaxe -->
+					<item id="2503" min="1" max="1" chance="11.12" /> <!-- Yaksa Mace -->
+				</group>
+				<group chance="100">
+					<item id="356" min="1" max="1" chance="20" /> <!-- Full Plate Armor -->
+					<item id="2497" min="1" max="3" chance="20" /> <!-- Full Plate Shield -->
+					<item id="2414" min="1" max="1" chance="20" /> <!-- Full Plate Helmet -->
+					<item id="2438" min="1" max="1" chance="20" /> <!-- Full Plate Boots -->
+					<item id="2462" min="1" max="1" chance="20" /> <!-- Full Plate Gauntlets -->
+				</group>
+				<group chance="100">
+					<item id="2461" min="1" max="1" chance="20" /> <!-- Drake Leather Gloves -->
+					<item id="2437" min="1" max="1" chance="20" /> <!-- Drake Leather Boots -->
+					<item id="401" min="1" max="1" chance="20" /> <!-- Drake Leather Armor -->
+					<item id="603" min="1" max="3" chance="20" /> <!-- Divine Boots -->
+					<item id="1128" min="1" max="3" chance="20" /> <!-- Adamantite Boots -->
+				</group>
+				<group chance="100">
+					<item id="442" min="1" max="1" chance="20" /> <!-- Divine Tunic -->
+					<item id="473" min="1" max="1" chance="20" /> <!-- Divine Stockings -->
+					<item id="2463" min="1" max="1" chance="20" /> <!-- Divine Gloves -->
+					<item id="2468" min="1" max="3" chance="20" /> <!-- Blessed Gloves -->
+					<item id="499" min="1" max="3" chance="20" /> <!-- Mithril Helmet -->
+				</group>
+				<group chance="100">
+					<item id="119" min="1" max="1" chance="16.66" /> <!-- Necklace of Seal -->
+					<item id="855" min="1" max="3" chance="16.66" /> <!-- Nassen's Earring -->
+					<item id="857" min="1" max="3" chance="16.66" /> <!-- Holy Earring -->
+					<item id="886" min="1" max="3" chance="16.66" /> <!-- Ring of Seal -->
+					<item id="888" min="1" max="3" chance="16.66" /> <!-- Blessed Ring -->
+					<item id="919" min="1" max="1" chance="16.7" /> <!-- Blessed Necklace -->
+				</group>
+				<group chance="100">
+					<item id="2376" min="1" max="1" chance="25" /> <!-- Avadon Breastplate -->
+					<item id="2379" min="1" max="1" chance="25" /> <!-- Avadon Gaiters -->
+					<item id="2415" min="1" max="1" chance="25" /> <!-- Avadon Circlet -->
+					<item id="673" min="1" max="1" chance="25" /> <!-- Avadon Shield -->
+				</group>
+				<group chance="100">
+					<item id="856" min="1" max="3" chance="33.33" /> <!-- Adamantite Earring -->
+					<item id="887" min="1" max="3" chance="33.33" /> <!-- Adamantite Ring -->
+					<item id="918" min="1" max="1" chance="33.34" /> <!-- Adamantite Necklace -->
+				</group>
+				<group chance="100">
+					<item id="4049" min="20" max="80" chance="12.5" /> <!-- Adamantite Earring Gemstone -->
+					<item id="4050" min="20" max="80" chance="12.5" /> <!-- Adamantite Ring Wire -->
+					<item id="4051" min="20" max="80" chance="12.5" /> <!-- Adamantite Necklace Chain -->
+					<item id="4064" min="20" max="80" chance="12.5" /> <!-- Avadon Breastplate Part -->
+					<item id="4065" min="20" max="80" chance="12.5" /> <!-- Avadon Gaiter Material -->
+					<item id="4071" min="20" max="80" chance="12.5" /> <!-- Avadon Robe Fabric -->
+					<item id="4072" min="20" max="80" chance="12.5" /> <!-- Avadon Circlet Pattern -->
+					<item id="4439" min="20" max="80" chance="12.5" /> <!-- Avadon Shield Fragment -->
+				</group>
+				<group chance="20">
+					<item id="6661" min="1" max="1" chance="100" /> <!-- Orfen's Earring -->
+				</group>
+				<group chance="100">
+					<item id="947" min="2" max="8" chance="100" /> <!-- Scroll: Enchant Weapon (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="948" min="10" max="30" chance="100" /> <!-- Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -1019,13 +950,13 @@
 			<param name="MoveAroundSocial1" value="70" />
 			<param name="MoveAroundSocial2" value="70" />
 		</parameters>
-		<race>BEAST</race>
+		<race>BUG</race>
 		<sex>MALE</sex>
-		<acquire exp="16035" sp="481" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="16035" sp="481" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="158" mp="36936" mpRegen="2.1" />
-			<attack physical="298" magical="40" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="765" magical="280" />
+			<attack physical="298" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1033,9 +964,9 @@
 			<hitTime>540</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1044,7 +975,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="2500" aggroRange="450">
@@ -1063,13 +994,13 @@
 			<param name="MoveAroundSocial1" value="70" />
 			<param name="MoveAroundSocial2" value="70" />
 		</parameters>
-		<race>BEAST</race>
+		<race>BUG</race>
 		<sex>MALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="162" mp="36936" mpRegen="2.1" />
-			<attack physical="1058" magical="1563" random="30" critical="15" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="783" magical="286" />
+			<attack physical="1058" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1077,9 +1008,9 @@
 			<hitTime>540</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1088,7 +1019,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="2700" aggroRange="450">
@@ -1109,11 +1040,11 @@
 		</parameters>
 		<race>BUG</race>
 		<sex>FEMALE</sex>
-		<acquire exp="16035" sp="481" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="16035" sp="481" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="158" mp="36936" mpRegen="2.1" />
-			<attack physical="298" magical="40" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="765" magical="280" />
+			<attack physical="298" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1121,9 +1052,9 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1132,7 +1063,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="2700" aggroRange="450">
@@ -1148,11 +1079,11 @@
 	<npc id="29018" level="49" type="Monster" name="Riba Iren">
 		<race>BUG</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="162" mp="36936" mpRegen="2.1" />
-			<attack physical="1058" magical="1563" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="783" magical="286" />
+			<attack physical="1058" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1160,9 +1091,9 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1171,8 +1102,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
-			<skill id="4516" level="1" /> <!-- Orfen Heal -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="2900" isAggressive="true">
@@ -1190,27 +1120,19 @@
 		<sex>MALE</sex>
 		<acquire exp="262720917" sp="63053" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="7500000" hpRegen="1000" mp="18000" mpRegen="99" />
-			<attack physical="3260" magical="1700" random="30" critical="4" accuracy="40" attackSpeed="206" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="440" magical="440" />
+			<vitals hp="7000000" hpRegen="1000" mp="18000" mpRegen="99" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3840" magical="825" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4106" level="1" /> <!-- Antharas Stun -->
-			<skill id="4108" level="1" /> <!-- Antharas Terror -->
-			<skill id="4109" level="1" /> <!-- Curse of Antharas -->
-			<skill id="4110" level="2" /> <!-- Breath Attack -->
-			<skill id="4111" level="1" /> <!-- Antharas Fossilization -->
-			<skill id="4112" level="1" /> <!-- Ordinary Attack -->
-			<skill id="4113" level="1" /> <!-- Animal doing ordinary attack -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1219,9 +1141,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5092" level="1" /> <!-- Antharas Terror -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1230,92 +1152,36 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists> <!-- CT2.5 -->
-			<drop>
-				<item id="8620" min="10" max="30" chance="50" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="80" min="1" max="2" chance="25" /> <!-- Tallum Blade -->
-				<item id="98" min="1" max="2" chance="25" /> <!-- Halberd -->
-				<item id="269" min="1" max="2" chance="25" /> <!-- Blood Tornado -->
-				<item id="2504" min="1" max="2" chance="25" /> <!-- Meteor Shower -->
-				<item id="235" min="1" max="2" chance="25" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="2" chance="25" /> <!-- Carnage Bow -->
-				<item id="150" min="1" max="2" chance="25" /> <!-- Elemental Sword -->
-				<item id="212" min="1" max="2" chance="25" /> <!-- Dasparion's Staff -->
-				<item id="81" min="1" max="2" chance="25" /> <!-- Dragon Slayer -->
-				<item id="151" min="1" max="2" chance="25" /> <!-- Sword of Miracles -->
-				<item id="2500" min="1" max="2" chance="25" /> <!-- Dark Legion's Edge -->
-				<item id="164" min="1" max="2" chance="25" /> <!-- Elysian -->
-				<item id="236" min="1" max="2" chance="20" /> <!-- Soul Separator -->
-				<item id="270" min="1" max="2" chance="20" /> <!-- Dragon Grinder -->
-				<item id="289" min="1" max="2" chance="20" /> <!-- Soul Bow -->
-				<item id="213" min="1" max="2" chance="20" /> <!-- Branch of the Mother Tree -->
-				<item id="305" min="1" max="2" chance="20" /> <!-- Tallum Glaive -->
-				<item id="6326" min="1" max="5" chance="30" /> <!-- Sealed Majestic Necklace -->
-				<item id="6327" min="1" max="5" chance="35" /> <!-- Sealed Majestic Earring -->
-				<item id="6328" min="1" max="5" chance="35" /> <!-- Sealed Majestic Ring -->
-				<item id="6323" min="1" max="5" chance="30" /> <!-- Sealed Phoenix Necklace -->
-				<item id="6324" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Earring -->
-				<item id="6325" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Ring -->
-				<item id="5287" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5297" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5304" min="1" max="3" chance="25" /> <!-- Sealed Tallum Tunic -->
-				<item id="5311" min="1" max="3" chance="35" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5320" min="1" max="3" chance="35" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="30" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="3" chance="25" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5301" min="1" max="3" chance="25" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5308" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5316" min="1" max="3" chance="8" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5323" min="1" max="3" chance="8" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5329" min="1" max="3" chance="9" /> <!-- Sealed Majestic Robe -->
-				<item id="5288" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5298" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="30" /> <!-- Sealed Tallum Stockings -->
-				<item id="5289" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5294" min="1" max="3" chance="25" /> <!-- Sealed Tallum Helmet -->
-				<item id="5312" min="1" max="3" chance="25" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5317" min="1" max="3" chance="25" /> <!-- Sealed Majestic Circlet -->
-				<item id="5291" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5296" min="1" max="3" chance="25" /> <!-- Sealed Tallum Boots -->
-				<item id="5314" min="1" max="3" chance="25" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5319" min="1" max="3" chance="25" /> <!-- Sealed Majestic Boots -->
-				<item id="5290" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5295" min="1" max="3" chance="25" /> <!-- Sealed Tallum Gloves -->
-				<item id="5313" min="1" max="3" chance="25" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5318" min="1" max="3" chance="25" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5292" min="1" max="3" chance="40" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="40" /> <!-- Sealed Shield of Nightmare -->
-				<item id="729" min="1" max="19" chance="100" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="1538" min="1" max="59" chance="100" /> <!-- Blessed Scroll of Escape -->
-				<item id="3936" min="1" max="39" chance="100" /> <!-- Blessed Scroll of Resurrection -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="9000000" max="13000000" chance="100" /> <!-- Adena -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29020" level="75" type="GrandBoss" name="Baium">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<acquire exp="51267002" sp="1538010" raidPoints="450" />
+		<acquire exp="256184712" sp="7685542" raidPoints="450" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="10334675.47262" hpRegen="310.756323" mp="15930" mpRegen="3" />
-			<attack physical="3374.18" magical="2200" random="30" critical="4" accuracy="40" attackSpeed="206" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3300" magical="2200" />
+			<vitals hp="18666666.62" hpRegen="6666" mp="18000" mpRegen="99" />
+			<attack physical="25931" magical="8204" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3202" magical="2134" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4127" level="1" /> <!-- Baium: General Attack -->
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4256" level="1" /> <!-- Stun Resistance -->
+			<skill id="4127" level="1" /> <!-- Baium: General Attack -->
 		</skillList>
 		<corpseTime>13</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1328,90 +1194,106 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="6328" min="1" max="3" chance="53.12" /> <!-- Sealed Majestic Ring -->
-				<item id="49580" min="1" max="1" chance="30.73" /> <!-- Baium's Ring -->
-				<item id="6327" min="1" max="1" chance="20.93" /> <!-- Sealed Majestic Earring -->
-				<item id="7900" min="1" max="1" chance="17.84" /> <!-- Ice Storm Hammer -->
-				<item id="7892" min="1" max="1" chance="17.25" /> <!-- Spell Breaker -->
-				<item id="7901" min="1" max="1" chance="16.71" /> <!-- Star Buster -->
-				<item id="7883" min="1" max="1" chance="16.74" /> <!-- Sword of Sentinel -->
-				<item id="7893" min="1" max="1" chance="16.48" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="15.31" /> <!-- Wizard's Tear -->
-				<item id="6325" min="1" max="3" chance="14.69" /> <!-- Sealed Phoenix Ring -->
-				<item id="6326" min="1" max="1" chance="8.013" /> <!-- Sealed Majestic Necklace -->
-				<item id="5292" min="1" max="3" chance="7.057" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="1" chance="5.999" /> <!-- Sealed Shield of Nightmare -->
-				<item id="289" min="1" max="1" chance="5.065" /> <!-- Soul Bow -->
-				<item id="151" min="1" max="1" chance="5.063" /> <!-- Sword of Miracles -->
-				<item id="5289" min="1" max="3" chance="5.056" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="80" min="1" max="1" chance="5.052" /> <!-- Tallum Blade -->
-				<item id="2504" min="1" max="1" chance="5.049" /> <!-- Meteor Shower -->
-				<item id="5294" min="1" max="3" chance="5.042" /> <!-- Sealed Tallum Helmet -->
-				<item id="235" min="1" max="1" chance="5.039" /> <!-- Bloody Orchid -->
-				<item id="5296" min="1" max="3" chance="5.037" /> <!-- Sealed Tallum Boots -->
-				<item id="269" min="1" max="1" chance="5.033" /> <!-- Blood Tornado -->
-				<item id="5290" min="1" max="3" chance="5.03" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="150" min="1" max="1" chance="5.024" /> <!-- Elemental Sword -->
-				<item id="288" min="1" max="1" chance="5.023" /> <!-- Carnage Bow -->
-				<item id="7899" min="1" max="1" chance="5.022" /> <!-- Destroyer Hammer -->
-				<item id="7884" min="1" max="1" chance="5.018" /> <!-- Infernal Master -->
-				<item id="5291" min="1" max="3" chance="5.009" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="7894" min="1" max="1" chance="5.008" /> <!-- Spiritual Eye -->
-				<item id="98" min="1" max="1" chance="4.987" /> <!-- Halberd -->
-				<item id="5295" min="1" max="3" chance="4.945" /> <!-- Sealed Tallum Gloves -->
-				<item id="81" min="1" max="1" chance="4.056" /> <!-- Dragon Slayer -->
-				<item id="305" min="1" max="1" chance="4.053" /> <!-- Tallum Glaive -->
-				<item id="270" min="1" max="1" chance="4.022" /> <!-- Dragon Grinder -->
-				<item id="212" min="1" max="1" chance="4.02" /> <!-- Dasparion's Staff -->
-				<item id="7902" min="1" max="1" chance="3.998" /> <!-- Doom Crusher -->
-				<item id="6324" min="1" max="1" chance="3.992" /> <!-- Sealed Phoenix Earring -->
-				<item id="236" min="1" max="1" chance="3.987" /> <!-- Soul Separator -->
-				<item id="164" min="1" max="1" chance="3.984" /> <!-- Elysian -->
-				<item id="213" min="1" max="1" chance="3.965" /> <!-- Branch of the Mother Tree -->
-				<item id="2500" min="1" max="1" chance="3.961" /> <!-- Dark Legion's Edge -->
-				<item id="7895" min="1" max="1" chance="3.948" /> <!-- Flaming Dragon Skull -->
-				<item id="5313" min="1" max="1" chance="3.06" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5298" min="1" max="1" chance="3.055" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="1" chance="3.046" /> <!-- Sealed Tallum Stockings -->
-				<item id="5304" min="1" max="1" chance="3.045" /> <!-- Sealed Tallum Tunic -->
-				<item id="5318" min="1" max="1" chance="3.034" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5308" min="1" max="1" chance="3.013" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="49683" min="1" max="1" chance="3.011" /> <!-- Talisman of Baium -->
-				<item id="5317" min="1" max="1" chance="3" /> <!-- Sealed Majestic Circlet -->
-				<item id="5297" min="1" max="1" chance="2.984" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5312" min="1" max="1" chance="2.978" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5319" min="1" max="1" chance="2.978" /> <!-- Sealed Majestic Boots -->
-				<item id="5301" min="1" max="1" chance="2.964" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5293" min="1" max="1" chance="2.963" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5288" min="1" max="1" chance="2.944" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5287" min="1" max="1" chance="2.942" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5314" min="1" max="1" chance="2.939" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5323" min="1" max="1" chance="2.056" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5320" min="1" max="1" chance="2.053" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5329" min="1" max="1" chance="2.023" /> <!-- Sealed Majestic Robe -->
-				<item id="5316" min="1" max="1" chance="1.959" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5326" min="1" max="1" chance="1.949" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5311" min="1" max="1" chance="1.949" /> <!-- Sealed Armor of Nightmare -->
-				<item id="6323" min="1" max="1" chance="0.75" /> <!-- Sealed Phoenix Necklace -->
-				<item id="8621" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Version) -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Lv. 1 -->
-				<item id="33814" min="2" max="4" chance="50.42" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="729" min="1" max="1" chance="50.21" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="33808" min="1" max="1" chance="49.96" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="730" min="1" max="1" chance="49.85" /> <!-- Scroll: Enchant Armor (A-grade) -->
-				<item id="49756" min="2" max="4" chance="49.02" /> <!-- Cloth Piece -->
-				<item id="49682" min="1" max="1" chance="26.34" /> <!-- Baium? Soul -->
+				<group chance="100">
+					<item id="80" min="1" max="1" chance="5" /> <!-- Tallum Blade -->
+					<item id="81" min="1" max="1" chance="4" /> <!-- Dragon Slayer -->
+					<item id="98" min="1" max="1" chance="5" /> <!-- Halberd -->
+					<item id="150" min="1" max="1" chance="5" /> <!-- Elemental Sword -->
+					<item id="151" min="1" max="1" chance="5" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="1" chance="4" /> <!-- Elysian -->
+					<item id="212" min="1" max="1" chance="4" /> <!-- Dasparion's Staff -->
+					<item id="213" min="1" max="1" chance="4" /> <!-- Branch of the Mother Tree -->
+					<item id="235" min="1" max="1" chance="5" /> <!-- Bloody Orchid -->
+					<item id="236" min="1" max="1" chance="4" /> <!-- Soul Separator -->
+					<item id="269" min="1" max="1" chance="5" /> <!-- Blood Tornado -->
+					<item id="270" min="1" max="1" chance="4" /> <!-- Dragon Grinder -->
+					<item id="288" min="1" max="1" chance="5" /> <!-- Carnage Bow -->
+					<item id="289" min="1" max="1" chance="5" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="1" chance="4" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="1" chance="4" /> <!-- Dark Legion's Edge -->
+					<item id="2504" min="1" max="1" chance="5" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="1" chance="5" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="1" chance="5" /> <!-- Spiritual Eye -->
+					<item id="7895" min="1" max="1" chance="4" /> <!-- Flaming Dragon Skull -->
+					<item id="7899" min="1" max="1" chance="5" /> <!-- Destroyer Hammer -->
+					<item id="7902" min="1" max="1" chance="4" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="100">
+					<item id="7883" min="1" max="1" chance="17" /> <!-- Sword of Sentinel -->
+					<item id="7889" min="1" max="1" chance="16" /> <!-- Wizard's Tear -->
+					<item id="7892" min="1" max="1" chance="17" /> <!-- Spell Breaker -->
+					<item id="7893" min="1" max="1" chance="17" /> <!-- Kaim Vanul's Bones -->
+					<item id="7900" min="1" max="1" chance="17" /> <!-- Ice Storm Hammer -->
+					<item id="7901" min="1" max="1" chance="16" /> <!-- Star Buster -->
+				</group>
+				<group chance="100">
+					<item id="5287" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5292" min="1" max="3" chance="7" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5293" min="1" max="1" chance="3" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="3" chance="5" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="3" chance="5" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="3" chance="5" /> <!-- Sealed Tallum Boots -->
+					<item id="5297" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5301" min="1" max="1" chance="3" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="1" chance="3" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="1" chance="3" /> <!-- Sealed Tallum Stockings -->
+					<item id="5308" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Robe -->
+					<item id="5311" min="1" max="1" chance="2" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="1" chance="3" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="1" chance="3" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="1" chance="3" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5315" min="1" max="1" chance="6" /> <!-- Sealed Shield of Nightmare -->
+					<item id="5316" min="1" max="1" chance="2" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="1" chance="3" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="1" chance="3" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="1" chance="3" /> <!-- Sealed Majestic Boots -->
+					<item id="5320" min="1" max="1" chance="2" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5323" min="1" max="1" chance="2" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5326" min="1" max="1" chance="2" /> <!-- Sealed Robe of Nightmare -->
+					<item id="5329" min="1" max="1" chance="2" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="100">
+					<item id="6323" min="1" max="1" chance="1" /> <!-- Sealed Phoenix Necklace -->
+					<item id="6324" min="1" max="1" chance="4" /> <!-- Sealed Phoenix Earring -->
+					<item id="6325" min="1" max="3" chance="15" /> <!-- Sealed Phoenix Ring -->
+					<item id="6326" min="1" max="1" chance="8" /> <!-- Sealed Majestic Necklace -->
+					<item id="6327" min="1" max="1" chance="20" /> <!-- Sealed Majestic Earring -->
+					<item id="6328" min="1" max="3" chance="52" /> <!-- Sealed Majestic Ring -->
+				</group>
+				<group chance="100">
+					<item id="33808" min="1" max="1" chance="50" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
+					<item id="33814" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="729" min="1" max="1" chance="50" /> <!-- Scroll: Enchant Weapon (A-grade) -->
+					<item id="730" min="1" max="1" chance="50" /> <!-- Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="30">
+					<item id="49580" min="1" max="1" chance="100" /> <!-- Baium's Ring -->
+				</group>
+				<group chance="30">
+					<item id="49683" min="1" max="1" chance="10" /> <!-- Talisman of Baium -->
+					<item id="49682" min="1" max="1" chance="90" /> <!-- Baium's Soul -->
+				</group>
+				<group chance="100">
+					<item id="8621" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Version) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29021" level="74" type="Monster" name="Archangel">
+	<npc id="29021" level="80" type="Monster" name="Archangel">
 		<race>DIVINE</race>
 		<sex>MALE</sex>
 		<equipment rhand="93" /> <!-- Winged Spear -->
 		<acquire exp="11520" sp="2" />
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="186915" hpRegen="158" mp="1475" mpRegen="3" />
-			<attack physical="395" magical="371" random="30" critical="4" accuracy="40" attackSpeed="206" type="POLE" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="747660" hpRegen="158" mp="1475" mpRegen="3" />
+			<attack physical="4185" magical="371" random="10" critical="4" accuracy="0" attackSpeed="253" type="POLE" range="80" distance="80" width="120" />
 			<defence physical="5108" magical="1686" />
 			<speed>
 				<walk ground="50" />
@@ -1420,10 +1302,9 @@
 			<hitTime>760</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4132" level="1" /> <!-- Spear: Pound the Ground -->
+			<skill id="4416" level="8" /> <!-- Angel -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1431,9 +1312,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="11" /> <!-- Spears -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="4133" level="1" /> <!-- Heal -->
+			<skill id="4415" level="11" /> <!-- Spear -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="300" isAggressive="true">
@@ -1451,9 +1331,9 @@
 		<sex>MALE</sex>
 		<acquire exp="102487500" sp="3074625" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="7027579.47902" hpRegen="310.756323" mp="10832.4" mpRegen="3" />
-			<attack physical="33864" magical="42273" random="30" critical="4" accuracy="40" attackSpeed="206" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3680" magical="4661" />
+			<vitals hp="66666666.6666667" hpRegen="2981.0298102981" mp="12240" mpRegen="10" />
+			<attack physical="15182.9268292683" magical="6600.03819341452" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2692.68292682927" magical="1794.92939666239" />
 			<speed>
 				<walk ground="42" />
 				<run ground="190" />
@@ -1461,96 +1341,28 @@
 			<hitTime>590</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4221" level="1" /> <!-- Range Dual Attack -->
-			<skill id="4220" level="1" /> <!-- Dual Attack -->
-			<skill id="4218" level="1" /> <!-- Drain -->
-			<skill id="4219" level="1" /> <!-- Hold -->
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="3" /> <!-- Extremely Weak P. Atk. -->
+			<skill id="4411" level="3" /> <!-- Extremely Weak M. Atk. -->
+			<skill id="4412" level="3" /> <!-- Extremely Weak P. Def. -->
+			<skill id="4413" level="3" /> <!-- Extremely Weak M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="1000" clanHelpRange="300" isAggressive="true" />
 		<collision>
-			<radius normal="16" />
-			<height normal="32" />
+			<radius normal="19.2" />
+			<height normal="39" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="6328" min="1" max="1" chance="52.1" /> <!-- Sealed Majestic Ring -->
-				<item id="6327" min="1" max="1" chance="20.12" /> <!-- Sealed Majestic Earring -->
-				<item id="6325" min="1" max="1" chance="15.75" /> <!-- Sealed Phoenix Ring -->
-				<item id="6326" min="1" max="1" chance="7.945" /> <!-- Sealed Majestic Necklace -->
-				<item id="7893" min="1" max="1" chance="6.864" /> <!-- Kaim Vanul's Bones -->
-				<item id="7883" min="1" max="1" chance="6.834" /> <!-- Sword of Sentinel -->
-				<item id="7892" min="1" max="1" chance="6.82" /> <!-- Spell Breaker -->
-				<item id="7900" min="1" max="1" chance="6.795" /> <!-- Ice Storm Hammer -->
-				<item id="7889" min="1" max="1" chance="6.401" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="6.35" /> <!-- Star Buster -->
-				<item id="6324" min="1" max="1" chance="4.019" /> <!-- Sealed Phoenix Earring -->
-				<item id="5292" min="1" max="1" chance="3.557" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="1" chance="3.046" /> <!-- Sealed Shield of Nightmare -->
-				<item id="5294" min="1" max="1" chance="2.548" /> <!-- Sealed Tallum Helmet -->
-				<item id="5290" min="1" max="1" chance="2.525" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5289" min="1" max="1" chance="2.512" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5296" min="1" max="1" chance="2.5" /> <!-- Sealed Tallum Boots -->
-				<item id="5291" min="1" max="1" chance="2.489" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5295" min="1" max="1" chance="2.443" /> <!-- Sealed Tallum Gloves -->
-				<item id="5318" min="1" max="1" chance="1.561" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5305" min="1" max="1" chance="1.544" /> <!-- Sealed Tallum Stockings -->
-				<item id="5317" min="1" max="1" chance="1.531" /> <!-- Sealed Majestic Circlet -->
-				<item id="5314" min="1" max="1" chance="1.525" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5297" min="1" max="1" chance="1.523" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5312" min="1" max="1" chance="1.485" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5298" min="1" max="1" chance="1.483" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5304" min="1" max="1" chance="1.48" /> <!-- Sealed Tallum Tunic -->
-				<item id="5301" min="1" max="1" chance="1.476" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5288" min="1" max="1" chance="1.475" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5308" min="1" max="1" chance="1.457" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5293" min="1" max="1" chance="1.456" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5319" min="1" max="1" chance="1.447" /> <!-- Sealed Majestic Boots -->
-				<item id="5287" min="1" max="1" chance="1.445" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5313" min="1" max="1" chance="1.44" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="7899" min="1" max="1" chance="0.75" /> <!-- Destroyer Hammer -->
-				<item id="212" min="1" max="1" chance="0.75" /> <!-- Dasparion's Staff -->
-				<item id="164" min="1" max="1" chance="0.75" /> <!-- Elysian -->
-				<item id="7884" min="1" max="1" chance="0.75" /> <!-- Infernal Master -->
-				<item id="151" min="1" max="1" chance="0.75" /> <!-- Sword of Miracles -->
-				<item id="235" min="1" max="1" chance="0.75" /> <!-- Bloody Orchid -->
-				<item id="150" min="1" max="1" chance="0.75" /> <!-- Elemental Sword -->
-				<item id="80" min="1" max="1" chance="0.75" /> <!-- Tallum Blade -->
-				<item id="7902" min="1" max="1" chance="0.75" /> <!-- Doom Crusher -->
-				<item id="81" min="1" max="1" chance="0.75" /> <!-- Dragon Slayer -->
-				<item id="7894" min="1" max="1" chance="0.75" /> <!-- Spiritual Eye -->
-				<item id="7895" min="1" max="1" chance="0.75" /> <!-- Flaming Dragon Skull -->
-				<item id="98" min="1" max="1" chance="0.75" /> <!-- Halberd -->
-				<item id="213" min="1" max="1" chance="0.75" /> <!-- Branch of the Mother Tree -->
-				<item id="236" min="1" max="1" chance="0.75" /> <!-- Soul Separator -->
-				<item id="269" min="1" max="1" chance="0.75" /> <!-- Blood Tornado -->
-				<item id="2500" min="1" max="1" chance="0.75" /> <!-- Dark Legion's Edge -->
-				<item id="305" min="1" max="1" chance="0.75" /> <!-- Tallum Glaive -->
-				<item id="289" min="1" max="1" chance="0.75" /> <!-- Soul Bow -->
-				<item id="5311" min="1" max="1" chance="0.75" /> <!-- Sealed Armor of Nightmare -->
-				<item id="288" min="1" max="1" chance="0.75" /> <!-- Carnage Bow -->
-				<item id="5316" min="1" max="1" chance="0.75" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5320" min="1" max="1" chance="0.75" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5323" min="1" max="1" chance="0.75" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5326" min="1" max="1" chance="0.75" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5329" min="1" max="1" chance="0.75" /> <!-- Sealed Majestic Robe -->
-				<item id="6323" min="1" max="1" chance="0.75" /> <!-- Sealed Phoenix Necklace -->
-				<item id="270" min="1" max="1" chance="0.75" /> <!-- Dragon Grinder -->
-				<item id="2504" min="1" max="1" chance="0.75" /> <!-- Meteor Shower -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Lv. 1 -->
-				<item id="49756" min="1" max="3" chance="50.22" /> <!-- Cloth Piece -->
-				<item id="33814" min="1" max="1" chance="34.82" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33808" min="1" max="1" chance="34.45" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="729" min="1" max="1" chance="25.37" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="730" min="1" max="1" chance="25.13" /> <!-- Scroll: Enchant Armor (A-grade) -->
-			</drop>
-		</dropLists>
 	</npc>
-	<npc id="29023" level="74" type="Monster" name="Maiden Doll">
+	<npc id="29023" level="58" type="Monster" name="Maiden Doll">
 		<parameters>
 			<param name="MoveAroundSocial" value="50" />
 			<param name="MoveAroundSocial1" value="50" />
@@ -1561,33 +1373,31 @@
 		<equipment rhand="5129" /> <!-- Doll Knife -->
 		<acquire exp="129198" sp="3875" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1828" hpRegen="6.5" mp="832" mpRegen="2.4" />
-			<attack physical="442" magical="302" random="30" critical="4" accuracy="40" attackSpeed="253" type="DUAL" range="40" distance="80" width="120" />
+			<vitals hp="1828" hpRegen="6.5" mp="832.4" mpRegen="2.4" />
+			<attack physical="442" magical="302" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="DUAL" range="40" distance="80" width="120" />
 			<defence physical="261" magical="191" />
 			<speed>
 				<walk ground="22" />
 				<run ground="150" />
 			</speed>
-			<hitTime>500</hitTime>
+			<hitTime>50</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="5" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4085" level="1" /> <!-- Critical Damage -->
-			<skill id="4086" level="1" /> <!-- Critical Chance -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="9" /> <!-- Average M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="19" /> <!-- Dual-Sword Weapons -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4333" level="5" /> <!-- Dark Attack Resistance -->
-			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4415" level="19" /> <!-- Dualsword -->
+			<skill id="4071" level="5" /> <!-- Bow/Crossbow Resistance -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1595,22 +1405,8 @@
 			<radius normal="6" />
 			<height normal="12" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="97" min="1" max="1" chance="0.0075" /> <!-- Lance -->
-				<item id="268" min="1" max="1" chance="0.0075" /> <!-- Bellion Cestus -->
-				<item id="57" min="2433" max="5685" chance="70" /> <!-- Adena -->
-				<item id="1887" min="1" max="1" chance="10.07" /> <!-- Varnish of Purity -->
-				<item id="4115" min="1" max="1" chance="1.689" /> <!-- Lance Blade -->
-				<item id="4120" min="1" max="1" chance="1.621" /> <!-- Bellion Cestus Edge -->
-			</drop>
-			<spoil>
-				<item id="948" min="1" max="1" chance="4.291" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="947" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-			</spoil>
-		</dropLists>
 	</npc>
-	<npc id="29024" level="74" type="Monster" name="Veil Master">
+	<npc id="29024" level="59" type="Monster" name="Veil Master">
 		<parameters>
 			<param name="MoveAroundSocial" value="114" />
 			<param name="MoveAroundSocial1" value="114" />
@@ -1621,7 +1417,7 @@
 		<acquire exp="90904" sp="2727" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1880" hpRegen="6.5" mp="861" mpRegen="2.4" />
-			<attack physical="461" magical="315" random="30" critical="4" accuracy="40" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="461" magical="315" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="267" magical="195" />
 			<speed>
 				<walk ground="70" />
@@ -1630,66 +1426,9 @@
 			<hitTime>740</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="5" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4085" level="1" /> <!-- Critical Damage -->
-			<skill id="4086" level="1" /> <!-- Critical Chance -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4333" level="5" /> <!-- Dark Attack Resistance -->
 			<skill id="4416" level="9" /> <!-- Demons -->
-		</skillList>
-		<exCrtEffect>true</exCrtEffect>
-		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
-		<collision>
-			<radius normal="12" />
-			<height normal="40" />
-		</collision>
-		<dropLists>
-			<drop>
-				<item id="79" min="1" max="1" chance="0.003" /> <!-- Damascus Sword -->
-				<item id="171" min="1" max="1" chance="0.003" /> <!-- Deadman's Glory -->
-				<item id="57" min="1372" max="3205" chance="70" /> <!-- Adena -->
-				<item id="1895" min="1" max="1" chance="11.72" /> <!-- Metallic Fiber -->
-				<item id="1876" min="1" max="1" chance="8.039" /> <!-- Mithril Ore -->
-				<item id="1866" min="2" max="6" chance="6.721" /> <!-- Suede -->
-				<item id="1879" min="1" max="1" chance="6.667" /> <!-- Cokes -->
-				<item id="1870" min="5" max="15" chance="4.008" /> <!-- Coal -->
-				<item id="1871" min="9" max="27" chance="2.214" /> <!-- Charcoal -->
-				<item id="4114" min="1" max="1" chance="0.75" /> <!-- Damascus Sword Blade -->
-				<item id="4116" min="1" max="1" chance="0.75" /> <!-- Deadman's Glory Stone -->
-			</drop>
-			<spoil>
-				<item id="948" min="1" max="1" chance="2.451" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="947" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-			</spoil>
-		</dropLists>
-	</npc>
-	<npc id="29025" level="75" type="Folk" name="Baium">
-		<race>HUMANOID</race>
-		<sex>MALE</sex>
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="1709400" hpRegen="8.5" mp="18000" mpRegen="3" />
-			<attack physical="874.18" magical="596.95" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="233.61" magical="233.61" />
-			<speed>
-				<walk ground="50" />
-				<run ground="120" />
-			</speed>
-			<abnormalResist physical="230" magical="230" />
-		</stats>
-		<status attackable="false" undying="true" />
-		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1698,7 +1437,44 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4071" level="5" /> <!-- Bow/Crossbow Resistance -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+		</skillList>
+		<exCrtEffect>true</exCrtEffect>
+		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="29025" level="75" type="Folk" name="Baium">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="1709400" hpRegen="718" mp="18000" mpRegen="99" />
+			<attack physical="1874.18" magical="1596.95" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3300" magical="2200" />
+			<speed>
+				<walk ground="50" />
+				<run ground="120" />
+			</speed>
+			<hitTime>60</hitTime>
+			<abnormalResist physical="230" magical="230" />
+		</stats>
+		<status attackable="false" undying="true" />
+		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="300" aggroRange="4296" />
@@ -1718,7 +1494,7 @@
 		<equipment rhand="232" /> <!-- Dark Elven Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1933" hpRegen="6.5" mp="804" mpRegen="2.4" />
-			<attack physical="420" magical="328" random="10" critical="8" accuracy="40" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
+			<attack physical="420" magical="328" random="5" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="272" magical="199" />
 			<speed>
 				<walk ground="14" />
@@ -1727,9 +1503,9 @@
 			<hitTime>760</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1737,10 +1513,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="7" /> <!-- Daggers -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4415" level="7" /> <!-- Dagger -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1760,7 +1534,7 @@
 		<equipment rhand="225" /> <!-- Mithril Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1776" hpRegen="6.5" mp="584" mpRegen="2.1" />
-			<attack physical="371" magical="289" random="10" critical="8" accuracy="40" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
+			<attack physical="371" magical="289" random="5" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="256" magical="187" />
 			<speed>
 				<walk ground="11" />
@@ -1769,9 +1543,9 @@
 			<hitTime>740</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1779,10 +1553,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="7" /> <!-- Daggers -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4415" level="7" /> <!-- Dagger -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1791,28 +1563,27 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="29066" level="1" type="GrandBoss" name="Antharas">
+	<npc id="29066" level="75" type="GrandBoss" name="Antharas">
 		<parameters>
 			<param name="ultra_respawn_time" value="8" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<acquire exp="262720917" sp="63053" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="6100000" hpRegen="2" mp="1800000" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="6100000" hpRegen="1100" mp="1800000" mpRegen="1000" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3456" magical="862.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1821,8 +1592,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1833,75 +1605,29 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists> <!-- CT2.5 -->
-			<drop>
-				<item id="8620" min="10" max="30" chance="50" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="80" min="1" max="2" chance="25" /> <!-- Tallum Blade -->
-				<item id="98" min="1" max="2" chance="25" /> <!-- Halberd -->
-				<item id="269" min="1" max="2" chance="25" /> <!-- Blood Tornado -->
-				<item id="2504" min="1" max="2" chance="25" /> <!-- Meteor Shower -->
-				<item id="235" min="1" max="2" chance="25" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="2" chance="25" /> <!-- Carnage Bow -->
-				<item id="150" min="1" max="2" chance="25" /> <!-- Elemental Sword -->
-				<item id="212" min="1" max="2" chance="25" /> <!-- Dasparion's Staff -->
-				<item id="81" min="1" max="2" chance="25" /> <!-- Dragon Slayer -->
-				<item id="151" min="1" max="2" chance="25" /> <!-- Sword of Miracles -->
-				<item id="2500" min="1" max="2" chance="25" /> <!-- Dark Legion's Edge -->
-				<item id="164" min="1" max="2" chance="25" /> <!-- Elysian -->
-				<item id="236" min="1" max="2" chance="20" /> <!-- Soul Separator -->
-				<item id="270" min="1" max="2" chance="20" /> <!-- Dragon Grinder -->
-				<item id="289" min="1" max="2" chance="20" /> <!-- Soul Bow -->
-				<item id="213" min="1" max="2" chance="20" /> <!-- Branch of the Mother Tree -->
-				<item id="305" min="1" max="2" chance="20" /> <!-- Tallum Glaive -->
-				<item id="6326" min="1" max="5" chance="30" /> <!-- Sealed Majestic Necklace -->
-				<item id="6327" min="1" max="5" chance="35" /> <!-- Sealed Majestic Earring -->
-				<item id="6328" min="1" max="5" chance="35" /> <!-- Sealed Majestic Ring -->
-				<item id="6323" min="1" max="5" chance="30" /> <!-- Sealed Phoenix Necklace -->
-				<item id="6324" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Earring -->
-				<item id="6325" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Ring -->
-				<item id="5287" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5297" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5304" min="1" max="3" chance="25" /> <!-- Sealed Tallum Tunic -->
-				<item id="5311" min="1" max="3" chance="35" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5320" min="1" max="3" chance="35" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="30" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="3" chance="25" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5301" min="1" max="3" chance="25" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5308" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5316" min="1" max="3" chance="8" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5323" min="1" max="3" chance="8" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5329" min="1" max="3" chance="9" /> <!-- Sealed Majestic Robe -->
-				<item id="5288" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5298" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="30" /> <!-- Sealed Tallum Stockings -->
-				<item id="5289" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5294" min="1" max="3" chance="25" /> <!-- Sealed Tallum Helmet -->
-				<item id="5312" min="1" max="3" chance="25" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5317" min="1" max="3" chance="25" /> <!-- Sealed Majestic Circlet -->
-				<item id="5291" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5296" min="1" max="3" chance="25" /> <!-- Sealed Tallum Boots -->
-				<item id="5314" min="1" max="3" chance="25" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5319" min="1" max="3" chance="25" /> <!-- Sealed Majestic Boots -->
-				<item id="5290" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5295" min="1" max="3" chance="25" /> <!-- Sealed Tallum Gloves -->
-				<item id="5313" min="1" max="3" chance="25" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5318" min="1" max="3" chance="25" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5292" min="1" max="3" chance="40" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="40" /> <!-- Sealed Shield of Nightmare -->
-				<item id="729" min="1" max="19" chance="100" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="1538" min="1" max="59" chance="100" /> <!-- Blessed Scroll of Escape -->
-				<item id="3936" min="1" max="39" chance="100" /> <!-- Blessed Scroll of Resurrection -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="9000000" max="13000000" chance="100" /> <!-- Adena -->
-			</drop>
-		</dropLists>
 	</npc>
-	<npc id="29067" level="1" type="GrandBoss" name="Antharas">
+	<npc id="29061" displayId="31842" level="70" type="Teleporter" name="Teleportation Cubic">
+		<race>ETC</race>
+		<sex>ETC</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2444" hpRegen="7.5" mp="1345" mpRegen="2.7" />
+			<attack physical="688.86373" magical="470.40463" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="295.91597" magical="216.53847" />
+			<speed>
+				<walk ground="50" />
+				<run ground="120" />
+			</speed>
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="false" />
+		<exCrtEffect>true</exCrtEffect>
+		<ai type="BALANCED" clanHelpRange="300" isAggressive="true" aggroRange="500" />
+		<collision>
+			<radius normal="40" />
+			<height normal="80" />
+		</collision>
+	</npc>
+	<npc id="29067" level="75" type="GrandBoss" name="Antharas">
 		<parameters>
 			<param name="ultra_respawn_time" value="5" />
 		</parameters>
@@ -1910,19 +1636,18 @@
 		<acquire exp="262720918" sp="29116376" raidPoints="30780" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="6800000" hpRegen="1100" mp="1800000" mpRegen="1000" />
-			<attack physical="4900" magical="2550" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3456" magical="862.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1931,8 +1656,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1943,112 +1669,29 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="5292" min="1" max="1" chance="51.25" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="1" chance="50.84" /> <!-- Sealed Shield of Nightmare -->
-				<item id="5329" min="1" max="1" chance="20.5" /> <!-- Sealed Majestic Robe -->
-				<item id="5311" min="1" max="1" chance="20.37" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5323" min="1" max="1" chance="20.04" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5320" min="1" max="1" chance="19.68" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="1" chance="19.57" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="1" chance="19.15" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5316" min="1" max="1" chance="19.09" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="7900" min="1" max="1" chance="17.8" /> <!-- Ice Storm Hammer -->
-				<item id="5308" min="1" max="1" chance="17.77" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="7892" min="1" max="1" chance="17.72" /> <!-- Spell Breaker -->
-				<item id="5301" min="1" max="1" chance="17.33" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="7883" min="1" max="1" chance="16.92" /> <!-- Sword of Sentinel -->
-				<item id="7893" min="1" max="1" chance="16.91" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="16.68" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="15.89" /> <!-- Star Buster -->
-				<item id="5319" min="1" max="1" chance="13.64" /> <!-- Sealed Majestic Boots -->
-				<item id="5313" min="1" max="1" chance="13.35" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5312" min="1" max="1" chance="13.17" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5288" min="1" max="1" chance="13.03" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5314" min="1" max="1" chance="12.9" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5318" min="1" max="1" chance="12.85" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5305" min="1" max="1" chance="12.76" /> <!-- Sealed Tallum Stockings -->
-				<item id="5295" min="1" max="1" chance="12.67" /> <!-- Sealed Tallum Gloves -->
-				<item id="5289" min="1" max="1" chance="12.66" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5317" min="1" max="1" chance="12.7" /> <!-- Sealed Majestic Circlet -->
-				<item id="5298" min="1" max="1" chance="12.59" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5296" min="1" max="1" chance="12.45" /> <!-- Sealed Tallum Boots -->
-				<item id="5304" min="1" max="1" chance="12.44" /> <!-- Sealed Tallum Tunic -->
-				<item id="5294" min="1" max="1" chance="12.34" /> <!-- Sealed Tallum Helmet -->
-				<item id="5297" min="1" max="1" chance="12.19" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5287" min="1" max="1" chance="11.92" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5291" min="1" max="1" chance="10.018" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5290" min="1" max="1" chance="9.982" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="2500" min="1" max="1" chance="9.154" /> <!-- Dark Legion's Edge -->
-				<item id="7902" min="1" max="1" chance="9.146" /> <!-- Doom Crusher -->
-				<item id="81" min="1" max="1" chance="9.146" /> <!-- Dragon Slayer -->
-				<item id="80" min="1" max="1" chance="9.144" /> <!-- Tallum Blade -->
-				<item id="7895" min="1" max="1" chance="9.136" /> <!-- Flaming Dragon Skull -->
-				<item id="213" min="1" max="1" chance="9.134" /> <!-- Branch of the Mother Tree -->
-				<item id="236" min="1" max="1" chance="9.13" /> <!-- Soul Separator -->
-				<item id="7899" min="1" max="1" chance="9.129" /> <!-- Destroyer Hammer -->
-				<item id="2504" min="1" max="1" chance="9.126" /> <!-- Meteor Shower -->
-				<item id="305" min="1" max="1" chance="9.124" /> <!-- Tallum Glaive -->
-				<item id="164" min="1" max="1" chance="9.124" /> <!-- Elysian -->
-				<item id="270" min="1" max="1" chance="9.122" /> <!-- Dragon Grinder -->
-				<item id="150" min="1" max="1" chance="9.103" /> <!-- Elemental Sword -->
-				<item id="235" min="1" max="1" chance="9.095" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="1" chance="9.08" /> <!-- Carnage Bow -->
-				<item id="269" min="1" max="1" chance="9.077" /> <!-- Blood Tornado -->
-				<item id="7884" min="1" max="1" chance="9.073" /> <!-- Infernal Master -->
-				<item id="98" min="1" max="1" chance="9.07" /> <!-- Halberd -->
-				<item id="7894" min="1" max="1" chance="9.067" /> <!-- Spiritual Eye -->
-				<item id="212" min="1" max="1" chance="9.029" /> <!-- Dasparion's Staff -->
-				<item id="289" min="1" max="1" chance="9.025" /> <!-- Soul Bow -->
-				<item id="151" min="1" max="1" chance="9.024" /> <!-- Sword of Miracles -->
-				<item id="8683" min="1" max="1" chance="8.378" /> <!-- Tiphon's Spear -->
-				<item id="8684" min="1" max="1" chance="8.378" /> <!-- Shyeed's Bow -->
-				<item id="8682" min="1" max="1" chance="8.368" /> <!-- Naga Storm -->
-				<item id="8688" min="1" max="1" chance="8.356" /> <!-- Daimon Crystal -->
-				<item id="8678" min="1" max="1" chance="8.356" /> <!-- Sirra's Blade -->
-				<item id="8680" min="1" max="1" chance="8.331" /> <!-- Barakiel's Axe -->
-				<item id="8681" min="1" max="1" chance="8.328" /> <!-- Behemoth' Tuning Fork -->
-				<item id="8686" min="1" max="1" chance="8.324" /> <!-- Themis' Tongue -->
-				<item id="8679" min="1" max="1" chance="8.317" /> <!-- Sword of Ipos -->
-				<item id="8687" min="1" max="1" chance="8.295" /> <!-- Cabrio's Hand -->
-				<item id="5706" min="1" max="1" chance="8.273" /> <!-- Damascus*Damascus -->
-				<item id="8685" min="1" max="1" chance="8.268" /> <!-- Sobekk's Hurricane -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Lv. 1 -->
-				<item id="49756" min="3" max="7" chance="100" /> <!-- Cloth Piece -->
-				<item id="33815" min="2" max="4" chance="50.21" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
-				<item id="33814" min="2" max="4" chance="49.99" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33809" min="2" max="4" chance="49.83" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
-				<item id="33807" min="2" max="4" chance="49.36" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
-				<item id="33813" min="2" max="4" chance="48.95" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
-				<item id="33808" min="2" max="4" chance="48.94" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29068" level="84" type="GrandBoss" name="Antharas" title="Land Dragon">
-		<!-- Todo: CT2.5 -->
 		<parameters>
 			<param name="ultra_respawn_time" value="3" />
 		</parameters>
 		<race>DRAGON</race>
 		<sex>MALE</sex>
-		<acquire exp="538538584" sp="63323403" raidPoints="38248" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="689482245" hpRegen="1830" mp="2025740" mpRegen="1000" />
-			<attack physical="4799.20533" magical="263.60854" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3974.13793" magical="496.01325" />
+		<acquire exp="40664236032" sp="9759416" raidPoints="1000" />
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="355555555" hpRegen="385356.45" mp="2025740" mpRegen="1000" />
+			<attack physical="35810" magical="3783.6" random="5" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2505.43352601156" magical="1452.04745968969" />
 			<speed>
 				<walk ground="50" />
 				<run ground="279" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
+		<status attackable="true" noSleepMode="true" isDeathPenalty="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4112" level="1" /> <!-- Ordinary Attack -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2057,9 +1700,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -2070,90 +1713,8 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="5292" min="1" max="1" chance="51.25" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="1" chance="50.84" /> <!-- Sealed Shield of Nightmare -->
-				<item id="5329" min="1" max="1" chance="20.5" /> <!-- Sealed Majestic Robe -->
-				<item id="5311" min="1" max="1" chance="20.37" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5323" min="1" max="1" chance="20.04" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5320" min="1" max="1" chance="19.68" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="1" chance="19.57" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="1" chance="19.15" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5316" min="1" max="1" chance="19.09" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="7900" min="1" max="1" chance="17.8" /> <!-- Ice Storm Hammer -->
-				<item id="5308" min="1" max="1" chance="17.77" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="7892" min="1" max="1" chance="17.72" /> <!-- Spell Breaker -->
-				<item id="5301" min="1" max="1" chance="17.33" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="7883" min="1" max="1" chance="16.92" /> <!-- Sword of Sentinel -->
-				<item id="7893" min="1" max="1" chance="16.91" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="16.68" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="15.89" /> <!-- Star Buster -->
-				<item id="5319" min="1" max="1" chance="13.64" /> <!-- Sealed Majestic Boots -->
-				<item id="5313" min="1" max="1" chance="13.35" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5312" min="1" max="1" chance="13.17" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5288" min="1" max="1" chance="13.03" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5314" min="1" max="1" chance="12.9" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5318" min="1" max="1" chance="12.85" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5305" min="1" max="1" chance="12.76" /> <!-- Sealed Tallum Stockings -->
-				<item id="5295" min="1" max="1" chance="12.67" /> <!-- Sealed Tallum Gloves -->
-				<item id="5289" min="1" max="1" chance="12.66" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5317" min="1" max="1" chance="12.7" /> <!-- Sealed Majestic Circlet -->
-				<item id="5298" min="1" max="1" chance="12.59" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5296" min="1" max="1" chance="12.45" /> <!-- Sealed Tallum Boots -->
-				<item id="5304" min="1" max="1" chance="12.44" /> <!-- Sealed Tallum Tunic -->
-				<item id="5294" min="1" max="1" chance="12.34" /> <!-- Sealed Tallum Helmet -->
-				<item id="5297" min="1" max="1" chance="12.19" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5287" min="1" max="1" chance="11.92" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5291" min="1" max="1" chance="10.018" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5290" min="1" max="1" chance="9.982" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="2500" min="1" max="1" chance="9.154" /> <!-- Dark Legion's Edge -->
-				<item id="7902" min="1" max="1" chance="9.146" /> <!-- Doom Crusher -->
-				<item id="81" min="1" max="1" chance="9.146" /> <!-- Dragon Slayer -->
-				<item id="80" min="1" max="1" chance="9.144" /> <!-- Tallum Blade -->
-				<item id="7895" min="1" max="1" chance="9.136" /> <!-- Flaming Dragon Skull -->
-				<item id="213" min="1" max="1" chance="9.134" /> <!-- Branch of the Mother Tree -->
-				<item id="236" min="1" max="1" chance="9.13" /> <!-- Soul Separator -->
-				<item id="7899" min="1" max="1" chance="9.129" /> <!-- Destroyer Hammer -->
-				<item id="2504" min="1" max="1" chance="9.126" /> <!-- Meteor Shower -->
-				<item id="305" min="1" max="1" chance="9.124" /> <!-- Tallum Glaive -->
-				<item id="164" min="1" max="1" chance="9.124" /> <!-- Elysian -->
-				<item id="270" min="1" max="1" chance="9.122" /> <!-- Dragon Grinder -->
-				<item id="150" min="1" max="1" chance="9.103" /> <!-- Elemental Sword -->
-				<item id="235" min="1" max="1" chance="9.095" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="1" chance="9.08" /> <!-- Carnage Bow -->
-				<item id="269" min="1" max="1" chance="9.077" /> <!-- Blood Tornado -->
-				<item id="7884" min="1" max="1" chance="9.073" /> <!-- Infernal Master -->
-				<item id="98" min="1" max="1" chance="9.07" /> <!-- Halberd -->
-				<item id="7894" min="1" max="1" chance="9.067" /> <!-- Spiritual Eye -->
-				<item id="212" min="1" max="1" chance="9.029" /> <!-- Dasparion's Staff -->
-				<item id="289" min="1" max="1" chance="9.025" /> <!-- Soul Bow -->
-				<item id="151" min="1" max="1" chance="9.024" /> <!-- Sword of Miracles -->
-				<item id="8683" min="1" max="1" chance="8.378" /> <!-- Tiphon's Spear -->
-				<item id="8684" min="1" max="1" chance="8.378" /> <!-- Shyeed's Bow -->
-				<item id="8682" min="1" max="1" chance="8.368" /> <!-- Naga Storm -->
-				<item id="8688" min="1" max="1" chance="8.356" /> <!-- Daimon Crystal -->
-				<item id="8678" min="1" max="1" chance="8.356" /> <!-- Sirra's Blade -->
-				<item id="8680" min="1" max="1" chance="8.331" /> <!-- Barakiel's Axe -->
-				<item id="8681" min="1" max="1" chance="8.328" /> <!-- Behemoth' Tuning Fork -->
-				<item id="8686" min="1" max="1" chance="8.324" /> <!-- Themis' Tongue -->
-				<item id="8679" min="1" max="1" chance="8.317" /> <!-- Sword of Ipos -->
-				<item id="8687" min="1" max="1" chance="8.295" /> <!-- Cabrio's Hand -->
-				<item id="5706" min="1" max="1" chance="8.273" /> <!-- Damascus*Damascus -->
-				<item id="8685" min="1" max="1" chance="8.268" /> <!-- Sobekk's Hurricane -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Lv. 1 -->
-				<item id="49756" min="3" max="7" chance="100" /> <!-- Cloth Piece -->
-				<item id="33815" min="2" max="4" chance="50.21" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
-				<item id="33814" min="2" max="4" chance="49.99" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33809" min="2" max="4" chance="49.83" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
-				<item id="33807" min="2" max="4" chance="49.36" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
-				<item id="33813" min="2" max="4" chance="48.95" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
-				<item id="33808" min="2" max="4" chance="48.94" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-			</drop>
-		</dropLists>
 	</npc>
-	<npc id="29069" level="79" type="Monster" name="Behemoth Dragon">
-		<!-- Todo: CT2.5 -->
+	<npc id="29069" level="84" type="Monster" name="Behemoth Dragon">
 		<parameters>
 			<param name="RootingManage" value="0" />
 			<skill name="PhysicalSpecial" id="5095" level="1" />
@@ -2162,18 +1723,20 @@
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="292335" hpRegen="76.71" mp="22800" mpRegen="3" />
-			<attack physical="3584.56902102981" magical="1386.66000087809" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="1071.29474264312" magical="522.626863116263" evasion="-18" />
+			<vitals hp="949367" hpRegen="22" mp="22800" mpRegen="30" />
+			<attack physical="14519" magical="11667" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="1370" magical="851" />
 			<speed>
-				<walk ground="180" />
+				<walk ground="55" />
 				<run ground="180" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" isDeathPenalty="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2182,10 +1745,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5095" level="1" /> <!-- Antharas Subordinate Melee Attack -->
 			<skill id="5096" level="1" /> <!-- Antharas Subordinate Remote Attack -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="300" isAggressive="true">
@@ -2196,26 +1758,27 @@
 			<height normal="54" />
 		</collision>
 	</npc>
-	<npc id="29070" level="79" type="Monster" name="Dragon Bomber">
-		<!-- Todo: CT2.5 -->
+	<npc id="29070" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1353" hpRegen="8.5" mp="1809" mpRegen="3" />
-			<attack physical="1094.11758465172" magical="4902.24" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<vitals hp="1353.6766" hpRegen="8.5" mp="1809" mpRegen="3" />
+			<attack physical="1094.11758465172" magical="4902.24" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.098247547707" magical="261.308998696584" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="250" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2224,10 +1787,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2236,25 +1797,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29071" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29071" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="245" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2263,9 +1825,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2274,25 +1835,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29072" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29072" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="255" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2301,9 +1863,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2312,25 +1873,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29073" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29073" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="247" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2339,9 +1901,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2350,25 +1911,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29074" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29074" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="252" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2377,9 +1939,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2388,25 +1949,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29075" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29075" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="243" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2415,9 +1977,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2426,25 +1987,27 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29076" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29076" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1353" hpRegen="2" mp="1809" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1353.6766" hpRegen="8.5" mp="1809" mpRegen="3" />
+			<attack physical="1094.11758465172" magical="4902.24" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="357.098247547707" magical="261.308998696584" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="250" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2453,9 +2016,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="200" clanHelpRange="300" isAggressive="true" />
@@ -2464,7 +2026,7 @@
 			<height normal="34.5" />
 		</collision>
 	</npc>
-	<npc id="29077" level="78" type="Monster" name="">
+	<npc id="29077" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="177456" />
 			<param name="suicide2_x" value="177120" />
@@ -2484,19 +2046,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2505,7 +2068,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2514,7 +2077,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29078" level="78" type="Monster" name="">
+	<npc id="29078" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175952" />
 			<param name="suicide2_x" value="175712" />
@@ -2534,19 +2097,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2555,7 +2119,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2564,7 +2128,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29079" level="78" type="Monster" name="">
+	<npc id="29079" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175120" />
 			<param name="suicide2_x" value="175024" />
@@ -2584,19 +2148,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2605,7 +2170,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2614,7 +2179,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29080" level="78" type="Monster" name="">
+	<npc id="29080" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="174640" />
 			<param name="suicide2_x" value="174576" />
@@ -2634,19 +2199,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2655,7 +2221,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2664,7 +2230,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29081" level="78" type="Monster" name="">
+	<npc id="29081" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="173968" />
 			<param name="suicide2_x" value="173856" />
@@ -2684,19 +2250,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2705,7 +2272,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2714,7 +2281,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29082" level="78" type="Monster" name="">
+	<npc id="29082" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="173920" />
 			<param name="suicide2_x" value="174064" />
@@ -2734,19 +2301,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2755,7 +2323,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2764,7 +2332,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29083" level="78" type="Monster" name="">
+	<npc id="29083" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="174704" />
 			<param name="suicide2_x" value="174800" />
@@ -2784,19 +2352,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2805,7 +2374,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2814,7 +2383,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29084" level="78" type="Monster" name="">
+	<npc id="29084" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175424" />
 			<param name="suicide2_x" value="175632" />
@@ -2834,19 +2403,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2855,7 +2425,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2864,7 +2434,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29085" level="78" type="Monster" name="">
+	<npc id="29085" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="176880" />
 			<param name="suicide2_x" value="177200" />
@@ -2884,19 +2454,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2905,7 +2476,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2914,7 +2485,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29086" level="78" type="Monster" name="">
+	<npc id="29086" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="178368" />
 			<param name="suicide2_x" value="178592" />
@@ -2934,19 +2505,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2955,7 +2527,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2964,7 +2536,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29087" level="78" type="Monster" name="">
+	<npc id="29087" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="179696" />
 			<param name="suicide2_x" value="179920" />
@@ -2984,19 +2556,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3005,7 +2578,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3014,7 +2587,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29088" level="78" type="Monster" name="">
+	<npc id="29088" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180592" />
 			<param name="suicide2_x" value="180752" />
@@ -3034,19 +2607,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3055,7 +2629,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3064,7 +2638,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29089" level="78" type="Monster" name="">
+	<npc id="29089" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180896" />
 			<param name="suicide2_x" value="180784" />
@@ -3084,19 +2658,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3105,7 +2680,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3114,7 +2689,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29090" level="78" type="Monster" name="">
+	<npc id="29090" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180496" />
 			<param name="suicide2_x" value="180512" />
@@ -3134,19 +2709,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3155,7 +2731,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3164,7 +2740,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29091" level="78" type="Monster" name="">
+	<npc id="29091" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180896" />
 			<param name="suicide2_x" value="181040" />
@@ -3184,19 +2760,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3205,7 +2782,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3214,7 +2791,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29092" level="78" type="Monster" name="">
+	<npc id="29092" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180720" />
 			<param name="suicide2_x" value="180640" />
@@ -3234,19 +2811,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3255,7 +2833,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3264,7 +2842,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29093" level="78" type="Monster" name="">
+	<npc id="29093" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180048" />
 			<param name="suicide2_x" value="179920" />
@@ -3284,19 +2862,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3305,7 +2884,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3314,7 +2893,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29094" level="78" type="Monster" name="">
+	<npc id="29094" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="178848" />
 			<param name="suicide2_x" value="178560" />
@@ -3334,19 +2913,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3355,7 +2935,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/02000-02099.xml
index b09b4d4a97..93044e9e5d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/02000-02099.xml
@@ -231,10 +231,16 @@
 	</skill>
 	<skill id="2013" toLevel="2" name="Scroll of Escape">
 		<icon>icon.skill0000</icon>
-		<hitTime>20000</hitTime>
+		<hitTime>
+			<value level="1">20000</value>
+			<value level="2">1000</value>
+		</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>736</itemConsumeId> <!-- Scroll of Escape -->
+		<itemConsumeId>
+			<value level="1">736</value> <!-- Scroll of Escape -->
+			<value level="2">49087</value> <!-- Improved Scroll of Escape -->
+		</itemConsumeId>
 		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39000-39099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39000-39099.xml
index 279e37f18a..b120a9b65e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39000-39099.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39000-39099.xml
@@ -1247,7 +1247,7 @@
 		<hitTime>1000</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>49087</itemConsumeId> <!-- Improved Scroll of Escape -->
+		<itemConsumeId>49500</itemConsumeId> <!-- Greater Scroll of Escape -->
 		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39100-39199.xml
index 06d0e993d3..a262f5ad81 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39100-39199.xml
@@ -57,7 +57,19 @@
 	</skill>
 	<skill id="39103" toLevel="1" name="Warrior's Quick Healing Potion">
 		<icon>icon.etc_reagent_white_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<amount>500</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39104" toLevel="1" name="Hero Cube - 7 days">
 		<icon>icon.sa_cube</icon>
@@ -91,7 +103,7 @@
 		<icon>icon.etc_scroll_of_resurrection_i01</icon>
 		<castRange>400</castRange>
 		<effectPoint>1</effectPoint>
-		<effectRange>600</effectRange>
+		<effectRange>900</effectRange>
 		<hitTime>1000</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
@@ -104,6 +116,9 @@
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpResurrection" />
+			<condition name="TargetMyParty">
+				<includeMe>false</includeMe>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="Resurrection">
@@ -2199,6 +2214,59 @@
 	</skill>
 	<skill id="39199" toLevel="1" name="Hero's Wondrous Cubic - 7 days">
 		<icon>icon.sa_cube</icon>
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<reuseDelay>-1</reuseDelay>
+		<hitTime>500</hitTime>
+		<coolTime>500</coolTime>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpEncumbered">
+				<weightPercent>20</weightPercent>
+				<slotsPercent>10</slotsPercent>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="RestorationRandom">
+				<items>
+					<item chance="16">
+						<item id="49487" count="2"/> <!-- Soulshot Ticket -->
+					</item>
+					<item chance="4">
+						<item id="49772" count="1"/> <!-- Scroll of Mood Melody -->
+					</item>
+					<item chance="16.49">
+						<item id="49488" count="5"/> <!-- Major Healing Potion -->
+					</item>
+					<item chance="20">
+						<item id="35669" count="1"/> <!-- Angel Cat's Blessing -->
+					</item>
+					<item chance="5">
+						<item id="49533" count="1"/> <!-- Quick Hero Healing Potion -->
+					</item>
+					<item chance="10">
+						<item id="49542" count="1"/> <!-- Improved Scroll of Resurrection -->
+					</item>
+					<item chance="14.5">
+						<item id="49536" count="1"/> <!-- Box of Scroll of Escape to the Base -->
+					</item>
+					<item chance="2">
+						<item id="49489" count="3"/> <!-- Parts of Enchantment Scrolls Chest -->
+					</item>
+					<item chance="10">
+						<item id="49416" count="1"/> <!-- Blade Spirit -->
+					</item>
+					<item chance="0.01">
+						<item id="49859" count="1"/> <!-- Weapon Exchange Coupon -->
+					</item>
+					<item chance="2">
+						<item id="49490" count="1"/> <!-- Fishing Kit -->
+					</item>
+				</items>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55200-55299.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55200-55299.xml
index b025e2da78..566b671309 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55200-55299.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55200-55299.xml
@@ -500,7 +500,7 @@
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>ATTACK_TIME_DOWN</abnormalType>
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer’s Potion -->
+		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer's Potion -->
 		<mpConsume>75</mpConsume>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt
index cc90f472b8..68a4c3b798 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt
@@ -10,6 +10,8 @@ AddHate: Instant effect that increases target's hate towards you.
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -193,7 +195,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java
index 91ddd29291..9c4c29defb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java
@@ -1198,6 +1198,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static boolean AUTO_PLAY_PREMIUM;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
@@ -1273,6 +1274,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2506,6 +2508,7 @@ public class Config
 			ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 			AUTO_PLAY_PREMIUM = autoPlayConfig.getBoolean("AutoPlayPremium", false);
 			DISABLED_AUTO_SKILLS.clear();
 			final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
@@ -3262,6 +3265,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index a50cbb8033..8378c362cb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index 603e7d33be..dd968ed772 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -549,9 +549,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 2260001e17..380989e049 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index a2622c95b6..b364eee587 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -61,7 +61,7 @@ public class DailyTaskManager
 	private static final Set<Integer> RESET_SKILLS = new HashSet<>();
 	static
 	{
-		// No known skills.
+		RESET_SKILLS.add(39199); // Hero's Wondrous Cubic
 	}
 	public static final Set<Integer> RESET_ITEMS = new HashSet<>();
 	static
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 36f3461010..efc07efb38 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -230,7 +230,7 @@ public class ShortCuts implements IRestorable
 			if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL))
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 55f0ee03a0..f5cc7704ae 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1288,7 +1288,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2816,7 +2816,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2829,178 +2829,140 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						player.refreshExpertisePenalty();
-						sendPacket(info);
+					}
+					player.refreshExpertisePenalty();
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
index 2a17b672b3..94385df2a6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4533,7 +4533,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8229,9 +8229,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Summon.java
index cc23c2a6f2..98b7163e50 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -846,7 +847,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -867,7 +868,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -892,7 +900,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -900,7 +908,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -946,7 +961,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index ea1abbff9b..074a4ae995 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -863,15 +862,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -882,8 +879,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -892,7 +893,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -965,33 +966,6 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
@@ -1001,9 +975,17 @@ public class CreatureStat
 		// Notify recalculation to child classes.
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 438e73d4cc..a2436eebf0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0b6092b2d9..1e393ec4bf 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2216,6 +2216,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index deb95a0431..2a8fb54b97 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -38,6 +38,7 @@ import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -51,6 +52,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -69,12 +71,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDr
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPickup;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -82,11 +86,13 @@ import org.l2jmobius.gameserver.model.options.EnchantOptions;
 import org.l2jmobius.gameserver.model.options.Options;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.SkillConditionScope;
 import org.l2jmobius.gameserver.model.variables.ItemVariables;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1585,7 +1591,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2505,6 +2513,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2529,6 +2542,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2554,6 +2569,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index b4e0d384dc..8c7e370a51 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -744,7 +744,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -896,7 +897,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 1692c9fcd7..ec97ae1f75 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -652,7 +652,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -675,7 +675,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -710,7 +710,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 66517b74da..ec5f458641 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -128,7 +128,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index c305987ba6..c29c9ba398 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -93,6 +93,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index c5257ff589..1aff35bfd5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index c6fd6dc758..9f04d53165 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -701,7 +701,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList(false);
 		player.updateShortCuts(_id, _level, 0);
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index c16d3301f0..7c284015a5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -63,6 +63,6 @@ public class RequestShortCutReg implements ClientPacket
 		
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index 93f16169bc..07ed7641a9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,127 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 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, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index dcc44cb9f3..2e152e2e29 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -207,7 +207,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		ServerPackets.EX_PET_INFO.writeId(this);
 		writeInt(_summon.getObjectId());
-		writeByte(_value); // // 0=teleported 1=default 2=summoned
+		writeByte(_value); // 0=teleported 1=default 2=summoned
 		writeShort(37); // mask_bits_37
 		writeBytes(_masks);
 		// Block 1
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index f93c9e5e69..03909a2746 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
deleted file mode 100644
index 52a4032d14..0000000000
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
new file mode 100644
index 0000000000..62bb425a5a
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -0,0 +1,182 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeByte(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 83e29f7bed..3ee2b1ef96 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,19 +19,19 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
 	}
 	
@@ -53,8 +53,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 8872c0cf63..c2b8c8f51a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -42,13 +48,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -59,8 +68,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 68ca369edf..37f3211b0a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1f54b5040f..0d5d066d25 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,6 +25,7 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -95,6 +98,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							if (player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -120,23 +134,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -144,6 +167,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -178,32 +204,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -302,6 +351,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 7cd7dd9696..c56221841f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
@@ -51,7 +52,6 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +381,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/buffer_schemes.sql
index 1784421092..bd964c8cc2 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/buffer_schemes.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL,
     PRIMARY KEY (`object_id`,`scheme_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle.sql
index 0109cb8ab4..082a199079 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/characters.sql
index ea2aace011..60e1a786a2 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/characters.sql
@@ -60,4 +60,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort.sql
index 43de96f562..b4c76f8a7d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort_siege_guards.sql
index 19df57a3b9..43763210b4 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort_spawnlist.sql
index 22303a9b09..144979acd9 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,4 +11,4 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/grandboss_data.sql
index 9ad3ae33ce..bc319dc49e 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/heroes.sql
index 2fc8753f90..49a371cbd5 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/heroes.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/items.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/olympiad_fights.sql
index ccd4ac94ec..f25cc4c1fa 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(4) NOT NULL DEFAULT 0,
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/Character.ini b/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/Character.ini
index 2f54e8652a..552515d495 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/Character.ini
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/Character.ini
@@ -285,8 +285,8 @@ MaxMAtk = 999999
 MaxPCritRate = 500
 
 # Maximum character Magic Critical Rate. (10 = 1%)
-# Default: 200
-MaxMCritRate = 200
+# Classic Default: 320
+MaxMCritRate = 320
 
 # Maximum character Attack Speed.
 # Default: 1500
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/Custom/AutoPlay.ini b/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/Custom/AutoPlay.ini
index 9a4fd4bf2e..6e9d9628be 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/Custom/AutoPlay.ini
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/Custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # Enable .play command only for premium players.
 # Premium System must be enabled.
 # Default: False
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/General.ini b/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/General.ini
index 978c3fce97..659ece7db8 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/General.ini
@@ -430,8 +430,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/ActionData.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/ActionData.xml
index b287bbf8fd..6878001dae 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/ActionData.xml
@@ -1,218 +1,248 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
-	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
-	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
-	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
-	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
-	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
-	<action id="70" handler="AirshipAction" option="4" /> <!-- Exit Airship -->
-	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
-	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
-	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
-	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
-	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Nightshade - Shade Sacrifice -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
-	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="0" handler="SitStand" /> <!-- Toggle Sit/Stand. (/sit, /stand) -->
+	<action id="1" handler="RunWalk" /> <!-- Toggle Walk/Run. (/walk, /run) -->
+	<action id="2" handler="None" /> <!-- Attacks selected target(s), or takes a general action if the target cannot be attacked. Hold down the Ctrl key and click to attack by force. (/attack, /attackforce) -->
+	<action id="3" handler="None" /> <!-- Request a trade from the selected target. (/trade) -->
+	<action id="4" handler="None" /> <!-- Select the nearest attackable target. (/targetnext) -->
+	<action id="5" handler="None" /> <!-- Pick up items that are scattered nearby. (/pickup) -->
+	<action id="6" handler="None" /> <!-- Change to the target of the currently selected player. (/assist) -->
+	<action id="7" handler="None" /> <!-- Invite the selected person to your party. (/invite) -->
+	<action id="8" handler="None" /> <!-- Leave the party. (/leave) -->
+	<action id="9" handler="None" /> <!-- If you are the leader of the party, dismiss selected members from your party. (/dismiss) -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Sets up a private store to sell your items. (/vendor) -->
+	<action id="11" handler="None" /> <!-- Display the party matching window to search for parties or to add members to your party. (/partymatching) -->
+	<action id="12" handler="SocialAction" option="2" /> <!-- Emote: Greet others with a kind "hello." (/socialhello) -->
+	<action id="13" handler="SocialAction" option="3" /> <!-- Emote: Let everyone know that you or someone else is victorious! (/socialvictory) -->
+	<action id="14" handler="SocialAction" option="4" /> <!-- Emote: Rouse your allies and charge! (/socialcharge) -->
+	<action id="15" handler="PetHold" /> <!-- Have your pet follow you or stay and hold its ground. -->
+	<action id="16" handler="PetAttack" /> <!-- Attack target. -->
+	<action id="17" handler="PetStop" /> <!-- Stop current action. -->
+	<action id="18" handler="None" /> <!-- Pick up nearby items. -->
+	<action id="19" handler="UnsummonPet" /> <!-- Returns your pet back to its home. -->
+	<action id="20" handler="None" /> <!-- Use special skill. -->
+	<action id="21" handler="ServitorHold" /> <!-- Have your summons follow you or stay and hold its ground. -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attack target. -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="24" handler="SocialAction" option="6" /> <!-- Emote: Respond positively. (/socialyes) -->
+	<action id="25" handler="SocialAction" option="5" /> <!-- Emote: Respond negatively. (/socialno) -->
+	<action id="26" handler="SocialAction" option="7" /> <!-- Emote: Show your respect and bow. (/socialbow) -->
+	<action id="27" handler="None" /> <!-- Use special skill. -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Sets up a private store to purchase items. (/buy) -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Emote: You have no idea what's going on. (/socialunaware) -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Emote: I'm waiting... (/socialwaiting) -->
+	<action id="31" handler="SocialAction" option="10" /> <!-- Emote: Have a good laugh. (/sociallaugh) -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Toggle between Attack/Move modes. -->
+	<action id="33" handler="SocialAction" option="11" /> <!-- Emote: Applaud. (/socialapplause) -->
+	<action id="34" handler="SocialAction" option="12" /> <!-- Emote: Serve them up your best dance moves. (/socialdance) -->
+	<action id="35" handler="SocialAction" option="13" /> <!-- Emote: Show grief. (/socialsad) -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Poison gas attack. -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Set up a private workshop that creates items by using Dwarven recipes in exchange for a fee. (/dwarvenmanufacture) -->
+	<action id="38" handler="Ride" /> <!-- Toggle mount/dismount when near or on an NPC that can be ridden. (/mount, /dismount, /mountdismount) -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Exploding corpse attack. -->
+	<action id="40" handler="None" /> <!-- Enhances a target's evaluation score. (/evaluate) -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Attacks castle gates, walls, or headquarters by shooting a cannon. -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Reflects damage back to an enemy. -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Attacks target and nearby enemies by creating a whirling surge of water. -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Attacks an enemy with a powerful explosion. -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Restores the summoner's MP. -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Attacks an enemy by summoning up a devastating storm. -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Damages an enemy and heals the servitor at the same time. -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Attacks the enemy by shooting a cannon. -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Attack with a fit of rage. -->
+	<action id="50" handler="None" /> <!-- The selected party member will become the new party leader. (/changepartyleader) -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Removes shackles from the Servitor and sets him free. -->
+	<action id="53" handler="ServitorMove" /> <!-- Move to the target. -->
+	<action id="54" handler="PetMove" /> <!-- Move to the target. -->
+	<action id="55" handler="None" /> <!-- Toggle recording and stop recording of replay files. (/start_replayrecording, /stop_replayrecording, /startstop_replayrecording) -->
+	<action id="56" handler="None" /> <!-- Invite the selected target to a command channel. (/channelinvite) -->
+	<action id="57" handler="None" /> <!-- Highlights private store and private workshop messages that contain the search word. (/findprivatestore) -->
+	<action id="58" handler="None" /> <!-- Challenges another character to a duel. (Command: /duel) -->
+	<action id="59" handler="None" /> <!-- Withdrawing from a duel means losing it. (Command: /withdraw) -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Open a personal store for package sale. (/packagesale) -->
+	<action id="62" handler="SocialAction" option="14" /> <!-- Charm Pose (Command: /charm) -->
+	<action id="64" handler="TeleportBookmark" /> <!-- Opens the window of an Unoccupied Teleport Device that enables to move freely from one location with a Teleport Device to another. (Command: /teleportbookmark) -->
+	<action id="65" handler="BotReport" /> <!-- Reports the targeted player as a suspected bot. (Command: /AutoHuntingReport) -->
+	<action id="66" handler="SocialAction" option="15" /> <!-- Allows character to strike shy pose. (command: /shyness) -->
+	<action id="67" handler="AirshipAction" option="1" /> <!-- Allows you to control the Airship. -->
+	<action id="68" handler="AirshipAction" option="2" /> <!-- Relinquishes control of the Airship. -->
+	<action id="69" handler="AirshipAction" option="3" /> <!-- Choose from pre-designated locations. -->
+	<action id="70" handler="AirshipAction" option="4" /> <!-- Disembarks from the Airship. -->
+	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange bows with another person. (command: /two-personbow) -->
+	<action id="72" handler="SocialAction" option="17" /> <!-- High Five another person. (command: /hi-five) -->
+	<action id="73" handler="SocialAction" option="18" /> <!-- Dance with another player. (command: /coupledance) -->
+	<action id="76" handler="None" /> <!-- Invite the selected target as friends. (Commands: /friendinvite, /addfriend, /registerfriend) -->
+	<action id="77" handler="None" /> <!-- Start or end recording videos. (Commands: /startrecording, /stoprecording, /startstoprecording) -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Applies Token 1 to the target. Can be only used in a group. (Command: /tacticalsign1) -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Applies Token 2 to the target. Can be only used in a group. (Command: /tacticalsign2) -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Applies Token 3 to the target. Can be only used in a group. (Command: /tacticalsign3) -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Applies Token 4 to the target. Can be only used in a group. (Command: /tacticalsign4) -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Automatically focuses on the target marked with Token 1. Can be only used in a group. (Command: /targettacticalsign1) -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Automatically focuses on the target marked with Token 2. Can be only used in a group. (Command: /targettacticalsign2) -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Automatically focuses on the target marked with Token 3. Can be only used in a group. (Command: /targettacticalsign3) -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Automatically focuses on the target marked with Token 4. Can be only used in a group. (Command: /targettacticalsign4) -->
+	<action id="87" handler="SocialAction" option="28" /> <!-- Gesture of Proposal (Command: /Socialpropose) -->
+	<action id="88" handler="SocialAction" option="29" /> <!-- Gesture of Provocation (Command: /Socialprovocation) -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off (Command: /Socialbeauty) -->
+	<action id="92" handler="None" /> <!-- Selects the previous target. (Command: /targetprev) -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Attacks castle gates, walls, or headquarters with a powerful strike. -->
+	<action id="1001" handler="None" /> <!-- A reckless yet powerful attack that must be used with extreme caution. -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Incites those around the summon to attack you. -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Instantly increases P. Def. and M. Def. significantly. Character is immovable while this skill is in effect. -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- A magical attack. -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Recovers the pet's HP. -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Temporarily increases your party's chance to land a critical attack and also increases the power of the attack if successful. -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Temporarily increases your party's P. Atk and accuracy. -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Has a chance to remove curses from party members. -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Temporarily increases your party's MP regeneration. -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Temporarily shortens your party's spell re-use timer. -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Remove a curse from your party. -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Provokes an opponent to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Provokes multiple enemies around the caster to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Sacrifice HP in order to regenerate the HP of a selected target. -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- A powerful blow on the enemy's vital points -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- A stunning blow that inflicts damage and instantly throws an enemy into a state of stun. -->
+	
+	<!-- Actions 1018 to 1030 are present in the Client, but are not used in Classic. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Inflict a deadly curse on an enemy that absorbs their HP. -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kat the Cat -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mew the Cat -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kai the Cat -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Boxer the Unicorn -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mirage the Unicorn -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Merrow the Unicorn -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Shadow -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by Shadow -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Silhouette -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by reanimated man -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by reanimated man -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by corrupted man -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King: A powerful slashing attack. Over-hit is possible. -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King: Slashes at surrounding enemies while spinning in the air. Over-hit is possible. -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King: Immobilizes the surrounding enemies. -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn: Powerful rear kicks that stun and damage an enemy. Over-hit is possible. -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn: Pounds the target and surrounding enemies with a tremendous onrush of water. -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord: Detonates a corpse, inflicting damage to nearby enemies. -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord: Blades attached to each arm slash out in a devastating attack. Over-hit is possible. -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord: Curses nearby enemies, poisoning them and reducing their Atk. Spd. -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon: Fires a projectile a short distance. Consumes 4 Flash Gunpowder. -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon: Fires a projectile a long distance. Consumes 5 Flash Gunpowder. -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Viciously bite an enemy. -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Scratch an enemy with both paws. Causes bleeding. -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awaken hidden powers. -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Decrease a nearby enemy's P. Atk./M. Atk. with a wolf cry. -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Decrease a nearby enemy's attack speed/magic speed with a strider roar. -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Viciously bite an enemy. -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Cause both damage and shock at the same time. Instantly stuns an enemy. -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Breath fire in front of you. -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Increases maximum HP temporarily. -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Increases maximum MP temporarily. -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Increases Atk. Spd. temporarily. -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Increases Casting Spd. temporarily. -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Temporarily decreases the target's MP consumption of skills. Consumes Spirit Ore. -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Increases M. Atk. power temporarily. -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Temporarily increases the critical rate of damage attack magic. -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Temporarily increases the critical attack power. -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Temporarily increases the probability of critical attack. -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Temporarily increases Accuracy. -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Rapidly attacks the enemy twice. -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Inflicts shock and damage to the enemy at the same time with a powerful spin attack. -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Attacks nearby enemies with a doll heap attack. -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakens a hidden ability. -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of thunder. -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack on nearby enemies when hit. -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Control put in place to prevent the use of a buff upon the master. 5-minute duration. -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Powerfully attacks the target. -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- A powerful attack that pierces through a target. -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies by spinning your own body like a whirlwind. -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Attacks a front-line enemy with a powerful lance thrust. -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Shouts a victory cry that increases your abilities. -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Powerfully attacks the target. -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Gathers energy into your body, then releases it in a destructive blast. -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Hits enemies with a powerful wave of force. -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Emits a loud roar that amplifies your abilities. -->
+	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Charges toward the enemy and inflicts damage. -->
+	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Cancels the target's de-buff. -->
+	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Emits a spread of ring-shaped flames. -->
+	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Attacks the enemy with a powerful flaming beak. -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Toggles you between Attack and Support modes. -->
+	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- At a certain probability, removes one or several buffs from an enemy. -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Decreases the enemy's Dark attribute by 25. -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Strike multiple enemies at the front with the tail. -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Viciously bite an enemy. -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Causes nearby enemies to flee in fear. -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Increases your speed. -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Greatly increases its master's speed. -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Increases the speed of its master and their party. -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Teleports its master to the Seed of Annihilation. -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Teleports its master and their party to the Seed of Annihilation. -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attack the target. -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move to a designated location. -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Make the servitor disappear by cancelling the summoning. -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Do not counter-attack. -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Counter-attack when the master or itself is attacked. -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Damages and provokes the target. -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Rolls over and delivers a shock to the ground stunning the surrounding targets. -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Bites the target to inflict damage. -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Damages the target and absorbs some of its HP. -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Attacks the surrounding enemies and blocks their physical skills. -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Flourishes claws and frontally attacks enemies. -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Dashes toward enemies to inflict damage and Stun them. -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Inflicts damage onto the enemies with a flame. -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Flies straight into the enemy. -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Purifies the master. -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Attack the enemy by darting a feather. -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Hurt the enemy by attacking them with sharp claws. -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Recover the targets near the tree and clear any debuff. -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Attacks nearby targets with a powerful punch. -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Provokes nearby enemies. -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Bites the enemy. -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Provokes nearby enemies. -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Bites the enemy. -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Provokes nearby enemies. -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Bites the enemy. -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Attacks nearby enemies and blocks their P. Skills. -->
+	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Rushes to the enemy to inflict damage and Stun. -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Can express affection to Rudolph. Affection Level rises by 25%. Warning: Can be used only when a Rudolph requests expression of affection, and cannot be used while transformed! -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Increases Max HP by 20%, Max MP by 20%, and the Speed by 20% for 5 minutes. Increases the Debuff Resistance by 10%. Reuse delay 10 minutes. Consumes 3 Rose Essence(s) during skill use. Doesn't overlap with other buffs except Critical Seduction. -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- For 30 minutes, increases party members' Max HP by 30%, Max MP by 30%, Max CP by 30%, P. Def. by 30%, magic M. Def. by 30%, Speed by 20, P. Atk. by 10%, and magic M. Atk. by 20%. Decreases MP consumption for skill use by 15%. Reuse delay 5 minutes. Consumes 10 Rose Essence(s) during skill use. -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of lightning. -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack upon contacted enemies nearby. -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Restricts to prevent the use of a buff upon the master. 5 minute duration. -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Inflicts a powerful attack that seems to pierce through the target. -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies. -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impales an enemy with a sword. -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Raises one's own abilities. -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Gathered energy within ones self can be focused and used to attack an enemy. -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Fires a shock wave to attack enemies at the front. -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Raises one's own abilities. -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switches between attack mode and support mode. -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Instantly restores the master's HP by 10%. Increases the master's Debuff Resistance by 80%, Buff-canceling Attack Resistance by 40%, Speed by 10, P. Def. by 20%, and M. Def. by 20%, and decreases MP consumption for all skills by 50% for 1 minute. -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/AttendanceRewards.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/AttendanceRewards.xml
index a0e71cbdea..8af1ecd126 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/AttendanceRewards.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/AttendanceRewards.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/AttendanceRewards.xsd">
-	<item id="29564" count="50" /> <!-- Attendance Coin -->
-	<item id="29553" count="3" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29565" count="3" /> <!-- XP/SP Scroll -->
-	<item id="29584" count="2" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29585" count="1" /> <!-- Refined Romantic Chapeau -->
+	<item id="49490" count="1" /> <!-- Fishing Kit -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49488" count="5" /> <!-- Major Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49500" count="1" /> <!-- Greater Scroll of Escape -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="100" /> <!-- Attendance Coin -->
-	<item id="29553" count="3" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29519" count="3" /> <!-- XP/SP Scroll - Medium -->
-	<item id="29584" count="2" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="49512" count="1" /> <!-- Amulet: Prosperity -->
+	<item id="90007" count="1" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49533" count="5" /> <!-- Quick Hero Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49500" count="1" /> <!-- Greater Scroll of Escape -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="150" /> <!-- Attendance Coin -->
-	<item id="29553" count="6" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29519" count="3" /> <!-- XP/SP Scroll - Medium -->
-	<item id="29584" count="4" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29578" count="1" /> <!-- Rare Accessory Pack -->
+	<item id="90007" count="2" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49488" count="5" /> <!-- Major Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49542" count="1" /> <!-- Improved Scroll of Resurrection -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="300" /> <!-- Attendance Coin -->
-	<item id="29553" count="6" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29650" count="5" /> <!-- XP/SP Scroll - High -->
-	<item id="29584" count="4" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29587" count="1" /> <!-- Agathion - Singer & Dancer -->
+	<item id="90007" count="3" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49533" count="5" /> <!-- Quick Hero Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49542" count="1" /> <!-- Improved Scroll of Resurrection -->
+	<item id="49860" count="1" /> <!-- Hero's Wondrous Cubic (7-day) -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 5b501b1f1b..bcc74a8afe 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -254,6 +255,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java
index ac68a198a1..c75a79eb29 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -41,6 +41,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AreaDamage", AreaDamage::new);
@@ -223,7 +225,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index cd446ab812..2775ff29a4 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -182,6 +182,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()))
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 43be5cfc4a..ae0fba5834 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,55 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..798a363468 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,46 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/experience.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/experience.xml
index 3892efec36..9ef9e70e83 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/experience.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/experience.xml
@@ -2,110 +2,89 @@
 <table maxLevel="107" maxPetLevel="99" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/experience.xsd">
 	<experience level="1" tolevel="0" trainingRate="0" />
 	<experience level="2" tolevel="68" trainingRate="0" />
-	<experience level="3" tolevel="363" trainingRate="0" />
-	<experience level="4" tolevel="1168" trainingRate="0" />
-	<experience level="5" tolevel="2884" trainingRate="0" />
-	<experience level="6" tolevel="6038" trainingRate="0" />
-	<experience level="7" tolevel="11287" trainingRate="0" />
-	<experience level="8" tolevel="19423" trainingRate="0" />
-	<experience level="9" tolevel="31378" trainingRate="0" />
-	<experience level="10" tolevel="48229" trainingRate="0" />
-	<experience level="11" tolevel="71202" trainingRate="0" />
-	<experience level="12" tolevel="101677" trainingRate="0" />
-	<experience level="13" tolevel="141193" trainingRate="0" />
-	<experience level="14" tolevel="191454" trainingRate="0" />
-	<experience level="15" tolevel="254330" trainingRate="0" />
-	<experience level="16" tolevel="331867" trainingRate="0" />
-	<experience level="17" tolevel="426288" trainingRate="0" />
-	<experience level="18" tolevel="540000" trainingRate="0" />
-	<experience level="19" tolevel="675596" trainingRate="0.4" />
-	<experience level="20" tolevel="835862" trainingRate="0.4" />
-	<experience level="21" tolevel="920357" trainingRate="0.4" />
-	<experience level="22" tolevel="1015431" trainingRate="0.4" />
-	<experience level="23" tolevel="1123336" trainingRate="0.4" />
-	<experience level="24" tolevel="1246808" trainingRate="0.4" />
-	<experience level="25" tolevel="1389235" trainingRate="0.4" />
-	<experience level="26" tolevel="1554904" trainingRate="0.4" />
-	<experience level="27" tolevel="1749413" trainingRate="0.4" />
-	<experience level="28" tolevel="1980499" trainingRate="0.4" />
-	<experience level="29" tolevel="2260321" trainingRate="0.4" />
-	<experience level="30" tolevel="2634751" trainingRate="0.4" />
-	<experience level="31" tolevel="2844287" trainingRate="0.4" />
-	<experience level="32" tolevel="3093068" trainingRate="0.4" />
-	<experience level="33" tolevel="3389496" trainingRate="0.4" />
-	<experience level="34" tolevel="3744042" trainingRate="0.4" />
-	<experience level="35" tolevel="4169902" trainingRate="0.4" />
-	<experience level="36" tolevel="4683988" trainingRate="0.4" />
-	<experience level="37" tolevel="5308556" trainingRate="0.4" />
-	<experience level="38" tolevel="6074376" trainingRate="0.4" />
-	<experience level="39" tolevel="7029248" trainingRate="0.4" />
-	<experience level="40" tolevel="8342182" trainingRate="0.4" />
-	<experience level="41" tolevel="8718976" trainingRate="0.4" />
-	<experience level="42" tolevel="12842357" trainingRate="0.4" />
-	<experience level="43" tolevel="14751932" trainingRate="0.4" />
-	<experience level="44" tolevel="17009030" trainingRate="0.4" />
-	<experience level="45" tolevel="19686117" trainingRate="0.4" />
-	<experience level="46" tolevel="22875008" trainingRate="0.4" />
-	<experience level="47" tolevel="26695470" trainingRate="0.4" />
-	<experience level="48" tolevel="31312332" trainingRate="0.4" />
-	<experience level="49" tolevel="36982854" trainingRate="0.4" />
-	<experience level="50" tolevel="44659561" trainingRate="0.4" />
-	<experience level="51" tolevel="48128727" trainingRate="0.4" />
-	<experience level="52" tolevel="52277875" trainingRate="0.4" />
-	<experience level="53" tolevel="57248635" trainingRate="0.4" />
-	<experience level="54" tolevel="63216221" trainingRate="0.4" />
-	<experience level="55" tolevel="70399827" trainingRate="0.4" />
-	<experience level="56" tolevel="79078300" trainingRate="0.4" />
-	<experience level="57" tolevel="89616178" trainingRate="0.3" />
-	<experience level="58" tolevel="102514871" trainingRate="0.3" />
-	<experience level="59" tolevel="118552044" trainingRate="0.3" />
-	<experience level="60" tolevel="140517709" trainingRate="0.2" />
-	<experience level="61" tolevel="153064754" trainingRate="0.2" />
-	<experience level="62" tolevel="168231664" trainingRate="0.2" />
-	<experience level="63" tolevel="186587702" trainingRate="0.2" />
-	<experience level="64" tolevel="208840245" trainingRate="0.2" />
-	<experience level="65" tolevel="235877658" trainingRate="0.2" />
-	<experience level="66" tolevel="268833561" trainingRate="0.15" />
-	<experience level="67" tolevel="309192920" trainingRate="0.15" />
-	<experience level="68" tolevel="358998712" trainingRate="0.15" />
-	<experience level="69" tolevel="421408669" trainingRate="0.1" />
-	<experience level="70" tolevel="493177635" trainingRate="0.1" />
-	<experience level="71" tolevel="555112374" trainingRate="0.1" />
-	<experience level="72" tolevel="630494192" trainingRate="0.1" />
-	<experience level="73" tolevel="722326994" trainingRate="0.1" />
-	<experience level="74" tolevel="834354722" trainingRate="0.05" />
-	<experience level="75" tolevel="971291524" trainingRate="0.05" />
-	<experience level="76" tolevel="1139165674" trainingRate="0.05" />
-	<experience level="77" tolevel="1345884863" trainingRate="0.05" />
-	<experience level="78" tolevel="1602331019" trainingRate="0.05" />
-	<experience level="79" tolevel="1902355477" trainingRate="0.05" />
-	<experience level="80" tolevel="2288742870" trainingRate="0.05" />
-	<experience level="81" tolevel="2703488268" trainingRate="0.025" />
-	<experience level="82" tolevel="3281805791" trainingRate="0.025" />
-	<experience level="83" tolevel="3928736800" trainingRate="0.025" />
-	<experience level="84" tolevel="4572352438" trainingRate="0.025" />
-	<experience level="85" tolevel="5432434004" trainingRate="0.025" />
-	<experience level="86" tolevel="12074543196" trainingRate="0.02" />
-	<experience level="87" tolevel="21923573162" trainingRate="0.01" />
-	<experience level="88" tolevel="39133185964" trainingRate="0.01" />
-	<experience level="89" tolevel="53473809657" trainingRate="0.01" />
-	<experience level="90" tolevel="79256490796" trainingRate="0.01" />
-	<experience level="91" tolevel="112393696116" trainingRate="0.01" />
-	<experience level="92" tolevel="154329787685" trainingRate="0.005" />
-	<experience level="93" tolevel="203542226665" trainingRate="0.005" />
-	<experience level="94" tolevel="271881875436" trainingRate="0.004" />
-	<experience level="95" tolevel="349555499437" trainingRate="0.003" />
-	<experience level="96" tolevel="482840015388" trainingRate="0.0025" />
-	<experience level="97" tolevel="726451834408" trainingRate="0.0018" />
-	<experience level="98" tolevel="1149904090077" trainingRate="0.001" />
-	<experience level="99" tolevel="1798492743100" trainingRate="0.0005" />
-	<experience level="100" tolevel="6019956790712" trainingRate="0.0002" />
-	<experience level="101" tolevel="16946124602908" trainingRate="0.0001" />
-	<experience level="102" tolevel="43523955372407" trainingRate="0.0001" />
-	<experience level="103" tolevel="84422086452639" trainingRate="0.0001" />
-	<experience level="104" tolevel="188752303396110" trainingRate="0.0001" />
-	<experience level="105" tolevel="358035537321346" trainingRate="0.0001" />
-	<experience level="106" tolevel="3514822095225670" trainingRate="0.0001" />
-	<experience level="107" tolevel="7302965964710870" trainingRate="0.0001" />
-	<experience level="108" tolevel="12302965964710870" trainingRate="0.0001" />
+	<experience level="3" tolevel="364" trainingRate="0" />
+	<experience level="4" tolevel="1169" trainingRate="0" />
+	<experience level="5" tolevel="2885" trainingRate="0" />
+	<experience level="6" tolevel="6039" trainingRate="0" />
+	<experience level="7" tolevel="11288" trainingRate="0" />
+	<experience level="8" tolevel="19424" trainingRate="0" />
+	<experience level="9" tolevel="31379" trainingRate="0" />
+	<experience level="10" tolevel="48230" trainingRate="0" />
+	<experience level="11" tolevel="71203" trainingRate="0" />
+	<experience level="12" tolevel="101678" trainingRate="0" />
+	<experience level="13" tolevel="141194" trainingRate="0" />
+	<experience level="14" tolevel="191455" trainingRate="0" />
+	<experience level="15" tolevel="254331" trainingRate="0" />
+	<experience level="16" tolevel="331868" trainingRate="0" />
+	<experience level="17" tolevel="426289" trainingRate="0" />
+	<experience level="18" tolevel="540001" trainingRate="0" />
+	<experience level="19" tolevel="675597" trainingRate="0.4" />
+	<experience level="20" tolevel="835864" trainingRate="0.4" />
+	<experience level="21" tolevel="1023785" trainingRate="0.4" />
+	<experience level="22" tolevel="1439215" trainingRate="0.4" />
+	<experience level="23" tolevel="1948497" trainingRate="0.4" />
+	<experience level="24" tolevel="2568850" trainingRate="0.4" />
+	<experience level="25" tolevel="3320625" trainingRate="0.4" />
+	<experience level="26" tolevel="4227172" trainingRate="0.4" />
+	<experience level="27" tolevel="5315161" trainingRate="0.4" />
+	<experience level="28" tolevel="6614929" trainingRate="0.4" />
+	<experience level="29" tolevel="8161929" trainingRate="0.4" />
+	<experience level="30" tolevel="9995812" trainingRate="0.4" />
+	<experience level="31" tolevel="12162655" trainingRate="0.4" />
+	<experience level="32" tolevel="14713777" trainingRate="0.4" />
+	<experience level="33" tolevel="17708475" trainingRate="0.4" />
+	<experience level="34" tolevel="21213445" trainingRate="0.4" />
+	<experience level="35" tolevel="25304463" trainingRate="0.4" />
+	<experience level="36" tolevel="30067485" trainingRate="0.4" />
+	<experience level="37" tolevel="35599858" trainingRate="0.4" />
+	<experience level="38" tolevel="42010312" trainingRate="0.4" />
+	<experience level="39" tolevel="49421366" trainingRate="0.4" />
+	<experience level="40" tolevel="57972427" trainingRate="0.4" />
+	<experience level="41" tolevel="67818553" trainingRate="0.4" />
+	<experience level="42" tolevel="79135431" trainingRate="0.4" />
+	<experience level="43" tolevel="92117896" trainingRate="0.4" />
+	<experience level="44" tolevel="106985763" trainingRate="0.4" />
+	<experience level="45" tolevel="123986756" trainingRate="0.4" />
+	<experience level="46" tolevel="143394645" trainingRate="0.4" />
+	<experience level="47" tolevel="165516618" trainingRate="0.4" />
+	<experience level="48" tolevel="190696911" trainingRate="0.4" />
+	<experience level="49" tolevel="219317613" trainingRate="0.4" />
+	<experience level="50" tolevel="251805374" trainingRate="0.4" />
+	<experience level="51" tolevel="288635909" trainingRate="0.4" />
+	<experience level="52" tolevel="330338848" trainingRate="0.4" />
+	<experience level="53" tolevel="377507026" trainingRate="0.4" />
+	<experience level="54" tolevel="430790086" trainingRate="0.4" />
+	<experience level="55" tolevel="490916803" trainingRate="0.4" />
+	<experience level="56" tolevel="558693890" trainingRate="0.4" />
+	<experience level="57" tolevel="635018116" trainingRate="0.3" />
+	<experience level="58" tolevel="720879370" trainingRate="0.3" />
+	<experience level="59" tolevel="817380319" trainingRate="0.3" />
+	<experience level="60" tolevel="925741335" trainingRate="0.2" />
+	<experience level="61" tolevel="1047311009" trainingRate="0.2" />
+	<experience level="62" tolevel="1183577349" trainingRate="0.2" />
+	<experience level="63" tolevel="1336187067" trainingRate="0.2" />
+	<experience level="64" tolevel="1506967658" trainingRate="0.2" />
+	<experience level="65" tolevel="1697936136" trainingRate="0.2" />
+	<experience level="66" tolevel="1911306680" trainingRate="0.15" />
+	<experience level="67" tolevel="2149533465" trainingRate="0.15" />
+	<experience level="68" tolevel="2415323168" trainingRate="0.15" />
+	<experience level="69" tolevel="2711646440" trainingRate="0.1" />
+	<experience level="70" tolevel="3041801165" trainingRate="0.1" />
+	<experience level="71" tolevel="3409398455" trainingRate="0.1" />
+	<experience level="72" tolevel="3818421441" trainingRate="0.1" />
+	<experience level="73" tolevel="4273257148" trainingRate="0.1" />
+	<experience level="74" tolevel="4778730308" trainingRate="0.05" />
+	<experience level="75" tolevel="5340152664" trainingRate="0.05" />
+	<experience level="76" tolevel="5963335189" trainingRate="0.05" />
+	<experience level="77" tolevel="7138805250" trainingRate="0.05" />
+	<experience level="78" tolevel="9372198366" trainingRate="0.05" />
+	<experience level="79" tolevel="16072377713" trainingRate="0.05" />
+	<experience level="80" tolevel="38406308871" trainingRate="0.05" />
+	<experience level="81" tolevel="150075964661" trainingRate="0.025" />
+	<experience level="82" tolevel="279783329566" trainingRate="0.025" />
+	<experience level="83" tolevel="454748284485" trainingRate="0.025" />
+	<experience level="84" tolevel="673468617187" trainingRate="0.025" />
+	<experience level="85" tolevel="2020405851561" trainingRate="0.025" />
+	<experience level="86" tolevel="8755092023431" trainingRate="0.025" />
+	<experience level="87" tolevel="16836715429675" trainingRate="0.025" />
 </table>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/items/49000-49099.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/items/49000-49099.xml
index f2843a9327..4f65fb166d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/items/49000-49099.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/items/49000-49099.xml
@@ -1217,7 +1217,7 @@
 		<set name="handler" val="ItemSkills" />
 		<set name="commissionItemType" val="SCROLL_OTHER" />
 		<skills>
-			<skill id="39075" level="1" /> <!-- Improved Scroll of Escape -->
+			<skill id="2013" level="2" /> <!-- Improved Scroll of Escape -->
 		</skills>
 	</item>
 	<item id="49088" name="Gold Medal" type="EtcItem">
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/items/49400-49499.xml
index 6e69f97aef..5597bf29d9 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/items/49400-49499.xml
@@ -1433,13 +1433,23 @@
 	<item id="49489" name="Parts of Enchantment Scrolls Chest" type="EtcItem">
 		<!-- Double-click to receive one Part of Enchantment Scrolls. Cannot be exchanged, dropped, or sold in a private store. Can be stored in a private warehouse. Can be shared within account through Dimensional Merchant. <Note>. Items received cannot be exchanged, dropped or sold. -->
 		<set name="icon" val="icon.etc_treasure_box_i08" />
-		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="default_action" val="PEEL" />
 		<set name="material" val="FISH" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="49474" min="1" max="1" chance="20" /> <!-- Scroll Part: Enchant Weapon -->
+			<item id="49475" min="1" max="1" chance="50" /> <!-- Scroll Part: Enchant Armor -->
+			<item id="49476" min="1" max="1" chance="2" /> <!-- Refined Scroll Part: Enchant Weapon -->
+			<item id="49478" min="1" max="1" chance="13" /> <!-- Refined Scroll Part: Enchant Armor -->
+			<item id="49479" min="1" max="1" chance="2" /> <!-- Solid Scroll Part: Enchant Weapon -->
+			<item id="49480" min="1" max="1" chance="13" /> <!-- Solid Scroll Part: Enchant Armor -->
+		</capsuled_items>
 	</item>
 	<item id="49490" name="Fishing kit" type="EtcItem">
 		<!-- Double-click to receive 1 Fishing Rod (1-day), Bait (720 pcs), 1 Hero's Dual Swords, 1 Soulshot Ticket. Cannot be exchanged, dropped, or sold in a private store. Can be stored in a private warehouse. Can be shared within account through Dimensional Merchant. <Note>. Be careful before opening the items as their relocation is restricted. -->
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/items/49500-49599.xml
index 966964d740..3125792343 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/items/49500-49599.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/items/49500-49599.xml
@@ -8,6 +8,13 @@
 		<set name="weight" val="120" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="commissionItemType" val="SCROLL_OTHER" />
+		<skills>
+			<skill id="39075" level="1" /> <!-- Improved Scroll of Escape -->
+		</skills>
 	</item>
 	<item id="49501" name="Fish Stew. The guild's gratitude." type="EtcItem">
 		<!-- For 20 min. XP/SP +10% while hunting. Cannot be dropped. -->
@@ -400,6 +407,8 @@
 		<!-- Magic potion that quickly restores HP. Instant cooldown. Cannot be used when HP is full. Cannot be exchanged, dropped, or sold. Can be stored in a private warehouse. Can be shared within account through Dimensional Merchant. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="LIQUID" />
 		<set name="weight" val="180" />
 		<set name="is_tradable" val="false" />
@@ -407,6 +416,12 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="is_event_restricted" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<skills>
+			<skill id="39103" level="1" /> <!-- Quick Hero Healing Potion -->
+		</skills>
 	</item>
 	<item id="49534" name="Hero Cube" additionalName="7-day" type="EtcItem">
 		<!-- 7-day item. Available at level 20 or higher. Double-click the Cube to receive Soulshot Ticket, Buff Scrolls Chest, Major Healing Potion, Warrior's Quick Healing Potion, Warrior's Quick Healing Potion, Angel Cat's Blessing, Improved Scroll of Resurrection, Parts of Enchantment Scrolls Chest, Fishing kit chest, My Teleport to the Base Package, Blade Spirit, Spellbook Box. (Can be used only once per day.) Cannot be exchanged, dropped, destroyed, or sold. Can be stored in a private warehouse. -->
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/items/49800-49899.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/items/49800-49899.xml
index 0245b5cfe6..fe2da01323 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/items/49800-49899.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/items/49800-49899.xml
@@ -678,6 +678,10 @@
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="time" val="10080" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39199" level="1" /> <!-- Hero's Wondrous Cubic -->
+		</skills>
 	</item>
 	<item id="49861" name="Life Stone - Tester" additionalName="Tester" type="EtcItem">
 		<!-- Tester -->
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20000-20099.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20000-20099.xml
index af499b27ce..41cc6409ae 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20000-20099.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20000-20099.xml
@@ -7,7 +7,7 @@
 		<acquire exp="44" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="20" />
@@ -84,7 +84,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -136,7 +136,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="60" />
@@ -188,7 +188,7 @@
 		<acquire exp="309" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="60" />
@@ -246,7 +246,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -5375,7 +5375,7 @@
 		<acquire exp="449" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -5431,7 +5431,7 @@
 		<acquire exp="441" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -5531,7 +5531,7 @@
 		<acquire exp="449" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20100-20199.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20100-20199.xml
index 531a146b9e..2609558718 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20100-20199.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20100-20199.xml
@@ -1135,7 +1135,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -1179,7 +1179,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="50" />
@@ -1229,7 +1229,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -1289,7 +1289,7 @@
 		<acquire exp="308" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -4407,7 +4407,7 @@
 		<acquire exp="1612" sp="48" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="636.798" hpRegen="3.5" mp="365.715" mpRegen="1.5" />
-			<attack physical="92.64226" magical="63.26266" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="92.64226" magical="63.26266" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.46427" magical="86.68702" />
 			<speed>
 				<walk ground="35" />
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20300-20399.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20300-20399.xml
index c487207bb3..c3f81eaa1a 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20300-20399.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20300-20399.xml
@@ -512,7 +512,7 @@
 		<acquire exp="265" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="60" />
@@ -569,7 +569,7 @@
 		<acquire exp="309" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="60" />
@@ -625,7 +625,7 @@
 		<acquire exp="442" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
@@ -808,7 +808,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="24" />
@@ -897,7 +897,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1002,7 +1002,7 @@
 		<acquire exp="441" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -1056,7 +1056,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -1158,7 +1158,7 @@
 		<acquire exp="441" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -1214,7 +1214,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1266,7 +1266,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -1316,7 +1316,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1527,7 +1527,7 @@
 		<acquire exp="453" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1733,7 +1733,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -2059,7 +2059,7 @@
 		<acquire exp="442" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="50" />
@@ -3004,7 +3004,7 @@
 		<acquire exp="449" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3225,7 +3225,7 @@
 		<acquire exp="353" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="70" />
@@ -3570,7 +3570,7 @@
 		<acquire exp="451" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3826,7 +3826,7 @@
 		<acquire exp="182" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="86.088" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -3880,7 +3880,7 @@
 		<acquire exp="183" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="40" />
@@ -4117,7 +4117,7 @@
 		<acquire exp="449" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -4281,7 +4281,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -4331,7 +4331,7 @@
 		<acquire exp="442" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20400-20499.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20400-20499.xml
index bad01704ff..564b59b709 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20400-20499.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20400-20499.xml
@@ -1282,7 +1282,7 @@
 		<acquire exp="438" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1346,7 +1346,7 @@
 		<acquire exp="291" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1575,7 +1575,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
@@ -2059,7 +2059,7 @@
 		<acquire exp="220" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="24" />
@@ -2226,7 +2226,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -2278,7 +2278,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -2329,7 +2329,7 @@
 		<acquire exp="308" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -2729,7 +2729,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -3320,7 +3320,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -3370,7 +3370,7 @@
 		<acquire exp="352" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -3422,7 +3422,7 @@
 		<acquire exp="308" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -3473,7 +3473,7 @@
 		<acquire exp="438" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3702,7 +3702,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -3806,7 +3806,7 @@
 		<acquire exp="264" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="24" />
@@ -3967,7 +3967,7 @@
 		<acquire exp="442" sp="13" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
@@ -4025,7 +4025,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20500-20599.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20500-20599.xml
index 0591c8bbff..ea6acd9fce 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20500-20599.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/20500-20599.xml
@@ -1348,7 +1348,7 @@
 		<acquire exp="176" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -1555,7 +1555,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1602,7 +1602,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1647,7 +1647,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1874,7 +1874,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1919,7 +1919,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1964,7 +1964,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2009,7 +2009,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2276,7 +2276,7 @@
 		<acquire exp="132" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2326,7 +2326,7 @@
 		<acquire exp="44" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/21600-21699.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/21600-21699.xml
index 11ed550544..d7a309264e 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/21600-21699.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/21600-21699.xml
@@ -2781,7 +2781,7 @@
 		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
-			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="22" />
@@ -2838,7 +2838,7 @@
 		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
-			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="60" />
@@ -2875,7 +2875,7 @@
 		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
-			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="80" />
@@ -2923,7 +2923,7 @@
 		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
-			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="80" />
@@ -2970,7 +2970,7 @@
 		<acquire exp="2711" sp="82" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1201.434" hpRegen="5.5" mp="650.16" mpRegen="2.1" />
-			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="173.43552" magical="126.91259" />
 			<speed>
 				<walk ground="100" />
@@ -3019,7 +3019,7 @@
 		<acquire exp="2835" sp="86" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1248.276" hpRegen="5.5" mp="679.056" mpRegen="2.1" />
-			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="177.78746" magical="130.09715" />
 			<speed>
 				<walk ground="45" />
@@ -3068,7 +3068,7 @@
 		<acquire exp="2963" sp="89" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1297.017" hpRegen="5.5" mp="708.855" mpRegen="2.1" />
-			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="182.18816" magical="133.31739" />
 			<speed>
 				<walk ground="80" />
@@ -3117,7 +3117,7 @@
 		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
-			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="27" />
@@ -3166,7 +3166,7 @@
 		<acquire exp="3226" sp="97" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1396.398" hpRegen="5.5" mp="770.259" mpRegen="2.1" />
-			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="191.12803" magical="139.8592" />
 			<speed>
 				<walk ground="60" />
@@ -3210,7 +3210,7 @@
 		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
-			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="80" />
@@ -3297,7 +3297,7 @@
 		<acquire exp="3362" sp="101" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1447.038" hpRegen="5.5" mp="800.961" mpRegen="2.1" />
-			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="195.66302" magical="143.17771" />
 			<speed>
 				<walk ground="70" />
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/24000-24099.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/24000-24099.xml
index 7a531b83bc..817165cebc 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/24000-24099.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/24000-24099.xml
@@ -1498,7 +1498,7 @@
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="314.65987" magical="230.25444" />
 			<hitTime>840</hitTime>
 		</stats>
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/25200-25299.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/25200-25299.xml
index 1f956aabc3..3ab8710a6d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/25200-25299.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/25200-25299.xml
@@ -3899,7 +3899,7 @@
 		<acquire exp="1008600000" sp="30258000" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="20782406.25" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="45" />
@@ -4038,7 +4038,7 @@
 		<acquire exp="1008600000" sp="30258000" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="20782406.25" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/25700-25799.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/25700-25799.xml
index 4c866e4448..7d164f02a0 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/25700-25799.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/25700-25799.xml
@@ -72,7 +72,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="45" />
@@ -133,7 +133,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="50" />
@@ -233,7 +233,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="30" />
@@ -293,7 +293,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="90" />
@@ -353,7 +353,7 @@
 		<acquire exp="52925400" sp="1587762" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="420467.42646" hpRegen="178.4276342" mp="515402.76" mpRegen="2.4" />
-			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1495.843372" magical="729.7418166" />
 			<speed>
 				<walk ground="60" />
@@ -397,7 +397,7 @@
 		<acquire exp="52925400" sp="1587762" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="420467.42646" hpRegen="178.4276342" mp="515402.76" mpRegen="2.4" />
-			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1495.843372" magical="729.7418166" />
 			<speed>
 				<walk ground="24" />
@@ -440,7 +440,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="50" />
@@ -504,7 +504,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="40" />
@@ -568,7 +568,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="50" />
@@ -632,7 +632,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="60" />
@@ -697,7 +697,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="60" />
@@ -762,7 +762,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="40" />
@@ -866,7 +866,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="13" />
@@ -908,7 +908,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="39" />
@@ -950,7 +950,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="80" />
@@ -992,7 +992,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="39" />
@@ -1034,7 +1034,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="50" />
@@ -1076,7 +1076,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="60" />
@@ -1118,7 +1118,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="25" />
@@ -1160,7 +1160,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="45" />
@@ -1203,7 +1203,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="79" />
@@ -1245,7 +1245,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="60" />
@@ -1327,7 +1327,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="45" />
@@ -1401,7 +1401,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="52" />
@@ -1475,7 +1475,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="38" />
@@ -1549,7 +1549,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="40" />
@@ -1624,7 +1624,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="30" />
@@ -1718,7 +1718,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -1792,7 +1792,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -1866,7 +1866,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -1940,7 +1940,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -2014,7 +2014,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="42" />
@@ -2089,7 +2089,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="48" />
@@ -2183,7 +2183,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="60" />
@@ -2242,7 +2242,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="50" />
@@ -2301,7 +2301,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="50" />
@@ -2360,7 +2360,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="55" />
@@ -2419,7 +2419,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="55" />
@@ -2478,7 +2478,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="55" />
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/29000-29099.xml
index 20a8f6b9e9..903e6f7e82 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/npcs/29000-29099.xml
@@ -11,8 +11,8 @@
 		<sex>FEMALE</sex>
 		<acquire exp="2179535" sp="65386" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="687245.8498023715" hpRegen="208" mp="196.2066710268149" mpRegen="2.1" />
-			<attack physical="105" magical="8" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="386384" hpRegen="208" mp="300.8" mpRegen="2.1" />
+			<attack physical="105" magical="8" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1252" magical="229" />
 			<speed>
 				<walk ground="80" />
@@ -21,11 +21,9 @@
 			<hitTime>370</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4019" level="1" /> <!-- Decrease Speed -->
-			<skill id="4021" level="1" /> <!-- Queen Ant -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -34,8 +32,11 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4021" level="1" /> <!-- Queen Ant -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4017" level="1" /> <!-- Queen Ant's Blow -->
+			<skill id="4018" level="1" /> <!-- Decrease Speed -->
+			<skill id="4019" level="1" /> <!-- Decrease Speed -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -50,115 +51,138 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="851" min="1" max="3" chance="34.67" /> <!-- Onyx Beast's Eye Earring -->
-				<item id="355" min="1" max="1" chance="34.47" /> <!-- Dwarven Chain Mail Shirt -->
-				<item id="2496" min="1" max="1" chance="34.07" /> <!-- Dwarven Chain Shield -->
-				<item id="914" min="1" max="1" chance="33.63" /> <!-- Dark Necklace -->
-				<item id="916" min="1" max="1" chance="33.55" /> <!-- Necklace of Protection -->
-				<item id="882" min="1" max="3" chance="33.34" /> <!-- Mithril Ring -->
-				<item id="852" min="1" max="3" chance="33.11" /> <!-- Moonstone Earring -->
-				<item id="883" min="1" max="3" chance="32.56" /> <!-- Aquastone Ring -->
-				<item id="853" min="1" max="3" chance="32.54" /> <!-- Earring of Protection -->
-				<item id="382" min="1" max="1" chance="32.12" /> <!-- Dwarven Chain Gaiters -->
-				<item id="884" min="1" max="3" chance="31.83" /> <!-- Ring of Protection -->
-				<item id="915" min="1" max="1" chance="31.77" /> <!-- Aquastone Necklace -->
-				<item id="399" min="1" max="1" chance="25.81" /> <!-- Rind Leather Armor -->
-				<item id="500" min="1" max="1" chance="25.63" /> <!-- Great Helmet -->
-				<item id="419" min="1" max="1" chance="24.75" /> <!-- Rind Leather Gaiters -->
-				<item id="440" min="1" max="1" chance="24.04" /> <!-- Robe of Seal -->
-				<item id="6660" min="1" max="1" chance="20.51" /> <!-- Queen Ant's Ring -->
-				<item id="498" min="1" max="3" chance="17.3" /> <!-- Steel Plate Helmet -->
-				<item id="2455" min="1" max="3" chance="17.21" /> <!-- Plated Leather Gloves -->
-				<item id="1126" min="1" max="3" chance="16.7" /> <!-- Crimson Boots -->
-				<item id="398" min="1" max="1" chance="16.59" /> <!-- Plated Leather Armor -->
-				<item id="418" min="1" max="1" chance="16.3" /> <!-- Plated Leather Gaiters -->
-				<item id="632" min="1" max="3" chance="16.2" /> <!-- Knight's Shield -->
-				<item id="1125" min="1" max="3" chance="7.218" /> <!-- Assault Boots -->
-				<item id="2412" min="1" max="3" chance="7.211" /> <!-- Plate Helmet -->
-				<item id="2451" min="1" max="3" chance="7.209" /> <!-- Sage's Worn Gloves -->
-				<item id="2427" min="1" max="3" chance="7.208" /> <!-- Salamander Skin Boots -->
-				<item id="297" min="1" max="1" chance="7.205" /> <!-- Glaive -->
-				<item id="187" min="1" max="1" chance="7.194" /> <!-- Atuba Hammer -->
-				<item id="188" min="1" max="1" chance="7.193" /> <!-- Ghost Staff -->
-				<item id="262" min="1" max="1" chance="7.189" /> <!-- Scallop Jamadhr -->
-				<item id="322" min="1" max="1" chance="7.184" /> <!-- Vajra Wand -->
-				<item id="396" min="1" max="1" chance="7.18" /> <!-- Salamander Skin Mail -->
-				<item id="321" min="1" max="1" chance="7.171" /> <!-- Demon's Fangs -->
-				<item id="225" min="1" max="1" chance="7.15" /> <!-- Mithril Dagger -->
-				<item id="380" min="1" max="1" chance="7.147" /> <!-- Plate Gaiters -->
-				<item id="438" min="1" max="3" chance="7.14" /> <!-- Sage's Rags -->
-				<item id="630" min="1" max="3" chance="7.133" /> <!-- Square Shield -->
-				<item id="61" min="1" max="3" chance="7.123" /> <!-- Mithril Gloves -->
-				<item id="189" min="1" max="1" chance="7.121" /> <!-- Staff of Life -->
-				<item id="2428" min="1" max="3" chance="7.116" /> <!-- Plate Boots -->
-				<item id="159" min="1" max="1" chance="7.114" /> <!-- Bonebreaker -->
-				<item id="320" min="1" max="1" chance="7.111" /> <!-- Blue Crystal Skull -->
-				<item id="190" min="1" max="1" chance="7.101" /> <!-- Atuba Mace -->
-				<item id="280" min="1" max="1" chance="7.1" /> <!-- Light Crossbow -->
-				<item id="2499" min="1" max="1" chance="7.086" /> <!-- Elven Long Sword -->
-				<item id="353" min="1" max="1" chance="7.091" /> <!-- Half Plate Armor -->
-				<item id="70" min="1" max="1" chance="7.088" /> <!-- Claymore -->
-				<item id="607" min="1" max="3" chance="7.086" /> <!-- Ogre Power Gauntlets -->
-				<item id="497" min="1" max="3" chance="7.083" /> <!-- Chain Helmet -->
-				<item id="2494" min="1" max="3" chance="6.983" /> <!-- Plate Shield -->
-				<item id="74" min="1" max="1" chance="6.432" /> <!-- Katana -->
-				<item id="282" min="1" max="1" chance="6.395" /> <!-- Elemental Bow -->
-				<item id="131" min="1" max="1" chance="6.388" /> <!-- Spirit Sword -->
-				<item id="94" min="1" max="1" chance="6.375" /> <!-- Bec de Corbin -->
-				<item id="242" min="1" max="1" chance="6.371" /> <!-- Soulfire Dirk -->
-				<item id="227" min="1" max="1" chance="6.356" /> <!-- Stiletto -->
-				<item id="195" min="1" max="1" chance="6.329" /> <!-- Cursed Staff -->
-				<item id="73" min="1" max="1" chance="6.312" /> <!-- Shamshir -->
-				<item id="325" min="1" max="1" chance="6.307" /> <!-- Horn of Glory -->
-				<item id="285" min="1" max="1" chance="6.301" /> <!-- Noble Elven Bow -->
-				<item id="133" min="1" max="1" chance="6.298" /> <!-- Raid Sword -->
-				<item id="631" min="1" max="3" chance="5.684" /> <!-- Eldarake -->
-				<item id="302" min="1" max="1" chance="5.67" /> <!-- Body Slasher -->
-				<item id="160" min="1" max="1" chance="5.62" /> <!-- Battle Axe -->
-				<item id="62" min="1" max="3" chance="5.618" /> <!-- Reinforced Mithril Boots -->
-				<item id="89" min="1" max="1" chance="5.615" /> <!-- Big Hammer -->
-				<item id="192" min="1" max="1" chance="5.614" /> <!-- Crystal Staff -->
-				<item id="2454" min="1" max="3" chance="5.613" /> <!-- Karmian Gloves -->
-				<item id="2429" min="1" max="3" chance="5.603" /> <!-- Chain Boots -->
-				<item id="2453" min="1" max="3" chance="5.597" /> <!-- Chain Gloves -->
-				<item id="72" min="1" max="1" chance="5.592" /> <!-- Stormbringer -->
-				<item id="263" min="1" max="1" chance="5.585" /> <!-- Chakram -->
-				<item id="2431" min="1" max="3" chance="5.584" /> <!-- Plated Leather Boots -->
-				<item id="2432" min="1" max="3" chance="5.583" /> <!-- Dwarven Chain Boots -->
-				<item id="2430" min="1" max="3" chance="5.58" /> <!-- Karmian Boots -->
-				<item id="226" min="1" max="1" chance="5.578" /> <!-- Cursed Dagger -->
-				<item id="354" min="1" max="1" chance="5.547" /> <!-- Chain Mail Shirt -->
-				<item id="2452" min="1" max="3" chance="5.546" /> <!-- Reinforced Mithril Gloves -->
-				<item id="439" min="1" max="1" chance="5.545" /> <!-- Karmian Tunic -->
-				<item id="2433" min="1" max="3" chance="5.543" /> <!-- Boots of Seal -->
-				<item id="397" min="1" max="1" chance="5.542" /> <!-- Reinforced Mithril Shirt -->
-				<item id="71" min="1" max="1" chance="5.539" /> <!-- Flamberge -->
-				<item id="298" min="1" max="1" chance="5.538" /> <!-- Orcish Glaive -->
-				<item id="230" min="1" max="1" chance="5.531" /> <!-- Needle Wolverine -->
-				<item id="281" min="1" max="1" chance="5.53" /> <!-- Crystallized Ice Bow -->
-				<item id="471" min="1" max="1" chance="5.528" /> <!-- Karmian Stockings -->
-				<item id="193" min="1" max="1" chance="5.523" /> <!-- Stick of Faith -->
-				<item id="232" min="1" max="1" chance="5.522" /> <!-- Dark Elven Dagger -->
-				<item id="96" min="1" max="1" chance="5.521" /> <!-- Scythe -->
-				<item id="161" min="1" max="1" chance="5.521" /> <!-- Silver Axe -->
-				<item id="2495" min="1" max="3" chance="5.497" /> <!-- Chain Shield -->
-				<item id="191" min="1" max="1" chance="5.495" /> <!-- Heavy Doom Hammer -->
-				<item id="2387" min="1" max="1" chance="5.491" /> <!-- Reinforced Mithril Gaiters -->
-				<item id="381" min="1" max="1" chance="5.488" /> <!-- Chain Gaiters -->
-				<item id="173" min="1" max="1" chance="5.483" /> <!-- Skull Graver -->
-				<item id="194" min="1" max="1" chance="5.482" /> <!-- Heavy Doom Axe -->
-				<item id="2413" min="1" max="3" chance="5.481" /> <!-- Chain Hood -->
-				<item id="70000" min="76" max="228" chance="100" /> <!-- Sealed Rune - Stage 1 -->
+				<group chance="100">
+					<item id="320" min="1" max="1" chance="7.15" /> <!-- Blue Crystal Skull -->
+					<item id="321" min="1" max="1" chance="7.15" /> <!-- Demon's Fangs -->
+					<item id="70" min="1" max="1" chance="7.15" /> <!-- Claymore -->
+					<item id="159" min="1" max="1" chance="7.15" /> <!-- Bonebreaker -->
+					<item id="187" min="1" max="1" chance="7.15" /> <!-- Atuba Hammer -->
+					<item id="188" min="1" max="1" chance="7.15" /> <!-- Ghost Staff -->
+					<item id="189" min="1" max="1" chance="7.15" /> <!-- Staff of Life -->
+					<item id="190" min="1" max="1" chance="7.15" /> <!-- Atuba Mace -->
+					<item id="225" min="1" max="1" chance="7.15" /> <!-- Mithril Dagger -->
+					<item id="262" min="1" max="1" chance="7.15" /> <!-- Scallop Jamadhr -->
+					<item id="280" min="1" max="1" chance="7.15" /> <!-- Light Crossbow -->
+					<item id="297" min="1" max="1" chance="7.15" /> <!-- Glaive -->
+					<item id="322" min="1" max="1" chance="7.15" /> <!-- Vajra Wand -->
+					<item id="2499" min="1" max="1" chance="7.05" /> <!-- Elven Long Sword -->
+				</group>
+				<group chance="100">
+					<item id="438" min="1" max="3" chance="7.15" /> <!-- Sage's Rags -->
+					<item id="61" min="1" max="3" chance="7.15" /> <!-- Mithril Gloves -->
+					<item id="353" min="1" max="1" chance="7.15" /> <!-- Half Plate Armor -->
+					<item id="380" min="1" max="1" chance="7.15" /> <!-- Plate Gaiters -->
+					<item id="396" min="1" max="1" chance="7.15" /> <!-- Salamander Skin Mail -->
+					<item id="497" min="1" max="3" chance="7.15" /> <!-- Chain Helmet -->
+					<item id="607" min="1" max="3" chance="7.15" /> <!-- Ogre Power Gauntlets -->
+					<item id="630" min="1" max="3" chance="7.15" /> <!-- Square Shield -->
+					<item id="1125" min="1" max="3" chance="7.15" /> <!-- Assault Boots -->
+					<item id="2412" min="1" max="3" chance="7.15" /> <!-- Plate Helmet -->
+					<item id="2427" min="1" max="3" chance="7.15" /> <!-- Salamander Skin Boots -->
+					<item id="2428" min="1" max="3" chance="7.15" /> <!-- Plate Boots -->
+					<item id="2451" min="1" max="3" chance="7.15" /> <!-- Sage's Worn Gloves -->
+					<item id="2494" min="1" max="3" chance="7.05" /> <!-- Plate Shield -->
+				</group>
+				<group chance="100">
+					<item id="851" min="1" max="3" chance="33.33" /> <!-- Onyx Beast's Eye Earring -->
+					<item id="882" min="1" max="3" chance="33.33" /> <!-- Mithril Ring -->
+					<item id="914" min="1" max="1" chance="33.34" /> <!-- Dark Necklace -->
+				</group>
+				<group chance="100">
+					<item id="71" min="1" max="1" chance="5.55" /> <!-- Flamberge -->
+					<item id="72" min="1" max="1" chance="5.55" /> <!-- Stormbringer -->
+					<item id="89" min="1" max="1" chance="5.55" /> <!-- Big Hammer -->
+					<item id="96" min="1" max="1" chance="5.55" /> <!-- Scythe -->
+					<item id="160" min="1" max="1" chance="5.55" /> <!-- Battle Axe -->
+					<item id="161" min="1" max="1" chance="5.55" /> <!-- Silver Axe -->
+					<item id="173" min="1" max="1" chance="5.55" /> <!-- Skull Graver -->
+					<item id="191" min="1" max="1" chance="5.55" /> <!-- Heavy Doom Hammer -->
+					<item id="192" min="1" max="1" chance="5.55" /> <!-- Crystal Staff -->
+					<item id="193" min="1" max="1" chance="5.55" /> <!-- Stick of Faith -->
+					<item id="194" min="1" max="1" chance="5.55" /> <!-- Heavy Doom Axe -->
+					<item id="226" min="1" max="1" chance="5.55" /> <!-- Cursed Dagger -->
+					<item id="230" min="1" max="1" chance="5.55" /> <!-- Needle Wolverine -->
+					<item id="232" min="1" max="1" chance="5.55" /> <!-- Dark Elven Dagger -->
+					<item id="263" min="1" max="1" chance="5.55" /> <!-- Chakram -->
+					<item id="281" min="1" max="1" chance="5.55" /> <!-- Crystallized Ice Bow -->
+					<item id="298" min="1" max="1" chance="5.55" /> <!-- Orcish Glaive -->
+					<item id="302" min="1" max="1" chance="5.65" /> <!-- Body Slasher -->
+				</group>
+				<group chance="100">
+					<item id="2387" min="1" max="1" chance="5.55" /> <!-- Reinforced Mithril Gaiters -->
+					<item id="2413" min="1" max="3" chance="5.55" /> <!-- Chain Hood -->
+					<item id="2429" min="1" max="3" chance="5.55" /> <!-- Chain Boots -->
+					<item id="2430" min="1" max="3" chance="5.55" /> <!-- Karmian Boots -->
+					<item id="2431" min="1" max="3" chance="5.55" /> <!-- Plated Leather Boots -->
+					<item id="2432" min="1" max="3" chance="5.55" /> <!-- Dwarven Chain Boots -->
+					<item id="2433" min="1" max="3" chance="5.55" /> <!-- Boots of Seal -->
+					<item id="2452" min="1" max="3" chance="5.55" /> <!-- Reinforced Mithril Gloves -->
+					<item id="2453" min="1" max="3" chance="5.55" /> <!-- Chain Gloves -->
+					<item id="2454" min="1" max="3" chance="5.55" /> <!-- Karmian Gloves -->
+					<item id="2495" min="1" max="3" chance="5.55" /> <!-- Chain Shield -->
+					<item id="62" min="1" max="3" chance="5.55" /> <!-- Reinforced Mithril Boots -->
+					<item id="354" min="1" max="1" chance="5.55" /> <!-- Chain Mail Shirt -->
+					<item id="381" min="1" max="1" chance="5.55" /> <!-- Chain Gaiters -->
+					<item id="397" min="1" max="1" chance="5.55" /> <!-- Reinforced Mithril Shirt -->
+					<item id="439" min="1" max="1" chance="5.55" /> <!-- Karmian Tunic -->
+					<item id="471" min="1" max="1" chance="5.55" /> <!-- Karmian Stockings -->
+					<item id="631" min="1" max="3" chance="5.65" /> <!-- Eldarake -->
+				</group>
+				<group chance="100">
+					<item id="852" min="1" max="3" chance="33.33" /> <!-- Moonstone Earring -->
+					<item id="883" min="1" max="3" chance="33.33" /> <!-- Aquastone Ring -->
+					<item id="915" min="1" max="1" chance="33.34" /> <!-- Aquastone Necklace -->
+				</group>
+				<group chance="70">
+					<item id="73" min="1" max="1" chance="9.09" /> <!-- Shamshir -->
+					<item id="74" min="1" max="1" chance="9.09" /> <!-- Katana -->
+					<item id="94" min="1" max="1" chance="9.09" /> <!-- Bec de Corbin -->
+					<item id="131" min="1" max="1" chance="9.09" /> <!-- Spirit Sword -->
+					<item id="133" min="1" max="1" chance="9.09" /> <!-- Raid Sword -->
+					<item id="195" min="1" max="1" chance="9.09" /> <!-- Cursed Staff -->
+					<item id="227" min="1" max="1" chance="9.09" /> <!-- Stiletto -->
+					<item id="242" min="1" max="1" chance="9.09" /> <!-- Soulfire Dirk -->
+					<item id="282" min="1" max="1" chance="9.09" /> <!-- Elemental Bow -->
+					<item id="285" min="1" max="1" chance="9.09" /> <!-- Noble Elven Bow -->
+					<item id="325" min="1" max="1" chance="9.1" /> <!-- Horn of Glory -->
+				</group>
+				<group chance="100">
+					<item id="355" min="1" max="1" chance="33.33" /> <!-- Dwarven Chain Mail Shirt -->
+					<item id="382" min="1" max="1" chance="33.33" /> <!-- Dwarven Chain Gaiters -->
+					<item id="2496" min="1" max="1" chance="33.34" /> <!-- Dwarven Chain Shield -->
+				</group>
+				<group chance="100">
+					<item id="399" min="1" max="1" chance="25" /> <!-- Rind Leather Armor -->
+					<item id="419" min="1" max="1" chance="25" /> <!-- Rind Leather Gaiters -->
+					<item id="440" min="1" max="1" chance="25" /> <!-- Robe of Seal -->
+					<item id="500" min="1" max="1" chance="25" /> <!-- Great Helmet -->
+				</group>
+				<group chance="100">
+					<item id="632" min="1" max="3" chance="16.66" /> <!-- Knight's Shield -->
+					<item id="1126" min="1" max="3" chance="16.66" /> <!-- Crimson Boots -->
+					<item id="498" min="1" max="3" chance="16.66" /> <!-- Steel Plate Helmet -->
+					<item id="398" min="1" max="1" chance="16.66" /> <!-- Plated Leather Armor -->
+					<item id="418" min="1" max="1" chance="16.66" /> <!-- Plated Leather Gaiters -->
+					<item id="2455" min="1" max="3" chance="16.7" /> <!-- Plated Leather Gloves -->
+				</group>
+				<group chance="100">
+					<item id="853" min="1" max="3" chance="33.33" /> <!-- Earring of Protection -->
+					<item id="884" min="1" max="3" chance="33.33" /> <!-- Ring of Protection -->
+					<item id="916" min="1" max="1" chance="33.34" /> <!-- Necklace of Protection -->
+				</group>
+				<group chance="20">
+					<item id="6660" min="1" max="1" chance="100" /> <!-- Queen Ant's Ring -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29002" level="29" type="Monster" name="Queen Ant Larva">
+	<npc id="29002" level="38" type="Monster" name="Queen Ant Larva">
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="591" hpRegen="3.5" mp="315" mpRegen="1.5" />
-			<attack physical="89.21" magical="59.01" random="30" critical="7" accuracy="40" attackSpeed="257" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="591.9" hpRegen="3.5" mp="315.1" mpRegen="1.5" />
+			<attack physical="89.21" magical="59.01" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.72" magical="84.16" />
 			<speed>
 				<walk ground="40" />
@@ -167,9 +191,9 @@
 			<hitTime>350</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="true" />
+		<status attackable="true" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -178,7 +202,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="4500" aggroRange="450">
@@ -195,9 +219,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4000" hpRegen="108" mp="402" mpRegen="1.8" />
-			<attack physical="637" magical="395" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="4000" hpRegen="108" mp="402.6" mpRegen="1.8" />
+			<attack physical="637" magical="395" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="547" magical="200" />
 			<speed>
 				<walk ground="40" />
@@ -206,9 +230,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -217,7 +241,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4020" level="1" /> <!-- Recovery -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
@@ -240,9 +264,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4343" hpRegen="115" mp="432" mpRegen="1.8" />
-			<attack physical="178" magical="27" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="4343" hpRegen="115" mp="432.7" mpRegen="1.8" />
+			<attack physical="178" magical="27" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="578" magical="211" />
 			<speed>
 				<walk ground="40" />
@@ -251,9 +275,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -262,7 +286,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="700" isAggressive="true">
@@ -284,9 +308,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="7051" hpRegen="122" mp="463" mpRegen="1.8" />
-			<attack physical="1190" magical="1074" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="7051" hpRegen="122" mp="463.3" mpRegen="1.8" />
+			<attack physical="1190" magical="1074" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="610" magical="223" />
 			<speed>
 				<walk ground="40" />
@@ -295,9 +319,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -306,7 +330,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="700" aggroRange="450">
@@ -331,18 +355,19 @@
 		<sex>MALE</sex>
 		<acquire exp="2041407" sp="61242" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="930422.1343873518" hpRegen="441.65" mp="1117.069980379333" mpRegen="20.0" />
-			<attack physical="722.31" magical="1398.68" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="523103.852" hpRegen="441.65" mp="1708.8" mpRegen="20" />
+			<attack physical="722.31" magical="1398.68" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1602" magical="293" />
 			<speed>
 				<walk ground="50" />
 				<run ground="110" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -351,7 +376,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>10</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -366,82 +391,107 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="608" min="1" max="3" chance="34.99" /> <!-- Mithril Gauntlets -->
-				<item id="854" min="1" max="3" chance="33.46" /> <!-- Earring of Seal -->
-				<item id="1127" min="1" max="3" chance="33.3" /> <!-- Forgotten Boots -->
-				<item id="885" min="1" max="3" chance="32.95" /> <!-- Ring of Ages -->
-				<item id="917" min="1" max="1" chance="32.52" /> <!-- Necklace of Mermaid -->
-				<item id="1149" min="1" max="3" chance="31.87" /> <!-- Shining Circlet -->
-				<item id="420" min="1" max="1" chance="26.08" /> <!-- Theca Leather Gaiters -->
-				<item id="472" min="1" max="1" chance="25.78" /> <!-- Demon's Stockings -->
-				<item id="400" min="1" max="1" chance="25.47" /> <!-- Theca Leather Armor -->
-				<item id="2460" min="1" max="1" chance="25.23" /> <!-- Theca Leather Gloves -->
-				<item id="2435" min="1" max="1" chance="25.04" /> <!-- Demon's Boots -->
-				<item id="2436" min="1" max="1" chance="24.9" /> <!-- Theca Leather Boots -->
-				<item id="441" min="1" max="1" chance="24.26" /> <!-- Demon's Tunic -->
-				<item id="2459" min="1" max="1" chance="24.03" /> <!-- Demon's Gloves -->
-				<item id="499" min="1" max="3" chance="20.88" /> <!-- Mithril Helmet -->
-				<item id="473" min="1" max="1" chance="20.74" /> <!-- Divine Stockings -->
-				<item id="401" min="1" max="1" chance="20.66" /> <!-- Drake Leather Armor -->
-				<item id="2437" min="1" max="1" chance="20.65" /> <!-- Drake Leather Boots -->
-				<item id="2462" min="1" max="1" chance="20.64" /> <!-- Full Plate Gauntlets -->
-				<item id="103" min="1" max="3" chance="20.48" /> <!-- Tower Shield -->
-				<item id="2468" min="1" max="3" chance="20.26" /> <!-- Blessed Gloves -->
-				<item id="356" min="1" max="1" chance="20.16" /> <!-- Full Plate Armor -->
-				<item id="2414" min="1" max="1" chance="20.08" /> <!-- Full Plate Helmet -->
-				<item id="6662" min="1" max="1" chance="20.05" /> <!-- Ring of Core -->
-				<item id="442" min="1" max="1" chance="19.81" /> <!-- Divine Tunic -->
-				<item id="2497" min="1" max="1" chance="19.76" /> <!-- Full Plate Shield -->
-				<item id="107" min="1" max="3" chance="19.74" /> <!-- Compound Shield -->
-				<item id="2438" min="1" max="1" chance="19.71" /> <!-- Full Plate Boots -->
-				<item id="60" min="1" max="1" chance="19.71" /> <!-- Compound Armor -->
-				<item id="2461" min="1" max="1" chance="19.52" /> <!-- Drake Leather Gloves -->
-				<item id="603" min="1" max="3" chance="19.51" /> <!-- Divine Boots -->
-				<item id="64" min="1" max="1" chance="19.47" /> <!-- Compound Boots -->
-				<item id="1128" min="1" max="3" chance="19.4" /> <!-- Adamantite Boots -->
-				<item id="517" min="1" max="3" chance="19.29" /> <!-- Compound Helmet -->
-				<item id="2463" min="1" max="1" chance="19.28" /> <!-- Divine Gloves -->
-				<item id="119" min="1" max="1" chance="17.35" /> <!-- Necklace of Seal -->
-				<item id="919" min="1" max="1" chance="17.23" /> <!-- Blessed Necklace -->
-				<item id="886" min="1" max="3" chance="17.2" /> <!-- Ring of Seal -->
-				<item id="857" min="1" max="3" chance="16.47" /> <!-- Holy Earring -->
-				<item id="855" min="1" max="3" chance="16.2" /> <!-- Nassen's Earring -->
-				<item id="888" min="1" max="3" chance="16.04" /> <!-- Blessed Ring -->
-				<item id="135" min="1" max="1" chance="11.58" /> <!-- Samurai Long Sword -->
-				<item id="299" min="1" max="1" chance="11.56" /> <!-- Orcish Poleaxe -->
-				<item id="206" min="1" max="1" chance="11.45" /> <!-- Demon's Staff -->
-				<item id="2503" min="1" max="1" chance="11.42" /> <!-- Yaksa Mace -->
-				<item id="205" min="1" max="1" chance="11.22" /> <!-- Ghoul's Staff -->
-				<item id="266" min="1" max="1" chance="11.2" /> <!-- Great Pata -->
-				<item id="204" min="1" max="1" chance="10.73" /> <!-- Deadman's Staff -->
-				<item id="228" min="1" max="1" chance="10.63" /> <!-- Crystal Dagger -->
-				<item id="286" min="1" max="1" chance="10.61" /> <!-- Eminence Bow -->
-				<item id="303" min="1" max="1" chance="4.364" /> <!-- Widow Maker -->
-				<item id="162" min="1" max="1" chance="4.23" /> <!-- War Axe -->
-				<item id="301" min="1" max="1" chance="4.227" /> <!-- scorpion -->
-				<item id="203" min="1" max="1" chance="4.22" /> <!-- Pa'agrio Axe -->
-				<item id="95" min="1" max="1" chance="4.219" /> <!-- Poleaxe -->
-				<item id="283" min="1" max="1" chance="4.205" /> <!-- Akat Longbow -->
-				<item id="202" min="1" max="1" chance="4.201" /> <!-- Mace of Underworld -->
-				<item id="199" min="1" max="1" chance="4.188" /> <!-- Pa'agrio Hammer -->
-				<item id="231" min="1" max="1" chance="4.184" /> <!-- Grace Dagger -->
-				<item id="134" min="1" max="1" chance="4.175" /> <!-- Sword of Nightmare -->
-				<item id="233" min="1" max="1" chance="4.171" /> <!-- Dark Screamer -->
-				<item id="174" min="1" max="1" chance="4.153" /> <!-- Nirvana Axe -->
-				<item id="265" min="1" max="1" chance="4.136" /> <!-- Fisted Blade -->
-				<item id="201" min="1" max="1" chance="4.131" /> <!-- Club of Nature -->
-				<item id="196" min="1" max="1" chance="4.13" /> <!-- Stick of Eternity -->
-				<item id="75" min="1" max="1" chance="4.129" /> <!-- Caliburs -->
-				<item id="197" min="1" max="1" chance="4.114" /> <!-- Paradia Staff -->
-				<item id="76" min="1" max="1" chance="4.113" /> <!-- Sword of Delusion -->
-				<item id="84" min="1" max="1" chance="4.109" /> <!-- Homunkulus' Sword -->
-				<item id="200" min="1" max="1" chance="4.108" /> <!-- Sage's Staff -->
-				<item id="132" min="1" max="1" chance="4.105" /> <!-- Ultimate Sword -->
-				<item id="77" min="1" max="1" chance="4.097" /> <!-- Tsurugi -->
-				<item id="198" min="1" max="1" chance="4.095" /> <!-- Inferno Staff -->
-				<item id="145" min="1" max="1" chance="4.093" /> <!-- Sword of Whispering Death -->
-				<item id="70000" min="297" max="891" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="8620" min="1" max="3" chance="50.85" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				<group chance="100">
+					<item id="75" min="1" max="1" chance="4.16" /> <!-- Caliburs -->
+					<item id="76" min="1" max="1" chance="4.16" /> <!-- Sword of Delusion -->
+					<item id="77" min="1" max="1" chance="4.16" /> <!-- Tsurugi -->
+					<item id="84" min="1" max="1" chance="4.16" /> <!-- Homunkulus' Sword -->
+					<item id="95" min="1" max="1" chance="4.16" /> <!-- Poleaxe -->
+					<item id="132" min="1" max="1" chance="4.16" /> <!-- Ultimate Sword -->
+					<item id="134" min="1" max="1" chance="4.16" /> <!-- Sword of Nightmare -->
+					<item id="145" min="1" max="1" chance="4.16" /> <!-- Sword of Whispering Death -->
+					<item id="162" min="1" max="1" chance="4.16" /> <!-- War Axe -->
+					<item id="174" min="1" max="1" chance="4.16" /> <!-- Nirvana Axe -->
+					<item id="196" min="1" max="1" chance="4.16" /> <!-- Stick of Eternity -->
+					<item id="197" min="1" max="1" chance="4.16" /> <!-- Paradia Staff -->
+					<item id="198" min="1" max="1" chance="4.16" /> <!-- Inferno Staff -->
+					<item id="199" min="1" max="1" chance="4.16" /> <!-- Pa'agrio Hammer -->
+					<item id="200" min="1" max="1" chance="4.16" /> <!-- Sage's Staff -->
+					<item id="201" min="1" max="1" chance="4.16" /> <!-- Club of Nature -->
+					<item id="202" min="1" max="1" chance="4.16" /> <!-- Mace of Underworld -->
+					<item id="231" min="1" max="1" chance="4.16" /> <!-- Grace Dagger -->
+					<item id="233" min="1" max="1" chance="4.16" /> <!-- Dark Screamer -->
+					<item id="265" min="1" max="1" chance="4.16" /> <!-- Fisted Blade -->
+					<item id="283" min="1" max="1" chance="4.16" /> <!-- Akat Longbow -->
+					<item id="203" min="1" max="1" chance="4.16" /> <!-- Pa'agrio Axe -->
+					<item id="301" min="1" max="1" chance="4.16" /> <!-- scorpion -->
+					<item id="303" min="1" max="1" chance="4.32" /> <!-- Widow Maker -->
+				</group>
+				<group chance="100">
+					<item id="60" min="1" max="1" chance="20" /> <!-- Compound Armor -->
+					<item id="64" min="1" max="1" chance="20" /> <!-- Compound Boots -->
+					<item id="103" min="1" max="3" chance="20" /> <!-- Tower Shield -->
+					<item id="107" min="1" max="3" chance="20" /> <!-- Compound Shield -->
+					<item id="517" min="1" max="3" chance="20" /> <!-- Compound Helmet -->
+				</group>
+				<group chance="100">
+					<item id="608" min="1" max="3" chance="33.33" /> <!-- Mithril Gauntlets -->
+					<item id="1127" min="1" max="3" chance="33.33" /> <!-- Forgotten Boots -->
+					<item id="1149" min="1" max="3" chance="33.34" /> <!-- Shining Circlet -->
+				</group>
+				<group chance="100">
+					<item id="400" min="1" max="1" chance="25" /> <!-- Theca Leather Armor -->
+					<item id="420" min="1" max="1" chance="25" /> <!-- Theca Leather Gaiters -->
+					<item id="2436" min="1" max="1" chance="25" /> <!-- Theca Leather Boots -->
+					<item id="2460" min="1" max="1" chance="25" /> <!-- Theca Leather Gloves -->
+				</group>
+				<group chance="100">
+					<item id="441" min="1" max="1" chance="25" /> <!-- Demon's Tunic -->
+					<item id="472" min="1" max="1" chance="25" /> <!-- Demon's Stockings -->
+					<item id="2435" min="1" max="1" chance="25" /> <!-- Demon's Boots -->
+					<item id="2459" min="1" max="1" chance="25" /> <!-- Demon's Gloves -->
+				</group>
+				<group chance="100">
+					<item id="854" min="1" max="3" chance="33.33" /> <!-- Earring of Seal -->
+					<item id="885" min="1" max="3" chance="33.33" /> <!-- Ring of Ages -->
+					<item id="917" min="1" max="1" chance="33.34" /> <!-- Necklace of Mermaid -->
+				</group>
+				<group chance="100">
+					<item id="135" min="1" max="1" chance="11.11" /> <!-- Samurai Long Sword -->
+					<item id="204" min="1" max="1" chance="11.11" /> <!-- Deadman's Staff -->
+					<item id="205" min="1" max="1" chance="11.11" /> <!-- Ghoul's Staff -->
+					<item id="206" min="1" max="1" chance="11.11" /> <!-- Demon's Staff -->
+					<item id="228" min="1" max="1" chance="11.11" /> <!-- Crystal Dagger -->
+					<item id="266" min="1" max="1" chance="11.11" /> <!-- Great Pata -->
+					<item id="286" min="1" max="1" chance="11.11" /> <!-- Eminence Bow -->
+					<item id="299" min="1" max="1" chance="11.11" /> <!-- Orcish Poleaxe -->
+					<item id="2503" min="1" max="1" chance="11.12" /> <!-- Yaksa Mace -->
+				</group>
+				<group chance="100">
+					<item id="356" min="1" max="1" chance="20" /> <!-- Full Plate Armor -->
+					<item id="2414" min="1" max="1" chance="20" /> <!-- Full Plate Helmet -->
+					<item id="2438" min="1" max="1" chance="20" /> <!-- Full Plate Boots -->
+					<item id="2462" min="1" max="1" chance="20" /> <!-- Full Plate Gauntlets -->
+					<item id="2497" min="1" max="1" chance="20" /> <!-- Full Plate Shield -->
+				</group>
+				<group chance="100">
+					<item id="401" min="1" max="1" chance="20" /> <!-- Drake Leather Armor -->
+					<item id="2437" min="1" max="1" chance="20" /> <!-- Drake Leather Boots -->
+					<item id="2461" min="1" max="1" chance="20" /> <!-- Drake Leather Gloves -->
+					<item id="499" min="1" max="3" chance="20" /> <!-- Mithril Helmet -->
+					<item id="1128" min="1" max="3" chance="20" /> <!-- Adamantite Boots -->
+				</group>
+				<group chance="100">
+					<item id="442" min="1" max="1" chance="20" /> <!-- Divine Tunic -->
+					<item id="473" min="1" max="1" chance="20" /> <!-- Divine Stockings -->
+					<item id="2463" min="1" max="1" chance="20" /> <!-- Divine Gloves -->
+					<item id="2468" min="1" max="3" chance="20" /> <!-- Blessed Gloves -->
+					<item id="603" min="1" max="3" chance="20" /> <!-- Divine Boots -->
+				</group>
+				<group chance="100">
+					<item id="119" min="1" max="1" chance="16.66" /> <!-- Necklace of Seal -->
+					<item id="855" min="1" max="3" chance="16.66" /> <!-- Nassen's Earring -->
+					<item id="857" min="1" max="3" chance="16.66" /> <!-- Holy Earring -->
+					<item id="886" min="1" max="3" chance="16.66" /> <!-- Ring of Seal -->
+					<item id="888" min="1" max="3" chance="16.66" /> <!-- Blessed Ring -->
+					<item id="919" min="1" max="1" chance="16.7" /> <!-- Blessed Necklace -->
+				</group>
+				<group chance="20">
+					<item id="6662" min="1" max="1" chance="100" /> <!-- Ring of Core -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -455,9 +505,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="75" /> <!-- Caliburs -->
 		<acquire exp="13947" sp="418" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="13817" hpRegen="166" mp="747" mpRegen="2.1" />
-			<attack physical="410" magical="69" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="13817" hpRegen="166" mp="747.8" mpRegen="2.1" />
+			<attack physical="410" magical="69" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="801" magical="293" />
 			<speed>
 				<walk ground="27" />
@@ -466,9 +516,9 @@
 			<hitTime>710</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -477,9 +527,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="2300" isAggressive="true">
@@ -491,40 +539,6 @@
 			<radius normal="12" grown="14.5" />
 			<height normal="31" grown="36" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="162" min="1" max="1" chance="0.003" /> <!-- War Axe -->
-				<item id="174" min="1" max="1" chance="0.003" /> <!-- Nirvana Axe -->
-				<item id="196" min="1" max="1" chance="0.003" /> <!-- Stick of Eternity -->
-				<item id="197" min="1" max="1" chance="0.003" /> <!-- Paradia Staff -->
-				<item id="199" min="1" max="1" chance="0.003" /> <!-- Pa'agrio Hammer -->
-				<item id="200" min="1" max="1" chance="0.003" /> <!-- Sage's Staff -->
-				<item id="201" min="1" max="1" chance="0.003" /> <!-- Club of Nature -->
-				<item id="202" min="1" max="1" chance="0.003" /> <!-- Mace of Underworld -->
-				<item id="57" min="1160" max="2714" chance="70" /> <!-- Adena -->
-				<item id="1872" min="1" max="3" chance="16.14" /> <!-- Animal Bone -->
-				<item id="1865" min="1" max="3" chance="8.492" /> <!-- Varnish -->
-				<item id="1882" min="1" max="1" chance="5.7" /> <!-- Leather -->
-				<item id="2508" min="2" max="6" chance="5.317" /> <!-- Cursed Bone -->
-				<item id="1876" min="1" max="1" chance="5.163" /> <!-- Mithril Ore -->
-				<item id="2952" min="1" max="1" chance="2.172" /> <!-- Demon's Boot Fabric -->
-				<item id="3005" min="1" max="1" chance="0.97" /> <!-- Recipe: Demon's Boots -->
-				<item id="2100" min="1" max="1" chance="0.3" /> <!-- Paradia Staff Head -->
-				<item id="2097" min="1" max="1" chance="0.3" /> <!-- War Axe Blade -->
-				<item id="2098" min="1" max="1" chance="0.3" /> <!-- Nirvana Axe Blade -->
-				<item id="2231" min="1" max="1" chance="0.3" /> <!-- Recipe: Full Plate Armor -->
-				<item id="2105" min="1" max="1" chance="0.3" /> <!-- Mace of Underworld Head -->
-				<item id="2104" min="1" max="1" chance="0.3" /> <!-- Club of Nature Head -->
-				<item id="2103" min="1" max="1" chance="0.3" /> <!-- Sage's Staff Head -->
-				<item id="2099" min="1" max="1" chance="0.3" /> <!-- Stick of Eternity Shaft -->
-				<item id="2102" min="1" max="1" chance="0.3" /> <!-- Pa'agrio Hammer Head -->
-				<item id="2360" min="1" max="1" chance="0.03" /> <!-- Recipe: Orcish Poleaxe -->
-			</drop>
-			<spoil>
-				<item id="1914" min="1" max="1" chance="46.21" /> <!-- Earring of Seal Gemstone -->
-				<item id="3011" min="1" max="1" chance="22.96" /> <!-- Recipe: Divine Boots -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29008" level="55" type="Monster" name="Doom Wraith">
 		<parameters>
@@ -537,9 +551,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="1472" /> <!-- Dreadbane -->
 		<acquire exp="15169" sp="501" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="16012" hpRegen="185" mp="889" mpRegen="2.4" />
-			<attack physical="470" magical="715" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="16012" hpRegen="185" mp="889.8" mpRegen="2.4" />
+			<attack physical="470" magical="715" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="895" magical="327" />
 			<speed>
 				<walk ground="100" />
@@ -548,21 +562,19 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="5" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="5" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="700" isAggressive="true">
@@ -585,9 +597,9 @@
 		<race>PLANT</race>
 		<sex>FEMALE</sex>
 		<acquire exp="11480" sp="344" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="12544" hpRegen="154" mp="665" mpRegen="2.1" />
-			<attack physical="354" magical="60" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<attack physical="354" magical="60" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="747" magical="273" />
 			<speed>
 				<walk ground="80" />
@@ -596,19 +608,19 @@
 			<hitTime>130</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4035" level="4" /> <!-- Poison -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4035" level="4" /> <!-- Poison -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="800" isAggressive="true">
@@ -620,34 +632,6 @@
 			<radius normal="12" />
 			<height normal="25.5" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="1126" min="1" max="1" chance="0.075" /> <!-- Crimson Boots -->
-				<item id="2434" min="1" max="1" chance="0.075" /> <!-- Rind Leather Boots -->
-				<item id="2455" min="1" max="1" chance="0.075" /> <!-- Plated Leather Gloves -->
-				<item id="2457" min="1" max="1" chance="0.075" /> <!-- Gloves of Seal -->
-				<item id="2458" min="1" max="1" chance="0.075" /> <!-- Rind Leather Gloves -->
-				<item id="57" min="996" max="2323" chance="70" /> <!-- Adena -->
-				<item id="1866" min="1" max="1" chance="13.34" /> <!-- Suede -->
-				<item id="1342" min="30" max="90" chance="12.95" /> <!-- Steel Arrow -->
-				<item id="1867" min="2" max="6" chance="6.416" /> <!-- Animal Skin -->
-				<item id="2951" min="1" max="1" chance="4.388" /> <!-- Rind Leather Glove Design -->
-				<item id="2950" min="1" max="1" chance="4.348" /> <!-- Gloves of Seal Pattern -->
-				<item id="2948" min="1" max="1" chance="4.342" /> <!-- Rind Leather Boot Lining -->
-				<item id="1882" min="1" max="1" chance="4.245" /> <!-- Leather -->
-				<item id="1868" min="5" max="15" chance="3.845" /> <!-- Thread -->
-				<item id="2946" min="1" max="1" chance="2.929" /> <!-- Plated Leather Glove Design -->
-				<item id="2508" min="3" max="9" chance="2.632" /> <!-- Cursed Bone -->
-				<item id="1974" min="1" max="3" chance="2.22" /> <!-- Crimson Boot Fabric -->
-				<item id="1885" min="1" max="1" chance="1.585" /> <!-- High-grade Suede -->
-				<item id="2350" min="1" max="1" chance="0.03" /> <!-- Recipe: Pa'agrio Axe -->
-				<item id="2339" min="1" max="1" chance="0.03" /> <!-- Recipe: Inferno Staff -->
-			</drop>
-			<spoil>
-				<item id="1895" min="1" max="5" chance="66.24" /> <!-- Metallic Fiber -->
-				<item id="2944" min="1" max="1" chance="62.28" /> <!-- Karmian Glove Fabric -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29010" level="46" type="Monster" name="Validus">
 		<parameters>
@@ -658,29 +642,29 @@
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<acquire exp="11032" sp="330" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="12130" hpRegen="150" mp="637" mpRegen="2.1" />
-			<attack physical="337" magical="58" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="12130" hpRegen="150" mp="637.8" mpRegen="2.1" />
+			<attack physical="337" magical="58" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="729" magical="267" />
 			<speed>
 				<walk ground="70" />
 				<run ground="110" />
 			</speed>
-			<hitTime>300</hitTime>
+			<hitTime>30</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="3" /> <!-- Beasts -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="3" /> <!-- Beasts -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="1200" isAggressive="true">
@@ -692,29 +676,6 @@
 			<radius normal="15" />
 			<height normal="29" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="354" min="1" max="1" chance="0.03" /> <!-- Chain Mail Shirt -->
-				<item id="232" min="1" max="1" chance="0.0075" /> <!-- Dark Elven Dagger -->
-				<item id="281" min="1" max="1" chance="0.0075" /> <!-- Crystallized Ice Bow -->
-				<item id="57" min="914" max="2141" chance="70" /> <!-- Adena -->
-				<item id="1866" min="1" max="1" chance="15.89" /> <!-- Suede -->
-				<item id="1878" min="1" max="1" chance="9.186" /> <!-- Durable Braid -->
-				<item id="1864" min="3" max="9" chance="7.663" /> <!-- Stem -->
-				<item id="1865" min="2" max="6" chance="5.755" /> <!-- Varnish -->
-				<item id="2508" min="2" max="6" chance="3.839" /> <!-- Cursed Bone -->
-				<item id="1959" min="1" max="1" chance="2.104" /> <!-- Chain Mail Shirt Material -->
-				<item id="2072" min="1" max="1" chance="0.75" /> <!-- Dark Elven Dagger Edge -->
-				<item id="2074" min="1" max="1" chance="0.75" /> <!-- Crystallized Ice Bow Shaft -->
-				<item id="2319" min="1" max="1" chance="0.075" /> <!-- Recipe: Raid Sword -->
-				<item id="951" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Weapon (C-grade) -->
-			</drop>
-			<spoil>
-				<item id="1873" min="1" max="3" chance="88.74" /> <!-- Silver Nugget -->
-				<item id="2060" min="1" max="1" chance="3.464" /> <!-- Stormbringer Blade -->
-				<item id="2067" min="1" max="1" chance="3.185" /> <!-- Crystal Staff Head -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29011" level="49" type="Monster" name="Susceptor">
 		<parameters>
@@ -725,10 +686,10 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="13389" hpRegen="162" mp="720" mpRegen="2.1" />
-			<attack physical="391" magical="66" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<attack physical="391" magical="66" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="783" magical="286" />
 			<speed>
 				<walk ground="27" />
@@ -737,10 +698,9 @@
 			<hitTime>430</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -749,7 +709,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="1500" isAggressive="true">
@@ -772,9 +733,9 @@
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<acquire exp="16035" sp="481" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="12964" hpRegen="158" mp="692" mpRegen="2.1" />
-			<attack physical="372" magical="63" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="12964" hpRegen="158" mp="692.4" mpRegen="2.1" />
+			<attack physical="372" magical="63" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="765" magical="280" />
 			<speed>
 				<walk ground="20" />
@@ -783,22 +744,22 @@
 			<hitTime>410</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4273" level="3" /> <!-- Resist Daggers/Rapier Weapon -->
-			<skill id="4274" level="1" /> <!-- Blunt Weapon Weak Point -->
-			<skill id="4408" level="12" /> <!-- HP Increase (4x) -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
-			<skill id="4444" level="2" /> <!-- Higher Resist Bow/Crossbow Weapons -->
+			<skill id="4444" level="2" /> <!-- Greater Bow/Crossbow Resistance -->
+			<skill id="4273" level="3" /> <!-- Dagger/Rapier Resistance -->
+			<skill id="4274" level="1" /> <!-- Blunt Weapon Vulnerability -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="800" isAggressive="true">
@@ -810,35 +771,6 @@
 			<radius normal="18" />
 			<height normal="34" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="1126" min="1" max="1" chance="0.075" /> <!-- Crimson Boots -->
-				<item id="2434" min="1" max="1" chance="0.075" /> <!-- Rind Leather Boots -->
-				<item id="2455" min="1" max="1" chance="0.075" /> <!-- Plated Leather Gloves -->
-				<item id="2457" min="1" max="1" chance="0.075" /> <!-- Gloves of Seal -->
-				<item id="2458" min="1" max="1" chance="0.075" /> <!-- Rind Leather Gloves -->
-				<item id="57" min="1447" max="3374" chance="70" /> <!-- Adena -->
-				<item id="1873" min="1" max="1" chance="12.81" /> <!-- Silver Nugget -->
-				<item id="1865" min="1" max="3" chance="10.09" /> <!-- Varnish -->
-				<item id="2508" min="2" max="6" chance="6.579" /> <!-- Cursed Bone -->
-				<item id="1965" min="1" max="1" chance="4.208" /> <!-- Metal Plate Helmet Material -->
-				<item id="2946" min="1" max="1" chance="3.494" /> <!-- Plated Leather Glove Design -->
-				<item id="1880" min="1" max="1" chance="3.151" /> <!-- Steel -->
-				<item id="1869" min="5" max="15" chance="3.142" /> <!-- Iron Ore -->
-				<item id="1974" min="1" max="3" chance="2.735" /> <!-- Crimson Boot Fabric -->
-				<item id="1874" min="1" max="1" chance="2.061" /> <!-- Oriharukon Ore -->
-				<item id="2948" min="1" max="3" chance="1.772" /> <!-- Rind Leather Boot Lining -->
-				<item id="2950" min="2" max="6" chance="1.296" /> <!-- Gloves of Seal Pattern -->
-				<item id="2951" min="2" max="6" chance="1.067" /> <!-- Rind Leather Glove Design -->
-				<item id="1973" min="3" max="9" chance="0.75" /> <!-- Pa'agrio Hand Design -->
-				<item id="2344" min="1" max="1" chance="0.075" /> <!-- Recipe: Grace Dagger -->
-				<item id="951" min="1" max="1" chance="0.075" /> <!-- Scroll: Enchant Weapon (C-grade) -->
-			</drop>
-			<spoil>
-				<item id="2073" min="1" max="1" chance="7.894" /> <!-- Chakram Edge -->
-				<item id="2352" min="1" max="1" chance="2.107" /> <!-- Recipe: Widow Maker -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29013" level="45" type="Monster" name="Premo">
 		<parameters>
@@ -849,9 +781,9 @@
 		<race>GIANT</race>
 		<sex>MALE</sex>
 		<acquire exp="10351" sp="310" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="11721" hpRegen="146" mp="610" mpRegen="2.1" />
-			<attack physical="320" magical="55" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="11721" hpRegen="146" mp="610.8" mpRegen="2.1" />
+			<attack physical="320" magical="55" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="711" magical="260" />
 			<speed>
 				<walk ground="55" />
@@ -860,10 +792,10 @@
 			<hitTime>610</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="11" /> <!-- Giant -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
@@ -871,7 +803,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="11" /> <!-- Giants -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="1200" aggroRange="450">
@@ -883,30 +815,6 @@
 			<radius normal="21" grown="25" />
 			<height normal="35" grown="43" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="631" min="1" max="1" chance="0.3" /> <!-- Eldarake -->
-				<item id="2495" min="1" max="1" chance="0.3" /> <!-- Chain Shield -->
-				<item id="2413" min="1" max="1" chance="0.075" /> <!-- Chain Hood -->
-				<item id="57" min="859" max="2006" chance="70" /> <!-- Adena -->
-				<item id="1868" min="1" max="3" chance="17.95" /> <!-- Thread -->
-				<item id="1866" min="1" max="1" chance="12.31" /> <!-- Suede -->
-				<item id="1867" min="1" max="3" chance="8.405" /> <!-- Animal Skin -->
-				<item id="1964" min="1" max="1" chance="6.108" /> <!-- Eldarake Temper -->
-				<item id="2945" min="1" max="1" chance="6.014" /> <!-- Chain Shield Fragment -->
-				<item id="2936" min="1" max="1" chance="5.526" /> <!-- Chain Hood Pattern -->
-				<item id="1882" min="1" max="1" chance="4.181" /> <!-- Leather -->
-				<item id="1885" min="1" max="1" chance="1.519" /> <!-- High-grade Suede -->
-				<item id="2207" min="1" max="1" chance="0.3" /> <!-- Recipe: Karmian Tunic -->
-				<item id="2323" min="1" max="1" chance="0.075" /> <!-- Recipe: Elemental Bow -->
-				<item id="2326" min="1" max="1" chance="0.075" /> <!-- Recipe: Horn of Glory -->
-			</drop>
-			<spoil>
-				<item id="1876" min="1" max="1" chance="80.65" /> <!-- Mithril Ore -->
-				<item id="1962" min="1" max="1" chance="13.24" /> <!-- Karmian Tunic Pattern -->
-				<item id="2073" min="1" max="1" chance="3.192" /> <!-- Chakram Edge -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29014" level="50" type="GrandBoss" name="Orfen">
 		<parameters>
@@ -917,13 +825,13 @@
 				<npc id="29016" count="4" respawnTime="360" weightPoint="1" />
 			</minions>
 		</parameters>
-		<race>ELEMENTAL</race>
+		<race>FAIRY</race>
 		<sex>FEMALE</sex>
 		<acquire exp="8872500" sp="266175" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="930422.1343873518" hpRegen="441.65" mp="1117.069980379333" mpRegen="20.0" />
-			<attack physical="722.31" magical="1398.68" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="1602" magical="293" />
+			<vitals hp="523103.852" hpRegen="441.65" mp="1708.8" mpRegen="20" />
+			<attack physical="3652" magical="1535" random="10" critical="4" accuracy="0" attackSpeed="253" type="SWORD" range="80" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -931,12 +839,9 @@
 			<hitTime>710</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4062" level="1" /> <!-- Orfen -->
-			<skill id="4063" level="1" /> <!-- Paralysis -->
-			<skill id="4064" level="1" /> <!-- Paralysis -->
+			<skill id="4416" level="13" /> <!-- Fairies -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -945,7 +850,10 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="13" /> <!-- Fairies -->
+			<skill id="4062" level="1" /> <!-- Orfen -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4063" level="1" /> <!-- Paralysis -->
+			<skill id="4064" level="1" /> <!-- Paralysis -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -960,56 +868,79 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="918" min="1" max="1" chance="33.35" /> <!-- Adamantite Necklace -->
-				<item id="856" min="1" max="3" chance="33.1" /> <!-- Adamantite Earring -->
-				<item id="887" min="1" max="3" chance="32.11" /> <!-- Adamantite Ring -->
-				<item id="673" min="1" max="1" chance="25.95" /> <!-- Avadon Shield -->
-				<item id="2379" min="1" max="1" chance="25.86" /> <!-- Avadon Gaiters -->
-				<item id="2376" min="1" max="1" chance="25.13" /> <!-- Avadon Breastplate -->
-				<item id="2415" min="1" max="1" chance="24.74" /> <!-- Sealed Avadon Circlet -->
-				<item id="2414" min="1" max="1" chance="20.98" /> <!-- Full Plate Helmet -->
-				<item id="603" min="1" max="3" chance="20.87" /> <!-- Divine Boots -->
-				<item id="2463" min="1" max="1" chance="20.81" /> <!-- Divine Gloves -->
-				<item id="356" min="1" max="1" chance="20.6" /> <!-- Full Plate Armor -->
-				<item id="1128" min="1" max="3" chance="20.45" /> <!-- Adamantite Boots -->
-				<item id="2438" min="1" max="1" chance="20.42" /> <!-- Full Plate Boots -->
-				<item id="6661" min="1" max="1" chance="20.12" /> <!-- Orfen's Earring -->
-				<item id="2437" min="1" max="1" chance="20.12" /> <!-- Drake Leather Boots -->
-				<item id="442" min="1" max="1" chance="20.08" /> <!-- Divine Tunic -->
-				<item id="2462" min="1" max="1" chance="19.79" /> <!-- Full Plate Gauntlets -->
-				<item id="499" min="1" max="3" chance="19.79" /> <!-- Mithril Helmet -->
-				<item id="401" min="1" max="1" chance="19.78" /> <!-- Drake Leather Armor -->
-				<item id="2461" min="1" max="1" chance="19.7" /> <!-- Drake Leather Gloves -->
-				<item id="2468" min="1" max="3" chance="19.32" /> <!-- Blessed Gloves -->
-				<item id="473" min="1" max="1" chance="19.15" /> <!-- Divine Stockings -->
-				<item id="2497" min="1" max="3" chance="19.15" /> <!-- Full Plate Shield -->
-				<item id="119" min="1" max="1" chance="16.97" /> <!-- Necklace of Seal -->
-				<item id="855" min="1" max="3" chance="16.5" /> <!-- Nassen's Earring -->
-				<item id="888" min="1" max="3" chance="16.16" /> <!-- Blessed Ring -->
-				<item id="857" min="1" max="3" chance="16.02" /> <!-- Holy Earring -->
-				<item id="919" min="1" max="1" chance="16.01" /> <!-- Blessed Necklace -->
-				<item id="886" min="1" max="3" chance="15.9" /> <!-- Ring of Seal -->
-				<item id="228" min="1" max="1" chance="11.59" /> <!-- Crystal Dagger -->
-				<item id="266" min="1" max="1" chance="11.58" /> <!-- Great Pata -->
-				<item id="299" min="1" max="1" chance="11.37" /> <!-- Orcish Poleaxe -->
-				<item id="204" min="1" max="1" chance="10.99" /> <!-- Deadman's Staff -->
-				<item id="286" min="1" max="1" chance="10.89" /> <!-- Eminence Bow -->
-				<item id="206" min="1" max="1" chance="10.83" /> <!-- Demon's Staff -->
-				<item id="2503" min="1" max="1" chance="10.7" /> <!-- Yaksa Mace -->
-				<item id="205" min="1" max="1" chance="10.62" /> <!-- Ghoul's Staff -->
-				<item id="135" min="1" max="1" chance="10.6" /> <!-- Samurai Long Sword -->
-				<item id="947" min="2" max="8" chance="100" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-				<item id="70000" min="198" max="593" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="948" min="10" max="30" chance="100" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="8620" min="1" max="3" chance="50.1" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="4065" min="20" max="80" chance="13.09" /> <!-- Avadon Gaiter Material -->
-				<item id="4071" min="20" max="80" chance="12.62" /> <!-- Avadon Robe Fabric -->
-				<item id="4050" min="20" max="80" chance="12.62" /> <!-- Adamantite Ring Wire -->
-				<item id="4064" min="20" max="80" chance="12.61" /> <!-- Avadon Breastplate Part -->
-				<item id="4072" min="20" max="80" chance="12.6" /> <!-- Sealed Avadon Circlet Pattern -->
-				<item id="4049" min="20" max="80" chance="12.14" /> <!-- Adamantite Earring Gemstone -->
-				<item id="4051" min="20" max="80" chance="12.12" /> <!-- Adamantite Necklace Chain -->
-				<item id="4439" min="20" max="80" chance="11.89" /> <!-- Avadon Shield Fragment -->
+				<group chance="100">
+					<item id="135" min="1" max="1" chance="11.11" /> <!-- Samurai Long Sword -->
+					<item id="204" min="1" max="1" chance="11.11" /> <!-- Deadman's Staff -->
+					<item id="205" min="1" max="1" chance="11.11" /> <!-- Ghoul's Staff -->
+					<item id="206" min="1" max="1" chance="11.11" /> <!-- Demon's Staff -->
+					<item id="228" min="1" max="1" chance="11.11" /> <!-- Crystal Dagger -->
+					<item id="266" min="1" max="1" chance="11.11" /> <!-- Great Pata -->
+					<item id="286" min="1" max="1" chance="11.11" /> <!-- Eminence Bow -->
+					<item id="299" min="1" max="1" chance="11.11" /> <!-- Orcish Poleaxe -->
+					<item id="2503" min="1" max="1" chance="11.12" /> <!-- Yaksa Mace -->
+				</group>
+				<group chance="100">
+					<item id="356" min="1" max="1" chance="20" /> <!-- Full Plate Armor -->
+					<item id="2497" min="1" max="3" chance="20" /> <!-- Full Plate Shield -->
+					<item id="2414" min="1" max="1" chance="20" /> <!-- Full Plate Helmet -->
+					<item id="2438" min="1" max="1" chance="20" /> <!-- Full Plate Boots -->
+					<item id="2462" min="1" max="1" chance="20" /> <!-- Full Plate Gauntlets -->
+				</group>
+				<group chance="100">
+					<item id="2461" min="1" max="1" chance="20" /> <!-- Drake Leather Gloves -->
+					<item id="2437" min="1" max="1" chance="20" /> <!-- Drake Leather Boots -->
+					<item id="401" min="1" max="1" chance="20" /> <!-- Drake Leather Armor -->
+					<item id="603" min="1" max="3" chance="20" /> <!-- Divine Boots -->
+					<item id="1128" min="1" max="3" chance="20" /> <!-- Adamantite Boots -->
+				</group>
+				<group chance="100">
+					<item id="442" min="1" max="1" chance="20" /> <!-- Divine Tunic -->
+					<item id="473" min="1" max="1" chance="20" /> <!-- Divine Stockings -->
+					<item id="2463" min="1" max="1" chance="20" /> <!-- Divine Gloves -->
+					<item id="2468" min="1" max="3" chance="20" /> <!-- Blessed Gloves -->
+					<item id="499" min="1" max="3" chance="20" /> <!-- Mithril Helmet -->
+				</group>
+				<group chance="100">
+					<item id="119" min="1" max="1" chance="16.66" /> <!-- Necklace of Seal -->
+					<item id="855" min="1" max="3" chance="16.66" /> <!-- Nassen's Earring -->
+					<item id="857" min="1" max="3" chance="16.66" /> <!-- Holy Earring -->
+					<item id="886" min="1" max="3" chance="16.66" /> <!-- Ring of Seal -->
+					<item id="888" min="1" max="3" chance="16.66" /> <!-- Blessed Ring -->
+					<item id="919" min="1" max="1" chance="16.7" /> <!-- Blessed Necklace -->
+				</group>
+				<group chance="100">
+					<item id="2376" min="1" max="1" chance="25" /> <!-- Avadon Breastplate -->
+					<item id="2379" min="1" max="1" chance="25" /> <!-- Avadon Gaiters -->
+					<item id="2415" min="1" max="1" chance="25" /> <!-- Sealed Avadon Circlet -->
+					<item id="673" min="1" max="1" chance="25" /> <!-- Avadon Shield -->
+				</group>
+				<group chance="100">
+					<item id="856" min="1" max="3" chance="33.33" /> <!-- Adamantite Earring -->
+					<item id="887" min="1" max="3" chance="33.33" /> <!-- Adamantite Ring -->
+					<item id="918" min="1" max="1" chance="33.34" /> <!-- Adamantite Necklace -->
+				</group>
+				<group chance="100">
+					<item id="4049" min="20" max="80" chance="12.5" /> <!-- Adamantite Earring Gemstone -->
+					<item id="4050" min="20" max="80" chance="12.5" /> <!-- Adamantite Ring Wire -->
+					<item id="4051" min="20" max="80" chance="12.5" /> <!-- Adamantite Necklace Chain -->
+					<item id="4064" min="20" max="80" chance="12.5" /> <!-- Avadon Breastplate Part -->
+					<item id="4065" min="20" max="80" chance="12.5" /> <!-- Avadon Gaiter Material -->
+					<item id="4071" min="20" max="80" chance="12.5" /> <!-- Avadon Robe Fabric -->
+					<item id="4072" min="20" max="80" chance="12.5" /> <!-- Sealed Avadon Circlet Pattern -->
+					<item id="4439" min="20" max="80" chance="12.5" /> <!-- Avadon Shield Fragment -->
+				</group>
+				<group chance="20">
+					<item id="6661" min="1" max="1" chance="100" /> <!-- Orfen's Earring -->
+				</group>
+				<group chance="100">
+					<item id="947" min="2" max="8" chance="100" /> <!-- Scroll: Enchant Weapon (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="948" min="10" max="30" chance="100" /> <!-- Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -1019,13 +950,13 @@
 			<param name="MoveAroundSocial1" value="70" />
 			<param name="MoveAroundSocial2" value="70" />
 		</parameters>
-		<race>BEAST</race>
+		<race>BUG</race>
 		<sex>MALE</sex>
-		<acquire exp="16035" sp="481" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="16035" sp="481" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="158" mp="36936" mpRegen="2.1" />
-			<attack physical="298" magical="40" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="765" magical="280" />
+			<attack physical="298" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1033,9 +964,9 @@
 			<hitTime>540</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1044,7 +975,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="2500" aggroRange="450">
@@ -1063,13 +994,13 @@
 			<param name="MoveAroundSocial1" value="70" />
 			<param name="MoveAroundSocial2" value="70" />
 		</parameters>
-		<race>BEAST</race>
+		<race>BUG</race>
 		<sex>MALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="162" mp="36936" mpRegen="2.1" />
-			<attack physical="1058" magical="1563" random="30" critical="15" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="783" magical="286" />
+			<attack physical="1058" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1077,9 +1008,9 @@
 			<hitTime>540</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1088,7 +1019,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="2700" aggroRange="450">
@@ -1109,11 +1040,11 @@
 		</parameters>
 		<race>BUG</race>
 		<sex>FEMALE</sex>
-		<acquire exp="16035" sp="481" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="16035" sp="481" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="158" mp="36936" mpRegen="2.1" />
-			<attack physical="298" magical="40" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="765" magical="280" />
+			<attack physical="298" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1121,9 +1052,9 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1132,7 +1063,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="2700" aggroRange="450">
@@ -1148,11 +1079,11 @@
 	<npc id="29018" level="49" type="Monster" name="Riba Iren">
 		<race>BUG</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="162" mp="36936" mpRegen="2.1" />
-			<attack physical="1058" magical="1563" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="783" magical="286" />
+			<attack physical="1058" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1160,9 +1091,9 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1171,8 +1102,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
-			<skill id="4516" level="1" /> <!-- Orfen Heal -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="2900" isAggressive="true">
@@ -1190,27 +1120,19 @@
 		<sex>MALE</sex>
 		<acquire exp="262720917" sp="63053" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="7500000" hpRegen="1000" mp="18000" mpRegen="99" />
-			<attack physical="3260" magical="1700" random="30" critical="4" accuracy="40" attackSpeed="206" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="440" magical="440" />
+			<vitals hp="7000000" hpRegen="1000" mp="18000" mpRegen="99" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3840" magical="825" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4106" level="1" /> <!-- Antharas Stun -->
-			<skill id="4108" level="1" /> <!-- Antharas Terror -->
-			<skill id="4109" level="1" /> <!-- Curse of Antharas -->
-			<skill id="4110" level="2" /> <!-- Breath Attack -->
-			<skill id="4111" level="1" /> <!-- Antharas Fossilization -->
-			<skill id="4112" level="1" /> <!-- Ordinary Attack -->
-			<skill id="4113" level="1" /> <!-- Animal doing ordinary attack -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1219,9 +1141,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5092" level="1" /> <!-- Antharas Terror -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1230,92 +1152,36 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists> <!-- CT2.5 -->
-			<drop>
-				<item id="8620" min="10" max="30" chance="50" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="80" min="1" max="2" chance="25" /> <!-- Tallum Blade -->
-				<item id="98" min="1" max="2" chance="25" /> <!-- Halberd -->
-				<item id="269" min="1" max="2" chance="25" /> <!-- Blood Tornado -->
-				<item id="2504" min="1" max="2" chance="25" /> <!-- Meteor Shower -->
-				<item id="235" min="1" max="2" chance="25" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="2" chance="25" /> <!-- Carnage Bow -->
-				<item id="150" min="1" max="2" chance="25" /> <!-- Elemental Sword -->
-				<item id="212" min="1" max="2" chance="25" /> <!-- Dasparion's Staff -->
-				<item id="81" min="1" max="2" chance="25" /> <!-- Dragon Slayer -->
-				<item id="151" min="1" max="2" chance="25" /> <!-- Sword of Miracles -->
-				<item id="2500" min="1" max="2" chance="25" /> <!-- Dark Legion's Edge -->
-				<item id="164" min="1" max="2" chance="25" /> <!-- Elysian -->
-				<item id="236" min="1" max="2" chance="20" /> <!-- Soul Separator -->
-				<item id="270" min="1" max="2" chance="20" /> <!-- Dragon Grinder -->
-				<item id="289" min="1" max="2" chance="20" /> <!-- Soul Bow -->
-				<item id="213" min="1" max="2" chance="20" /> <!-- Branch of the Mother Tree -->
-				<item id="305" min="1" max="2" chance="20" /> <!-- Tallum Glaive -->
-				<item id="6326" min="1" max="5" chance="30" /> <!-- Sealed Majestic Necklace -->
-				<item id="6327" min="1" max="5" chance="35" /> <!-- Sealed Majestic Earring -->
-				<item id="6328" min="1" max="5" chance="35" /> <!-- Sealed Majestic Ring -->
-				<item id="6323" min="1" max="5" chance="30" /> <!-- Sealed Phoenix Necklace -->
-				<item id="6324" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Earring -->
-				<item id="6325" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Ring -->
-				<item id="5287" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5297" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5304" min="1" max="3" chance="25" /> <!-- Sealed Tallum Tunic -->
-				<item id="5311" min="1" max="3" chance="35" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5320" min="1" max="3" chance="35" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="30" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="3" chance="25" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5301" min="1" max="3" chance="25" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5308" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5316" min="1" max="3" chance="8" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5323" min="1" max="3" chance="8" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5329" min="1" max="3" chance="9" /> <!-- Sealed Majestic Robe -->
-				<item id="5288" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5298" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="30" /> <!-- Sealed Tallum Stockings -->
-				<item id="5289" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5294" min="1" max="3" chance="25" /> <!-- Sealed Tallum Helmet -->
-				<item id="5312" min="1" max="3" chance="25" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5317" min="1" max="3" chance="25" /> <!-- Sealed Majestic Circlet -->
-				<item id="5291" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5296" min="1" max="3" chance="25" /> <!-- Sealed Tallum Boots -->
-				<item id="5314" min="1" max="3" chance="25" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5319" min="1" max="3" chance="25" /> <!-- Sealed Majestic Boots -->
-				<item id="5290" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5295" min="1" max="3" chance="25" /> <!-- Sealed Tallum Gloves -->
-				<item id="5313" min="1" max="3" chance="25" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5318" min="1" max="3" chance="25" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5292" min="1" max="3" chance="40" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="40" /> <!-- Sealed Shield of Nightmare -->
-				<item id="729" min="1" max="19" chance="100" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="1538" min="1" max="59" chance="100" /> <!-- Blessed Scroll of Escape -->
-				<item id="3936" min="1" max="39" chance="100" /> <!-- Blessed Scroll of Resurrection -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="9000000" max="13000000" chance="100" /> <!-- Adena -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29020" level="75" type="GrandBoss" name="Baium">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
-		<acquire exp="51267002" sp="1538010" raidPoints="450" />
+		<acquire exp="512369424" sp="15371083" raidPoints="450" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="10334675.47262" hpRegen="310.756323" mp="15930" mpRegen="3" />
-			<attack physical="3374.18" magical="2200" random="30" critical="4" accuracy="40" attackSpeed="206" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3300" magical="2200" />
+			<vitals hp="18666666.62" hpRegen="6666" mp="18000" mpRegen="99" />
+			<attack physical="25931" magical="8204" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3202" magical="2134" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4127" level="1" /> <!-- Baium: General Attack -->
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4256" level="1" /> <!-- Stun Resistance -->
+			<skill id="4127" level="1" /> <!-- Baium: General Attack -->
 		</skillList>
 		<corpseTime>13</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1328,79 +1194,95 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="6328" min="1" max="3" chance="53.12" /> <!-- Sealed Majestic Ring -->
-				<item id="49580" min="1" max="1" chance="30.73" /> <!-- Baium's Ring -->
-				<item id="6327" min="1" max="1" chance="20.93" /> <!-- Sealed Majestic Earring -->
-				<item id="7900" min="1" max="1" chance="17.84" /> <!-- Ice Storm Hammer -->
-				<item id="7892" min="1" max="1" chance="17.25" /> <!-- Spell Breaker -->
-				<item id="7901" min="1" max="1" chance="16.71" /> <!-- Star Buster -->
-				<item id="7883" min="1" max="1" chance="16.74" /> <!-- Guardian's Sword -->
-				<item id="7893" min="1" max="1" chance="16.48" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="15.31" /> <!-- Wizard's Tear -->
-				<item id="6325" min="1" max="3" chance="14.69" /> <!-- Sealed Phoenix Ring -->
-				<item id="6326" min="1" max="1" chance="8.013" /> <!-- Sealed Majestic Necklace -->
-				<item id="5292" min="1" max="3" chance="7.057" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="1" chance="5.999" /> <!-- Sealed Shield of Nightmare -->
-				<item id="289" min="1" max="1" chance="5.065" /> <!-- Soul Bow -->
-				<item id="151" min="1" max="1" chance="5.063" /> <!-- Sword of Miracles -->
-				<item id="5289" min="1" max="3" chance="5.056" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="80" min="1" max="1" chance="5.052" /> <!-- Tallum Blade -->
-				<item id="2504" min="1" max="1" chance="5.049" /> <!-- Meteor Shower -->
-				<item id="5294" min="1" max="3" chance="5.042" /> <!-- Sealed Tallum Helmet -->
-				<item id="235" min="1" max="1" chance="5.039" /> <!-- Bloody Orchid -->
-				<item id="5296" min="1" max="3" chance="5.037" /> <!-- Sealed Tallum Boots -->
-				<item id="269" min="1" max="1" chance="5.033" /> <!-- Blood Tornado -->
-				<item id="5290" min="1" max="3" chance="5.03" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="150" min="1" max="1" chance="5.024" /> <!-- Elemental Sword -->
-				<item id="288" min="1" max="1" chance="5.023" /> <!-- Carnage Bow -->
-				<item id="7899" min="1" max="1" chance="5.022" /> <!-- Destroyer Hammer -->
-				<item id="7884" min="1" max="1" chance="5.018" /> <!-- Infernal Master -->
-				<item id="5291" min="1" max="3" chance="5.009" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="7894" min="1" max="1" chance="5.008" /> <!-- Spiritual Eye -->
-				<item id="98" min="1" max="1" chance="4.987" /> <!-- Halberd -->
-				<item id="5295" min="1" max="3" chance="4.945" /> <!-- Sealed Tallum Gloves -->
-				<item id="81" min="1" max="1" chance="4.056" /> <!-- Dragon Slayer -->
-				<item id="305" min="1" max="1" chance="4.053" /> <!-- Tallum Glaive -->
-				<item id="270" min="1" max="1" chance="4.022" /> <!-- Dragon Grinder -->
-				<item id="212" min="1" max="1" chance="4.02" /> <!-- Dasparion's Staff -->
-				<item id="7902" min="1" max="1" chance="3.998" /> <!-- Doom Crusher -->
-				<item id="6324" min="1" max="1" chance="3.992" /> <!-- Sealed Phoenix Earring -->
-				<item id="236" min="1" max="1" chance="3.987" /> <!-- Soul Separator -->
-				<item id="164" min="1" max="1" chance="3.984" /> <!-- Elysian -->
-				<item id="213" min="1" max="1" chance="3.965" /> <!-- Branch of the Mother Tree -->
-				<item id="2500" min="1" max="1" chance="3.961" /> <!-- Dark Legion's Edge -->
-				<item id="7895" min="1" max="1" chance="3.948" /> <!-- Flaming Dragon Skull -->
-				<item id="5313" min="1" max="1" chance="3.06" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5298" min="1" max="1" chance="3.055" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="1" chance="3.046" /> <!-- Sealed Tallum Stockings -->
-				<item id="5304" min="1" max="1" chance="3.045" /> <!-- Sealed Tallum Tunic -->
-				<item id="5318" min="1" max="1" chance="3.034" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5308" min="1" max="1" chance="3.013" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="49683" min="1" max="1" chance="3.011" /> <!-- Talisman of Baium -->
-				<item id="5317" min="1" max="1" chance="3" /> <!-- Sealed Majestic Circlet -->
-				<item id="5297" min="1" max="1" chance="2.984" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5312" min="1" max="1" chance="2.978" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5319" min="1" max="1" chance="2.978" /> <!-- Sealed Majestic Boots -->
-				<item id="5301" min="1" max="1" chance="2.964" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5293" min="1" max="1" chance="2.963" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5288" min="1" max="1" chance="2.944" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5287" min="1" max="1" chance="2.942" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5314" min="1" max="1" chance="2.939" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5323" min="1" max="1" chance="2.056" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5320" min="1" max="1" chance="2.053" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5329" min="1" max="1" chance="2.023" /> <!-- Sealed Majestic Robe -->
-				<item id="5316" min="1" max="1" chance="1.959" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5326" min="1" max="1" chance="1.949" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5311" min="1" max="1" chance="1.949" /> <!-- Sealed Armor of Nightmare -->
-				<item id="6323" min="1" max="1" chance="0.75" /> <!-- Sealed Phoenix Necklace -->
-				<item id="8621" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Version) -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="33814" min="2" max="4" chance="50.42" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="729" min="1" max="1" chance="50.21" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="33808" min="1" max="1" chance="49.96" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="730" min="1" max="1" chance="49.85" /> <!-- Scroll: Enchant Armor (A-grade) -->
-				<item id="49756" min="2" max="4" chance="49.02" /> <!-- Cloth Piece -->
-				<item id="49682" min="1" max="1" chance="26.34" /> <!-- Baium? Soul -->
+				<group chance="100">
+					<item id="80" min="1" max="1" chance="5" /> <!-- Tallum Blade -->
+					<item id="81" min="1" max="1" chance="4" /> <!-- Dragon Slayer -->
+					<item id="98" min="1" max="1" chance="5" /> <!-- Halberd -->
+					<item id="150" min="1" max="1" chance="5" /> <!-- Elemental Sword -->
+					<item id="151" min="1" max="1" chance="5" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="1" chance="4" /> <!-- Elysian -->
+					<item id="212" min="1" max="1" chance="4" /> <!-- Dasparion's Staff -->
+					<item id="213" min="1" max="1" chance="4" /> <!-- Branch of the Mother Tree -->
+					<item id="235" min="1" max="1" chance="5" /> <!-- Bloody Orchid -->
+					<item id="236" min="1" max="1" chance="4" /> <!-- Soul Separator -->
+					<item id="269" min="1" max="1" chance="5" /> <!-- Blood Tornado -->
+					<item id="270" min="1" max="1" chance="4" /> <!-- Dragon Grinder -->
+					<item id="288" min="1" max="1" chance="5" /> <!-- Carnage Bow -->
+					<item id="289" min="1" max="1" chance="5" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="1" chance="4" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="1" chance="4" /> <!-- Dark Legion's Edge -->
+					<item id="2504" min="1" max="1" chance="5" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="1" chance="5" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="1" chance="5" /> <!-- Spiritual Eye -->
+					<item id="7895" min="1" max="1" chance="4" /> <!-- Flaming Dragon Skull -->
+					<item id="7899" min="1" max="1" chance="5" /> <!-- Destroyer Hammer -->
+					<item id="7902" min="1" max="1" chance="4" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="100">
+					<item id="7883" min="1" max="1" chance="17" /> <!-- Guardian's Sword -->
+					<item id="7889" min="1" max="1" chance="16" /> <!-- Wizard's Tear -->
+					<item id="7892" min="1" max="1" chance="17" /> <!-- Spell Breaker -->
+					<item id="7893" min="1" max="1" chance="17" /> <!-- Kaim Vanul's Bones -->
+					<item id="7900" min="1" max="1" chance="17" /> <!-- Ice Storm Hammer -->
+					<item id="7901" min="1" max="1" chance="16" /> <!-- Star Buster -->
+				</group>
+				<group chance="100">
+					<item id="5287" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5292" min="1" max="3" chance="7" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5293" min="1" max="1" chance="3" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="3" chance="5" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="3" chance="5" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="3" chance="5" /> <!-- Sealed Tallum Boots -->
+					<item id="5297" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5301" min="1" max="1" chance="3" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="1" chance="3" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="1" chance="3" /> <!-- Sealed Tallum Stockings -->
+					<item id="5308" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Robe -->
+					<item id="5311" min="1" max="1" chance="2" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="1" chance="3" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="1" chance="3" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="1" chance="3" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5315" min="1" max="1" chance="6" /> <!-- Sealed Shield of Nightmare -->
+					<item id="5316" min="1" max="1" chance="2" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="1" chance="3" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="1" chance="3" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="1" chance="3" /> <!-- Sealed Majestic Boots -->
+					<item id="5320" min="1" max="1" chance="2" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5323" min="1" max="1" chance="2" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5326" min="1" max="1" chance="2" /> <!-- Sealed Robe of Nightmare -->
+					<item id="5329" min="1" max="1" chance="2" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="100">
+					<item id="6323" min="1" max="1" chance="1" /> <!-- Sealed Phoenix Necklace -->
+					<item id="6324" min="1" max="1" chance="4" /> <!-- Sealed Phoenix Earring -->
+					<item id="6325" min="1" max="3" chance="15" /> <!-- Sealed Phoenix Ring -->
+					<item id="6326" min="1" max="1" chance="8" /> <!-- Sealed Majestic Necklace -->
+					<item id="6327" min="1" max="1" chance="20" /> <!-- Sealed Majestic Earring -->
+					<item id="6328" min="1" max="3" chance="52" /> <!-- Sealed Majestic Ring -->
+				</group>
+				<group chance="100">
+					<item id="33808" min="1" max="1" chance="50" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
+					<item id="33814" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="729" min="1" max="1" chance="50" /> <!-- Scroll: Enchant Weapon (A-grade) -->
+					<item id="730" min="1" max="1" chance="50" /> <!-- Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="30">
+					<item id="49580" min="1" max="1" chance="100" /> <!-- Baium's Ring -->
+				</group>
+				<group chance="30">
+					<item id="49683" min="1" max="1" chance="10" /> <!-- Talisman of Baium -->
+					<item id="49682" min="1" max="1" chance="90" /> <!-- Baium's Soul -->
+				</group>
+				<group chance="100">
+					<item id="8621" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Version) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -1409,9 +1291,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="93" /> <!-- Winged Spear -->
 		<acquire exp="11520" sp="2" />
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="186915" hpRegen="158" mp="1475" mpRegen="3" />
-			<attack physical="395" magical="371" random="30" critical="4" accuracy="40" attackSpeed="206" type="POLE" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="747660" hpRegen="158" mp="1475" mpRegen="3" />
+			<attack physical="4185" magical="371" random="10" critical="4" accuracy="0" attackSpeed="253" type="POLE" range="80" distance="80" width="120" />
 			<defence physical="5108" magical="1686" />
 			<speed>
 				<walk ground="50" />
@@ -1420,10 +1302,9 @@
 			<hitTime>760</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4132" level="1" /> <!-- Spear: Pound the Ground -->
+			<skill id="4416" level="8" /> <!-- Angel -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1431,9 +1312,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="11" /> <!-- Spears -->
-			<skill id="4416" level="8" /> <!-- Angels -->
-			<skill id="4133" level="1" /> <!-- Heal -->
+			<skill id="4415" level="11" /> <!-- Spear -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="300" isAggressive="true">
@@ -1451,9 +1331,9 @@
 		<sex>MALE</sex>
 		<acquire exp="102487500" sp="3074625" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="7027579.47902" hpRegen="310.756323" mp="10832.4" mpRegen="3" />
-			<attack physical="33864" magical="42273" random="30" critical="4" accuracy="40" attackSpeed="206" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3680" magical="4661" />
+			<vitals hp="66666666.6666667" hpRegen="2981.0298102981" mp="12240" mpRegen="10" />
+			<attack physical="15182.9268292683" magical="6600.03819341452" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2692.68292682927" magical="1794.92939666239" />
 			<speed>
 				<walk ground="42" />
 				<run ground="190" />
@@ -1461,97 +1341,118 @@
 			<hitTime>590</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4221" level="1" /> <!-- Range Dual Attack -->
-			<skill id="4220" level="1" /> <!-- Dual Attack -->
-			<skill id="4218" level="1" /> <!-- Drain -->
-			<skill id="4219" level="1" /> <!-- Hold -->
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
+			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="3" /> <!-- Extremely Weak P. Atk. -->
+			<skill id="4411" level="3" /> <!-- Extremely Weak M. Atk. -->
+			<skill id="4412" level="3" /> <!-- Extremely Weak P. Def. -->
+			<skill id="4413" level="3" /> <!-- Extremely Weak M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="1000" clanHelpRange="300" isAggressive="true" />
 		<collision>
-			<radius normal="16" />
-			<height normal="32" />
+			<radius normal="19.2" />
+			<height normal="39" />
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="6328" min="1" max="1" chance="52.1" /> <!-- Sealed Majestic Ring -->
-				<item id="6327" min="1" max="1" chance="20.12" /> <!-- Sealed Majestic Earring -->
-				<item id="90763" min="1" max="1" chance="19.89" /> <!-- Zaken's Earring -->
-				<item id="6325" min="1" max="1" chance="15.75" /> <!-- Sealed Phoenix Ring -->
-				<item id="6326" min="1" max="1" chance="7.945" /> <!-- Sealed Majestic Necklace -->
-				<item id="7893" min="1" max="1" chance="6.864" /> <!-- Kaim Vanul's Bones -->
-				<item id="7883" min="1" max="1" chance="6.834" /> <!-- Guardian's Sword -->
-				<item id="7892" min="1" max="1" chance="6.82" /> <!-- Spell Breaker -->
-				<item id="7900" min="1" max="1" chance="6.795" /> <!-- Ice Storm Hammer -->
-				<item id="7889" min="1" max="1" chance="6.401" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="6.35" /> <!-- Star Buster -->
-				<item id="6324" min="1" max="1" chance="4.019" /> <!-- Sealed Phoenix Earring -->
-				<item id="5292" min="1" max="1" chance="3.557" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="1" chance="3.046" /> <!-- Sealed Shield of Nightmare -->
-				<item id="5294" min="1" max="1" chance="2.548" /> <!-- Sealed Tallum Helmet -->
-				<item id="5290" min="1" max="1" chance="2.525" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5289" min="1" max="1" chance="2.512" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5296" min="1" max="1" chance="2.5" /> <!-- Sealed Tallum Boots -->
-				<item id="5291" min="1" max="1" chance="2.489" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5295" min="1" max="1" chance="2.443" /> <!-- Sealed Tallum Gloves -->
-				<item id="5318" min="1" max="1" chance="1.561" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5305" min="1" max="1" chance="1.544" /> <!-- Sealed Tallum Stockings -->
-				<item id="5317" min="1" max="1" chance="1.531" /> <!-- Sealed Majestic Circlet -->
-				<item id="5314" min="1" max="1" chance="1.525" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5297" min="1" max="1" chance="1.523" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5312" min="1" max="1" chance="1.485" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5298" min="1" max="1" chance="1.483" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5304" min="1" max="1" chance="1.48" /> <!-- Sealed Tallum Tunic -->
-				<item id="5301" min="1" max="1" chance="1.476" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5288" min="1" max="1" chance="1.475" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5308" min="1" max="1" chance="1.457" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5293" min="1" max="1" chance="1.456" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5319" min="1" max="1" chance="1.447" /> <!-- Sealed Majestic Boots -->
-				<item id="5287" min="1" max="1" chance="1.445" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5313" min="1" max="1" chance="1.44" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="7899" min="1" max="1" chance="0.75" /> <!-- Destroyer Hammer -->
-				<item id="212" min="1" max="1" chance="0.75" /> <!-- Dasparion's Staff -->
-				<item id="164" min="1" max="1" chance="0.75" /> <!-- Elysian -->
-				<item id="7884" min="1" max="1" chance="0.75" /> <!-- Infernal Master -->
-				<item id="151" min="1" max="1" chance="0.75" /> <!-- Sword of Miracles -->
-				<item id="235" min="1" max="1" chance="0.75" /> <!-- Bloody Orchid -->
-				<item id="150" min="1" max="1" chance="0.75" /> <!-- Elemental Sword -->
-				<item id="80" min="1" max="1" chance="0.75" /> <!-- Tallum Blade -->
-				<item id="7902" min="1" max="1" chance="0.75" /> <!-- Doom Crusher -->
-				<item id="81" min="1" max="1" chance="0.75" /> <!-- Dragon Slayer -->
-				<item id="7894" min="1" max="1" chance="0.75" /> <!-- Spiritual Eye -->
-				<item id="7895" min="1" max="1" chance="0.75" /> <!-- Flaming Dragon Skull -->
-				<item id="98" min="1" max="1" chance="0.75" /> <!-- Halberd -->
-				<item id="213" min="1" max="1" chance="0.75" /> <!-- Branch of the Mother Tree -->
-				<item id="236" min="1" max="1" chance="0.75" /> <!-- Soul Separator -->
-				<item id="269" min="1" max="1" chance="0.75" /> <!-- Blood Tornado -->
-				<item id="2500" min="1" max="1" chance="0.75" /> <!-- Dark Legion's Edge -->
-				<item id="305" min="1" max="1" chance="0.75" /> <!-- Tallum Glaive -->
-				<item id="289" min="1" max="1" chance="0.75" /> <!-- Soul Bow -->
-				<item id="5311" min="1" max="1" chance="0.75" /> <!-- Sealed Armor of Nightmare -->
-				<item id="288" min="1" max="1" chance="0.75" /> <!-- Carnage Bow -->
-				<item id="5316" min="1" max="1" chance="0.75" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5320" min="1" max="1" chance="0.75" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5323" min="1" max="1" chance="0.75" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5326" min="1" max="1" chance="0.75" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5329" min="1" max="1" chance="0.75" /> <!-- Sealed Majestic Robe -->
-				<item id="6323" min="1" max="1" chance="0.75" /> <!-- Sealed Phoenix Necklace -->
-				<item id="270" min="1" max="1" chance="0.75" /> <!-- Dragon Grinder -->
-				<item id="2504" min="1" max="1" chance="0.75" /> <!-- Meteor Shower -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="1" max="3" chance="50.22" /> <!-- Cloth Piece -->
-				<item id="33814" min="1" max="1" chance="34.82" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33808" min="1" max="1" chance="34.45" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="729" min="1" max="1" chance="25.37" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="730" min="1" max="1" chance="25.13" /> <!-- Scroll: Enchant Armor (A-grade) -->
+				<group chance="98">
+					<item id="80" min="1" max="3" chance="5" /> <!-- Tallum Blade -->
+					<item id="81" min="1" max="3" chance="4" /> <!-- Dragon Slayer -->
+					<item id="98" min="1" max="3" chance="5" /> <!-- Halberd -->
+					<item id="150" min="1" max="3" chance="5" /> <!-- Elemental Sword -->
+					<item id="151" min="1" max="3" chance="5" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="3" chance="4" /> <!-- Elysian -->
+					<item id="212" min="1" max="3" chance="4" /> <!-- Dasparion's Staff -->
+					<item id="213" min="1" max="3" chance="4" /> <!-- Branch of the Mother Tree -->
+					<item id="235" min="1" max="3" chance="5" /> <!-- Bloody Orchid -->
+					<item id="236" min="1" max="3" chance="4" /> <!-- Soul Separator -->
+					<item id="269" min="1" max="3" chance="5" /> <!-- Blood Tornado -->
+					<item id="270" min="1" max="3" chance="4" /> <!-- Dragon Grinder -->
+					<item id="288" min="1" max="3" chance="5" /> <!-- Carnage Bow -->
+					<item id="289" min="1" max="3" chance="5" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="3" chance="4" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="3" chance="4" /> <!-- Dark Legion's Edge -->
+					<item id="2504" min="1" max="3" chance="5" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="3" chance="5" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="3" chance="5" /> <!-- Spiritual Eye -->
+					<item id="7895" min="1" max="3" chance="4" /> <!-- Flaming Dragon Skull -->
+					<item id="7899" min="1" max="3" chance="5" /> <!-- Destroyer Hammer -->
+					<item id="7902" min="1" max="3" chance="4" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="98">
+					<item id="7883" min="1" max="3" chance="17" /> <!-- Guardian's Sword -->
+					<item id="7889" min="1" max="3" chance="16" /> <!-- Wizard's Tear -->
+					<item id="7892" min="1" max="3" chance="17" /> <!-- Spell Breaker -->
+					<item id="7893" min="1" max="3" chance="17" /> <!-- Kaim Vanul's Bones -->
+					<item id="7900" min="1" max="3" chance="17" /> <!-- Ice Storm Hammer -->
+					<item id="7901" min="1" max="3" chance="16" /> <!-- Star Buster -->
+				</group>
+				<group chance="98">
+					<item id="5287" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5292" min="1" max="3" chance="7" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5293" min="1" max="3" chance="3" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="3" chance="5" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="3" chance="5" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="3" chance="5" /> <!-- Sealed Tallum Boots -->
+					<item id="5297" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5301" min="1" max="3" chance="3" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="3" chance="3" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="3" chance="3" /> <!-- Sealed Tallum Stockings -->
+					<item id="5308" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Robe -->
+					<item id="5311" min="1" max="3" chance="2" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="3" chance="3" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="3" chance="3" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="3" chance="3" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5315" min="1" max="3" chance="6" /> <!-- Sealed Shield of Nightmare -->
+					<item id="5316" min="1" max="3" chance="2" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="3" chance="3" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="3" chance="3" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="3" chance="3" /> <!-- Sealed Majestic Boots -->
+					<item id="5320" min="1" max="3" chance="2" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5323" min="1" max="3" chance="2" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5326" min="1" max="3" chance="2" /> <!-- Sealed Robe of Nightmare -->
+					<item id="5329" min="1" max="3" chance="2" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="98">
+					<item id="6323" min="1" max="3" chance="1" /> <!-- Sealed Phoenix Necklace -->
+					<item id="6324" min="1" max="3" chance="4" /> <!-- Sealed Phoenix Earring -->
+					<item id="6325" min="1" max="3" chance="15" /> <!-- Sealed Phoenix Ring -->
+					<item id="6326" min="1" max="3" chance="8" /> <!-- Sealed Majestic Necklace -->
+					<item id="6327" min="1" max="3" chance="20" /> <!-- Sealed Majestic Earring -->
+					<item id="6328" min="1" max="3" chance="52" /> <!-- Sealed Majestic Ring -->
+				</group>
+				<group chance="100">
+					<item id="33808" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
+					<item id="33814" min="5" max="15" chance="50" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="729" min="2" max="4" chance="50" /> <!-- Scroll: Enchant Weapon (A-grade) -->
+					<item id="730" min="6" max="12" chance="50" /> <!-- Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="20">
+					<item id="90763" min="1" max="1" chance="100" /> <!-- Zaken's Earring -->
+				</group>
+				<group chance="100">
+					<item id="49756" min="1" max="3" chance="100" /> <!-- Cloth Piece -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29023" level="74" type="Monster" name="Maiden Doll">
+	<npc id="29023" level="58" type="Monster" name="Maiden Doll">
 		<parameters>
 			<param name="MoveAroundSocial" value="50" />
 			<param name="MoveAroundSocial1" value="50" />
@@ -1562,33 +1463,31 @@
 		<equipment rhand="5129" /> <!-- Doll Knife -->
 		<acquire exp="129198" sp="3875" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1828" hpRegen="6.5" mp="832" mpRegen="2.4" />
-			<attack physical="442" magical="302" random="30" critical="4" accuracy="40" attackSpeed="253" type="DUAL" range="40" distance="80" width="120" />
+			<vitals hp="1828" hpRegen="6.5" mp="832.4" mpRegen="2.4" />
+			<attack physical="442" magical="302" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="DUAL" range="40" distance="80" width="120" />
 			<defence physical="261" magical="191" />
 			<speed>
 				<walk ground="22" />
 				<run ground="150" />
 			</speed>
-			<hitTime>500</hitTime>
+			<hitTime>50</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="5" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4085" level="1" /> <!-- Critical Damage -->
-			<skill id="4086" level="1" /> <!-- Critical Chance -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="9" /> <!-- Average M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="19" /> <!-- Dual-Sword Weapons -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4333" level="5" /> <!-- Dark Attack Resistance -->
-			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4415" level="19" /> <!-- Dualsword -->
+			<skill id="4071" level="5" /> <!-- Bow/Crossbow Resistance -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1596,22 +1495,8 @@
 			<radius normal="6" />
 			<height normal="12" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="97" min="1" max="1" chance="0.0075" /> <!-- Lance -->
-				<item id="268" min="1" max="1" chance="0.0075" /> <!-- Bellion Cestus -->
-				<item id="57" min="2433" max="5685" chance="70" /> <!-- Adena -->
-				<item id="1887" min="1" max="1" chance="10.68" /> <!-- Varnish of Purity -->
-				<item id="4120" min="1" max="1" chance="1.603" /> <!-- Bellion Cestus Edge -->
-				<item id="4115" min="1" max="1" chance="1.574" /> <!-- Lance Blade -->
-			</drop>
-			<spoil>
-				<item id="948" min="1" max="1" chance="4.296" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="947" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-			</spoil>
-		</dropLists>
 	</npc>
-	<npc id="29024" level="74" type="Monster" name="Veil Master">
+	<npc id="29024" level="59" type="Monster" name="Veil Master">
 		<parameters>
 			<param name="MoveAroundSocial" value="114" />
 			<param name="MoveAroundSocial1" value="114" />
@@ -1622,7 +1507,7 @@
 		<acquire exp="90904" sp="2727" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1880" hpRegen="6.5" mp="861" mpRegen="2.4" />
-			<attack physical="461" magical="315" random="30" critical="4" accuracy="40" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="461" magical="315" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="267" magical="195" />
 			<speed>
 				<walk ground="70" />
@@ -1631,66 +1516,9 @@
 			<hitTime>740</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="5" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4085" level="1" /> <!-- Critical Damage -->
-			<skill id="4086" level="1" /> <!-- Critical Chance -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4333" level="5" /> <!-- Dark Attack Resistance -->
 			<skill id="4416" level="9" /> <!-- Demons -->
-		</skillList>
-		<exCrtEffect>true</exCrtEffect>
-		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
-		<collision>
-			<radius normal="12" />
-			<height normal="40" />
-		</collision>
-		<dropLists>
-			<drop>
-				<item id="79" min="1" max="1" chance="0.003" /> <!-- Damascus -->
-				<item id="171" min="1" max="1" chance="0.003" /> <!-- Deadman's Glory -->
-				<item id="57" min="1372" max="3205" chance="70" /> <!-- Adena -->
-				<item id="1895" min="1" max="1" chance="11.11" /> <!-- Metallic Fiber -->
-				<item id="1876" min="1" max="1" chance="8.019" /> <!-- Mithril Ore -->
-				<item id="1866" min="2" max="6" chance="6.628" /> <!-- Suede -->
-				<item id="1879" min="1" max="1" chance="6.623" /> <!-- Cokes -->
-				<item id="1870" min="5" max="15" chance="3.946" /> <!-- Coal -->
-				<item id="1871" min="9" max="27" chance="2.235" /> <!-- Charcoal -->
-				<item id="4114" min="1" max="1" chance="0.75" /> <!-- Damascus Sword Blade -->
-				<item id="4116" min="1" max="1" chance="0.75" /> <!-- Deadman's Glory Stone -->
-			</drop>
-			<spoil>
-				<item id="948" min="1" max="1" chance="2.453" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="947" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-			</spoil>
-		</dropLists>
-	</npc>
-	<npc id="29025" level="75" type="Folk" name="Baium">
-		<race>HUMANOID</race>
-		<sex>MALE</sex>
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="1709400" hpRegen="8.5" mp="18000" mpRegen="3" />
-			<attack physical="874.18" magical="596.95" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="233.61" magical="233.61" />
-			<speed>
-				<walk ground="50" />
-				<run ground="120" />
-			</speed>
-			<abnormalResist physical="230" magical="230" />
-		</stats>
-		<status attackable="false" undying="true" />
-		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1699,7 +1527,44 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4071" level="5" /> <!-- Bow/Crossbow Resistance -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+		</skillList>
+		<exCrtEffect>true</exCrtEffect>
+		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="29025" level="75" type="Folk" name="Baium">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="1709400" hpRegen="718" mp="18000" mpRegen="99" />
+			<attack physical="1874.18" magical="1596.95" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3300" magical="2200" />
+			<speed>
+				<walk ground="50" />
+				<run ground="120" />
+			</speed>
+			<hitTime>60</hitTime>
+			<abnormalResist physical="230" magical="230" />
+		</stats>
+		<status attackable="false" undying="true" />
+		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="300" aggroRange="4296" />
@@ -1719,7 +1584,7 @@
 		<equipment rhand="232" /> <!-- Dark Elven Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1933" hpRegen="6.5" mp="804" mpRegen="2.4" />
-			<attack physical="420" magical="328" random="10" critical="8" accuracy="40" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
+			<attack physical="420" magical="328" random="5" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="272" magical="199" />
 			<speed>
 				<walk ground="14" />
@@ -1728,9 +1593,9 @@
 			<hitTime>760</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1738,10 +1603,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="7" /> <!-- Daggers -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4415" level="7" /> <!-- Dagger -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1761,7 +1624,7 @@
 		<equipment rhand="225" /> <!-- Mithril Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1776" hpRegen="6.5" mp="584" mpRegen="2.1" />
-			<attack physical="371" magical="289" random="10" critical="8" accuracy="40" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
+			<attack physical="371" magical="289" random="5" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="256" magical="187" />
 			<speed>
 				<walk ground="11" />
@@ -1770,9 +1633,9 @@
 			<hitTime>740</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1780,10 +1643,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="7" /> <!-- Daggers -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4415" level="7" /> <!-- Dagger -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1792,28 +1653,27 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="29066" level="1" type="GrandBoss" name="Antharas">
+	<npc id="29066" level="75" type="GrandBoss" name="Antharas">
 		<parameters>
 			<param name="ultra_respawn_time" value="8" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<acquire exp="262720917" sp="63053" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="6100000" hpRegen="2" mp="1800000" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="6100000" hpRegen="1100" mp="1800000" mpRegen="1000" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3456" magical="862.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1822,8 +1682,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1834,75 +1695,29 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists> <!-- CT2.5 -->
-			<drop>
-				<item id="8620" min="10" max="30" chance="50" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="80" min="1" max="2" chance="25" /> <!-- Tallum Blade -->
-				<item id="98" min="1" max="2" chance="25" /> <!-- Halberd -->
-				<item id="269" min="1" max="2" chance="25" /> <!-- Blood Tornado -->
-				<item id="2504" min="1" max="2" chance="25" /> <!-- Meteor Shower -->
-				<item id="235" min="1" max="2" chance="25" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="2" chance="25" /> <!-- Carnage Bow -->
-				<item id="150" min="1" max="2" chance="25" /> <!-- Elemental Sword -->
-				<item id="212" min="1" max="2" chance="25" /> <!-- Dasparion's Staff -->
-				<item id="81" min="1" max="2" chance="25" /> <!-- Dragon Slayer -->
-				<item id="151" min="1" max="2" chance="25" /> <!-- Sword of Miracles -->
-				<item id="2500" min="1" max="2" chance="25" /> <!-- Dark Legion's Edge -->
-				<item id="164" min="1" max="2" chance="25" /> <!-- Elysian -->
-				<item id="236" min="1" max="2" chance="20" /> <!-- Soul Separator -->
-				<item id="270" min="1" max="2" chance="20" /> <!-- Dragon Grinder -->
-				<item id="289" min="1" max="2" chance="20" /> <!-- Soul Bow -->
-				<item id="213" min="1" max="2" chance="20" /> <!-- Branch of the Mother Tree -->
-				<item id="305" min="1" max="2" chance="20" /> <!-- Tallum Glaive -->
-				<item id="6326" min="1" max="5" chance="30" /> <!-- Sealed Majestic Necklace -->
-				<item id="6327" min="1" max="5" chance="35" /> <!-- Sealed Majestic Earring -->
-				<item id="6328" min="1" max="5" chance="35" /> <!-- Sealed Majestic Ring -->
-				<item id="6323" min="1" max="5" chance="30" /> <!-- Sealed Phoenix Necklace -->
-				<item id="6324" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Earring -->
-				<item id="6325" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Ring -->
-				<item id="5287" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5297" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5304" min="1" max="3" chance="25" /> <!-- Sealed Tallum Tunic -->
-				<item id="5311" min="1" max="3" chance="35" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5320" min="1" max="3" chance="35" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="30" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="3" chance="25" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5301" min="1" max="3" chance="25" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5308" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5316" min="1" max="3" chance="8" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5323" min="1" max="3" chance="8" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5329" min="1" max="3" chance="9" /> <!-- Sealed Majestic Robe -->
-				<item id="5288" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5298" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="30" /> <!-- Sealed Tallum Stockings -->
-				<item id="5289" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5294" min="1" max="3" chance="25" /> <!-- Sealed Tallum Helmet -->
-				<item id="5312" min="1" max="3" chance="25" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5317" min="1" max="3" chance="25" /> <!-- Sealed Majestic Circlet -->
-				<item id="5291" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5296" min="1" max="3" chance="25" /> <!-- Sealed Tallum Boots -->
-				<item id="5314" min="1" max="3" chance="25" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5319" min="1" max="3" chance="25" /> <!-- Sealed Majestic Boots -->
-				<item id="5290" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5295" min="1" max="3" chance="25" /> <!-- Sealed Tallum Gloves -->
-				<item id="5313" min="1" max="3" chance="25" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5318" min="1" max="3" chance="25" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5292" min="1" max="3" chance="40" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="40" /> <!-- Sealed Shield of Nightmare -->
-				<item id="729" min="1" max="19" chance="100" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="1538" min="1" max="59" chance="100" /> <!-- Blessed Scroll of Escape -->
-				<item id="3936" min="1" max="39" chance="100" /> <!-- Blessed Scroll of Resurrection -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="9000000" max="13000000" chance="100" /> <!-- Adena -->
-			</drop>
-		</dropLists>
 	</npc>
-	<npc id="29067" level="1" type="GrandBoss" name="Antharas">
+	<npc id="29061" displayId="31842" level="70" type="Teleporter" name="Teleportation Cubic">
+		<race>ETC</race>
+		<sex>ETC</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2444" hpRegen="7.5" mp="1345" mpRegen="2.7" />
+			<attack physical="688.86373" magical="470.40463" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="295.91597" magical="216.53847" />
+			<speed>
+				<walk ground="50" />
+				<run ground="120" />
+			</speed>
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="false" />
+		<exCrtEffect>true</exCrtEffect>
+		<ai type="BALANCED" clanHelpRange="300" isAggressive="true" aggroRange="500" />
+		<collision>
+			<radius normal="40" />
+			<height normal="80" />
+		</collision>
+	</npc>
+	<npc id="29067" level="75" type="GrandBoss" name="Antharas">
 		<parameters>
 			<param name="ultra_respawn_time" value="5" />
 		</parameters>
@@ -1911,19 +1726,18 @@
 		<acquire exp="262720918" sp="29116376" raidPoints="30780" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="6800000" hpRegen="1100" mp="1800000" mpRegen="1000" />
-			<attack physical="4900" magical="2550" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3456" magical="862.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1932,8 +1746,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1944,112 +1759,29 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="5292" min="1" max="1" chance="51.25" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="1" chance="50.84" /> <!-- Sealed Shield of Nightmare -->
-				<item id="5329" min="1" max="1" chance="20.5" /> <!-- Sealed Majestic Robe -->
-				<item id="5311" min="1" max="1" chance="20.37" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5323" min="1" max="1" chance="20.04" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5320" min="1" max="1" chance="19.68" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="1" chance="19.57" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="1" chance="19.15" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5316" min="1" max="1" chance="19.09" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="7900" min="1" max="1" chance="17.8" /> <!-- Ice Storm Hammer -->
-				<item id="5308" min="1" max="1" chance="17.77" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="7892" min="1" max="1" chance="17.72" /> <!-- Spell Breaker -->
-				<item id="5301" min="1" max="1" chance="17.33" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="7883" min="1" max="1" chance="16.92" /> <!-- Guardian's Sword -->
-				<item id="7893" min="1" max="1" chance="16.91" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="16.68" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="15.89" /> <!-- Star Buster -->
-				<item id="5319" min="1" max="1" chance="13.64" /> <!-- Sealed Majestic Boots -->
-				<item id="5313" min="1" max="1" chance="13.35" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5312" min="1" max="1" chance="13.17" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5288" min="1" max="1" chance="13.03" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5314" min="1" max="1" chance="12.9" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5318" min="1" max="1" chance="12.85" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5305" min="1" max="1" chance="12.76" /> <!-- Sealed Tallum Stockings -->
-				<item id="5295" min="1" max="1" chance="12.67" /> <!-- Sealed Tallum Gloves -->
-				<item id="5289" min="1" max="1" chance="12.66" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5317" min="1" max="1" chance="12.7" /> <!-- Sealed Majestic Circlet -->
-				<item id="5298" min="1" max="1" chance="12.59" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5296" min="1" max="1" chance="12.45" /> <!-- Sealed Tallum Boots -->
-				<item id="5304" min="1" max="1" chance="12.44" /> <!-- Sealed Tallum Tunic -->
-				<item id="5294" min="1" max="1" chance="12.34" /> <!-- Sealed Tallum Helmet -->
-				<item id="5297" min="1" max="1" chance="12.19" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5287" min="1" max="1" chance="11.92" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5291" min="1" max="1" chance="10.018" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5290" min="1" max="1" chance="9.982" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="2500" min="1" max="1" chance="9.154" /> <!-- Dark Legion's Edge -->
-				<item id="7902" min="1" max="1" chance="9.146" /> <!-- Doom Crusher -->
-				<item id="81" min="1" max="1" chance="9.146" /> <!-- Dragon Slayer -->
-				<item id="80" min="1" max="1" chance="9.144" /> <!-- Tallum Blade -->
-				<item id="7895" min="1" max="1" chance="9.136" /> <!-- Flaming Dragon Skull -->
-				<item id="213" min="1" max="1" chance="9.134" /> <!-- Branch of the Mother Tree -->
-				<item id="236" min="1" max="1" chance="9.13" /> <!-- Soul Separator -->
-				<item id="7899" min="1" max="1" chance="9.129" /> <!-- Destroyer Hammer -->
-				<item id="2504" min="1" max="1" chance="9.126" /> <!-- Meteor Shower -->
-				<item id="305" min="1" max="1" chance="9.124" /> <!-- Tallum Glaive -->
-				<item id="164" min="1" max="1" chance="9.124" /> <!-- Elysian -->
-				<item id="270" min="1" max="1" chance="9.122" /> <!-- Dragon Grinder -->
-				<item id="150" min="1" max="1" chance="9.103" /> <!-- Elemental Sword -->
-				<item id="235" min="1" max="1" chance="9.095" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="1" chance="9.08" /> <!-- Carnage Bow -->
-				<item id="269" min="1" max="1" chance="9.077" /> <!-- Blood Tornado -->
-				<item id="7884" min="1" max="1" chance="9.073" /> <!-- Infernal Master -->
-				<item id="98" min="1" max="1" chance="9.07" /> <!-- Halberd -->
-				<item id="7894" min="1" max="1" chance="9.067" /> <!-- Spiritual Eye -->
-				<item id="212" min="1" max="1" chance="9.029" /> <!-- Dasparion's Staff -->
-				<item id="289" min="1" max="1" chance="9.025" /> <!-- Soul Bow -->
-				<item id="151" min="1" max="1" chance="9.024" /> <!-- Sword of Miracles -->
-				<item id="8683" min="1" max="1" chance="8.378" /> <!-- Tiphon's Spear -->
-				<item id="8684" min="1" max="1" chance="8.378" /> <!-- Shyeed's Bow -->
-				<item id="8682" min="1" max="1" chance="8.368" /> <!-- Naga Storm -->
-				<item id="8688" min="1" max="1" chance="8.356" /> <!-- Daimon Crystal -->
-				<item id="8678" min="1" max="1" chance="8.356" /> <!-- Sirra's Blade -->
-				<item id="8680" min="1" max="1" chance="8.331" /> <!-- Barakiel's Axe -->
-				<item id="8681" min="1" max="1" chance="8.328" /> <!-- Behemoth' Tuning Fork -->
-				<item id="8686" min="1" max="1" chance="8.324" /> <!-- Themis' Tongue -->
-				<item id="8679" min="1" max="1" chance="8.317" /> <!-- Sword of Ipos -->
-				<item id="8687" min="1" max="1" chance="8.295" /> <!-- Cabrio's Hand -->
-				<item id="5706" min="1" max="1" chance="8.273" /> <!-- Damascus*Damascus -->
-				<item id="8685" min="1" max="1" chance="8.268" /> <!-- Sobekk's Hurricane -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="3" max="7" chance="100" /> <!-- Cloth Piece -->
-				<item id="33815" min="2" max="4" chance="50.21" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
-				<item id="33814" min="2" max="4" chance="49.99" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33809" min="2" max="4" chance="49.83" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
-				<item id="33807" min="2" max="4" chance="49.36" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
-				<item id="33813" min="2" max="4" chance="48.95" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
-				<item id="33808" min="2" max="4" chance="48.94" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29068" level="84" type="GrandBoss" name="Antharas" title="Land Dragon">
-		<!-- Todo: CT2.5 -->
 		<parameters>
 			<param name="ultra_respawn_time" value="3" />
 		</parameters>
 		<race>DRAGON</race>
 		<sex>MALE</sex>
-		<acquire exp="538538584" sp="63323403" raidPoints="38248" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="689482245" hpRegen="1830" mp="2025740" mpRegen="1000" />
-			<attack physical="4799.20533" magical="263.60854" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3974.13793" magical="496.01325" />
+		<acquire exp="40664236032" sp="9759416" raidPoints="1000" />
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="355555555" hpRegen="385356.45" mp="2025740" mpRegen="1000" />
+			<attack physical="35810" magical="3783.6" random="5" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2505.43352601156" magical="1452.04745968969" />
 			<speed>
 				<walk ground="50" />
 				<run ground="279" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
+		<status attackable="true" noSleepMode="true" isDeathPenalty="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4112" level="1" /> <!-- Ordinary Attack -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2058,9 +1790,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -2071,90 +1803,8 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="5292" min="1" max="1" chance="51.25" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="1" chance="50.84" /> <!-- Sealed Shield of Nightmare -->
-				<item id="5329" min="1" max="1" chance="20.5" /> <!-- Sealed Majestic Robe -->
-				<item id="5311" min="1" max="1" chance="20.37" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5323" min="1" max="1" chance="20.04" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5320" min="1" max="1" chance="19.68" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="1" chance="19.57" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="1" chance="19.15" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5316" min="1" max="1" chance="19.09" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="7900" min="1" max="1" chance="17.8" /> <!-- Ice Storm Hammer -->
-				<item id="5308" min="1" max="1" chance="17.77" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="7892" min="1" max="1" chance="17.72" /> <!-- Spell Breaker -->
-				<item id="5301" min="1" max="1" chance="17.33" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="7883" min="1" max="1" chance="16.92" /> <!-- Guardian's Sword -->
-				<item id="7893" min="1" max="1" chance="16.91" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="16.68" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="15.89" /> <!-- Star Buster -->
-				<item id="5319" min="1" max="1" chance="13.64" /> <!-- Sealed Majestic Boots -->
-				<item id="5313" min="1" max="1" chance="13.35" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5312" min="1" max="1" chance="13.17" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5288" min="1" max="1" chance="13.03" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5314" min="1" max="1" chance="12.9" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5318" min="1" max="1" chance="12.85" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5305" min="1" max="1" chance="12.76" /> <!-- Sealed Tallum Stockings -->
-				<item id="5295" min="1" max="1" chance="12.67" /> <!-- Sealed Tallum Gloves -->
-				<item id="5289" min="1" max="1" chance="12.66" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5317" min="1" max="1" chance="12.7" /> <!-- Sealed Majestic Circlet -->
-				<item id="5298" min="1" max="1" chance="12.59" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5296" min="1" max="1" chance="12.45" /> <!-- Sealed Tallum Boots -->
-				<item id="5304" min="1" max="1" chance="12.44" /> <!-- Sealed Tallum Tunic -->
-				<item id="5294" min="1" max="1" chance="12.34" /> <!-- Sealed Tallum Helmet -->
-				<item id="5297" min="1" max="1" chance="12.19" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5287" min="1" max="1" chance="11.92" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5291" min="1" max="1" chance="10.018" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5290" min="1" max="1" chance="9.982" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="2500" min="1" max="1" chance="9.154" /> <!-- Dark Legion's Edge -->
-				<item id="7902" min="1" max="1" chance="9.146" /> <!-- Doom Crusher -->
-				<item id="81" min="1" max="1" chance="9.146" /> <!-- Dragon Slayer -->
-				<item id="80" min="1" max="1" chance="9.144" /> <!-- Tallum Blade -->
-				<item id="7895" min="1" max="1" chance="9.136" /> <!-- Flaming Dragon Skull -->
-				<item id="213" min="1" max="1" chance="9.134" /> <!-- Branch of the Mother Tree -->
-				<item id="236" min="1" max="1" chance="9.13" /> <!-- Soul Separator -->
-				<item id="7899" min="1" max="1" chance="9.129" /> <!-- Destroyer Hammer -->
-				<item id="2504" min="1" max="1" chance="9.126" /> <!-- Meteor Shower -->
-				<item id="305" min="1" max="1" chance="9.124" /> <!-- Tallum Glaive -->
-				<item id="164" min="1" max="1" chance="9.124" /> <!-- Elysian -->
-				<item id="270" min="1" max="1" chance="9.122" /> <!-- Dragon Grinder -->
-				<item id="150" min="1" max="1" chance="9.103" /> <!-- Elemental Sword -->
-				<item id="235" min="1" max="1" chance="9.095" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="1" chance="9.08" /> <!-- Carnage Bow -->
-				<item id="269" min="1" max="1" chance="9.077" /> <!-- Blood Tornado -->
-				<item id="7884" min="1" max="1" chance="9.073" /> <!-- Infernal Master -->
-				<item id="98" min="1" max="1" chance="9.07" /> <!-- Halberd -->
-				<item id="7894" min="1" max="1" chance="9.067" /> <!-- Spiritual Eye -->
-				<item id="212" min="1" max="1" chance="9.029" /> <!-- Dasparion's Staff -->
-				<item id="289" min="1" max="1" chance="9.025" /> <!-- Soul Bow -->
-				<item id="151" min="1" max="1" chance="9.024" /> <!-- Sword of Miracles -->
-				<item id="8683" min="1" max="1" chance="8.378" /> <!-- Tiphon's Spear -->
-				<item id="8684" min="1" max="1" chance="8.378" /> <!-- Shyeed's Bow -->
-				<item id="8682" min="1" max="1" chance="8.368" /> <!-- Naga Storm -->
-				<item id="8688" min="1" max="1" chance="8.356" /> <!-- Daimon Crystal -->
-				<item id="8678" min="1" max="1" chance="8.356" /> <!-- Sirra's Blade -->
-				<item id="8680" min="1" max="1" chance="8.331" /> <!-- Barakiel's Axe -->
-				<item id="8681" min="1" max="1" chance="8.328" /> <!-- Behemoth' Tuning Fork -->
-				<item id="8686" min="1" max="1" chance="8.324" /> <!-- Themis' Tongue -->
-				<item id="8679" min="1" max="1" chance="8.317" /> <!-- Sword of Ipos -->
-				<item id="8687" min="1" max="1" chance="8.295" /> <!-- Cabrio's Hand -->
-				<item id="5706" min="1" max="1" chance="8.273" /> <!-- Damascus*Damascus -->
-				<item id="8685" min="1" max="1" chance="8.268" /> <!-- Sobekk's Hurricane -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="3" max="7" chance="100" /> <!-- Cloth Piece -->
-				<item id="33815" min="2" max="4" chance="50.21" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
-				<item id="33814" min="2" max="4" chance="49.99" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33809" min="2" max="4" chance="49.83" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
-				<item id="33807" min="2" max="4" chance="49.36" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
-				<item id="33813" min="2" max="4" chance="48.95" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
-				<item id="33808" min="2" max="4" chance="48.94" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29069" level="84" type="Monster" name="Behemoth Dragon">
-		<!-- Todo: CT2.5 -->
 		<parameters>
 			<param name="RootingManage" value="0" />
 			<skill name="PhysicalSpecial" id="5095" level="1" />
@@ -2163,18 +1813,20 @@
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="292335" hpRegen="76.71" mp="22800" mpRegen="3" />
-			<attack physical="3584.56902102981" magical="1386.66000087809" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="1071.29474264312" magical="522.626863116263" evasion="-18" />
+			<vitals hp="949367" hpRegen="22" mp="22800" mpRegen="30" />
+			<attack physical="14519" magical="11667" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="1370" magical="851" />
 			<speed>
-				<walk ground="180" />
+				<walk ground="55" />
 				<run ground="180" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" isDeathPenalty="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2183,10 +1835,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5095" level="1" /> <!-- Antharas Subordinate Melee Attack -->
 			<skill id="5096" level="1" /> <!-- Antharas Subordinate Remote Attack -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="300" isAggressive="true">
@@ -2197,26 +1848,27 @@
 			<height normal="54" />
 		</collision>
 	</npc>
-	<npc id="29070" level="79" type="Monster" name="Dragon Bomber">
-		<!-- Todo: CT2.5 -->
+	<npc id="29070" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1353" hpRegen="8.5" mp="1809" mpRegen="3" />
-			<attack physical="1094.11758465172" magical="4902.24" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<vitals hp="1353.6766" hpRegen="8.5" mp="1809" mpRegen="3" />
+			<attack physical="1094.11758465172" magical="4902.24" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.098247547707" magical="261.308998696584" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="250" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2225,10 +1877,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2237,25 +1887,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29071" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29071" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="245" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2264,9 +1915,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2275,25 +1925,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29072" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29072" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="255" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2302,9 +1953,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2313,25 +1963,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29073" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29073" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="247" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2340,9 +1991,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2351,25 +2001,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29074" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29074" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="252" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2378,9 +2029,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2389,25 +2039,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29075" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29075" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="243" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2416,9 +2067,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2427,25 +2077,27 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29076" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29076" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1353" hpRegen="2" mp="1809" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1353.6766" hpRegen="8.5" mp="1809" mpRegen="3" />
+			<attack physical="1094.11758465172" magical="4902.24" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="357.098247547707" magical="261.308998696584" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="250" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2454,9 +2106,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="200" clanHelpRange="300" isAggressive="true" />
@@ -2465,7 +2116,7 @@
 			<height normal="34.5" />
 		</collision>
 	</npc>
-	<npc id="29077" level="78" type="Monster" name="">
+	<npc id="29077" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="177456" />
 			<param name="suicide2_x" value="177120" />
@@ -2485,19 +2136,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2506,7 +2158,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2515,7 +2167,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29078" level="78" type="Monster" name="">
+	<npc id="29078" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175952" />
 			<param name="suicide2_x" value="175712" />
@@ -2535,19 +2187,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2556,7 +2209,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2565,7 +2218,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29079" level="78" type="Monster" name="">
+	<npc id="29079" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175120" />
 			<param name="suicide2_x" value="175024" />
@@ -2585,19 +2238,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2606,7 +2260,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2615,7 +2269,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29080" level="78" type="Monster" name="">
+	<npc id="29080" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="174640" />
 			<param name="suicide2_x" value="174576" />
@@ -2635,19 +2289,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2656,7 +2311,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2665,7 +2320,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29081" level="78" type="Monster" name="">
+	<npc id="29081" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="173968" />
 			<param name="suicide2_x" value="173856" />
@@ -2685,19 +2340,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2706,7 +2362,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2715,7 +2371,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29082" level="78" type="Monster" name="">
+	<npc id="29082" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="173920" />
 			<param name="suicide2_x" value="174064" />
@@ -2735,19 +2391,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2756,7 +2413,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2765,7 +2422,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29083" level="78" type="Monster" name="">
+	<npc id="29083" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="174704" />
 			<param name="suicide2_x" value="174800" />
@@ -2785,19 +2442,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2806,7 +2464,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2815,7 +2473,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29084" level="78" type="Monster" name="">
+	<npc id="29084" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175424" />
 			<param name="suicide2_x" value="175632" />
@@ -2835,19 +2493,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2856,7 +2515,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2865,7 +2524,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29085" level="78" type="Monster" name="">
+	<npc id="29085" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="176880" />
 			<param name="suicide2_x" value="177200" />
@@ -2885,19 +2544,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2906,7 +2566,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2915,7 +2575,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29086" level="78" type="Monster" name="">
+	<npc id="29086" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="178368" />
 			<param name="suicide2_x" value="178592" />
@@ -2935,19 +2595,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2956,7 +2617,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2965,7 +2626,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29087" level="78" type="Monster" name="">
+	<npc id="29087" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="179696" />
 			<param name="suicide2_x" value="179920" />
@@ -2985,19 +2646,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3006,7 +2668,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3015,7 +2677,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29088" level="78" type="Monster" name="">
+	<npc id="29088" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180592" />
 			<param name="suicide2_x" value="180752" />
@@ -3035,19 +2697,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3056,7 +2719,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3065,7 +2728,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29089" level="78" type="Monster" name="">
+	<npc id="29089" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180896" />
 			<param name="suicide2_x" value="180784" />
@@ -3085,19 +2748,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3106,7 +2770,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3115,7 +2779,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29090" level="78" type="Monster" name="">
+	<npc id="29090" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180496" />
 			<param name="suicide2_x" value="180512" />
@@ -3135,19 +2799,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3156,7 +2821,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3165,7 +2830,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29091" level="78" type="Monster" name="">
+	<npc id="29091" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180896" />
 			<param name="suicide2_x" value="181040" />
@@ -3185,19 +2850,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3206,7 +2872,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3215,7 +2881,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29092" level="78" type="Monster" name="">
+	<npc id="29092" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180720" />
 			<param name="suicide2_x" value="180640" />
@@ -3235,19 +2901,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3256,7 +2923,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3265,7 +2932,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29093" level="78" type="Monster" name="">
+	<npc id="29093" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180048" />
 			<param name="suicide2_x" value="179920" />
@@ -3285,19 +2952,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3306,7 +2974,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3315,7 +2983,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29094" level="78" type="Monster" name="">
+	<npc id="29094" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="178848" />
 			<param name="suicide2_x" value="178560" />
@@ -3335,19 +3003,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3356,7 +3025,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/02000-02099.xml
index 584e885baf..2349336041 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/02000-02099.xml
@@ -231,10 +231,16 @@
 	</skill>
 	<skill id="2013" toLevel="2" name="Scroll of Escape">
 		<icon>icon.skill0000</icon>
-		<hitTime>20000</hitTime>
+		<hitTime>
+			<value level="1">20000</value>
+			<value level="2">1000</value>
+		</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>736</itemConsumeId> <!-- Scroll of Escape -->
+		<itemConsumeId>
+			<value level="1">736</value> <!-- Scroll of Escape -->
+			<value level="2">49087</value> <!-- Improved Scroll of Escape -->
+		</itemConsumeId>
 		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/39000-39099.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/39000-39099.xml
index 0cfcaa5588..2bd0c8dfe3 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/39000-39099.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/39000-39099.xml
@@ -1247,7 +1247,7 @@
 		<hitTime>1000</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>49087</itemConsumeId> <!-- Improved Scroll of Escape -->
+		<itemConsumeId>49500</itemConsumeId> <!-- Greater Scroll of Escape -->
 		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/39100-39199.xml
index dd46f9ed4f..3efd3c69d8 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/39100-39199.xml
@@ -57,7 +57,19 @@
 	</skill>
 	<skill id="39103" toLevel="1" name="Warrior's Quick Healing Potion">
 		<icon>icon.etc_reagent_white_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<amount>500</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39104" toLevel="1" name="Hero Cube - 7 days">
 		<icon>icon.sa_cube</icon>
@@ -91,7 +103,7 @@
 		<icon>icon.etc_scroll_of_resurrection_i01</icon>
 		<castRange>400</castRange>
 		<effectPoint>1</effectPoint>
-		<effectRange>600</effectRange>
+		<effectRange>900</effectRange>
 		<hitTime>1000</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
@@ -104,6 +116,9 @@
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpResurrection" />
+			<condition name="TargetMyParty">
+				<includeMe>false</includeMe>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="Resurrection">
@@ -2199,6 +2214,59 @@
 	</skill>
 	<skill id="39199" toLevel="1" name="Hero's Wondrous Cubic - 7 days">
 		<icon>icon.sa_cube</icon>
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<reuseDelay>-1</reuseDelay>
+		<hitTime>500</hitTime>
+		<coolTime>500</coolTime>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpEncumbered">
+				<weightPercent>20</weightPercent>
+				<slotsPercent>10</slotsPercent>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="RestorationRandom">
+				<items>
+					<item chance="16">
+						<item id="49487" count="2"/> <!-- Soulshot Ticket -->
+					</item>
+					<item chance="4">
+						<item id="49772" count="1"/> <!-- Scroll of Mood Melody -->
+					</item>
+					<item chance="16.49">
+						<item id="49488" count="5"/> <!-- Major Healing Potion -->
+					</item>
+					<item chance="20">
+						<item id="35669" count="1"/> <!-- Angel Cat's Blessing -->
+					</item>
+					<item chance="5">
+						<item id="49533" count="1"/> <!-- Quick Hero Healing Potion -->
+					</item>
+					<item chance="10">
+						<item id="49542" count="1"/> <!-- Improved Scroll of Resurrection -->
+					</item>
+					<item chance="14.5">
+						<item id="49536" count="1"/> <!-- Box of Scroll of Escape to the Base -->
+					</item>
+					<item chance="2">
+						<item id="49489" count="3"/> <!-- Parts of Enchantment Scrolls Chest -->
+					</item>
+					<item chance="10">
+						<item id="49416" count="1"/> <!-- Blade Spirit -->
+					</item>
+					<item chance="0.01">
+						<item id="49859" count="1"/> <!-- Weapon Exchange Coupon -->
+					</item>
+					<item chance="2">
+						<item id="49490" count="1"/> <!-- Fishing Kit -->
+					</item>
+				</items>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/55200-55299.xml b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/55200-55299.xml
index 15af6b7280..020804c5f7 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/55200-55299.xml
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/55200-55299.xml
@@ -500,7 +500,7 @@
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>ATTACK_TIME_DOWN</abnormalType>
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer’s Potion -->
+		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer's Potion -->
 		<mpConsume>75</mpConsume>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/documentation.txt
index 7d286b7881..a06d1d6565 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/stats/skills/documentation.txt
@@ -10,6 +10,8 @@ AddHate: Instant effect that increases target's hate towards you.
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -194,7 +196,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/Config.java
index 0506e61840..14e62140f2 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/Config.java
@@ -1202,6 +1202,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static boolean AUTO_PLAY_PREMIUM;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
@@ -1277,6 +1278,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2512,6 +2514,7 @@ public class Config
 			ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 			AUTO_PLAY_PREMIUM = autoPlayConfig.getBoolean("AutoPlayPremium", false);
 			DISABLED_AUTO_SKILLS.clear();
 			final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
@@ -3268,6 +3271,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index a50cbb8033..8378c362cb 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index 603e7d33be..dd968ed772 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -549,9 +549,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 2260001e17..380989e049 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index a2622c95b6..b364eee587 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -61,7 +61,7 @@ public class DailyTaskManager
 	private static final Set<Integer> RESET_SKILLS = new HashSet<>();
 	static
 	{
-		// No known skills.
+		RESET_SKILLS.add(39199); // Hero's Wondrous Cubic
 	}
 	public static final Set<Integer> RESET_ITEMS = new HashSet<>();
 	static
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 36f3461010..efc07efb38 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -230,7 +230,7 @@ public class ShortCuts implements IRestorable
 			if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL))
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 55f0ee03a0..f5cc7704ae 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1288,7 +1288,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2816,7 +2816,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2829,178 +2829,140 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						player.refreshExpertisePenalty();
-						sendPacket(info);
+					}
+					player.refreshExpertisePenalty();
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java
index d6a60597b4..ec9f60340f 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4533,7 +4533,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8229,9 +8229,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Summon.java
index cc23c2a6f2..98b7163e50 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -846,7 +847,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -867,7 +868,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -892,7 +900,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -900,7 +908,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -946,7 +961,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index ea1abbff9b..074a4ae995 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -863,15 +862,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -882,8 +879,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -892,7 +893,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -965,33 +966,6 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
@@ -1001,9 +975,17 @@ public class CreatureStat
 		// Notify recalculation to child classes.
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 438e73d4cc..a2436eebf0 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0b6092b2d9..1e393ec4bf 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2216,6 +2216,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index deb95a0431..2a8fb54b97 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -38,6 +38,7 @@ import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -51,6 +52,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -69,12 +71,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDr
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPickup;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -82,11 +86,13 @@ import org.l2jmobius.gameserver.model.options.EnchantOptions;
 import org.l2jmobius.gameserver.model.options.Options;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.SkillConditionScope;
 import org.l2jmobius.gameserver.model.variables.ItemVariables;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1585,7 +1591,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2505,6 +2513,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2529,6 +2542,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2554,6 +2569,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index b4e0d384dc..8c7e370a51 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -744,7 +744,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -896,7 +897,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 1692c9fcd7..ec97ae1f75 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -652,7 +652,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -675,7 +675,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -710,7 +710,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 66517b74da..ec5f458641 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -128,7 +128,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index c305987ba6..c29c9ba398 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -93,6 +93,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index c5257ff589..1aff35bfd5 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index c6fd6dc758..9f04d53165 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -701,7 +701,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList(false);
 		player.updateShortCuts(_id, _level, 0);
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index c16d3301f0..7c284015a5 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -63,6 +63,6 @@ public class RequestShortCutReg implements ClientPacket
 		
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 	}
 }
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index 93f16169bc..07ed7641a9 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,127 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 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, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index dcc44cb9f3..2e152e2e29 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -207,7 +207,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		ServerPackets.EX_PET_INFO.writeId(this);
 		writeInt(_summon.getObjectId());
-		writeByte(_value); // // 0=teleported 1=default 2=summoned
+		writeByte(_value); // 0=teleported 1=default 2=summoned
 		writeShort(37); // mask_bits_37
 		writeBytes(_masks);
 		// Block 1
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index f93c9e5e69..03909a2746 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
deleted file mode 100644
index 52a4032d14..0000000000
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
new file mode 100644
index 0000000000..62bb425a5a
--- /dev/null
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -0,0 +1,182 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeByte(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 83e29f7bed..3ee2b1ef96 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,19 +19,19 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
 	}
 	
@@ -53,8 +53,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 8872c0cf63..c2b8c8f51a 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -42,13 +48,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -59,8 +68,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 68ca369edf..37f3211b0a 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1f54b5040f..0d5d066d25 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,6 +25,7 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -95,6 +98,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							if (player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -120,23 +134,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -144,6 +167,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -178,32 +204,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -302,6 +351,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 7cd7dd9696..c56221841f 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
@@ -51,7 +52,6 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +381,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/buffer_schemes.sql
index 1784421092..bd964c8cc2 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/buffer_schemes.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL,
     PRIMARY KEY (`object_id`,`scheme_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle.sql
index 0109cb8ab4..082a199079 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/characters.sql
index ea2aace011..60e1a786a2 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/characters.sql
@@ -60,4 +60,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort.sql
index 43de96f562..b4c76f8a7d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort_siege_guards.sql
index 19df57a3b9..43763210b4 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort_spawnlist.sql
index 22303a9b09..144979acd9 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,4 +11,4 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/grandboss_data.sql
index 9ad3ae33ce..bc319dc49e 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/heroes.sql
index 2fc8753f90..49a371cbd5 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/heroes.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/items.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/olympiad_fights.sql
index ccd4ac94ec..f25cc4c1fa 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(4) NOT NULL DEFAULT 0,
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/Character.ini b/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/Character.ini
index 1f79cac9fd..8b31c63f05 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/Character.ini
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/Character.ini
@@ -285,8 +285,8 @@ MaxMAtk = 999999
 MaxPCritRate = 500
 
 # Maximum character Magic Critical Rate. (10 = 1%)
-# Default: 200
-MaxMCritRate = 200
+# Classic Default: 320
+MaxMCritRate = 320
 
 # Maximum character Attack Speed.
 # Default: 1500
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/Custom/AutoPlay.ini b/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/Custom/AutoPlay.ini
index 9a4fd4bf2e..6e9d9628be 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/Custom/AutoPlay.ini
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/Custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # Enable .play command only for premium players.
 # Premium System must be enabled.
 # Default: False
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/General.ini b/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/General.ini
index 978c3fce97..659ece7db8 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/General.ini
@@ -430,8 +430,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/ActionData.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/ActionData.xml
index b287bbf8fd..0ed213cf95 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/ActionData.xml
@@ -1,218 +1,248 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
-	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
-	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
-	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
-	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
-	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
-	<action id="70" handler="AirshipAction" option="4" /> <!-- Exit Airship -->
-	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
-	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
-	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
-	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
-	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Nightshade - Shade Sacrifice -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
-	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="0" handler="SitStand" /> <!-- Toggle Sit/Stand. (/sit, /stand) -->
+	<action id="1" handler="RunWalk" /> <!-- Toggle Walk/Run. (/walk, /run) -->
+	<action id="2" handler="None" /> <!-- Attacks selected target(s), or takes a general action if the target cannot be attacked. Hold down the Ctrl key and click to attack by force. (/attack, /attackforce) -->
+	<action id="3" handler="None" /> <!-- Request a trade from the selected target. (/trade) -->
+	<action id="4" handler="None" /> <!-- Select the nearest attackable target. (/targetnext) -->
+	<action id="5" handler="None" /> <!-- Pick up items that are scattered nearby. (/pickup) -->
+	<action id="6" handler="None" /> <!-- Change to the target of the currently selected player. (/assist) -->
+	<action id="7" handler="None" /> <!-- Invite the selected person to your party. (/invite) -->
+	<action id="8" handler="None" /> <!-- Leave the party. (/leave) -->
+	<action id="9" handler="None" /> <!-- If you are the leader of the party, dismiss selected members from your party. (/dismiss) -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Sets up a private store to sell your items. (/vendor) -->
+	<action id="11" handler="None" /> <!-- Display the party matching window to search for parties or to add members to your party. (/partymatching) -->
+	<action id="12" handler="SocialAction" option="2" /> <!-- Emote: Greet others with a kind "hello." (/socialhello) -->
+	<action id="13" handler="SocialAction" option="3" /> <!-- Emote: Let everyone know that you or someone else is victorious! (/socialvictory) -->
+	<action id="14" handler="SocialAction" option="4" /> <!-- Emote: Rouse your allies and charge! (/socialcharge) -->
+	<action id="15" handler="PetHold" /> <!-- Have your pet follow you or stay and hold its ground. -->
+	<action id="16" handler="PetAttack" /> <!-- Attack target. -->
+	<action id="17" handler="PetStop" /> <!-- Stop current action. -->
+	<action id="18" handler="None" /> <!-- Pick up nearby items. -->
+	<action id="19" handler="UnsummonPet" /> <!-- Returns your pet back to its home. -->
+	<action id="20" handler="None" /> <!-- Use special skill. -->
+	<action id="21" handler="ServitorHold" /> <!-- Have your summons follow you or stay and hold its ground. -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attack target. -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="24" handler="SocialAction" option="6" /> <!-- Emote: Respond positively. (/socialyes) -->
+	<action id="25" handler="SocialAction" option="5" /> <!-- Emote: Respond negatively. (/socialno) -->
+	<action id="26" handler="SocialAction" option="7" /> <!-- Emote: Show your respect and bow. (/socialbow) -->
+	<action id="27" handler="None" /> <!-- Use special skill. -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Sets up a private store to purchase items. (/buy) -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Emote: You have no idea what's going on. (/socialunaware) -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Emote: I'm waiting... (/socialwaiting) -->
+	<action id="31" handler="SocialAction" option="10" /> <!-- Emote: Have a good laugh. (/sociallaugh) -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Toggle between Attack/Move modes. -->
+	<action id="33" handler="SocialAction" option="11" /> <!-- Emote: Applaud. (/socialapplause) -->
+	<action id="34" handler="SocialAction" option="12" /> <!-- Emote: Serve them up your best dance moves. (/socialdance) -->
+	<action id="35" handler="SocialAction" option="13" /> <!-- Emote: Show grief. (/socialsad) -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Poison gas attack. -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Set up a private workshop that creates items by using Dwarven recipes in exchange for a fee. (/dwarvenmanufacture) -->
+	<action id="38" handler="Ride" /> <!-- Toggle mount/dismount when near or on an NPC that can be ridden. (/mount, /dismount, /mountdismount) -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Exploding corpse attack. -->
+	<action id="40" handler="None" /> <!-- Enhances a target's evaluation score. (/evaluate) -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Attacks castle gates, walls, or headquarters by shooting a cannon. -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Reflects damage back to an enemy. -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Attacks target and nearby enemies by creating a whirling surge of water. -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Attacks an enemy with a powerful explosion. -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Restores the summoner's MP. -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Attacks an enemy by summoning up a devastating storm. -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Damages an enemy and heals the servitor at the same time. -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Attacks the enemy by shooting a cannon. -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Attack with a fit of rage. -->
+	<action id="50" handler="None" /> <!-- The selected party member will become the new party leader. (/changepartyleader) -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Removes shackles from the Servitor and sets him free. -->
+	<action id="53" handler="ServitorMove" /> <!-- Move to the target. -->
+	<action id="54" handler="PetMove" /> <!-- Move to the target. -->
+	<action id="55" handler="None" /> <!-- Toggle recording and stop recording of replay files. (Commands: /replayrecstart, /replayrecstop, /replayrecstartstop) -->
+	<action id="56" handler="None" /> <!-- Invite the selected target to a command channel. (/channelinvite) -->
+	<action id="57" handler="None" /> <!-- Highlights private store and private workshop messages that contain the search word. (/findprivatestore) -->
+	<action id="58" handler="None" /> <!-- Challenges another character to a duel. (Command: /duel) -->
+	<action id="59" handler="None" /> <!-- Withdrawing from a duel means losing it. (Command: /withdraw) -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Open a personal store for package sale. (/packagesale) -->
+	<action id="62" handler="SocialAction" option="14" /> <!-- Charm Pose (Command: /charm) -->
+	<action id="64" handler="TeleportBookmark" /> <!-- Displays My Teleports window you can use to save and manage teleport locations. \ \ (command: /teleportbookmark) -->
+	<action id="65" handler="BotReport" /> <!-- Reports the targeted player as a suspected bot. (Command: /botreport) -->
+	<action id="66" handler="SocialAction" option="15" /> <!-- Allows character to strike shy pose. (Command: /shyness) -->
+	<action id="67" handler="AirshipAction" option="1" /> <!-- Allows you to control the Airship. -->
+	<action id="68" handler="AirshipAction" option="2" /> <!-- Relinquishes control of the Airship. -->
+	<action id="69" handler="AirshipAction" option="3" /> <!-- Choose from pre-designated locations. -->
+	<action id="70" handler="AirshipAction" option="4" /> <!-- Disembarks from the Airship. -->
+	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange bows with another person. (Command: /couplebow) -->
+	<action id="72" handler="SocialAction" option="17" /> <!-- High Five another person. (Command: /couplehighfive) -->
+	<action id="73" handler="SocialAction" option="18" /> <!-- Dance with another player. (Command: /coupledance) -->
+	<action id="76" handler="None" /> <!-- Invite the selected target as friends. (Commands: /friendinvite, /friendadd, /friendreg) -->
+	<action id="77" handler="None" /> <!-- Start or end recording videos. (Commands: /recstart, /recstop, /recstartstop) -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Applies Token 1 to the target. Can be only used in a group. (Command: /tacticalsign1) -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Applies Token 2 to the target. Can be only used in a group. (Command: /tacticalsign2) -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Applies Token 3 to the target. Can be only used in a group. (Command: /tacticalsign3) -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Applies Token 4 to the target. Can be only used in a group. (Command: /tacticalsign4) -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Automatically focuses on the target marked with Token 1. Can be only used in a group. (Command: /targettacticalsign1) -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Automatically focuses on the target marked with Token 2. Can be only used in a group. (Command: /targettacticalsign2) -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Automatically focuses on the target marked with Token 3. Can be only used in a group. (Command: /targettacticalsign3) -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Automatically focuses on the target marked with Token 4. Can be only used in a group. (Command: /targettacticalsign4) -->
+	<action id="87" handler="SocialAction" option="28" /> <!-- Gesture of Proposal (Command: /socialpropose) -->
+	<action id="88" handler="SocialAction" option="29" /> <!-- Gesture of Provocation (Command: /socialprovocation) -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off (Command: /socialbeauty) -->
+	<action id="92" handler="None" /> <!-- Selects the previous target. (Command: /targetprev) -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Attacks castle gates, walls, or headquarters with a powerful strike. -->
+	<action id="1001" handler="None" /> <!-- A reckless yet powerful attack that must be used with extreme caution. -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Incites those around the summon to attack you. -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Instantly increases P. Def. and M. Def. significantly. Character is immovable while this skill is in effect. -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- A magical attack. -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Recovers the pet's HP. -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Temporarily increases your party's chance to land a critical attack and also increases the power of the attack if successful. -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Temporarily increases your party's P. Atk and accuracy. -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Has a chance to remove curses from party members. -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Temporarily increases your party's MP regeneration. -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Temporarily shortens your party's spell re-use timer. -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Remove a curse from your party. -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Provokes an opponent to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Provokes multiple enemies around the caster to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Sacrifice HP in order to regenerate the HP of a selected target. -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- A powerful blow on the enemy's vital points -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- A stunning blow that inflicts damage and instantly throws an enemy into a state of stun. -->
+	
+	<!-- Actions 1018 to 1030 are present in the Client, but are not used in Classic. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Inflict a deadly curse on an enemy that absorbs their HP. -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kat the Cat -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mew the Cat -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kai the Cat -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Boxer the Unicorn -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mirage the Unicorn -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Merrow the Unicorn -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Shadow -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by Shadow -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Silhouette -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by reanimated man -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by reanimated man -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by corrupted man -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King: A powerful slashing attack. Over-hit is possible. -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King: Slashes at surrounding enemies while spinning in the air. Over-hit is possible. -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King: Immobilizes the surrounding enemies. -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn: Powerful rear kicks that stun and damage an enemy. Over-hit is possible. -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn: Pounds the target and surrounding enemies with a tremendous onrush of water. -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord: Detonates a corpse, inflicting damage to nearby enemies. -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord: Blades attached to each arm slash out in a devastating attack. Over-hit is possible. -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord: Curses nearby enemies, poisoning them and reducing their Atk. Spd. -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon: Fires a projectile a short distance. Consumes 4 Flash Gunpowder. -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon: Fires a projectile a long distance. Consumes 5 Flash Gunpowder. -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Viciously bite an enemy. -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Scratch an enemy with both paws. Causes bleeding. -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awaken hidden powers. -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Decrease a nearby enemy's P. Atk./M. Atk. with a wolf cry. -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Decrease a nearby enemy's attack speed/magic speed with a strider roar. -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Viciously bite an enemy. -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Cause both damage and shock at the same time. Instantly stuns an enemy. -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Breath fire in front of you. -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Increases maximum HP temporarily. -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Increases maximum MP temporarily. -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Increases Atk. Spd. temporarily. -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Increases Casting Spd. temporarily. -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Temporarily decreases the target's MP consumption of skills. Consumes Spirit Ore. -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Increases M. Atk. power temporarily. -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Temporarily increases the critical rate of damage attack magic. -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Temporarily increases the critical attack power. -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Temporarily increases the probability of critical attack. -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Temporarily increases Accuracy. -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Rapidly attacks the enemy twice. -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Inflicts shock and damage to the enemy at the same time with a powerful spin attack. -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Attacks nearby enemies with a doll heap attack. -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakens a hidden ability. -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of thunder. -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack on nearby enemies when hit. -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Control put in place to prevent the use of a buff upon the master. 5-minute duration. -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Powerfully attacks the target. -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- A powerful attack that pierces through a target. -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies by spinning your own body like a whirlwind. -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Attacks a front-line enemy with a powerful lance thrust. -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Shouts a victory cry that increases your abilities. -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Powerfully attacks the target. -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Gathers energy into your body, then releases it in a destructive blast. -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Hits enemies with a powerful wave of force. -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Emits a loud roar that amplifies your abilities. -->
+	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Charges toward the enemy and inflicts damage. -->
+	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Cancels the target's de-buff. -->
+	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Emits a spread of ring-shaped flames. -->
+	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Attacks the enemy with a powerful flaming beak. -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Toggles you between Attack and Support modes. -->
+	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- At a certain probability, removes one or several buffs from an enemy. -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Decreases the enemy's Dark attribute by 25. -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Strike multiple enemies at the front with the tail. -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Viciously bite an enemy. -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Causes nearby enemies to flee in fear. -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Increases your speed. -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Greatly increases its master's speed. -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Increases the speed of its master and their party. -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Teleports its master to the Seed of Annihilation. -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Teleports its master and their party to the Seed of Annihilation. -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attack the target. -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move to a designated location. -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Make the servitor disappear by cancelling the summoning. -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Do not counter-attack. -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Counter-attack when the master or itself is attacked. -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Damages and provokes the target. -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Rolls over and delivers a shock to the ground stunning the surrounding targets. -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Bites the target to inflict damage. -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Damages the target and absorbs some of its HP. -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Attacks the surrounding enemies and blocks their physical skills. -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Flourishes claws and frontally attacks enemies. -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Dashes toward enemies to inflict damage and Stun them. -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Inflicts damage onto the enemies with a flame. -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Flies straight into the enemy. -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Purifies the master. -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Attack the enemy by darting a feather. -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Hurt the enemy by attacking them with sharp claws. -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Recover the targets near the tree and clear any debuff. -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Attacks nearby targets with a powerful punch. -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Provokes nearby enemies. -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Bites the enemy. -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Provokes nearby enemies. -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Bites the enemy. -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Provokes nearby enemies. -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Bites the enemy. -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Attacks nearby enemies and blocks their P. Skills. -->
+	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Rushes to the enemy to inflict damage and Stun. -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Can express affection to Rudolph. Affection Level rises by 25%. Warning: Can be used only when a Rudolph requests expression of affection, and cannot be used while transformed! -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Increases Max HP by 20%, Max MP by 20%, and the Speed by 20% for 5 minutes. Increases the Debuff Resistance by 10%. Reuse delay 10 minutes. Consumes 3 Rose Essence(s) during skill use. Doesn't overlap with other buffs except Critical Seduction. -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- For 30 minutes, increases party members' Max HP by 30%, Max MP by 30%, Max CP by 30%, P. Def. by 30%, magic M. Def. by 30%, Speed by 20, P. Atk. by 10%, and magic M. Atk. by 20%. Decreases MP consumption for skill use by 15%. Reuse delay 5 minutes. Consumes 10 Rose Essence(s) during skill use. -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of lightning. -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack upon contacted enemies nearby. -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Restricts to prevent the use of a buff upon the master. 5 minute duration. -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Inflicts a powerful attack that seems to pierce through the target. -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies. -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impales an enemy with a sword. -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Raises one's own abilities. -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Gathered energy within ones self can be focused and used to attack an enemy. -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Fires a shock wave to attack enemies at the front. -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Raises one's own abilities. -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switches between attack mode and support mode. -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Instantly restores the master's HP by 10%. Increases the master's Debuff Resistance by 80%, Buff-canceling Attack Resistance by 40%, Speed by 10, P. Def. by 20%, and M. Def. by 20%, and decreases MP consumption for all skills by 50% for 1 minute. -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/AttendanceRewards.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/AttendanceRewards.xml
index a0e71cbdea..8af1ecd126 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/AttendanceRewards.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/AttendanceRewards.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/AttendanceRewards.xsd">
-	<item id="29564" count="50" /> <!-- Attendance Coin -->
-	<item id="29553" count="3" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29565" count="3" /> <!-- XP/SP Scroll -->
-	<item id="29584" count="2" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29585" count="1" /> <!-- Refined Romantic Chapeau -->
+	<item id="49490" count="1" /> <!-- Fishing Kit -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49488" count="5" /> <!-- Major Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49500" count="1" /> <!-- Greater Scroll of Escape -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="100" /> <!-- Attendance Coin -->
-	<item id="29553" count="3" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29519" count="3" /> <!-- XP/SP Scroll - Medium -->
-	<item id="29584" count="2" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="49512" count="1" /> <!-- Amulet: Prosperity -->
+	<item id="90007" count="1" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49533" count="5" /> <!-- Quick Hero Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49500" count="1" /> <!-- Greater Scroll of Escape -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="150" /> <!-- Attendance Coin -->
-	<item id="29553" count="6" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29519" count="3" /> <!-- XP/SP Scroll - Medium -->
-	<item id="29584" count="4" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29578" count="1" /> <!-- Rare Accessory Pack -->
+	<item id="90007" count="2" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49488" count="5" /> <!-- Major Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49542" count="1" /> <!-- Improved Scroll of Resurrection -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="300" /> <!-- Attendance Coin -->
-	<item id="29553" count="6" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29650" count="5" /> <!-- XP/SP Scroll - High -->
-	<item id="29584" count="4" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29587" count="1" /> <!-- Agathion - Singer & Dancer -->
+	<item id="90007" count="3" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49533" count="5" /> <!-- Quick Hero Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49542" count="1" /> <!-- Improved Scroll of Resurrection -->
+	<item id="49860" count="1" /> <!-- Hero's Wondrous Cubic (7-day) -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 5b501b1f1b..bcc74a8afe 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -254,6 +255,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java
index b29a04c82e..8f257d053a 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -41,6 +41,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AgathionSlot", AgathionSlot::new);
@@ -225,7 +227,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index cd446ab812..2775ff29a4 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -182,6 +182,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()))
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 43be5cfc4a..ae0fba5834 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,55 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..798a363468 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,46 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/experience.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/experience.xml
index 3892efec36..9ef9e70e83 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/experience.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/experience.xml
@@ -2,110 +2,89 @@
 <table maxLevel="107" maxPetLevel="99" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/experience.xsd">
 	<experience level="1" tolevel="0" trainingRate="0" />
 	<experience level="2" tolevel="68" trainingRate="0" />
-	<experience level="3" tolevel="363" trainingRate="0" />
-	<experience level="4" tolevel="1168" trainingRate="0" />
-	<experience level="5" tolevel="2884" trainingRate="0" />
-	<experience level="6" tolevel="6038" trainingRate="0" />
-	<experience level="7" tolevel="11287" trainingRate="0" />
-	<experience level="8" tolevel="19423" trainingRate="0" />
-	<experience level="9" tolevel="31378" trainingRate="0" />
-	<experience level="10" tolevel="48229" trainingRate="0" />
-	<experience level="11" tolevel="71202" trainingRate="0" />
-	<experience level="12" tolevel="101677" trainingRate="0" />
-	<experience level="13" tolevel="141193" trainingRate="0" />
-	<experience level="14" tolevel="191454" trainingRate="0" />
-	<experience level="15" tolevel="254330" trainingRate="0" />
-	<experience level="16" tolevel="331867" trainingRate="0" />
-	<experience level="17" tolevel="426288" trainingRate="0" />
-	<experience level="18" tolevel="540000" trainingRate="0" />
-	<experience level="19" tolevel="675596" trainingRate="0.4" />
-	<experience level="20" tolevel="835862" trainingRate="0.4" />
-	<experience level="21" tolevel="920357" trainingRate="0.4" />
-	<experience level="22" tolevel="1015431" trainingRate="0.4" />
-	<experience level="23" tolevel="1123336" trainingRate="0.4" />
-	<experience level="24" tolevel="1246808" trainingRate="0.4" />
-	<experience level="25" tolevel="1389235" trainingRate="0.4" />
-	<experience level="26" tolevel="1554904" trainingRate="0.4" />
-	<experience level="27" tolevel="1749413" trainingRate="0.4" />
-	<experience level="28" tolevel="1980499" trainingRate="0.4" />
-	<experience level="29" tolevel="2260321" trainingRate="0.4" />
-	<experience level="30" tolevel="2634751" trainingRate="0.4" />
-	<experience level="31" tolevel="2844287" trainingRate="0.4" />
-	<experience level="32" tolevel="3093068" trainingRate="0.4" />
-	<experience level="33" tolevel="3389496" trainingRate="0.4" />
-	<experience level="34" tolevel="3744042" trainingRate="0.4" />
-	<experience level="35" tolevel="4169902" trainingRate="0.4" />
-	<experience level="36" tolevel="4683988" trainingRate="0.4" />
-	<experience level="37" tolevel="5308556" trainingRate="0.4" />
-	<experience level="38" tolevel="6074376" trainingRate="0.4" />
-	<experience level="39" tolevel="7029248" trainingRate="0.4" />
-	<experience level="40" tolevel="8342182" trainingRate="0.4" />
-	<experience level="41" tolevel="8718976" trainingRate="0.4" />
-	<experience level="42" tolevel="12842357" trainingRate="0.4" />
-	<experience level="43" tolevel="14751932" trainingRate="0.4" />
-	<experience level="44" tolevel="17009030" trainingRate="0.4" />
-	<experience level="45" tolevel="19686117" trainingRate="0.4" />
-	<experience level="46" tolevel="22875008" trainingRate="0.4" />
-	<experience level="47" tolevel="26695470" trainingRate="0.4" />
-	<experience level="48" tolevel="31312332" trainingRate="0.4" />
-	<experience level="49" tolevel="36982854" trainingRate="0.4" />
-	<experience level="50" tolevel="44659561" trainingRate="0.4" />
-	<experience level="51" tolevel="48128727" trainingRate="0.4" />
-	<experience level="52" tolevel="52277875" trainingRate="0.4" />
-	<experience level="53" tolevel="57248635" trainingRate="0.4" />
-	<experience level="54" tolevel="63216221" trainingRate="0.4" />
-	<experience level="55" tolevel="70399827" trainingRate="0.4" />
-	<experience level="56" tolevel="79078300" trainingRate="0.4" />
-	<experience level="57" tolevel="89616178" trainingRate="0.3" />
-	<experience level="58" tolevel="102514871" trainingRate="0.3" />
-	<experience level="59" tolevel="118552044" trainingRate="0.3" />
-	<experience level="60" tolevel="140517709" trainingRate="0.2" />
-	<experience level="61" tolevel="153064754" trainingRate="0.2" />
-	<experience level="62" tolevel="168231664" trainingRate="0.2" />
-	<experience level="63" tolevel="186587702" trainingRate="0.2" />
-	<experience level="64" tolevel="208840245" trainingRate="0.2" />
-	<experience level="65" tolevel="235877658" trainingRate="0.2" />
-	<experience level="66" tolevel="268833561" trainingRate="0.15" />
-	<experience level="67" tolevel="309192920" trainingRate="0.15" />
-	<experience level="68" tolevel="358998712" trainingRate="0.15" />
-	<experience level="69" tolevel="421408669" trainingRate="0.1" />
-	<experience level="70" tolevel="493177635" trainingRate="0.1" />
-	<experience level="71" tolevel="555112374" trainingRate="0.1" />
-	<experience level="72" tolevel="630494192" trainingRate="0.1" />
-	<experience level="73" tolevel="722326994" trainingRate="0.1" />
-	<experience level="74" tolevel="834354722" trainingRate="0.05" />
-	<experience level="75" tolevel="971291524" trainingRate="0.05" />
-	<experience level="76" tolevel="1139165674" trainingRate="0.05" />
-	<experience level="77" tolevel="1345884863" trainingRate="0.05" />
-	<experience level="78" tolevel="1602331019" trainingRate="0.05" />
-	<experience level="79" tolevel="1902355477" trainingRate="0.05" />
-	<experience level="80" tolevel="2288742870" trainingRate="0.05" />
-	<experience level="81" tolevel="2703488268" trainingRate="0.025" />
-	<experience level="82" tolevel="3281805791" trainingRate="0.025" />
-	<experience level="83" tolevel="3928736800" trainingRate="0.025" />
-	<experience level="84" tolevel="4572352438" trainingRate="0.025" />
-	<experience level="85" tolevel="5432434004" trainingRate="0.025" />
-	<experience level="86" tolevel="12074543196" trainingRate="0.02" />
-	<experience level="87" tolevel="21923573162" trainingRate="0.01" />
-	<experience level="88" tolevel="39133185964" trainingRate="0.01" />
-	<experience level="89" tolevel="53473809657" trainingRate="0.01" />
-	<experience level="90" tolevel="79256490796" trainingRate="0.01" />
-	<experience level="91" tolevel="112393696116" trainingRate="0.01" />
-	<experience level="92" tolevel="154329787685" trainingRate="0.005" />
-	<experience level="93" tolevel="203542226665" trainingRate="0.005" />
-	<experience level="94" tolevel="271881875436" trainingRate="0.004" />
-	<experience level="95" tolevel="349555499437" trainingRate="0.003" />
-	<experience level="96" tolevel="482840015388" trainingRate="0.0025" />
-	<experience level="97" tolevel="726451834408" trainingRate="0.0018" />
-	<experience level="98" tolevel="1149904090077" trainingRate="0.001" />
-	<experience level="99" tolevel="1798492743100" trainingRate="0.0005" />
-	<experience level="100" tolevel="6019956790712" trainingRate="0.0002" />
-	<experience level="101" tolevel="16946124602908" trainingRate="0.0001" />
-	<experience level="102" tolevel="43523955372407" trainingRate="0.0001" />
-	<experience level="103" tolevel="84422086452639" trainingRate="0.0001" />
-	<experience level="104" tolevel="188752303396110" trainingRate="0.0001" />
-	<experience level="105" tolevel="358035537321346" trainingRate="0.0001" />
-	<experience level="106" tolevel="3514822095225670" trainingRate="0.0001" />
-	<experience level="107" tolevel="7302965964710870" trainingRate="0.0001" />
-	<experience level="108" tolevel="12302965964710870" trainingRate="0.0001" />
+	<experience level="3" tolevel="364" trainingRate="0" />
+	<experience level="4" tolevel="1169" trainingRate="0" />
+	<experience level="5" tolevel="2885" trainingRate="0" />
+	<experience level="6" tolevel="6039" trainingRate="0" />
+	<experience level="7" tolevel="11288" trainingRate="0" />
+	<experience level="8" tolevel="19424" trainingRate="0" />
+	<experience level="9" tolevel="31379" trainingRate="0" />
+	<experience level="10" tolevel="48230" trainingRate="0" />
+	<experience level="11" tolevel="71203" trainingRate="0" />
+	<experience level="12" tolevel="101678" trainingRate="0" />
+	<experience level="13" tolevel="141194" trainingRate="0" />
+	<experience level="14" tolevel="191455" trainingRate="0" />
+	<experience level="15" tolevel="254331" trainingRate="0" />
+	<experience level="16" tolevel="331868" trainingRate="0" />
+	<experience level="17" tolevel="426289" trainingRate="0" />
+	<experience level="18" tolevel="540001" trainingRate="0" />
+	<experience level="19" tolevel="675597" trainingRate="0.4" />
+	<experience level="20" tolevel="835864" trainingRate="0.4" />
+	<experience level="21" tolevel="1023785" trainingRate="0.4" />
+	<experience level="22" tolevel="1439215" trainingRate="0.4" />
+	<experience level="23" tolevel="1948497" trainingRate="0.4" />
+	<experience level="24" tolevel="2568850" trainingRate="0.4" />
+	<experience level="25" tolevel="3320625" trainingRate="0.4" />
+	<experience level="26" tolevel="4227172" trainingRate="0.4" />
+	<experience level="27" tolevel="5315161" trainingRate="0.4" />
+	<experience level="28" tolevel="6614929" trainingRate="0.4" />
+	<experience level="29" tolevel="8161929" trainingRate="0.4" />
+	<experience level="30" tolevel="9995812" trainingRate="0.4" />
+	<experience level="31" tolevel="12162655" trainingRate="0.4" />
+	<experience level="32" tolevel="14713777" trainingRate="0.4" />
+	<experience level="33" tolevel="17708475" trainingRate="0.4" />
+	<experience level="34" tolevel="21213445" trainingRate="0.4" />
+	<experience level="35" tolevel="25304463" trainingRate="0.4" />
+	<experience level="36" tolevel="30067485" trainingRate="0.4" />
+	<experience level="37" tolevel="35599858" trainingRate="0.4" />
+	<experience level="38" tolevel="42010312" trainingRate="0.4" />
+	<experience level="39" tolevel="49421366" trainingRate="0.4" />
+	<experience level="40" tolevel="57972427" trainingRate="0.4" />
+	<experience level="41" tolevel="67818553" trainingRate="0.4" />
+	<experience level="42" tolevel="79135431" trainingRate="0.4" />
+	<experience level="43" tolevel="92117896" trainingRate="0.4" />
+	<experience level="44" tolevel="106985763" trainingRate="0.4" />
+	<experience level="45" tolevel="123986756" trainingRate="0.4" />
+	<experience level="46" tolevel="143394645" trainingRate="0.4" />
+	<experience level="47" tolevel="165516618" trainingRate="0.4" />
+	<experience level="48" tolevel="190696911" trainingRate="0.4" />
+	<experience level="49" tolevel="219317613" trainingRate="0.4" />
+	<experience level="50" tolevel="251805374" trainingRate="0.4" />
+	<experience level="51" tolevel="288635909" trainingRate="0.4" />
+	<experience level="52" tolevel="330338848" trainingRate="0.4" />
+	<experience level="53" tolevel="377507026" trainingRate="0.4" />
+	<experience level="54" tolevel="430790086" trainingRate="0.4" />
+	<experience level="55" tolevel="490916803" trainingRate="0.4" />
+	<experience level="56" tolevel="558693890" trainingRate="0.4" />
+	<experience level="57" tolevel="635018116" trainingRate="0.3" />
+	<experience level="58" tolevel="720879370" trainingRate="0.3" />
+	<experience level="59" tolevel="817380319" trainingRate="0.3" />
+	<experience level="60" tolevel="925741335" trainingRate="0.2" />
+	<experience level="61" tolevel="1047311009" trainingRate="0.2" />
+	<experience level="62" tolevel="1183577349" trainingRate="0.2" />
+	<experience level="63" tolevel="1336187067" trainingRate="0.2" />
+	<experience level="64" tolevel="1506967658" trainingRate="0.2" />
+	<experience level="65" tolevel="1697936136" trainingRate="0.2" />
+	<experience level="66" tolevel="1911306680" trainingRate="0.15" />
+	<experience level="67" tolevel="2149533465" trainingRate="0.15" />
+	<experience level="68" tolevel="2415323168" trainingRate="0.15" />
+	<experience level="69" tolevel="2711646440" trainingRate="0.1" />
+	<experience level="70" tolevel="3041801165" trainingRate="0.1" />
+	<experience level="71" tolevel="3409398455" trainingRate="0.1" />
+	<experience level="72" tolevel="3818421441" trainingRate="0.1" />
+	<experience level="73" tolevel="4273257148" trainingRate="0.1" />
+	<experience level="74" tolevel="4778730308" trainingRate="0.05" />
+	<experience level="75" tolevel="5340152664" trainingRate="0.05" />
+	<experience level="76" tolevel="5963335189" trainingRate="0.05" />
+	<experience level="77" tolevel="7138805250" trainingRate="0.05" />
+	<experience level="78" tolevel="9372198366" trainingRate="0.05" />
+	<experience level="79" tolevel="16072377713" trainingRate="0.05" />
+	<experience level="80" tolevel="38406308871" trainingRate="0.05" />
+	<experience level="81" tolevel="150075964661" trainingRate="0.025" />
+	<experience level="82" tolevel="279783329566" trainingRate="0.025" />
+	<experience level="83" tolevel="454748284485" trainingRate="0.025" />
+	<experience level="84" tolevel="673468617187" trainingRate="0.025" />
+	<experience level="85" tolevel="2020405851561" trainingRate="0.025" />
+	<experience level="86" tolevel="8755092023431" trainingRate="0.025" />
+	<experience level="87" tolevel="16836715429675" trainingRate="0.025" />
 </table>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/items/49000-49099.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/items/49000-49099.xml
index d4ceaef8b5..2359d9f07b 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/items/49000-49099.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/items/49000-49099.xml
@@ -1217,7 +1217,7 @@
 		<set name="handler" val="ItemSkills" />
 		<set name="commissionItemType" val="SCROLL_OTHER" />
 		<skills>
-			<skill id="39075" level="1" /> <!-- Improved Scroll of Escape -->
+			<skill id="2013" level="2" /> <!-- Improved Scroll of Escape -->
 		</skills>
 	</item>
 	<item id="49088" name="Gold Medal" type="EtcItem">
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/items/49400-49499.xml
index c6b7a5b006..555900b364 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/items/49400-49499.xml
@@ -1433,13 +1433,23 @@
 	<item id="49489" name="Parts of Enchantment Scrolls Chest" type="EtcItem">
 		<!-- Double-click to receive one Part of Enchantment Scrolls. Cannot be exchanged, dropped, or sold in a private store. Can be stored in a private warehouse. Can be shared within account through Dimensional Merchant. <Note>. Items received cannot be exchanged, dropped or sold. -->
 		<set name="icon" val="icon.etc_treasure_box_i08" />
-		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="default_action" val="PEEL" />
 		<set name="material" val="FISH" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="49474" min="1" max="1" chance="20" /> <!-- Scroll Part: Enchant Weapon -->
+			<item id="49475" min="1" max="1" chance="50" /> <!-- Scroll Part: Enchant Armor -->
+			<item id="49476" min="1" max="1" chance="2" /> <!-- Refined Scroll Part: Enchant Weapon -->
+			<item id="49478" min="1" max="1" chance="13" /> <!-- Refined Scroll Part: Enchant Armor -->
+			<item id="49479" min="1" max="1" chance="2" /> <!-- Solid Scroll Part: Enchant Weapon -->
+			<item id="49480" min="1" max="1" chance="13" /> <!-- Solid Scroll Part: Enchant Armor -->
+		</capsuled_items>
 	</item>
 	<item id="49490" name="Fishing kit" type="EtcItem">
 		<!-- Double-click to receive 1 Fishing Rod (1-day), Bait (720 pcs), 1 Hero's Dual Swords, 1 Soulshot Ticket. Cannot be exchanged, dropped, or sold in a private store. Can be stored in a private warehouse. Can be shared within account through Dimensional Merchant. <Note>. Be careful before opening the items as their relocation is restricted. -->
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/items/49500-49599.xml
index 0d6ec76a83..396cfdbb4b 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/items/49500-49599.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/items/49500-49599.xml
@@ -8,6 +8,13 @@
 		<set name="weight" val="120" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="commissionItemType" val="SCROLL_OTHER" />
+		<skills>
+			<skill id="39075" level="1" /> <!-- Improved Scroll of Escape -->
+		</skills>
 	</item>
 	<item id="49501" name="Fish Stew. The guild's gratitude." type="EtcItem">
 		<!-- For 20 min. XP/SP +10% while hunting. Cannot be dropped. -->
@@ -400,6 +407,8 @@
 		<!-- Magic potion that quickly restores HP. Instant cooldown. Cannot be used when HP is full. Cannot be exchanged, dropped, or sold. Can be stored in a private warehouse. Can be shared within account through Dimensional Merchant. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="LIQUID" />
 		<set name="weight" val="180" />
 		<set name="is_tradable" val="false" />
@@ -407,6 +416,12 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="is_event_restricted" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<skills>
+			<skill id="39103" level="1" /> <!-- Quick Hero Healing Potion -->
+		</skills>
 	</item>
 	<item id="49534" name="Hero Cube" additionalName="7-day" type="EtcItem">
 		<!-- 7-day item. Available at level 20 or higher. Double-click the Cube to receive Soulshot Ticket, Buff Scrolls Chest, Major Healing Potion, Warrior's Quick Healing Potion, Warrior's Quick Healing Potion, Angel Cat's Blessing, Improved Scroll of Resurrection, Parts of Enchantment Scrolls Chest, Fishing kit chest, My Teleport to the Base Package, Blade Spirit, Spellbook Box. (Can be used only once per day.) Cannot be exchanged, dropped, destroyed, or sold. Can be stored in a private warehouse. -->
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/items/49800-49899.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/items/49800-49899.xml
index 52e0295ef7..f1912132d9 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/items/49800-49899.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/items/49800-49899.xml
@@ -678,6 +678,10 @@
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="time" val="10080" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39199" level="1" /> <!-- Hero's Wondrous Cubic -->
+		</skills>
 	</item>
 	<item id="49861" name="Life Stone - Tester" additionalName="Tester" type="EtcItem">
 		<!-- Tester -->
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20000-20099.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20000-20099.xml
index 1b4c1c696e..eb125619ef 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20000-20099.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20000-20099.xml
@@ -7,7 +7,7 @@
 		<acquire exp="30" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="20" />
@@ -84,7 +84,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -136,7 +136,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="60" />
@@ -188,7 +188,7 @@
 		<acquire exp="310" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="60" />
@@ -246,7 +246,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -5386,7 +5386,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -5442,7 +5442,7 @@
 		<acquire exp="441" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -5542,7 +5542,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20100-20199.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20100-20199.xml
index d81c65dc60..19ed6b136e 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20100-20199.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20100-20199.xml
@@ -1135,7 +1135,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -1179,7 +1179,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="50" />
@@ -1229,7 +1229,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -1281,7 +1281,7 @@
 		<acquire exp="309" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -4345,7 +4345,7 @@
 		<acquire exp="1882" sp="57" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="636.798" hpRegen="3.5" mp="365.715" mpRegen="1.5" />
-			<attack physical="92.64226" magical="63.26266" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="92.64226" magical="63.26266" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.46427" magical="86.68702" />
 			<speed>
 				<walk ground="35" />
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20200-20299.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20200-20299.xml
index 99520dbbcd..449b4b43e0 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20200-20299.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20200-20299.xml
@@ -4066,7 +4066,7 @@
 		<acquire exp="2009" sp="61" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="670.347" hpRegen="4.5" mp="381.969" mpRegen="1.8" />
-			<attack physical="99.21986" magical="67.7543" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="99.21986" magical="67.7543" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="121.98819" magical="89.26566" />
 			<speed>
 				<walk ground="80" />
@@ -4133,7 +4133,7 @@
 		<acquire exp="2141" sp="65" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="705.162" hpRegen="4.5" mp="398.223" mpRegen="1.8" />
-			<attack physical="106.16525" magical="72.49711" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="106.16525" magical="72.49711" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="125.57727" magical="91.89199" />
 			<speed>
 				<walk ground="45" />
@@ -4201,7 +4201,7 @@
 		<acquire exp="2417" sp="73" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="777.324" hpRegen="4.5" mp="430.731" mpRegen="1.8" />
-			<attack physical="121.20802" magical="82.76936" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="121.20802" magical="82.76936" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="132.9486" magical="97.28601" />
 			<speed>
 				<walk ground="50" />
@@ -4267,7 +4267,7 @@
 		<acquire exp="2582" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="815.304" hpRegen="4.5" mp="446.985" mpRegen="1.8" />
-			<attack physical="129.32896" magical="88.31491" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="129.32896" magical="88.31491" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="136.72948" magical="100.0527" />
 			<speed>
 				<walk ground="80" />
@@ -4338,7 +4338,7 @@
 		<acquire exp="2295" sp="69" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="739.977" hpRegen="4.5" mp="413.574" mpRegen="1.8" />
-			<attack physical="113.49065" magical="77.49941" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="113.49065" magical="77.49941" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="129.23095" magical="94.5656" />
 			<speed>
 				<walk ground="80" />
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20300-20399.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20300-20399.xml
index a3d64dedb4..df6ebc20aa 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20300-20399.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20300-20399.xml
@@ -512,7 +512,7 @@
 		<acquire exp="266" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="60" />
@@ -569,7 +569,7 @@
 		<acquire exp="310" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="60" />
@@ -625,7 +625,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
@@ -808,7 +808,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="24" />
@@ -897,7 +897,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1002,7 +1002,7 @@
 		<acquire exp="441" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -1056,7 +1056,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -1158,7 +1158,7 @@
 		<acquire exp="441" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -1214,7 +1214,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1266,7 +1266,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -1316,7 +1316,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1527,7 +1527,7 @@
 		<acquire exp="454" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1733,7 +1733,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -2059,7 +2059,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="50" />
@@ -3004,7 +3004,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3225,7 +3225,7 @@
 		<acquire exp="354" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="70" />
@@ -3570,7 +3570,7 @@
 		<acquire exp="452" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3826,7 +3826,7 @@
 		<acquire exp="691" sp="21" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="86.088" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -3883,7 +3883,7 @@
 		<acquire exp="183" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="40" />
@@ -4103,7 +4103,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -4267,7 +4267,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -4317,7 +4317,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20400-20499.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20400-20499.xml
index c313c42fce..482436222b 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20400-20499.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20400-20499.xml
@@ -1284,7 +1284,7 @@
 		<acquire exp="439" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1348,7 +1348,7 @@
 		<acquire exp="292" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1577,7 +1577,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
@@ -2061,7 +2061,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="24" />
@@ -2228,7 +2228,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -2280,7 +2280,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -2331,7 +2331,7 @@
 		<acquire exp="309" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -2731,7 +2731,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -3322,7 +3322,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -3372,7 +3372,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -3424,7 +3424,7 @@
 		<acquire exp="309" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -3475,7 +3475,7 @@
 		<acquire exp="439" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3704,7 +3704,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -3808,7 +3808,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="24" />
@@ -3969,7 +3969,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
@@ -4027,7 +4027,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20500-20599.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20500-20599.xml
index 0bf3029205..11129fe642 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20500-20599.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/20500-20599.xml
@@ -1348,7 +1348,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -1555,7 +1555,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1602,7 +1602,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1647,7 +1647,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1874,7 +1874,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1919,7 +1919,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1964,7 +1964,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2009,7 +2009,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2276,7 +2276,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2326,7 +2326,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/21600-21699.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/21600-21699.xml
index 561115f0e2..f8ee382e56 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/21600-21699.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/21600-21699.xml
@@ -2717,7 +2717,7 @@
 		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
-			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="22" />
@@ -2774,7 +2774,7 @@
 		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
-			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="60" />
@@ -2811,7 +2811,7 @@
 		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
-			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="80" />
@@ -2859,7 +2859,7 @@
 		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
-			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="80" />
@@ -2906,7 +2906,7 @@
 		<acquire exp="2711" sp="82" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1201.434" hpRegen="5.5" mp="650.16" mpRegen="2.1" />
-			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="173.43552" magical="126.91259" />
 			<speed>
 				<walk ground="100" />
@@ -2955,7 +2955,7 @@
 		<acquire exp="2835" sp="86" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1248.276" hpRegen="5.5" mp="679.056" mpRegen="2.1" />
-			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="177.78746" magical="130.09715" />
 			<speed>
 				<walk ground="45" />
@@ -3004,7 +3004,7 @@
 		<acquire exp="2963" sp="89" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1297.017" hpRegen="5.5" mp="708.855" mpRegen="2.1" />
-			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="182.18816" magical="133.31739" />
 			<speed>
 				<walk ground="80" />
@@ -3053,7 +3053,7 @@
 		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
-			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="27" />
@@ -3102,7 +3102,7 @@
 		<acquire exp="3226" sp="97" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1396.398" hpRegen="5.5" mp="770.259" mpRegen="2.1" />
-			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="191.12803" magical="139.8592" />
 			<speed>
 				<walk ground="60" />
@@ -3146,7 +3146,7 @@
 		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
-			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="80" />
@@ -3233,7 +3233,7 @@
 		<acquire exp="3362" sp="101" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1447.038" hpRegen="5.5" mp="800.961" mpRegen="2.1" />
-			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="195.66302" magical="143.17771" />
 			<speed>
 				<walk ground="70" />
@@ -3624,7 +3624,7 @@
 		<acquire exp="285232" sp="8556" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2423.3825125" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="25" />
@@ -3652,7 +3652,7 @@
 		<acquire exp="352209" sp="10566" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="25" />
@@ -3680,7 +3680,7 @@
 		<acquire exp="351362" sp="9486" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="3104.58" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="25" />
@@ -3707,7 +3707,7 @@
 		<acquire exp="366236" sp="9888" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2908.034384" hpRegen="8.5" mp="3415.215" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="37" />
@@ -3734,7 +3734,7 @@
 		<acquire exp="372072" sp="10045" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2908.034384" hpRegen="8.5" mp="3415.215" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="45" />
@@ -3761,7 +3761,7 @@
 		<acquire exp="387793" sp="10470" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2827.269335" hpRegen="8.5" mp="3753.285" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="45" />
@@ -3789,7 +3789,7 @@
 		<acquire exp="303033" sp="8181" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.5997675" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="40" />
@@ -3817,7 +3817,7 @@
 		<acquire exp="375994" sp="10151" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3063.234315" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="80" />
@@ -3844,7 +3844,7 @@
 		<acquire exp="313883" sp="8474" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.5997675" hpRegen="8.5" mp="3828.51" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="70" />
@@ -3871,7 +3871,7 @@
 		<acquire exp="384867" sp="10391" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2940.744352" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="23" />
@@ -3897,7 +3897,7 @@
 		<acquire exp="400636" sp="10817" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2859.043325" hpRegen="8.5" mp="3166.53" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="13" />
@@ -3923,7 +3923,7 @@
 		<acquire exp="399045" sp="10774" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2859.043325" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="35" />
@@ -3949,7 +3949,7 @@
 		<acquire exp="21409" sp="642" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1380.32124" hpRegen="8.5" mp="2629.335" mpRegen="3" />
-			<attack physical="890.50086" magical="608.0966579" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="890.50086" magical="608.0966579" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="70" />
@@ -3975,7 +3975,7 @@
 		<acquire exp="23085" sp="623" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1399.77973" hpRegen="8.5" mp="2683.32" mpRegen="3" />
-			<attack physical="929.9308143" magical="635.0221958" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="929.9308143" magical="635.0221958" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="337.07008" magical="246.65326" />
 			<speed>
 				<walk ground="37" />
@@ -4001,7 +4001,7 @@
 		<acquire exp="43737" sp="1180" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.868755" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="41" />
@@ -4028,7 +4028,7 @@
 		<acquire exp="25440" sp="686" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.99191" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="35" />
@@ -4073,7 +4073,7 @@
 		<acquire exp="27733" sp="748" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.72623" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="940.9565" magical="661.831856" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="940.9565" magical="661.831856" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="355.9783" magical="237.312" />
 			<speed>
 				<walk ground="57" />
@@ -4213,7 +4213,7 @@
 		<acquire exp="48262" sp="1303" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.849385" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="940.9565" magical="661.831856" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="940.9565" magical="661.831856" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="355.9783" magical="237.312" />
 			<speed>
 				<walk ground="41" />
@@ -4240,7 +4240,7 @@
 		<acquire exp="51842" sp="1399" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="57" />
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/21700-21799.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/21700-21799.xml
index 5b7cc1b3b5..4e8c8af6f8 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/21700-21799.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/21700-21799.xml
@@ -1271,7 +1271,7 @@
 		<acquire exp="266169" sp="7186" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.9098066667" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="60" />
@@ -1299,7 +1299,7 @@
 		<acquire exp="686195" sp="18527" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2993.2206975" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="940.9565" magical="661.831856" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="940.9565" magical="661.831856" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="355.9783" magical="237.312" />
 			<speed>
 				<walk ground="40" />
@@ -1337,7 +1337,7 @@
 		<acquire exp="686195" sp="18527" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2993.2206975" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="940.9565" magical="661.831856" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="940.9565" magical="661.831856" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="355.9783" magical="237.312" />
 			<speed>
 				<walk ground="40" />
@@ -1374,7 +1374,7 @@
 		<acquire exp="1772332" sp="47852" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2758.7130516667" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="60" />
@@ -2504,7 +2504,7 @@
 		<acquire exp="133236" sp="3597" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="30" />
@@ -2530,7 +2530,7 @@
 		<acquire exp="687418" sp="18560" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.6202933333" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="13" />
@@ -2557,7 +2557,7 @@
 		<acquire exp="2521725" sp="68086" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3063.234315" hpRegen="8.5" mp="3828.51" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="85" />
@@ -2584,7 +2584,7 @@
 		<acquire exp="141405" sp="3817" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="20" />
@@ -2611,7 +2611,7 @@
 		<acquire exp="880166" sp="23764" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.5997675" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="20" />
@@ -2638,7 +2638,7 @@
 		<acquire exp="2525776" sp="68195" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3063.234315" hpRegen="8.5" mp="3828.51" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="40" />
@@ -2665,7 +2665,7 @@
 		<acquire exp="141405" sp="3817" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="60" />
@@ -2692,7 +2692,7 @@
 		<acquire exp="880166" sp="23764" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.5997675" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="33" />
@@ -2719,7 +2719,7 @@
 		<acquire exp="2525776" sp="68195" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3063.234315" hpRegen="8.5" mp="3828.51" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="60" />
@@ -2746,7 +2746,7 @@
 		<acquire exp="141405" sp="3817" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="60" />
@@ -2773,7 +2773,7 @@
 		<acquire exp="880166" sp="23764" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.5997675" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="45" />
@@ -2800,7 +2800,7 @@
 		<acquire exp="2525776" sp="68195" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3063.234315" hpRegen="8.5" mp="3828.51" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="80" />
@@ -2827,7 +2827,7 @@
 		<acquire exp="165067" sp="4456" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2423.44409" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="54" />
@@ -2853,7 +2853,7 @@
 		<acquire exp="65216" sp="1760" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="20" />
@@ -2878,7 +2878,7 @@
 		<acquire exp="591127" sp="15960" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2423.3825125" hpRegen="8.5" mp="3104.58" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="40" />
@@ -2905,7 +2905,7 @@
 		<acquire exp="110421" sp="2981" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="60" />
@@ -2931,7 +2931,7 @@
 		<acquire exp="22942" sp="688" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1380.32124" hpRegen="8.5" mp="2629.335" mpRegen="3" />
-			<attack physical="890.50086" magical="608.0966579" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="890.50086" magical="608.0966579" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="60" />
@@ -2957,7 +2957,7 @@
 		<acquire exp="42650" sp="1151" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1399.902885" hpRegen="8.5" mp="2683.32" mpRegen="3" />
-			<attack physical="929.9308143" magical="635.0221958" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="929.9308143" magical="635.0221958" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="337.07008" magical="246.65326" />
 			<speed>
 				<walk ground="60" />
@@ -2983,7 +2983,7 @@
 		<acquire exp="25744" sp="695" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1399.77973" hpRegen="8.5" mp="2683.32" mpRegen="3" />
-			<attack physical="929.9308143" magical="635.0221958" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="929.9308143" magical="635.0221958" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="337.07008" magical="246.65326" />
 			<speed>
 				<walk ground="60" />
@@ -3008,7 +3008,7 @@
 		<acquire exp="45081" sp="1217" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.868755" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="39" />
@@ -3034,7 +3034,7 @@
 		<acquire exp="28320" sp="764" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.99191" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="60" />
@@ -3060,7 +3060,7 @@
 		<acquire exp="30607" sp="826" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.72623" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="940.9565" magical="661.831856" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="940.9565" magical="661.831856" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="355.9783" magical="237.312" />
 			<speed>
 				<walk ground="60" />
@@ -3086,7 +3086,7 @@
 		<acquire exp="52317" sp="1412" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.849385" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="940.9565" magical="661.831856" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="940.9565" magical="661.831856" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="355.9783" magical="237.312" />
 			<speed>
 				<walk ground="60" />
@@ -3112,7 +3112,7 @@
 		<acquire exp="52205" sp="1409" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="60" />
@@ -3138,7 +3138,7 @@
 		<acquire exp="356540" sp="10696" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="60" />
@@ -3164,7 +3164,7 @@
 		<acquire exp="297563" sp="8034" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2423.3825125" hpRegen="8.5" mp="3415.215" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="39" />
@@ -3190,7 +3190,7 @@
 		<acquire exp="357952" sp="9664" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="60" />
@@ -3216,7 +3216,7 @@
 		<acquire exp="299823" sp="8095" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2423.3825125" hpRegen="8.5" mp="3753.285" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="60" />
@@ -3243,7 +3243,7 @@
 		<acquire exp="311134" sp="8400" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.5997675" hpRegen="8.5" mp="3166.53" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="39" />
@@ -3269,7 +3269,7 @@
 		<acquire exp="405458" sp="10947" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2859.043325" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="60" />
@@ -3295,7 +3295,7 @@
 		<acquire exp="402228" sp="10860" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2859.043325" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="60" />
@@ -3322,7 +3322,7 @@
 		<acquire exp="398997" sp="10772" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2940.744352" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="36" />
@@ -3348,7 +3348,7 @@
 		<acquire exp="407195" sp="10994" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2940.744352" hpRegen="8.5" mp="3828.51" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/24000-24099.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/24000-24099.xml
index 6a3e399f3e..82cf275c42 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/24000-24099.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/24000-24099.xml
@@ -436,7 +436,7 @@
 		<acquire exp="39238" sp="1177" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1360.493285" hpRegen="8.5" mp="2574.465" mpRegen="3" />
-			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="328.27073" magical="240.21427" />
 			<speed>
 				<walk ground="27" />
@@ -696,7 +696,7 @@
 		<acquire exp="129880" sp="3896" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1360.493285" hpRegen="8.5" mp="2574.465" mpRegen="3" />
-			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="328.27073" magical="240.21427" />
 			<speed>
 				<walk ground="27" />
@@ -1586,7 +1586,7 @@
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="314.65987" magical="230.25444" />
 			<hitTime>840</hitTime>
 		</stats>
@@ -1605,7 +1605,7 @@
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1620.4119125" hpRegen="8.5" mp="2412.51" mpRegen="3" />
-			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="314.65987" magical="230.25444" />
 			<speed>
 				<walk ground="30" />
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/25200-25299.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/25200-25299.xml
index ea91b28c43..3db8c1a562 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/25200-25299.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/25200-25299.xml
@@ -3900,7 +3900,7 @@
 		<acquire exp="1008600000" sp="30258000" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="20782406.25" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="45" />
@@ -4039,7 +4039,7 @@
 		<acquire exp="1008600000" sp="30258000" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="20782406.25" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/25700-25799.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/25700-25799.xml
index b7263cfb0c..ff646d9c03 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/25700-25799.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/25700-25799.xml
@@ -72,7 +72,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="45" />
@@ -134,7 +134,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="50" />
@@ -235,7 +235,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="30" />
@@ -296,7 +296,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="90" />
@@ -357,7 +357,7 @@
 		<acquire exp="52925400" sp="1587762" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="420467.42646" hpRegen="178.4276342" mp="515402.76" mpRegen="2.4" />
-			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1495.843372" magical="729.7418166" />
 			<speed>
 				<walk ground="60" />
@@ -401,7 +401,7 @@
 		<acquire exp="52925400" sp="1587762" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="420467.42646" hpRegen="178.4276342" mp="515402.76" mpRegen="2.4" />
-			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1495.843372" magical="729.7418166" />
 			<speed>
 				<walk ground="24" />
@@ -444,7 +444,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="50" />
@@ -508,7 +508,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="40" />
@@ -572,7 +572,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="50" />
@@ -636,7 +636,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="60" />
@@ -701,7 +701,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="60" />
@@ -766,7 +766,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="40" />
@@ -870,7 +870,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="13" />
@@ -913,7 +913,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="39" />
@@ -956,7 +956,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="80" />
@@ -999,7 +999,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="39" />
@@ -1042,7 +1042,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="50" />
@@ -1085,7 +1085,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="60" />
@@ -1128,7 +1128,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="25" />
@@ -1171,7 +1171,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="45" />
@@ -1215,7 +1215,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="79" />
@@ -1258,7 +1258,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="60" />
@@ -1341,7 +1341,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="45" />
@@ -1416,7 +1416,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="52" />
@@ -1491,7 +1491,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="38" />
@@ -1566,7 +1566,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="40" />
@@ -1642,7 +1642,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="30" />
@@ -1737,7 +1737,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -1812,7 +1812,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -1887,7 +1887,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -1962,7 +1962,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -2037,7 +2037,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="42" />
@@ -2113,7 +2113,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="48" />
@@ -2208,7 +2208,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="60" />
@@ -2268,7 +2268,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="50" />
@@ -2328,7 +2328,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="50" />
@@ -2388,7 +2388,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="55" />
@@ -2448,7 +2448,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="55" />
@@ -2508,7 +2508,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="55" />
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/29000-29099.xml
index ba589daa50..004df33da8 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/29000-29099.xml
@@ -11,8 +11,8 @@
 		<sex>FEMALE</sex>
 		<acquire exp="2179535" sp="65386" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="687245.8498023715" hpRegen="208" mp="300" mpRegen="2.1" />
-			<attack physical="105" magical="8" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="386384" hpRegen="208" mp="300.8" mpRegen="2.1" />
+			<attack physical="105" magical="8" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1252" magical="229" />
 			<speed>
 				<walk ground="80" />
@@ -21,11 +21,9 @@
 			<hitTime>370</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4019" level="1" /> <!-- Decrease Speed -->
-			<skill id="4021" level="1" /> <!-- Queen Ant -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -34,8 +32,11 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4021" level="1" /> <!-- Queen Ant -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4017" level="1" /> <!-- Queen Ant's Blow -->
+			<skill id="4018" level="1" /> <!-- Decrease Speed -->
+			<skill id="4019" level="1" /> <!-- Decrease Speed -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -50,115 +51,138 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="851" min="1" max="3" chance="34.67" /> <!-- Onyx Beast's Eye Earring -->
-				<item id="355" min="1" max="1" chance="34.47" /> <!-- Dwarven Chain Mail Shirt -->
-				<item id="2496" min="1" max="1" chance="34.07" /> <!-- Dwarven Chain Shield -->
-				<item id="914" min="1" max="1" chance="33.63" /> <!-- Dark Necklace -->
-				<item id="916" min="1" max="1" chance="33.55" /> <!-- Necklace of Protection -->
-				<item id="882" min="1" max="3" chance="33.34" /> <!-- Mithril Ring -->
-				<item id="852" min="1" max="3" chance="33.11" /> <!-- Moonstone Earring -->
-				<item id="883" min="1" max="3" chance="32.56" /> <!-- Aquastone Ring -->
-				<item id="853" min="1" max="3" chance="32.54" /> <!-- Earring of Protection -->
-				<item id="382" min="1" max="1" chance="32.12" /> <!-- Dwarven Chain Gaiters -->
-				<item id="884" min="1" max="3" chance="31.83" /> <!-- Ring of Protection -->
-				<item id="915" min="1" max="1" chance="31.77" /> <!-- Aquastone Necklace -->
-				<item id="399" min="1" max="1" chance="25.81" /> <!-- Rind Leather Armor -->
-				<item id="500" min="1" max="1" chance="25.63" /> <!-- Great Helmet -->
-				<item id="419" min="1" max="1" chance="24.75" /> <!-- Rind Leather Gaiters -->
-				<item id="440" min="1" max="1" chance="24.04" /> <!-- Robe of Seal -->
-				<item id="6660" min="1" max="1" chance="20.51" /> <!-- Queen Ant's Ring -->
-				<item id="498" min="1" max="3" chance="17.3" /> <!-- Steel Plate Helmet -->
-				<item id="2455" min="1" max="3" chance="17.21" /> <!-- Plated Leather Gloves -->
-				<item id="1126" min="1" max="3" chance="16.7" /> <!-- Crimson Boots -->
-				<item id="398" min="1" max="1" chance="16.59" /> <!-- Plated Leather Armor -->
-				<item id="418" min="1" max="1" chance="16.3" /> <!-- Plated Leather Gaiters -->
-				<item id="632" min="1" max="3" chance="16.2" /> <!-- Knight's Shield -->
-				<item id="1125" min="1" max="3" chance="7.218" /> <!-- Assault Boots -->
-				<item id="2412" min="1" max="3" chance="7.211" /> <!-- Plate Helmet -->
-				<item id="2451" min="1" max="3" chance="7.209" /> <!-- Sage's Worn Gloves -->
-				<item id="2427" min="1" max="3" chance="7.208" /> <!-- Salamander Skin Boots -->
-				<item id="297" min="1" max="1" chance="7.205" /> <!-- Glaive -->
-				<item id="187" min="1" max="1" chance="7.194" /> <!-- Atuba Hammer -->
-				<item id="188" min="1" max="1" chance="7.193" /> <!-- Ghost Staff -->
-				<item id="262" min="1" max="1" chance="7.189" /> <!-- Scallop Jamadhr -->
-				<item id="322" min="1" max="1" chance="7.184" /> <!-- Vajra Wand -->
-				<item id="396" min="1" max="1" chance="7.18" /> <!-- Salamander Skin Mail -->
-				<item id="321" min="1" max="1" chance="7.171" /> <!-- Demon's Fangs -->
-				<item id="225" min="1" max="1" chance="7.15" /> <!-- Mithril Dagger -->
-				<item id="380" min="1" max="1" chance="7.147" /> <!-- Plate Gaiters -->
-				<item id="438" min="1" max="3" chance="7.14" /> <!-- Sage's Rags -->
-				<item id="630" min="1" max="3" chance="7.133" /> <!-- Square Shield -->
-				<item id="61" min="1" max="3" chance="7.123" /> <!-- Mithril Gloves -->
-				<item id="189" min="1" max="1" chance="7.121" /> <!-- Staff of Life -->
-				<item id="2428" min="1" max="3" chance="7.116" /> <!-- Plate Boots -->
-				<item id="159" min="1" max="1" chance="7.114" /> <!-- Bonebreaker -->
-				<item id="320" min="1" max="1" chance="7.111" /> <!-- Blue Crystal Skull -->
-				<item id="190" min="1" max="1" chance="7.101" /> <!-- Atuba Mace -->
-				<item id="280" min="1" max="1" chance="7.1" /> <!-- Light Crossbow -->
-				<item id="2499" min="1" max="1" chance="7.086" /> <!-- Elven Long Sword -->
-				<item id="353" min="1" max="1" chance="7.091" /> <!-- Half Plate Armor -->
-				<item id="70" min="1" max="1" chance="7.088" /> <!-- Claymore -->
-				<item id="607" min="1" max="3" chance="7.086" /> <!-- Ogre Power Gauntlets -->
-				<item id="497" min="1" max="3" chance="7.083" /> <!-- Chain Helmet -->
-				<item id="2494" min="1" max="3" chance="6.983" /> <!-- Plate Shield -->
-				<item id="74" min="1" max="1" chance="6.432" /> <!-- Katana -->
-				<item id="282" min="1" max="1" chance="6.395" /> <!-- Elemental Bow -->
-				<item id="131" min="1" max="1" chance="6.388" /> <!-- Spirit Sword -->
-				<item id="94" min="1" max="1" chance="6.375" /> <!-- Bec de Corbin -->
-				<item id="242" min="1" max="1" chance="6.371" /> <!-- Soulfire Dirk -->
-				<item id="227" min="1" max="1" chance="6.356" /> <!-- Stiletto -->
-				<item id="195" min="1" max="1" chance="6.329" /> <!-- Cursed Staff -->
-				<item id="73" min="1" max="1" chance="6.312" /> <!-- Shamshir -->
-				<item id="325" min="1" max="1" chance="6.307" /> <!-- Horn of Glory -->
-				<item id="285" min="1" max="1" chance="6.301" /> <!-- Noble Elven Bow -->
-				<item id="133" min="1" max="1" chance="6.298" /> <!-- Raid Sword -->
-				<item id="631" min="1" max="3" chance="5.684" /> <!-- Eldarake -->
-				<item id="302" min="1" max="1" chance="5.67" /> <!-- Body Slasher -->
-				<item id="160" min="1" max="1" chance="5.62" /> <!-- Battle Axe -->
-				<item id="62" min="1" max="3" chance="5.618" /> <!-- Reinforced Mithril Boots -->
-				<item id="89" min="1" max="1" chance="5.615" /> <!-- Big Hammer -->
-				<item id="192" min="1" max="1" chance="5.614" /> <!-- Crystal Staff -->
-				<item id="2454" min="1" max="3" chance="5.613" /> <!-- Karmian Gloves -->
-				<item id="2429" min="1" max="3" chance="5.603" /> <!-- Chain Boots -->
-				<item id="2453" min="1" max="3" chance="5.597" /> <!-- Chain Gloves -->
-				<item id="72" min="1" max="1" chance="5.592" /> <!-- Stormbringer -->
-				<item id="263" min="1" max="1" chance="5.585" /> <!-- Chakram -->
-				<item id="2431" min="1" max="3" chance="5.584" /> <!-- Plated Leather Boots -->
-				<item id="2432" min="1" max="3" chance="5.583" /> <!-- Dwarven Chain Boots -->
-				<item id="2430" min="1" max="3" chance="5.58" /> <!-- Karmian Boots -->
-				<item id="226" min="1" max="1" chance="5.578" /> <!-- Cursed Dagger -->
-				<item id="354" min="1" max="1" chance="5.547" /> <!-- Chain Mail Shirt -->
-				<item id="2452" min="1" max="3" chance="5.546" /> <!-- Reinforced Mithril Gloves -->
-				<item id="439" min="1" max="1" chance="5.545" /> <!-- Karmian Tunic -->
-				<item id="2433" min="1" max="3" chance="5.543" /> <!-- Boots of Seal -->
-				<item id="397" min="1" max="1" chance="5.542" /> <!-- Reinforced Mithril Shirt -->
-				<item id="71" min="1" max="1" chance="5.539" /> <!-- Flamberge -->
-				<item id="298" min="1" max="1" chance="5.538" /> <!-- Orcish Glaive -->
-				<item id="230" min="1" max="1" chance="5.531" /> <!-- Needle Wolverine -->
-				<item id="281" min="1" max="1" chance="5.53" /> <!-- Crystallized Ice Bow -->
-				<item id="471" min="1" max="1" chance="5.528" /> <!-- Karmian Stockings -->
-				<item id="193" min="1" max="1" chance="5.523" /> <!-- Stick of Faith -->
-				<item id="232" min="1" max="1" chance="5.522" /> <!-- Dark Elven Dagger -->
-				<item id="96" min="1" max="1" chance="5.521" /> <!-- Scythe -->
-				<item id="161" min="1" max="1" chance="5.521" /> <!-- Silver Axe -->
-				<item id="2495" min="1" max="3" chance="5.497" /> <!-- Chain Shield -->
-				<item id="191" min="1" max="1" chance="5.495" /> <!-- Heavy Doom Hammer -->
-				<item id="2387" min="1" max="1" chance="5.491" /> <!-- Reinforced Mithril Gaiters -->
-				<item id="381" min="1" max="1" chance="5.488" /> <!-- Chain Gaiters -->
-				<item id="173" min="1" max="1" chance="5.483" /> <!-- Skull Graver -->
-				<item id="194" min="1" max="1" chance="5.482" /> <!-- Heavy Doom Axe -->
-				<item id="2413" min="1" max="3" chance="5.481" /> <!-- Chain Hood -->
-				<item id="70000" min="76" max="228" chance="100" /> <!-- Sealed Rune - Stage 1 -->
+				<group chance="100">
+					<item id="320" min="1" max="1" chance="7.15" /> <!-- Blue Crystal Skull -->
+					<item id="321" min="1" max="1" chance="7.15" /> <!-- Demon's Fangs -->
+					<item id="70" min="1" max="1" chance="7.15" /> <!-- Claymore -->
+					<item id="159" min="1" max="1" chance="7.15" /> <!-- Bonebreaker -->
+					<item id="187" min="1" max="1" chance="7.15" /> <!-- Atuba Hammer -->
+					<item id="188" min="1" max="1" chance="7.15" /> <!-- Ghost Staff -->
+					<item id="189" min="1" max="1" chance="7.15" /> <!-- Staff of Life -->
+					<item id="190" min="1" max="1" chance="7.15" /> <!-- Atuba Mace -->
+					<item id="225" min="1" max="1" chance="7.15" /> <!-- Mithril Dagger -->
+					<item id="262" min="1" max="1" chance="7.15" /> <!-- Scallop Jamadhr -->
+					<item id="280" min="1" max="1" chance="7.15" /> <!-- Light Crossbow -->
+					<item id="297" min="1" max="1" chance="7.15" /> <!-- Glaive -->
+					<item id="322" min="1" max="1" chance="7.15" /> <!-- Vajra Wand -->
+					<item id="2499" min="1" max="1" chance="7.05" /> <!-- Elven Long Sword -->
+				</group>
+				<group chance="100">
+					<item id="438" min="1" max="3" chance="7.15" /> <!-- Sage's Rags -->
+					<item id="61" min="1" max="3" chance="7.15" /> <!-- Mithril Gloves -->
+					<item id="353" min="1" max="1" chance="7.15" /> <!-- Half Plate Armor -->
+					<item id="380" min="1" max="1" chance="7.15" /> <!-- Plate Gaiters -->
+					<item id="396" min="1" max="1" chance="7.15" /> <!-- Salamander Skin Mail -->
+					<item id="497" min="1" max="3" chance="7.15" /> <!-- Chain Helmet -->
+					<item id="607" min="1" max="3" chance="7.15" /> <!-- Ogre Power Gauntlets -->
+					<item id="630" min="1" max="3" chance="7.15" /> <!-- Square Shield -->
+					<item id="1125" min="1" max="3" chance="7.15" /> <!-- Assault Boots -->
+					<item id="2412" min="1" max="3" chance="7.15" /> <!-- Plate Helmet -->
+					<item id="2427" min="1" max="3" chance="7.15" /> <!-- Salamander Skin Boots -->
+					<item id="2428" min="1" max="3" chance="7.15" /> <!-- Plate Boots -->
+					<item id="2451" min="1" max="3" chance="7.15" /> <!-- Sage's Worn Gloves -->
+					<item id="2494" min="1" max="3" chance="7.05" /> <!-- Plate Shield -->
+				</group>
+				<group chance="100">
+					<item id="851" min="1" max="3" chance="33.33" /> <!-- Onyx Beast's Eye Earring -->
+					<item id="882" min="1" max="3" chance="33.33" /> <!-- Mithril Ring -->
+					<item id="914" min="1" max="1" chance="33.34" /> <!-- Dark Necklace -->
+				</group>
+				<group chance="100">
+					<item id="71" min="1" max="1" chance="5.55" /> <!-- Flamberge -->
+					<item id="72" min="1" max="1" chance="5.55" /> <!-- Stormbringer -->
+					<item id="89" min="1" max="1" chance="5.55" /> <!-- Big Hammer -->
+					<item id="96" min="1" max="1" chance="5.55" /> <!-- Scythe -->
+					<item id="160" min="1" max="1" chance="5.55" /> <!-- Battle Axe -->
+					<item id="161" min="1" max="1" chance="5.55" /> <!-- Silver Axe -->
+					<item id="173" min="1" max="1" chance="5.55" /> <!-- Skull Graver -->
+					<item id="191" min="1" max="1" chance="5.55" /> <!-- Heavy Doom Hammer -->
+					<item id="192" min="1" max="1" chance="5.55" /> <!-- Crystal Staff -->
+					<item id="193" min="1" max="1" chance="5.55" /> <!-- Stick of Faith -->
+					<item id="194" min="1" max="1" chance="5.55" /> <!-- Heavy Doom Axe -->
+					<item id="226" min="1" max="1" chance="5.55" /> <!-- Cursed Dagger -->
+					<item id="230" min="1" max="1" chance="5.55" /> <!-- Needle Wolverine -->
+					<item id="232" min="1" max="1" chance="5.55" /> <!-- Dark Elven Dagger -->
+					<item id="263" min="1" max="1" chance="5.55" /> <!-- Chakram -->
+					<item id="281" min="1" max="1" chance="5.55" /> <!-- Crystallized Ice Bow -->
+					<item id="298" min="1" max="1" chance="5.55" /> <!-- Orcish Glaive -->
+					<item id="302" min="1" max="1" chance="5.65" /> <!-- Body Slasher -->
+				</group>
+				<group chance="100">
+					<item id="2387" min="1" max="1" chance="5.55" /> <!-- Reinforced Mithril Gaiters -->
+					<item id="2413" min="1" max="3" chance="5.55" /> <!-- Chain Hood -->
+					<item id="2429" min="1" max="3" chance="5.55" /> <!-- Chain Boots -->
+					<item id="2430" min="1" max="3" chance="5.55" /> <!-- Karmian Boots -->
+					<item id="2431" min="1" max="3" chance="5.55" /> <!-- Plated Leather Boots -->
+					<item id="2432" min="1" max="3" chance="5.55" /> <!-- Dwarven Chain Boots -->
+					<item id="2433" min="1" max="3" chance="5.55" /> <!-- Boots of Seal -->
+					<item id="2452" min="1" max="3" chance="5.55" /> <!-- Reinforced Mithril Gloves -->
+					<item id="2453" min="1" max="3" chance="5.55" /> <!-- Chain Gloves -->
+					<item id="2454" min="1" max="3" chance="5.55" /> <!-- Karmian Gloves -->
+					<item id="2495" min="1" max="3" chance="5.55" /> <!-- Chain Shield -->
+					<item id="62" min="1" max="3" chance="5.55" /> <!-- Reinforced Mithril Boots -->
+					<item id="354" min="1" max="1" chance="5.55" /> <!-- Chain Mail Shirt -->
+					<item id="381" min="1" max="1" chance="5.55" /> <!-- Chain Gaiters -->
+					<item id="397" min="1" max="1" chance="5.55" /> <!-- Reinforced Mithril Shirt -->
+					<item id="439" min="1" max="1" chance="5.55" /> <!-- Karmian Tunic -->
+					<item id="471" min="1" max="1" chance="5.55" /> <!-- Karmian Stockings -->
+					<item id="631" min="1" max="3" chance="5.65" /> <!-- Eldarake -->
+				</group>
+				<group chance="100">
+					<item id="852" min="1" max="3" chance="33.33" /> <!-- Moonstone Earring -->
+					<item id="883" min="1" max="3" chance="33.33" /> <!-- Aquastone Ring -->
+					<item id="915" min="1" max="1" chance="33.34" /> <!-- Aquastone Necklace -->
+				</group>
+				<group chance="70">
+					<item id="73" min="1" max="1" chance="9.09" /> <!-- Shamshir -->
+					<item id="74" min="1" max="1" chance="9.09" /> <!-- Katana -->
+					<item id="94" min="1" max="1" chance="9.09" /> <!-- Bec de Corbin -->
+					<item id="131" min="1" max="1" chance="9.09" /> <!-- Spirit Sword -->
+					<item id="133" min="1" max="1" chance="9.09" /> <!-- Raid Sword -->
+					<item id="195" min="1" max="1" chance="9.09" /> <!-- Cursed Staff -->
+					<item id="227" min="1" max="1" chance="9.09" /> <!-- Stiletto -->
+					<item id="242" min="1" max="1" chance="9.09" /> <!-- Soulfire Dirk -->
+					<item id="282" min="1" max="1" chance="9.09" /> <!-- Elemental Bow -->
+					<item id="285" min="1" max="1" chance="9.09" /> <!-- Noble Elven Bow -->
+					<item id="325" min="1" max="1" chance="9.1" /> <!-- Horn of Glory -->
+				</group>
+				<group chance="100">
+					<item id="355" min="1" max="1" chance="33.33" /> <!-- Dwarven Chain Mail Shirt -->
+					<item id="382" min="1" max="1" chance="33.33" /> <!-- Dwarven Chain Gaiters -->
+					<item id="2496" min="1" max="1" chance="33.34" /> <!-- Dwarven Chain Shield -->
+				</group>
+				<group chance="100">
+					<item id="399" min="1" max="1" chance="25" /> <!-- Rind Leather Armor -->
+					<item id="419" min="1" max="1" chance="25" /> <!-- Rind Leather Gaiters -->
+					<item id="440" min="1" max="1" chance="25" /> <!-- Robe of Seal -->
+					<item id="500" min="1" max="1" chance="25" /> <!-- Great Helmet -->
+				</group>
+				<group chance="100">
+					<item id="632" min="1" max="3" chance="16.66" /> <!-- Knight's Shield -->
+					<item id="1126" min="1" max="3" chance="16.66" /> <!-- Crimson Boots -->
+					<item id="498" min="1" max="3" chance="16.66" /> <!-- Steel Plate Helmet -->
+					<item id="398" min="1" max="1" chance="16.66" /> <!-- Plated Leather Armor -->
+					<item id="418" min="1" max="1" chance="16.66" /> <!-- Plated Leather Gaiters -->
+					<item id="2455" min="1" max="3" chance="16.7" /> <!-- Plated Leather Gloves -->
+				</group>
+				<group chance="100">
+					<item id="853" min="1" max="3" chance="33.33" /> <!-- Earring of Protection -->
+					<item id="884" min="1" max="3" chance="33.33" /> <!-- Ring of Protection -->
+					<item id="916" min="1" max="1" chance="33.34" /> <!-- Necklace of Protection -->
+				</group>
+				<group chance="20">
+					<item id="6660" min="1" max="1" chance="100" /> <!-- Queen Ant's Ring -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29002" level="29" type="Monster" name="Queen Ant Larva">
+	<npc id="29002" level="38" type="Monster" name="Queen Ant Larva">
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="591" hpRegen="3.5" mp="315" mpRegen="1.5" />
-			<attack physical="89.21" magical="59.01" random="30" critical="7" accuracy="40" attackSpeed="257" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="591.9" hpRegen="3.5" mp="315.1" mpRegen="1.5" />
+			<attack physical="89.21" magical="59.01" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.72" magical="84.16" />
 			<speed>
 				<walk ground="40" />
@@ -167,9 +191,9 @@
 			<hitTime>350</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="true" />
+		<status attackable="true" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -178,7 +202,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="4500" aggroRange="450">
@@ -195,9 +219,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4000" hpRegen="108" mp="402" mpRegen="1.8" />
-			<attack physical="637" magical="395" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="4000" hpRegen="108" mp="402.6" mpRegen="1.8" />
+			<attack physical="637" magical="395" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="547" magical="200" />
 			<speed>
 				<walk ground="40" />
@@ -206,9 +230,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -217,7 +241,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4020" level="1" /> <!-- Recovery -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
@@ -240,9 +264,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4343" hpRegen="115" mp="432" mpRegen="1.8" />
-			<attack physical="178" magical="27" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="4343" hpRegen="115" mp="432.7" mpRegen="1.8" />
+			<attack physical="178" magical="27" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="578" magical="211" />
 			<speed>
 				<walk ground="40" />
@@ -251,9 +275,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -262,7 +286,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="700" isAggressive="true">
@@ -284,9 +308,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="7051" hpRegen="122" mp="463" mpRegen="1.8" />
-			<attack physical="1190" magical="1074" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="7051" hpRegen="122" mp="463.3" mpRegen="1.8" />
+			<attack physical="1190" magical="1074" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="610" magical="223" />
 			<speed>
 				<walk ground="40" />
@@ -295,9 +319,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -306,7 +330,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="700" aggroRange="450">
@@ -331,18 +355,19 @@
 		<sex>MALE</sex>
 		<acquire exp="2041407" sp="61242" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="930422.1343873518" hpRegen="441.65" mp="1708" mpRegen="20.0" />
-			<attack physical="722.31" magical="1398.68" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="523103.852" hpRegen="441.65" mp="1708.8" mpRegen="20" />
+			<attack physical="722.31" magical="1398.68" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1602" magical="293" />
 			<speed>
 				<walk ground="50" />
 				<run ground="110" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -351,7 +376,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>10</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -366,82 +391,107 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="608" min="1" max="3" chance="34.99" /> <!-- Mithril Gauntlets -->
-				<item id="854" min="1" max="3" chance="33.46" /> <!-- Earring of Seal -->
-				<item id="1127" min="1" max="3" chance="33.3" /> <!-- Forgotten Boots -->
-				<item id="885" min="1" max="3" chance="32.95" /> <!-- Ring of Ages -->
-				<item id="917" min="1" max="1" chance="32.52" /> <!-- Necklace of Mermaid -->
-				<item id="1149" min="1" max="3" chance="31.87" /> <!-- Shining Circlet -->
-				<item id="420" min="1" max="1" chance="26.08" /> <!-- Theca Leather Gaiters -->
-				<item id="472" min="1" max="1" chance="25.78" /> <!-- Demon's Stockings -->
-				<item id="400" min="1" max="1" chance="25.47" /> <!-- Theca Leather Armor -->
-				<item id="2460" min="1" max="1" chance="25.23" /> <!-- Theca Leather Gloves -->
-				<item id="2435" min="1" max="1" chance="25.04" /> <!-- Demon's Boots -->
-				<item id="2436" min="1" max="1" chance="24.9" /> <!-- Theca Leather Boots -->
-				<item id="441" min="1" max="1" chance="24.26" /> <!-- Demon's Tunic -->
-				<item id="2459" min="1" max="1" chance="24.03" /> <!-- Demon's Gloves -->
-				<item id="499" min="1" max="3" chance="20.88" /> <!-- Mithril Helmet -->
-				<item id="473" min="1" max="1" chance="20.74" /> <!-- Divine Stockings -->
-				<item id="401" min="1" max="1" chance="20.66" /> <!-- Drake Leather Armor -->
-				<item id="2437" min="1" max="1" chance="20.65" /> <!-- Drake Leather Boots -->
-				<item id="2462" min="1" max="1" chance="20.64" /> <!-- Full Plate Gauntlets -->
-				<item id="103" min="1" max="3" chance="20.48" /> <!-- Tower Shield -->
-				<item id="2468" min="1" max="3" chance="20.26" /> <!-- Blessed Gloves -->
-				<item id="356" min="1" max="1" chance="20.16" /> <!-- Full Plate Armor -->
-				<item id="2414" min="1" max="1" chance="20.08" /> <!-- Full Plate Helmet -->
-				<item id="6662" min="1" max="1" chance="20.05" /> <!-- Ring of Core -->
-				<item id="442" min="1" max="1" chance="19.81" /> <!-- Divine Tunic -->
-				<item id="2497" min="1" max="1" chance="19.76" /> <!-- Full Plate Shield -->
-				<item id="107" min="1" max="3" chance="19.74" /> <!-- Compound Shield -->
-				<item id="2438" min="1" max="1" chance="19.71" /> <!-- Full Plate Boots -->
-				<item id="60" min="1" max="1" chance="19.71" /> <!-- Compound Armor -->
-				<item id="2461" min="1" max="1" chance="19.52" /> <!-- Drake Leather Gloves -->
-				<item id="603" min="1" max="3" chance="19.51" /> <!-- Divine Boots -->
-				<item id="64" min="1" max="1" chance="19.47" /> <!-- Compound Boots -->
-				<item id="1128" min="1" max="3" chance="19.4" /> <!-- Adamantite Boots -->
-				<item id="517" min="1" max="3" chance="19.29" /> <!-- Compound Helmet -->
-				<item id="2463" min="1" max="1" chance="19.28" /> <!-- Divine Gloves -->
-				<item id="119" min="1" max="1" chance="17.35" /> <!-- Necklace of Seal -->
-				<item id="919" min="1" max="1" chance="17.23" /> <!-- Blessed Necklace -->
-				<item id="886" min="1" max="3" chance="17.2" /> <!-- Ring of Seal -->
-				<item id="857" min="1" max="3" chance="16.47" /> <!-- Holy Earring -->
-				<item id="855" min="1" max="3" chance="16.2" /> <!-- Nassen's Earring -->
-				<item id="888" min="1" max="3" chance="16.04" /> <!-- Blessed Ring -->
-				<item id="135" min="1" max="1" chance="11.58" /> <!-- Samurai Long Sword -->
-				<item id="299" min="1" max="1" chance="11.56" /> <!-- Orcish Poleaxe -->
-				<item id="206" min="1" max="1" chance="11.45" /> <!-- Demon's Staff -->
-				<item id="2503" min="1" max="1" chance="11.42" /> <!-- Yaksa Mace -->
-				<item id="205" min="1" max="1" chance="11.22" /> <!-- Ghoul's Staff -->
-				<item id="266" min="1" max="1" chance="11.2" /> <!-- Great Pata -->
-				<item id="204" min="1" max="1" chance="10.73" /> <!-- Deadman's Staff -->
-				<item id="228" min="1" max="1" chance="10.63" /> <!-- Crystal Dagger -->
-				<item id="286" min="1" max="1" chance="10.61" /> <!-- Eminence Bow -->
-				<item id="303" min="1" max="1" chance="4.364" /> <!-- Widow Maker -->
-				<item id="162" min="1" max="1" chance="4.23" /> <!-- War Axe -->
-				<item id="301" min="1" max="1" chance="4.227" /> <!-- scorpion -->
-				<item id="203" min="1" max="1" chance="4.22" /> <!-- Pa'agrio Axe -->
-				<item id="95" min="1" max="1" chance="4.219" /> <!-- Poleaxe -->
-				<item id="283" min="1" max="1" chance="4.205" /> <!-- Akat Longbow -->
-				<item id="202" min="1" max="1" chance="4.201" /> <!-- Mace of Underworld -->
-				<item id="199" min="1" max="1" chance="4.188" /> <!-- Pa'agrio Hammer -->
-				<item id="231" min="1" max="1" chance="4.184" /> <!-- Grace Dagger -->
-				<item id="134" min="1" max="1" chance="4.175" /> <!-- Sword of Nightmare -->
-				<item id="233" min="1" max="1" chance="4.171" /> <!-- Dark Screamer -->
-				<item id="174" min="1" max="1" chance="4.153" /> <!-- Nirvana Axe -->
-				<item id="265" min="1" max="1" chance="4.136" /> <!-- Fisted Blade -->
-				<item id="201" min="1" max="1" chance="4.131" /> <!-- Club of Nature -->
-				<item id="196" min="1" max="1" chance="4.13" /> <!-- Stick of Eternity -->
-				<item id="75" min="1" max="1" chance="4.129" /> <!-- Caliburs -->
-				<item id="197" min="1" max="1" chance="4.114" /> <!-- Paradia Staff -->
-				<item id="76" min="1" max="1" chance="4.113" /> <!-- Sword of Delusion -->
-				<item id="84" min="1" max="1" chance="4.109" /> <!-- Homunkulus' Sword -->
-				<item id="200" min="1" max="1" chance="4.108" /> <!-- Sage's Staff -->
-				<item id="132" min="1" max="1" chance="4.105" /> <!-- Ultimate Sword -->
-				<item id="77" min="1" max="1" chance="4.097" /> <!-- Tsurugi -->
-				<item id="198" min="1" max="1" chance="4.095" /> <!-- Inferno Staff -->
-				<item id="145" min="1" max="1" chance="4.093" /> <!-- Sword of Whispering Death -->
-				<item id="70000" min="297" max="891" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="8620" min="1" max="3" chance="50.85" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				<group chance="100">
+					<item id="75" min="1" max="1" chance="4.16" /> <!-- Caliburs -->
+					<item id="76" min="1" max="1" chance="4.16" /> <!-- Sword of Delusion -->
+					<item id="77" min="1" max="1" chance="4.16" /> <!-- Tsurugi -->
+					<item id="84" min="1" max="1" chance="4.16" /> <!-- Homunkulus' Sword -->
+					<item id="95" min="1" max="1" chance="4.16" /> <!-- Poleaxe -->
+					<item id="132" min="1" max="1" chance="4.16" /> <!-- Ultimate Sword -->
+					<item id="134" min="1" max="1" chance="4.16" /> <!-- Sword of Nightmare -->
+					<item id="145" min="1" max="1" chance="4.16" /> <!-- Sword of Whispering Death -->
+					<item id="162" min="1" max="1" chance="4.16" /> <!-- War Axe -->
+					<item id="174" min="1" max="1" chance="4.16" /> <!-- Nirvana Axe -->
+					<item id="196" min="1" max="1" chance="4.16" /> <!-- Stick of Eternity -->
+					<item id="197" min="1" max="1" chance="4.16" /> <!-- Paradia Staff -->
+					<item id="198" min="1" max="1" chance="4.16" /> <!-- Inferno Staff -->
+					<item id="199" min="1" max="1" chance="4.16" /> <!-- Pa'agrio Hammer -->
+					<item id="200" min="1" max="1" chance="4.16" /> <!-- Sage's Staff -->
+					<item id="201" min="1" max="1" chance="4.16" /> <!-- Club of Nature -->
+					<item id="202" min="1" max="1" chance="4.16" /> <!-- Mace of Underworld -->
+					<item id="231" min="1" max="1" chance="4.16" /> <!-- Grace Dagger -->
+					<item id="233" min="1" max="1" chance="4.16" /> <!-- Dark Screamer -->
+					<item id="265" min="1" max="1" chance="4.16" /> <!-- Fisted Blade -->
+					<item id="283" min="1" max="1" chance="4.16" /> <!-- Akat Longbow -->
+					<item id="203" min="1" max="1" chance="4.16" /> <!-- Pa'agrio Axe -->
+					<item id="301" min="1" max="1" chance="4.16" /> <!-- scorpion -->
+					<item id="303" min="1" max="1" chance="4.32" /> <!-- Widow Maker -->
+				</group>
+				<group chance="100">
+					<item id="60" min="1" max="1" chance="20" /> <!-- Compound Armor -->
+					<item id="64" min="1" max="1" chance="20" /> <!-- Compound Boots -->
+					<item id="103" min="1" max="3" chance="20" /> <!-- Tower Shield -->
+					<item id="107" min="1" max="3" chance="20" /> <!-- Compound Shield -->
+					<item id="517" min="1" max="3" chance="20" /> <!-- Compound Helmet -->
+				</group>
+				<group chance="100">
+					<item id="608" min="1" max="3" chance="33.33" /> <!-- Mithril Gauntlets -->
+					<item id="1127" min="1" max="3" chance="33.33" /> <!-- Forgotten Boots -->
+					<item id="1149" min="1" max="3" chance="33.34" /> <!-- Shining Circlet -->
+				</group>
+				<group chance="100">
+					<item id="400" min="1" max="1" chance="25" /> <!-- Theca Leather Armor -->
+					<item id="420" min="1" max="1" chance="25" /> <!-- Theca Leather Gaiters -->
+					<item id="2436" min="1" max="1" chance="25" /> <!-- Theca Leather Boots -->
+					<item id="2460" min="1" max="1" chance="25" /> <!-- Theca Leather Gloves -->
+				</group>
+				<group chance="100">
+					<item id="441" min="1" max="1" chance="25" /> <!-- Demon's Tunic -->
+					<item id="472" min="1" max="1" chance="25" /> <!-- Demon's Stockings -->
+					<item id="2435" min="1" max="1" chance="25" /> <!-- Demon's Boots -->
+					<item id="2459" min="1" max="1" chance="25" /> <!-- Demon's Gloves -->
+				</group>
+				<group chance="100">
+					<item id="854" min="1" max="3" chance="33.33" /> <!-- Earring of Seal -->
+					<item id="885" min="1" max="3" chance="33.33" /> <!-- Ring of Ages -->
+					<item id="917" min="1" max="1" chance="33.34" /> <!-- Necklace of Mermaid -->
+				</group>
+				<group chance="100">
+					<item id="135" min="1" max="1" chance="11.11" /> <!-- Samurai Long Sword -->
+					<item id="204" min="1" max="1" chance="11.11" /> <!-- Deadman's Staff -->
+					<item id="205" min="1" max="1" chance="11.11" /> <!-- Ghoul's Staff -->
+					<item id="206" min="1" max="1" chance="11.11" /> <!-- Demon's Staff -->
+					<item id="228" min="1" max="1" chance="11.11" /> <!-- Crystal Dagger -->
+					<item id="266" min="1" max="1" chance="11.11" /> <!-- Great Pata -->
+					<item id="286" min="1" max="1" chance="11.11" /> <!-- Eminence Bow -->
+					<item id="299" min="1" max="1" chance="11.11" /> <!-- Orcish Poleaxe -->
+					<item id="2503" min="1" max="1" chance="11.12" /> <!-- Yaksa Mace -->
+				</group>
+				<group chance="100">
+					<item id="356" min="1" max="1" chance="20" /> <!-- Full Plate Armor -->
+					<item id="2414" min="1" max="1" chance="20" /> <!-- Full Plate Helmet -->
+					<item id="2438" min="1" max="1" chance="20" /> <!-- Full Plate Boots -->
+					<item id="2462" min="1" max="1" chance="20" /> <!-- Full Plate Gauntlets -->
+					<item id="2497" min="1" max="1" chance="20" /> <!-- Full Plate Shield -->
+				</group>
+				<group chance="100">
+					<item id="401" min="1" max="1" chance="20" /> <!-- Drake Leather Armor -->
+					<item id="2437" min="1" max="1" chance="20" /> <!-- Drake Leather Boots -->
+					<item id="2461" min="1" max="1" chance="20" /> <!-- Drake Leather Gloves -->
+					<item id="499" min="1" max="3" chance="20" /> <!-- Mithril Helmet -->
+					<item id="1128" min="1" max="3" chance="20" /> <!-- Adamantite Boots -->
+				</group>
+				<group chance="100">
+					<item id="442" min="1" max="1" chance="20" /> <!-- Divine Tunic -->
+					<item id="473" min="1" max="1" chance="20" /> <!-- Divine Stockings -->
+					<item id="2463" min="1" max="1" chance="20" /> <!-- Divine Gloves -->
+					<item id="2468" min="1" max="3" chance="20" /> <!-- Blessed Gloves -->
+					<item id="603" min="1" max="3" chance="20" /> <!-- Divine Boots -->
+				</group>
+				<group chance="100">
+					<item id="119" min="1" max="1" chance="16.66" /> <!-- Necklace of Seal -->
+					<item id="855" min="1" max="3" chance="16.66" /> <!-- Nassen's Earring -->
+					<item id="857" min="1" max="3" chance="16.66" /> <!-- Holy Earring -->
+					<item id="886" min="1" max="3" chance="16.66" /> <!-- Ring of Seal -->
+					<item id="888" min="1" max="3" chance="16.66" /> <!-- Blessed Ring -->
+					<item id="919" min="1" max="1" chance="16.7" /> <!-- Blessed Necklace -->
+				</group>
+				<group chance="20">
+					<item id="6662" min="1" max="1" chance="100" /> <!-- Ring of Core -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -455,9 +505,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="75" /> <!-- Caliburs -->
 		<acquire exp="13947" sp="418" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="13817" hpRegen="166" mp="747" mpRegen="2.1" />
-			<attack physical="410" magical="69" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="13817" hpRegen="166" mp="747.8" mpRegen="2.1" />
+			<attack physical="410" magical="69" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="801" magical="293" />
 			<speed>
 				<walk ground="27" />
@@ -466,9 +516,9 @@
 			<hitTime>710</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -477,9 +527,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="2300" isAggressive="true">
@@ -491,40 +539,6 @@
 			<radius normal="12" grown="14.5" />
 			<height normal="31" grown="36" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="162" min="1" max="1" chance="0.003" /> <!-- War Axe -->
-				<item id="174" min="1" max="1" chance="0.003" /> <!-- Nirvana Axe -->
-				<item id="196" min="1" max="1" chance="0.003" /> <!-- Stick of Eternity -->
-				<item id="197" min="1" max="1" chance="0.003" /> <!-- Paradia Staff -->
-				<item id="199" min="1" max="1" chance="0.003" /> <!-- Pa'agrio Hammer -->
-				<item id="200" min="1" max="1" chance="0.003" /> <!-- Sage's Staff -->
-				<item id="201" min="1" max="1" chance="0.003" /> <!-- Club of Nature -->
-				<item id="202" min="1" max="1" chance="0.003" /> <!-- Mace of Underworld -->
-				<item id="57" min="1160" max="2714" chance="70" /> <!-- Adena -->
-				<item id="1872" min="1" max="3" chance="16.14" /> <!-- Animal Bone -->
-				<item id="1865" min="1" max="3" chance="8.492" /> <!-- Varnish -->
-				<item id="1882" min="1" max="1" chance="5.7" /> <!-- Leather -->
-				<item id="2508" min="2" max="6" chance="5.317" /> <!-- Cursed Bone -->
-				<item id="1876" min="1" max="1" chance="5.163" /> <!-- Mithril Ore -->
-				<item id="2952" min="1" max="1" chance="2.172" /> <!-- Demon's Boot Fabric -->
-				<item id="3005" min="1" max="1" chance="0.97" /> <!-- Recipe: Demon's Boots -->
-				<item id="2100" min="1" max="1" chance="0.3" /> <!-- Paradia Staff Head -->
-				<item id="2097" min="1" max="1" chance="0.3" /> <!-- War Axe Blade -->
-				<item id="2098" min="1" max="1" chance="0.3" /> <!-- Nirvana Axe Blade -->
-				<item id="2231" min="1" max="1" chance="0.3" /> <!-- Recipe: Full Plate Armor -->
-				<item id="2105" min="1" max="1" chance="0.3" /> <!-- Mace of Underworld Head -->
-				<item id="2104" min="1" max="1" chance="0.3" /> <!-- Club of Nature Head -->
-				<item id="2103" min="1" max="1" chance="0.3" /> <!-- Sage's Staff Head -->
-				<item id="2099" min="1" max="1" chance="0.3" /> <!-- Stick of Eternity Shaft -->
-				<item id="2102" min="1" max="1" chance="0.3" /> <!-- Pa'agrio Hammer Head -->
-				<item id="2360" min="1" max="1" chance="0.03" /> <!-- Recipe: Orcish Poleaxe -->
-			</drop>
-			<spoil>
-				<item id="1914" min="1" max="1" chance="46.21" /> <!-- Earring of Seal Gemstone -->
-				<item id="3011" min="1" max="1" chance="22.96" /> <!-- Recipe: Divine Boots -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29008" level="55" type="Monster" name="Doom Wraith">
 		<parameters>
@@ -537,9 +551,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="1472" /> <!-- Dreadbane -->
 		<acquire exp="15169" sp="501" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="16012" hpRegen="185" mp="889" mpRegen="2.4" />
-			<attack physical="470" magical="715" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="16012" hpRegen="185" mp="889.8" mpRegen="2.4" />
+			<attack physical="470" magical="715" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="895" magical="327" />
 			<speed>
 				<walk ground="100" />
@@ -548,21 +562,19 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="5" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="5" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="700" isAggressive="true">
@@ -585,9 +597,9 @@
 		<race>PLANT</race>
 		<sex>FEMALE</sex>
 		<acquire exp="11480" sp="344" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="12544" hpRegen="154" mp="665" mpRegen="2.1" />
-			<attack physical="354" magical="60" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<attack physical="354" magical="60" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="747" magical="273" />
 			<speed>
 				<walk ground="80" />
@@ -596,19 +608,19 @@
 			<hitTime>130</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4035" level="4" /> <!-- Poison -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4035" level="4" /> <!-- Poison -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="800" isAggressive="true">
@@ -620,34 +632,6 @@
 			<radius normal="12" />
 			<height normal="25.5" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="1126" min="1" max="1" chance="0.075" /> <!-- Crimson Boots -->
-				<item id="2434" min="1" max="1" chance="0.075" /> <!-- Rind Leather Boots -->
-				<item id="2455" min="1" max="1" chance="0.075" /> <!-- Plated Leather Gloves -->
-				<item id="2457" min="1" max="1" chance="0.075" /> <!-- Gloves of Seal -->
-				<item id="2458" min="1" max="1" chance="0.075" /> <!-- Rind Leather Gloves -->
-				<item id="57" min="996" max="2323" chance="70" /> <!-- Adena -->
-				<item id="1866" min="1" max="1" chance="13.34" /> <!-- Suede -->
-				<item id="1342" min="30" max="90" chance="12.95" /> <!-- Steel Arrow -->
-				<item id="1867" min="2" max="6" chance="6.416" /> <!-- Animal Skin -->
-				<item id="2951" min="1" max="1" chance="4.388" /> <!-- Rind Leather Glove Design -->
-				<item id="2950" min="1" max="1" chance="4.348" /> <!-- Gloves of Seal Pattern -->
-				<item id="2948" min="1" max="1" chance="4.342" /> <!-- Rind Leather Boot Lining -->
-				<item id="1882" min="1" max="1" chance="4.245" /> <!-- Leather -->
-				<item id="1868" min="5" max="15" chance="3.845" /> <!-- Thread -->
-				<item id="2946" min="1" max="1" chance="2.929" /> <!-- Plated Leather Glove Design -->
-				<item id="2508" min="3" max="9" chance="2.632" /> <!-- Cursed Bone -->
-				<item id="1974" min="1" max="3" chance="2.22" /> <!-- Crimson Boot Fabric -->
-				<item id="1885" min="1" max="1" chance="1.585" /> <!-- High-grade Suede -->
-				<item id="2350" min="1" max="1" chance="0.03" /> <!-- Recipe: Pa'agrio Axe -->
-				<item id="2339" min="1" max="1" chance="0.03" /> <!-- Recipe: Inferno Staff -->
-			</drop>
-			<spoil>
-				<item id="1895" min="1" max="5" chance="66.24" /> <!-- Metallic Fiber -->
-				<item id="2944" min="1" max="1" chance="62.28" /> <!-- Karmian Glove Fabric -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29010" level="46" type="Monster" name="Validus">
 		<parameters>
@@ -658,29 +642,29 @@
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<acquire exp="11032" sp="330" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="12130" hpRegen="150" mp="637" mpRegen="2.1" />
-			<attack physical="337" magical="58" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="12130" hpRegen="150" mp="637.8" mpRegen="2.1" />
+			<attack physical="337" magical="58" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="729" magical="267" />
 			<speed>
 				<walk ground="70" />
 				<run ground="110" />
 			</speed>
-			<hitTime>300</hitTime>
+			<hitTime>30</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="3" /> <!-- Beasts -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="3" /> <!-- Beasts -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="1200" isAggressive="true">
@@ -692,29 +676,6 @@
 			<radius normal="15" />
 			<height normal="29" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="354" min="1" max="1" chance="0.03" /> <!-- Chain Mail Shirt -->
-				<item id="232" min="1" max="1" chance="0.0075" /> <!-- Dark Elven Dagger -->
-				<item id="281" min="1" max="1" chance="0.0075" /> <!-- Crystallized Ice Bow -->
-				<item id="57" min="914" max="2141" chance="70" /> <!-- Adena -->
-				<item id="1866" min="1" max="1" chance="15.89" /> <!-- Suede -->
-				<item id="1878" min="1" max="1" chance="9.186" /> <!-- Durable Braid -->
-				<item id="1864" min="3" max="9" chance="7.663" /> <!-- Stem -->
-				<item id="1865" min="2" max="6" chance="5.755" /> <!-- Varnish -->
-				<item id="2508" min="2" max="6" chance="3.839" /> <!-- Cursed Bone -->
-				<item id="1959" min="1" max="1" chance="2.104" /> <!-- Chain Mail Shirt Material -->
-				<item id="2072" min="1" max="1" chance="0.75" /> <!-- Dark Elven Dagger Edge -->
-				<item id="2074" min="1" max="1" chance="0.75" /> <!-- Crystallized Ice Bow Shaft -->
-				<item id="2319" min="1" max="1" chance="0.075" /> <!-- Recipe: Raid Sword -->
-				<item id="951" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Weapon (C-grade) -->
-			</drop>
-			<spoil>
-				<item id="1873" min="1" max="3" chance="88.74" /> <!-- Silver Nugget -->
-				<item id="2060" min="1" max="1" chance="3.464" /> <!-- Stormbringer Blade -->
-				<item id="2067" min="1" max="1" chance="3.185" /> <!-- Crystal Staff Head -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29011" level="49" type="Monster" name="Susceptor">
 		<parameters>
@@ -725,10 +686,10 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="13389" hpRegen="162" mp="720" mpRegen="2.1" />
-			<attack physical="391" magical="66" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<attack physical="391" magical="66" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="783" magical="286" />
 			<speed>
 				<walk ground="27" />
@@ -737,10 +698,9 @@
 			<hitTime>430</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -749,7 +709,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="1500" isAggressive="true">
@@ -772,9 +733,9 @@
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<acquire exp="16035" sp="481" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="12964" hpRegen="158" mp="692" mpRegen="2.1" />
-			<attack physical="372" magical="63" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="12964" hpRegen="158" mp="692.4" mpRegen="2.1" />
+			<attack physical="372" magical="63" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="765" magical="280" />
 			<speed>
 				<walk ground="20" />
@@ -783,22 +744,22 @@
 			<hitTime>410</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4273" level="3" /> <!-- Resist Daggers/Rapier Weapon -->
-			<skill id="4274" level="1" /> <!-- Blunt Weapon Weak Point -->
-			<skill id="4408" level="12" /> <!-- HP Increase (4x) -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
-			<skill id="4444" level="2" /> <!-- Higher Resist Bow/Crossbow Weapons -->
+			<skill id="4444" level="2" /> <!-- Greater Bow/Crossbow Resistance -->
+			<skill id="4273" level="3" /> <!-- Dagger/Rapier Resistance -->
+			<skill id="4274" level="1" /> <!-- Blunt Weapon Vulnerability -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="800" isAggressive="true">
@@ -810,35 +771,6 @@
 			<radius normal="18" />
 			<height normal="34" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="1126" min="1" max="1" chance="0.075" /> <!-- Crimson Boots -->
-				<item id="2434" min="1" max="1" chance="0.075" /> <!-- Rind Leather Boots -->
-				<item id="2455" min="1" max="1" chance="0.075" /> <!-- Plated Leather Gloves -->
-				<item id="2457" min="1" max="1" chance="0.075" /> <!-- Gloves of Seal -->
-				<item id="2458" min="1" max="1" chance="0.075" /> <!-- Rind Leather Gloves -->
-				<item id="57" min="1447" max="3374" chance="70" /> <!-- Adena -->
-				<item id="1873" min="1" max="1" chance="12.81" /> <!-- Silver Nugget -->
-				<item id="1865" min="1" max="3" chance="10.09" /> <!-- Varnish -->
-				<item id="2508" min="2" max="6" chance="6.579" /> <!-- Cursed Bone -->
-				<item id="1965" min="1" max="1" chance="4.208" /> <!-- Metal Plate Helmet Material -->
-				<item id="2946" min="1" max="1" chance="3.494" /> <!-- Plated Leather Glove Design -->
-				<item id="1880" min="1" max="1" chance="3.151" /> <!-- Steel -->
-				<item id="1869" min="5" max="15" chance="3.142" /> <!-- Iron Ore -->
-				<item id="1974" min="1" max="3" chance="2.735" /> <!-- Crimson Boot Fabric -->
-				<item id="1874" min="1" max="1" chance="2.061" /> <!-- Oriharukon Ore -->
-				<item id="2948" min="1" max="3" chance="1.772" /> <!-- Rind Leather Boot Lining -->
-				<item id="2950" min="2" max="6" chance="1.296" /> <!-- Gloves of Seal Pattern -->
-				<item id="2951" min="2" max="6" chance="1.067" /> <!-- Rind Leather Glove Design -->
-				<item id="1973" min="3" max="9" chance="0.75" /> <!-- Pa'agrio Hand Design -->
-				<item id="2344" min="1" max="1" chance="0.075" /> <!-- Recipe: Grace Dagger -->
-				<item id="951" min="1" max="1" chance="0.075" /> <!-- Scroll: Enchant Weapon (C-grade) -->
-			</drop>
-			<spoil>
-				<item id="2073" min="1" max="1" chance="7.894" /> <!-- Chakram Edge -->
-				<item id="2352" min="1" max="1" chance="2.107" /> <!-- Recipe: Widow Maker -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29013" level="45" type="Monster" name="Premo">
 		<parameters>
@@ -849,9 +781,9 @@
 		<race>GIANT</race>
 		<sex>MALE</sex>
 		<acquire exp="10351" sp="310" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="11721" hpRegen="146" mp="610" mpRegen="2.1" />
-			<attack physical="320" magical="55" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="11721" hpRegen="146" mp="610.8" mpRegen="2.1" />
+			<attack physical="320" magical="55" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="711" magical="260" />
 			<speed>
 				<walk ground="55" />
@@ -860,10 +792,10 @@
 			<hitTime>610</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="11" /> <!-- Giant -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
@@ -871,7 +803,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="11" /> <!-- Giants -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="1200" aggroRange="450">
@@ -883,30 +815,6 @@
 			<radius normal="21" grown="25" />
 			<height normal="35" grown="43" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="631" min="1" max="1" chance="0.3" /> <!-- Eldarake -->
-				<item id="2495" min="1" max="1" chance="0.3" /> <!-- Chain Shield -->
-				<item id="2413" min="1" max="1" chance="0.075" /> <!-- Chain Hood -->
-				<item id="57" min="859" max="2006" chance="70" /> <!-- Adena -->
-				<item id="1868" min="1" max="3" chance="17.95" /> <!-- Thread -->
-				<item id="1866" min="1" max="1" chance="12.31" /> <!-- Suede -->
-				<item id="1867" min="1" max="3" chance="8.405" /> <!-- Animal Skin -->
-				<item id="1964" min="1" max="1" chance="6.108" /> <!-- Eldarake Temper -->
-				<item id="2945" min="1" max="1" chance="6.014" /> <!-- Chain Shield Fragment -->
-				<item id="2936" min="1" max="1" chance="5.526" /> <!-- Chain Hood Pattern -->
-				<item id="1882" min="1" max="1" chance="4.181" /> <!-- Leather -->
-				<item id="1885" min="1" max="1" chance="1.519" /> <!-- High-grade Suede -->
-				<item id="2207" min="1" max="1" chance="0.3" /> <!-- Recipe: Karmian Tunic -->
-				<item id="2323" min="1" max="1" chance="0.075" /> <!-- Recipe: Elemental Bow -->
-				<item id="2326" min="1" max="1" chance="0.075" /> <!-- Recipe: Horn of Glory -->
-			</drop>
-			<spoil>
-				<item id="1876" min="1" max="1" chance="80.65" /> <!-- Mithril Ore -->
-				<item id="1962" min="1" max="1" chance="13.24" /> <!-- Karmian Tunic Pattern -->
-				<item id="2073" min="1" max="1" chance="3.192" /> <!-- Chakram Edge -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29014" level="50" type="GrandBoss" name="Orfen">
 		<parameters>
@@ -917,13 +825,13 @@
 				<npc id="29016" count="4" respawnTime="360" weightPoint="1" />
 			</minions>
 		</parameters>
-		<race>ELEMENTAL</race>
+		<race>FAIRY</race>
 		<sex>FEMALE</sex>
 		<acquire exp="8872500" sp="266175" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="930422.1343873518" hpRegen="441.65" mp="36939" mpRegen="20.0" />
-			<attack physical="722.31" magical="1398.68" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="1602" magical="293" />
+			<vitals hp="523103.852" hpRegen="441.65" mp="1708.8" mpRegen="20" />
+			<attack physical="3652" magical="1535" random="10" critical="4" accuracy="0" attackSpeed="253" type="SWORD" range="80" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -931,12 +839,9 @@
 			<hitTime>710</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4062" level="1" /> <!-- Orfen -->
-			<skill id="4063" level="1" /> <!-- Paralysis -->
-			<skill id="4064" level="1" /> <!-- Paralysis -->
+			<skill id="4416" level="13" /> <!-- Fairies -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -945,7 +850,10 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="13" /> <!-- Fairies -->
+			<skill id="4062" level="1" /> <!-- Orfen -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4063" level="1" /> <!-- Paralysis -->
+			<skill id="4064" level="1" /> <!-- Paralysis -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -960,56 +868,79 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="918" min="1" max="1" chance="33.35" /> <!-- Adamantite Necklace -->
-				<item id="856" min="1" max="3" chance="33.1" /> <!-- Adamantite Earring -->
-				<item id="887" min="1" max="3" chance="32.11" /> <!-- Adamantite Ring -->
-				<item id="673" min="1" max="1" chance="25.95" /> <!-- Avadon Shield -->
-				<item id="2379" min="1" max="1" chance="25.86" /> <!-- Avadon Gaiters -->
-				<item id="2376" min="1" max="1" chance="25.13" /> <!-- Avadon Breastplate -->
-				<item id="2415" min="1" max="1" chance="24.74" /> <!-- Sealed Avadon Circlet -->
-				<item id="2414" min="1" max="1" chance="20.98" /> <!-- Full Plate Helmet -->
-				<item id="603" min="1" max="3" chance="20.87" /> <!-- Divine Boots -->
-				<item id="2463" min="1" max="1" chance="20.81" /> <!-- Divine Gloves -->
-				<item id="356" min="1" max="1" chance="20.6" /> <!-- Full Plate Armor -->
-				<item id="1128" min="1" max="3" chance="20.45" /> <!-- Adamantite Boots -->
-				<item id="2438" min="1" max="1" chance="20.42" /> <!-- Full Plate Boots -->
-				<item id="6661" min="1" max="1" chance="20.12" /> <!-- Orfen's Earring -->
-				<item id="2437" min="1" max="1" chance="20.12" /> <!-- Drake Leather Boots -->
-				<item id="442" min="1" max="1" chance="20.08" /> <!-- Divine Tunic -->
-				<item id="2462" min="1" max="1" chance="19.79" /> <!-- Full Plate Gauntlets -->
-				<item id="499" min="1" max="3" chance="19.79" /> <!-- Mithril Helmet -->
-				<item id="401" min="1" max="1" chance="19.78" /> <!-- Drake Leather Armor -->
-				<item id="2461" min="1" max="1" chance="19.7" /> <!-- Drake Leather Gloves -->
-				<item id="2468" min="1" max="3" chance="19.32" /> <!-- Blessed Gloves -->
-				<item id="473" min="1" max="1" chance="19.15" /> <!-- Divine Stockings -->
-				<item id="2497" min="1" max="3" chance="19.15" /> <!-- Full Plate Shield -->
-				<item id="119" min="1" max="1" chance="16.97" /> <!-- Necklace of Seal -->
-				<item id="855" min="1" max="3" chance="16.5" /> <!-- Nassen's Earring -->
-				<item id="888" min="1" max="3" chance="16.16" /> <!-- Blessed Ring -->
-				<item id="857" min="1" max="3" chance="16.02" /> <!-- Holy Earring -->
-				<item id="919" min="1" max="1" chance="16.01" /> <!-- Blessed Necklace -->
-				<item id="886" min="1" max="3" chance="15.9" /> <!-- Ring of Seal -->
-				<item id="228" min="1" max="1" chance="11.59" /> <!-- Crystal Dagger -->
-				<item id="266" min="1" max="1" chance="11.58" /> <!-- Great Pata -->
-				<item id="299" min="1" max="1" chance="11.37" /> <!-- Orcish Poleaxe -->
-				<item id="204" min="1" max="1" chance="10.99" /> <!-- Deadman's Staff -->
-				<item id="286" min="1" max="1" chance="10.89" /> <!-- Eminence Bow -->
-				<item id="206" min="1" max="1" chance="10.83" /> <!-- Demon's Staff -->
-				<item id="2503" min="1" max="1" chance="10.7" /> <!-- Yaksa Mace -->
-				<item id="205" min="1" max="1" chance="10.62" /> <!-- Ghoul's Staff -->
-				<item id="135" min="1" max="1" chance="10.6" /> <!-- Samurai Long Sword -->
-				<item id="947" min="2" max="8" chance="100" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-				<item id="70000" min="198" max="593" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="948" min="10" max="30" chance="100" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="8620" min="1" max="3" chance="50.1" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="4065" min="20" max="80" chance="13.09" /> <!-- Avadon Gaiter Material -->
-				<item id="4071" min="20" max="80" chance="12.62" /> <!-- Avadon Robe Fabric -->
-				<item id="4050" min="20" max="80" chance="12.62" /> <!-- Adamantite Ring Wire -->
-				<item id="4064" min="20" max="80" chance="12.61" /> <!-- Avadon Breastplate Part -->
-				<item id="4072" min="20" max="80" chance="12.6" /> <!-- Sealed Avadon Circlet Pattern -->
-				<item id="4049" min="20" max="80" chance="12.14" /> <!-- Adamantite Earring Gemstone -->
-				<item id="4051" min="20" max="80" chance="12.12" /> <!-- Adamantite Necklace Chain -->
-				<item id="4439" min="20" max="80" chance="11.89" /> <!-- Avadon Shield Fragment -->
+				<group chance="100">
+					<item id="135" min="1" max="1" chance="11.11" /> <!-- Samurai Long Sword -->
+					<item id="204" min="1" max="1" chance="11.11" /> <!-- Deadman's Staff -->
+					<item id="205" min="1" max="1" chance="11.11" /> <!-- Ghoul's Staff -->
+					<item id="206" min="1" max="1" chance="11.11" /> <!-- Demon's Staff -->
+					<item id="228" min="1" max="1" chance="11.11" /> <!-- Crystal Dagger -->
+					<item id="266" min="1" max="1" chance="11.11" /> <!-- Great Pata -->
+					<item id="286" min="1" max="1" chance="11.11" /> <!-- Eminence Bow -->
+					<item id="299" min="1" max="1" chance="11.11" /> <!-- Orcish Poleaxe -->
+					<item id="2503" min="1" max="1" chance="11.12" /> <!-- Yaksa Mace -->
+				</group>
+				<group chance="100">
+					<item id="356" min="1" max="1" chance="20" /> <!-- Full Plate Armor -->
+					<item id="2497" min="1" max="3" chance="20" /> <!-- Full Plate Shield -->
+					<item id="2414" min="1" max="1" chance="20" /> <!-- Full Plate Helmet -->
+					<item id="2438" min="1" max="1" chance="20" /> <!-- Full Plate Boots -->
+					<item id="2462" min="1" max="1" chance="20" /> <!-- Full Plate Gauntlets -->
+				</group>
+				<group chance="100">
+					<item id="2461" min="1" max="1" chance="20" /> <!-- Drake Leather Gloves -->
+					<item id="2437" min="1" max="1" chance="20" /> <!-- Drake Leather Boots -->
+					<item id="401" min="1" max="1" chance="20" /> <!-- Drake Leather Armor -->
+					<item id="603" min="1" max="3" chance="20" /> <!-- Divine Boots -->
+					<item id="1128" min="1" max="3" chance="20" /> <!-- Adamantite Boots -->
+				</group>
+				<group chance="100">
+					<item id="442" min="1" max="1" chance="20" /> <!-- Divine Tunic -->
+					<item id="473" min="1" max="1" chance="20" /> <!-- Divine Stockings -->
+					<item id="2463" min="1" max="1" chance="20" /> <!-- Divine Gloves -->
+					<item id="2468" min="1" max="3" chance="20" /> <!-- Blessed Gloves -->
+					<item id="499" min="1" max="3" chance="20" /> <!-- Mithril Helmet -->
+				</group>
+				<group chance="100">
+					<item id="119" min="1" max="1" chance="16.66" /> <!-- Necklace of Seal -->
+					<item id="855" min="1" max="3" chance="16.66" /> <!-- Nassen's Earring -->
+					<item id="857" min="1" max="3" chance="16.66" /> <!-- Holy Earring -->
+					<item id="886" min="1" max="3" chance="16.66" /> <!-- Ring of Seal -->
+					<item id="888" min="1" max="3" chance="16.66" /> <!-- Blessed Ring -->
+					<item id="919" min="1" max="1" chance="16.7" /> <!-- Blessed Necklace -->
+				</group>
+				<group chance="100">
+					<item id="2376" min="1" max="1" chance="25" /> <!-- Avadon Breastplate -->
+					<item id="2379" min="1" max="1" chance="25" /> <!-- Avadon Gaiters -->
+					<item id="2415" min="1" max="1" chance="25" /> <!-- Sealed Avadon Circlet -->
+					<item id="673" min="1" max="1" chance="25" /> <!-- Avadon Shield -->
+				</group>
+				<group chance="100">
+					<item id="856" min="1" max="3" chance="33.33" /> <!-- Adamantite Earring -->
+					<item id="887" min="1" max="3" chance="33.33" /> <!-- Adamantite Ring -->
+					<item id="918" min="1" max="1" chance="33.34" /> <!-- Adamantite Necklace -->
+				</group>
+				<group chance="100">
+					<item id="4049" min="20" max="80" chance="12.5" /> <!-- Adamantite Earring Gemstone -->
+					<item id="4050" min="20" max="80" chance="12.5" /> <!-- Adamantite Ring Wire -->
+					<item id="4051" min="20" max="80" chance="12.5" /> <!-- Adamantite Necklace Chain -->
+					<item id="4064" min="20" max="80" chance="12.5" /> <!-- Avadon Breastplate Part -->
+					<item id="4065" min="20" max="80" chance="12.5" /> <!-- Avadon Gaiter Material -->
+					<item id="4071" min="20" max="80" chance="12.5" /> <!-- Avadon Robe Fabric -->
+					<item id="4072" min="20" max="80" chance="12.5" /> <!-- Sealed Avadon Circlet Pattern -->
+					<item id="4439" min="20" max="80" chance="12.5" /> <!-- Avadon Shield Fragment -->
+				</group>
+				<group chance="20">
+					<item id="6661" min="1" max="1" chance="100" /> <!-- Orfen's Earring -->
+				</group>
+				<group chance="100">
+					<item id="947" min="2" max="8" chance="100" /> <!-- Scroll: Enchant Weapon (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="948" min="10" max="30" chance="100" /> <!-- Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -1019,13 +950,13 @@
 			<param name="MoveAroundSocial1" value="70" />
 			<param name="MoveAroundSocial2" value="70" />
 		</parameters>
-		<race>BEAST</race>
+		<race>BUG</race>
 		<sex>MALE</sex>
-		<acquire exp="16035" sp="481" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="16035" sp="481" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="158" mp="36936" mpRegen="2.1" />
-			<attack physical="298" magical="40" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="765" magical="280" />
+			<attack physical="298" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1033,9 +964,9 @@
 			<hitTime>540</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1044,7 +975,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="2500" aggroRange="450">
@@ -1063,13 +994,13 @@
 			<param name="MoveAroundSocial1" value="70" />
 			<param name="MoveAroundSocial2" value="70" />
 		</parameters>
-		<race>BEAST</race>
+		<race>BUG</race>
 		<sex>MALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="162" mp="36936" mpRegen="2.1" />
-			<attack physical="1058" magical="1563" random="30" critical="15" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="783" magical="286" />
+			<attack physical="1058" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1077,9 +1008,9 @@
 			<hitTime>540</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1088,7 +1019,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="2700" aggroRange="450">
@@ -1109,11 +1040,11 @@
 		</parameters>
 		<race>BUG</race>
 		<sex>FEMALE</sex>
-		<acquire exp="16035" sp="481" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="16035" sp="481" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="158" mp="36936" mpRegen="2.1" />
-			<attack physical="298" magical="40" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="765" magical="280" />
+			<attack physical="298" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1121,9 +1052,9 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1132,7 +1063,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="2700" aggroRange="450">
@@ -1148,11 +1079,11 @@
 	<npc id="29018" level="49" type="Monster" name="Riba Iren">
 		<race>BUG</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="162" mp="36936" mpRegen="2.1" />
-			<attack physical="1058" magical="1563" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="783" magical="286" />
+			<attack physical="1058" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1160,9 +1091,9 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1171,8 +1102,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
-			<skill id="4516" level="1" /> <!-- Orfen Heal -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="2900" isAggressive="true">
@@ -1190,27 +1120,19 @@
 		<sex>MALE</sex>
 		<acquire exp="262720917" sp="63053" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="7500000" hpRegen="1000" mp="18000" mpRegen="99" />
-			<attack physical="3260" magical="1700" random="30" critical="4" accuracy="40" attackSpeed="206" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="440" magical="440" />
+			<vitals hp="7000000" hpRegen="1000" mp="18000" mpRegen="99" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3840" magical="825" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4106" level="1" /> <!-- Antharas Stun -->
-			<skill id="4108" level="1" /> <!-- Antharas Terror -->
-			<skill id="4109" level="1" /> <!-- Curse of Antharas -->
-			<skill id="4110" level="2" /> <!-- Breath Attack -->
-			<skill id="4111" level="1" /> <!-- Antharas Fossilization -->
-			<skill id="4112" level="1" /> <!-- Ordinary Attack -->
-			<skill id="4113" level="1" /> <!-- Animal doing ordinary attack -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1219,9 +1141,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5092" level="1" /> <!-- Antharas Terror -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1230,92 +1152,36 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists> <!-- CT2.5 -->
-			<drop>
-				<item id="8620" min="10" max="30" chance="50" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="80" min="1" max="2" chance="25" /> <!-- Tallum Blade -->
-				<item id="98" min="1" max="2" chance="25" /> <!-- Halberd -->
-				<item id="269" min="1" max="2" chance="25" /> <!-- Blood Tornado -->
-				<item id="2504" min="1" max="2" chance="25" /> <!-- Meteor Shower -->
-				<item id="235" min="1" max="2" chance="25" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="2" chance="25" /> <!-- Carnage Bow -->
-				<item id="150" min="1" max="2" chance="25" /> <!-- Elemental Sword -->
-				<item id="212" min="1" max="2" chance="25" /> <!-- Dasparion's Staff -->
-				<item id="81" min="1" max="2" chance="25" /> <!-- Dragon Slayer -->
-				<item id="151" min="1" max="2" chance="25" /> <!-- Sword of Miracles -->
-				<item id="2500" min="1" max="2" chance="25" /> <!-- Dark Legion's Edge -->
-				<item id="164" min="1" max="2" chance="25" /> <!-- Elysian -->
-				<item id="236" min="1" max="2" chance="20" /> <!-- Soul Separator -->
-				<item id="270" min="1" max="2" chance="20" /> <!-- Dragon Grinder -->
-				<item id="289" min="1" max="2" chance="20" /> <!-- Soul Bow -->
-				<item id="213" min="1" max="2" chance="20" /> <!-- Branch of the Mother Tree -->
-				<item id="305" min="1" max="2" chance="20" /> <!-- Tallum Glaive -->
-				<item id="6326" min="1" max="5" chance="30" /> <!-- Sealed Majestic Necklace -->
-				<item id="6327" min="1" max="5" chance="35" /> <!-- Sealed Majestic Earring -->
-				<item id="6328" min="1" max="5" chance="35" /> <!-- Sealed Majestic Ring -->
-				<item id="6323" min="1" max="5" chance="30" /> <!-- Sealed Phoenix Necklace -->
-				<item id="6324" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Earring -->
-				<item id="6325" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Ring -->
-				<item id="5287" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5297" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5304" min="1" max="3" chance="25" /> <!-- Sealed Tallum Tunic -->
-				<item id="5311" min="1" max="3" chance="35" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5320" min="1" max="3" chance="35" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="30" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="3" chance="25" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5301" min="1" max="3" chance="25" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5308" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5316" min="1" max="3" chance="8" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5323" min="1" max="3" chance="8" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5329" min="1" max="3" chance="9" /> <!-- Sealed Majestic Robe -->
-				<item id="5288" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5298" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="30" /> <!-- Sealed Tallum Stockings -->
-				<item id="5289" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5294" min="1" max="3" chance="25" /> <!-- Sealed Tallum Helmet -->
-				<item id="5312" min="1" max="3" chance="25" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5317" min="1" max="3" chance="25" /> <!-- Sealed Majestic Circlet -->
-				<item id="5291" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5296" min="1" max="3" chance="25" /> <!-- Sealed Tallum Boots -->
-				<item id="5314" min="1" max="3" chance="25" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5319" min="1" max="3" chance="25" /> <!-- Sealed Majestic Boots -->
-				<item id="5290" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5295" min="1" max="3" chance="25" /> <!-- Sealed Tallum Gloves -->
-				<item id="5313" min="1" max="3" chance="25" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5318" min="1" max="3" chance="25" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5292" min="1" max="3" chance="40" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="40" /> <!-- Sealed Shield of Nightmare -->
-				<item id="729" min="1" max="19" chance="100" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="1538" min="1" max="59" chance="100" /> <!-- Blessed Scroll of Escape -->
-				<item id="3936" min="1" max="39" chance="100" /> <!-- Blessed Scroll of Resurrection -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="9000000" max="13000000" chance="100" /> <!-- Adena -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29020" level="80" type="GrandBoss" name="Baium">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<acquire exp="1024738848" sp="30742165" raidPoints="450" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="73892999.75369" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="3374.18" magical="2200" random="30" critical="4" accuracy="40" attackSpeed="206" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3300" magical="2200" />
+			<vitals hp="133333333" hpRegen="6666" mp="18000" mpRegen="99" />
+			<attack physical="25931" magical="8204" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3202" magical="2134" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4127" level="1" /> <!-- Baium: General Attack -->
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4256" level="1" /> <!-- Stun Resistance -->
+			<skill id="4127" level="1" /> <!-- Baium: General Attack -->
 		</skillList>
 		<corpseTime>13</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1328,80 +1194,95 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="6328" min="1" max="3" chance="52.39" /> <!-- Sealed Majestic Ring -->
-				<item id="49580" min="1" max="1" chance="30.2" /> <!-- Baium's Ring -->
-				<item id="6327" min="1" max="1" chance="19.65" /> <!-- Sealed Majestic Earring -->
-				<item id="7892" min="1" max="1" chance="17.6" /> <!-- Spell Breaker -->
-				<item id="7883" min="1" max="1" chance="17.19" /> <!-- Guardian's Sword -->
-				<item id="7900" min="1" max="1" chance="16.32" /> <!-- Ice Storm Hammer -->
-				<item id="7901" min="1" max="1" chance="16.13" /> <!-- Star Buster -->
-				<item id="7893" min="1" max="1" chance="16.19" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="15.46" /> <!-- Wizard's Tear -->
-				<item id="6325" min="1" max="3" chance="15.03" /> <!-- Sealed Phoenix Ring -->
-				<item id="6326" min="1" max="1" chance="8.062" /> <!-- Sealed Majestic Necklace -->
-				<item id="5292" min="1" max="3" chance="6.998" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="1" chance="6.054" /> <!-- Sealed Shield of Nightmare -->
-				<item id="98" min="1" max="1" chance="5.069" /> <!-- Halberd -->
-				<item id="7899" min="1" max="1" chance="5.053" /> <!-- Destroyer Hammer -->
-				<item id="151" min="1" max="1" chance="5.047" /> <!-- Sword of Miracles -->
-				<item id="2504" min="1" max="1" chance="5.045" /> <!-- Meteor Shower -->
-				<item id="269" min="1" max="1" chance="5.045" /> <!-- Blood Tornado -->
-				<item id="5289" min="1" max="3" chance="5.04" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5291" min="1" max="3" chance="5.037" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5295" min="1" max="3" chance="5.029" /> <!-- Sealed Tallum Gloves -->
-				<item id="5290" min="1" max="3" chance="5.017" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="288" min="1" max="1" chance="4.993" /> <!-- Carnage Bow -->
-				<item id="5294" min="1" max="3" chance="4.974" /> <!-- Sealed Tallum Helmet -->
-				<item id="5296" min="1" max="3" chance="4.973" /> <!-- Sealed Tallum Boots -->
-				<item id="235" min="1" max="1" chance="4.964" /> <!-- Bloody Orchid -->
-				<item id="7884" min="1" max="1" chance="4.961" /> <!-- Infernal Master -->
-				<item id="80" min="1" max="1" chance="4.956" /> <!-- Tallum Blade -->
-				<item id="150" min="1" max="1" chance="4.952" /> <!-- Elemental Sword -->
-				<item id="289" min="1" max="1" chance="4.937" /> <!-- Soul Bow -->
-				<item id="7894" min="1" max="1" chance="4.937" /> <!-- Spiritual Eye -->
-				<item id="305" min="1" max="1" chance="4.07" /> <!-- Tallum Glaive -->
-				<item id="7895" min="1" max="1" chance="4.07" /> <!-- Flaming Dragon Skull -->
-				<item id="81" min="1" max="1" chance="4.07" /> <!-- Dragon Slayer -->
-				<item id="164" min="1" max="1" chance="4.067" /> <!-- Elysian -->
-				<item id="270" min="1" max="1" chance="4.064" /> <!-- Dragon Grinder -->
-				<item id="236" min="1" max="1" chance="4.054" /> <!-- Soul Separator -->
-				<item id="213" min="1" max="1" chance="4.008" /> <!-- Branch of the Mother Tree -->
-				<item id="2500" min="1" max="1" chance="3.998" /> <!-- Dark Legion's Edge -->
-				<item id="212" min="1" max="1" chance="3.963" /> <!-- Dasparion's Staff -->
-				<item id="7902" min="1" max="1" chance="3.939" /> <!-- Doom Crusher -->
-				<item id="6324" min="1" max="1" chance="3.937" /> <!-- Sealed Phoenix Earring -->
-				<item id="5314" min="1" max="1" chance="3.05" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5301" min="1" max="1" chance="3.029" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="49683" min="1" max="1" chance="3.027" /> <!-- Talisman of Baium -->
-				<item id="5304" min="1" max="1" chance="3.024" /> <!-- Sealed Tallum Tunic -->
-				<item id="5293" min="1" max="1" chance="3.023" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5297" min="1" max="1" chance="3.013" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5288" min="1" max="1" chance="3.004" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5308" min="1" max="1" chance="3.003" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5317" min="1" max="1" chance="2.998" /> <!-- Sealed Majestic Circlet -->
-				<item id="5318" min="1" max="1" chance="2.996" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5298" min="1" max="1" chance="2.989" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5287" min="1" max="1" chance="2.974" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5313" min="1" max="1" chance="2.966" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5319" min="1" max="1" chance="2.96" /> <!-- Sealed Majestic Boots -->
-				<item id="5312" min="1" max="1" chance="2.948" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5305" min="1" max="1" chance="2.933" /> <!-- Sealed Tallum Stockings -->
-				<item id="5326" min="1" max="1" chance="2.054" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5311" min="1" max="1" chance="2.047" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5329" min="1" max="1" chance="2.047" /> <!-- Sealed Majestic Robe -->
-				<item id="5323" min="1" max="1" chance="2.019" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5316" min="1" max="1" chance="2.017" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5320" min="1" max="1" chance="1.973" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="6323" min="1" max="1" chance="0.75" /> <!-- Sealed Phoenix Necklace -->
-				<item id="8621" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Version) -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="2" max="4" chance="50.91" /> <!-- Cloth Piece -->
-				<item id="33808" min="1" max="1" chance="50.79" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="33814" min="2" max="4" chance="50.72" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="729" min="1" max="1" chance="49.79" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="730" min="1" max="1" chance="49.6" /> <!-- Scroll: Enchant Armor (A-grade) -->
-				<item id="49682" min="1" max="1" chance="26.83" /> <!-- Baium? Soul -->
-				<item id="90899" min="1" max="1" chance="2.959" /> <!-- Blessed Agathion's Soul -->
+				<group chance="100">
+					<item id="80" min="1" max="1" chance="5" /> <!-- Tallum Blade -->
+					<item id="81" min="1" max="1" chance="4" /> <!-- Dragon Slayer -->
+					<item id="98" min="1" max="1" chance="5" /> <!-- Halberd -->
+					<item id="150" min="1" max="1" chance="5" /> <!-- Elemental Sword -->
+					<item id="151" min="1" max="1" chance="5" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="1" chance="4" /> <!-- Elysian -->
+					<item id="212" min="1" max="1" chance="4" /> <!-- Dasparion's Staff -->
+					<item id="213" min="1" max="1" chance="4" /> <!-- Branch of the Mother Tree -->
+					<item id="235" min="1" max="1" chance="5" /> <!-- Bloody Orchid -->
+					<item id="236" min="1" max="1" chance="4" /> <!-- Soul Separator -->
+					<item id="269" min="1" max="1" chance="5" /> <!-- Blood Tornado -->
+					<item id="270" min="1" max="1" chance="4" /> <!-- Dragon Grinder -->
+					<item id="288" min="1" max="1" chance="5" /> <!-- Carnage Bow -->
+					<item id="289" min="1" max="1" chance="5" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="1" chance="4" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="1" chance="4" /> <!-- Dark Legion's Edge -->
+					<item id="2504" min="1" max="1" chance="5" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="1" chance="5" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="1" chance="5" /> <!-- Spiritual Eye -->
+					<item id="7895" min="1" max="1" chance="4" /> <!-- Flaming Dragon Skull -->
+					<item id="7899" min="1" max="1" chance="5" /> <!-- Destroyer Hammer -->
+					<item id="7902" min="1" max="1" chance="4" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="100">
+					<item id="7883" min="1" max="1" chance="17" /> <!-- Guardian's Sword -->
+					<item id="7889" min="1" max="1" chance="16" /> <!-- Wizard's Tear -->
+					<item id="7892" min="1" max="1" chance="17" /> <!-- Spell Breaker -->
+					<item id="7893" min="1" max="1" chance="17" /> <!-- Kaim Vanul's Bones -->
+					<item id="7900" min="1" max="1" chance="17" /> <!-- Ice Storm Hammer -->
+					<item id="7901" min="1" max="1" chance="16" /> <!-- Star Buster -->
+				</group>
+				<group chance="100">
+					<item id="5287" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5292" min="1" max="3" chance="7" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5293" min="1" max="1" chance="3" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="3" chance="5" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="3" chance="5" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="3" chance="5" /> <!-- Sealed Tallum Boots -->
+					<item id="5297" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5301" min="1" max="1" chance="3" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="1" chance="3" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="1" chance="3" /> <!-- Sealed Tallum Stockings -->
+					<item id="5308" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Robe -->
+					<item id="5311" min="1" max="1" chance="2" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="1" chance="3" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="1" chance="3" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="1" chance="3" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5315" min="1" max="1" chance="6" /> <!-- Sealed Shield of Nightmare -->
+					<item id="5316" min="1" max="1" chance="2" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="1" chance="3" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="1" chance="3" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="1" chance="3" /> <!-- Sealed Majestic Boots -->
+					<item id="5320" min="1" max="1" chance="2" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5323" min="1" max="1" chance="2" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5326" min="1" max="1" chance="2" /> <!-- Sealed Robe of Nightmare -->
+					<item id="5329" min="1" max="1" chance="2" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="100">
+					<item id="6323" min="1" max="1" chance="1" /> <!-- Sealed Phoenix Necklace -->
+					<item id="6324" min="1" max="1" chance="4" /> <!-- Sealed Phoenix Earring -->
+					<item id="6325" min="1" max="3" chance="15" /> <!-- Sealed Phoenix Ring -->
+					<item id="6326" min="1" max="1" chance="8" /> <!-- Sealed Majestic Necklace -->
+					<item id="6327" min="1" max="1" chance="20" /> <!-- Sealed Majestic Earring -->
+					<item id="6328" min="1" max="3" chance="52" /> <!-- Sealed Majestic Ring -->
+				</group>
+				<group chance="100">
+					<item id="33808" min="1" max="1" chance="50" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
+					<item id="33814" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="729" min="1" max="1" chance="50" /> <!-- Scroll: Enchant Weapon (A-grade) -->
+					<item id="730" min="1" max="1" chance="50" /> <!-- Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="30">
+					<item id="49580" min="1" max="1" chance="100" /> <!-- Baium's Ring -->
+				</group>
+				<group chance="30">
+					<item id="49683" min="1" max="1" chance="10" /> <!-- Talisman of Baium -->
+					<item id="49682" min="1" max="1" chance="90" /> <!-- Baium's Soul -->
+				</group>
+				<group chance="100">
+					<item id="8621" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Version) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -1410,9 +1291,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="93" /> <!-- Winged Spear -->
 		<acquire exp="11520" sp="2" />
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="290966.74193" hpRegen="8.5" mp="1608.045" mpRegen="3" />
-			<attack physical="395" magical="371" random="30" critical="4" accuracy="40" attackSpeed="206" type="POLE" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="747660" hpRegen="158" mp="1475" mpRegen="3" />
+			<attack physical="4185" magical="371" random="10" critical="4" accuracy="0" attackSpeed="253" type="POLE" range="80" distance="80" width="120" />
 			<defence physical="5108" magical="1686" />
 			<speed>
 				<walk ground="50" />
@@ -1421,11 +1302,18 @@
 			<hitTime>760</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4132" level="1" /> <!-- Spear: Pound the Ground -->
-			<skill id="4133" level="1" /> <!-- Heal -->
 			<skill id="4416" level="8" /> <!-- Angel -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="11" /> <!-- Spear -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="300" isAggressive="true">
@@ -1443,9 +1331,9 @@
 		<sex>MALE</sex>
 		<acquire exp="102487500" sp="3074625" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="36946499.75369" hpRegen="310.756323" mp="20787.765" mpRegen="3" />
-			<attack physical="33864" magical="42273" random="30" critical="4" accuracy="40" attackSpeed="206" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3680" magical="4661" />
+			<vitals hp="66666666.6666667" hpRegen="2981.0298102981" mp="12240" mpRegen="10" />
+			<attack physical="15182.9268292683" magical="6600.03819341452" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2692.68292682927" magical="1794.92939666239" />
 			<speed>
 				<walk ground="42" />
 				<run ground="190" />
@@ -1453,98 +1341,118 @@
 			<hitTime>590</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4221" level="1" /> <!-- Range Dual Attack -->
-			<skill id="4220" level="1" /> <!-- Dual Attack -->
-			<skill id="4218" level="1" /> <!-- Drain -->
-			<skill id="4219" level="1" /> <!-- Hold -->
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
+			<skill id="4408" level="9" /> <!-- HP Increase (1/2x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="3" /> <!-- Extremely Weak P. Atk. -->
+			<skill id="4411" level="3" /> <!-- Extremely Weak M. Atk. -->
+			<skill id="4412" level="3" /> <!-- Extremely Weak P. Def. -->
+			<skill id="4413" level="3" /> <!-- Extremely Weak M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="1000" clanHelpRange="300" isAggressive="true" />
 		<collision>
-			<radius normal="16" />
-			<height normal="32" />
+			<radius normal="19.2" />
+			<height normal="39" />
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="6328" min="1" max="3" chance="50.42" /> <!-- Sealed Majestic Ring -->
-				<item id="6327" min="1" max="3" chance="19.4" /> <!-- Sealed Majestic Earring -->
-				<item id="90763" min="1" max="1" chance="19.02" /> <!-- Zaken's Earring -->
-				<item id="7892" min="1" max="3" chance="17.3" /> <!-- Spell Breaker -->
-				<item id="7893" min="1" max="3" chance="17.14" /> <!-- Kaim Vanul's Bones -->
-				<item id="7883" min="1" max="3" chance="16.6" /> <!-- Guardian's Sword -->
-				<item id="7900" min="1" max="3" chance="16.49" /> <!-- Ice Storm Hammer -->
-				<item id="7889" min="1" max="3" chance="15.72" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="3" chance="15.06" /> <!-- Star Buster -->
-				<item id="6325" min="1" max="3" chance="14.33" /> <!-- Sealed Phoenix Ring -->
-				<item id="6326" min="1" max="3" chance="7.881" /> <!-- Sealed Majestic Necklace -->
-				<item id="5292" min="1" max="3" chance="6.897" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="5.815" /> <!-- Sealed Shield of Nightmare -->
-				<item id="5291" min="1" max="3" chance="4.97" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="269" min="1" max="3" chance="4.969" /> <!-- Blood Tornado -->
-				<item id="5295" min="1" max="3" chance="4.969" /> <!-- Sealed Tallum Gloves -->
-				<item id="5289" min="1" max="3" chance="4.965" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5294" min="1" max="3" chance="4.948" /> <!-- Sealed Tallum Helmet -->
-				<item id="80" min="1" max="3" chance="4.946" /> <!-- Tallum Blade -->
-				<item id="98" min="1" max="3" chance="4.933" /> <!-- Halberd -->
-				<item id="7884" min="1" max="3" chance="4.931" /> <!-- Infernal Master -->
-				<item id="7894" min="1" max="3" chance="4.907" /> <!-- Spiritual Eye -->
-				<item id="288" min="1" max="3" chance="4.897" /> <!-- Carnage Bow -->
-				<item id="235" min="1" max="3" chance="4.894" /> <!-- Bloody Orchid -->
-				<item id="5290" min="1" max="3" chance="4.87" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="289" min="1" max="3" chance="4.853" /> <!-- Soul Bow -->
-				<item id="7899" min="1" max="3" chance="4.847" /> <!-- Destroyer Hammer -->
-				<item id="150" min="1" max="3" chance="4.845" /> <!-- Elemental Sword -->
-				<item id="2504" min="1" max="3" chance="4.84" /> <!-- Meteor Shower -->
-				<item id="5296" min="1" max="3" chance="4.836" /> <!-- Sealed Tallum Boots -->
-				<item id="151" min="1" max="3" chance="4.831" /> <!-- Sword of Miracles -->
-				<item id="81" min="1" max="3" chance="3.984" /> <!-- Dragon Slayer -->
-				<item id="2500" min="1" max="3" chance="3.975" /> <!-- Dark Legion's Edge -->
-				<item id="7895" min="1" max="3" chance="3.938" /> <!-- Flaming Dragon Skull -->
-				<item id="7902" min="1" max="3" chance="3.929" /> <!-- Doom Crusher -->
-				<item id="6324" min="1" max="3" chance="3.916" /> <!-- Sealed Phoenix Earring -->
-				<item id="270" min="1" max="3" chance="3.905" /> <!-- Dragon Grinder -->
-				<item id="236" min="1" max="3" chance="3.903" /> <!-- Soul Separator -->
-				<item id="213" min="1" max="3" chance="3.902" /> <!-- Branch of the Mother Tree -->
-				<item id="164" min="1" max="3" chance="3.892" /> <!-- Elysian -->
-				<item id="305" min="1" max="3" chance="3.877" /> <!-- Tallum Glaive -->
-				<item id="212" min="1" max="3" chance="3.874" /> <!-- Dasparion's Staff -->
-				<item id="5313" min="1" max="3" chance="3.004" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5293" min="1" max="3" chance="2.988" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5317" min="1" max="3" chance="2.975" /> <!-- Sealed Majestic Circlet -->
-				<item id="5288" min="1" max="3" chance="2.966" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5319" min="1" max="3" chance="2.956" /> <!-- Sealed Majestic Boots -->
-				<item id="5304" min="1" max="3" chance="2.93" /> <!-- Sealed Tallum Tunic -->
-				<item id="5287" min="1" max="3" chance="2.929" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5312" min="1" max="3" chance="2.916" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5318" min="1" max="3" chance="2.916" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5308" min="1" max="3" chance="2.915" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5298" min="1" max="3" chance="2.906" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="2.889" /> <!-- Sealed Tallum Stockings -->
-				<item id="5301" min="1" max="3" chance="2.889" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5297" min="1" max="3" chance="2.889" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5314" min="1" max="3" chance="2.874" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5316" min="1" max="3" chance="2.028" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5311" min="1" max="3" chance="1.958" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5323" min="1" max="3" chance="1.956" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5329" min="1" max="3" chance="1.936" /> <!-- Sealed Majestic Robe -->
-				<item id="5320" min="1" max="3" chance="1.91" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="1.898" /> <!-- Sealed Robe of Nightmare -->
-				<item id="6323" min="1" max="3" chance="0.75" /> <!-- Sealed Phoenix Necklace -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="1" max="3" chance="100" /> <!-- Cloth Piece -->
-				<item id="33814" min="5" max="15" chance="50.84" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="729" min="2" max="4" chance="50.56" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="730" min="6" max="12" chance="50.48" /> <!-- Scroll: Enchant Armor (A-grade) -->
-				<item id="33808" min="2" max="4" chance="49.66" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="90899" min="1" max="1" chance="2.93" /> <!-- Blessed Agathion's Soul -->
+				<group chance="98">
+					<item id="80" min="1" max="3" chance="5" /> <!-- Tallum Blade -->
+					<item id="81" min="1" max="3" chance="4" /> <!-- Dragon Slayer -->
+					<item id="98" min="1" max="3" chance="5" /> <!-- Halberd -->
+					<item id="150" min="1" max="3" chance="5" /> <!-- Elemental Sword -->
+					<item id="151" min="1" max="3" chance="5" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="3" chance="4" /> <!-- Elysian -->
+					<item id="212" min="1" max="3" chance="4" /> <!-- Dasparion's Staff -->
+					<item id="213" min="1" max="3" chance="4" /> <!-- Branch of the Mother Tree -->
+					<item id="235" min="1" max="3" chance="5" /> <!-- Bloody Orchid -->
+					<item id="236" min="1" max="3" chance="4" /> <!-- Soul Separator -->
+					<item id="269" min="1" max="3" chance="5" /> <!-- Blood Tornado -->
+					<item id="270" min="1" max="3" chance="4" /> <!-- Dragon Grinder -->
+					<item id="288" min="1" max="3" chance="5" /> <!-- Carnage Bow -->
+					<item id="289" min="1" max="3" chance="5" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="3" chance="4" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="3" chance="4" /> <!-- Dark Legion's Edge -->
+					<item id="2504" min="1" max="3" chance="5" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="3" chance="5" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="3" chance="5" /> <!-- Spiritual Eye -->
+					<item id="7895" min="1" max="3" chance="4" /> <!-- Flaming Dragon Skull -->
+					<item id="7899" min="1" max="3" chance="5" /> <!-- Destroyer Hammer -->
+					<item id="7902" min="1" max="3" chance="4" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="98">
+					<item id="7883" min="1" max="3" chance="17" /> <!-- Guardian's Sword -->
+					<item id="7889" min="1" max="3" chance="16" /> <!-- Wizard's Tear -->
+					<item id="7892" min="1" max="3" chance="17" /> <!-- Spell Breaker -->
+					<item id="7893" min="1" max="3" chance="17" /> <!-- Kaim Vanul's Bones -->
+					<item id="7900" min="1" max="3" chance="17" /> <!-- Ice Storm Hammer -->
+					<item id="7901" min="1" max="3" chance="16" /> <!-- Star Buster -->
+				</group>
+				<group chance="98">
+					<item id="5287" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5292" min="1" max="3" chance="7" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5293" min="1" max="3" chance="3" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="3" chance="5" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="3" chance="5" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="3" chance="5" /> <!-- Sealed Tallum Boots -->
+					<item id="5297" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5301" min="1" max="3" chance="3" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="3" chance="3" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="3" chance="3" /> <!-- Sealed Tallum Stockings -->
+					<item id="5308" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Robe -->
+					<item id="5311" min="1" max="3" chance="2" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="3" chance="3" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="3" chance="3" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="3" chance="3" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5315" min="1" max="3" chance="6" /> <!-- Sealed Shield of Nightmare -->
+					<item id="5316" min="1" max="3" chance="2" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="3" chance="3" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="3" chance="3" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="3" chance="3" /> <!-- Sealed Majestic Boots -->
+					<item id="5320" min="1" max="3" chance="2" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5323" min="1" max="3" chance="2" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5326" min="1" max="3" chance="2" /> <!-- Sealed Robe of Nightmare -->
+					<item id="5329" min="1" max="3" chance="2" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="98">
+					<item id="6323" min="1" max="3" chance="1" /> <!-- Sealed Phoenix Necklace -->
+					<item id="6324" min="1" max="3" chance="4" /> <!-- Sealed Phoenix Earring -->
+					<item id="6325" min="1" max="3" chance="15" /> <!-- Sealed Phoenix Ring -->
+					<item id="6326" min="1" max="3" chance="8" /> <!-- Sealed Majestic Necklace -->
+					<item id="6327" min="1" max="3" chance="20" /> <!-- Sealed Majestic Earring -->
+					<item id="6328" min="1" max="3" chance="52" /> <!-- Sealed Majestic Ring -->
+				</group>
+				<group chance="100">
+					<item id="33808" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
+					<item id="33814" min="5" max="15" chance="50" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="729" min="2" max="4" chance="50" /> <!-- Scroll: Enchant Weapon (A-grade) -->
+					<item id="730" min="6" max="12" chance="50" /> <!-- Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="20">
+					<item id="90763" min="1" max="1" chance="100" /> <!-- Zaken's Earring -->
+				</group>
+				<group chance="100">
+					<item id="49756" min="1" max="3" chance="100" /> <!-- Cloth Piece -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29023" level="74" type="Monster" name="Maiden Doll">
+	<npc id="29023" level="58" type="Monster" name="Maiden Doll">
 		<parameters>
 			<param name="MoveAroundSocial" value="50" />
 			<param name="MoveAroundSocial1" value="50" />
@@ -1555,33 +1463,31 @@
 		<equipment rhand="5129" /> <!-- Doll Knife -->
 		<acquire exp="129198" sp="3875" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1828" hpRegen="6.5" mp="832" mpRegen="2.4" />
-			<attack physical="442" magical="302" random="30" critical="4" accuracy="40" attackSpeed="253" type="DUAL" range="40" distance="80" width="120" />
+			<vitals hp="1828" hpRegen="6.5" mp="832.4" mpRegen="2.4" />
+			<attack physical="442" magical="302" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="DUAL" range="40" distance="80" width="120" />
 			<defence physical="261" magical="191" />
 			<speed>
 				<walk ground="22" />
 				<run ground="150" />
 			</speed>
-			<hitTime>500</hitTime>
+			<hitTime>50</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="5" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4085" level="1" /> <!-- Critical Damage -->
-			<skill id="4086" level="1" /> <!-- Critical Chance -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="9" /> <!-- Average M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="19" /> <!-- Dual-Sword Weapons -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4333" level="5" /> <!-- Dark Attack Resistance -->
-			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4415" level="19" /> <!-- Dual Sword -->
+			<skill id="4071" level="5" /> <!-- Bow/Crossbow Resistance -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1589,22 +1495,8 @@
 			<radius normal="6" />
 			<height normal="12" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="97" min="1" max="1" chance="0.0075" /> <!-- Lance -->
-				<item id="268" min="1" max="1" chance="0.0075" /> <!-- Bellion Cestus -->
-				<item id="57" min="2433" max="5685" chance="70" /> <!-- Adena -->
-				<item id="1887" min="1" max="1" chance="10.68" /> <!-- Varnish of Purity -->
-				<item id="4120" min="1" max="1" chance="1.603" /> <!-- Bellion Cestus Edge -->
-				<item id="4115" min="1" max="1" chance="1.574" /> <!-- Lance Blade -->
-			</drop>
-			<spoil>
-				<item id="948" min="1" max="1" chance="4.296" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="947" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-			</spoil>
-		</dropLists>
 	</npc>
-	<npc id="29024" level="74" type="Monster" name="Veil Master">
+	<npc id="29024" level="59" type="Monster" name="Veil Master">
 		<parameters>
 			<param name="MoveAroundSocial" value="114" />
 			<param name="MoveAroundSocial1" value="114" />
@@ -1615,7 +1507,7 @@
 		<acquire exp="90904" sp="2727" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1880" hpRegen="6.5" mp="861" mpRegen="2.4" />
-			<attack physical="461" magical="315" random="30" critical="4" accuracy="40" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="461" magical="315" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="267" magical="195" />
 			<speed>
 				<walk ground="70" />
@@ -1624,66 +1516,9 @@
 			<hitTime>740</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="5" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4085" level="1" /> <!-- Critical Damage -->
-			<skill id="4086" level="1" /> <!-- Critical Chance -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4333" level="5" /> <!-- Dark Attack Resistance -->
 			<skill id="4416" level="9" /> <!-- Demons -->
-		</skillList>
-		<exCrtEffect>true</exCrtEffect>
-		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
-		<collision>
-			<radius normal="12" />
-			<height normal="40" />
-		</collision>
-		<dropLists>
-			<drop>
-				<item id="79" min="1" max="1" chance="0.003" /> <!-- Damascus -->
-				<item id="171" min="1" max="1" chance="0.003" /> <!-- Deadman's Glory -->
-				<item id="57" min="1372" max="3205" chance="70" /> <!-- Adena -->
-				<item id="1895" min="1" max="1" chance="11.11" /> <!-- Metallic Fiber -->
-				<item id="1876" min="1" max="1" chance="8.019" /> <!-- Mithril Ore -->
-				<item id="1866" min="2" max="6" chance="6.628" /> <!-- Suede -->
-				<item id="1879" min="1" max="1" chance="6.623" /> <!-- Cokes -->
-				<item id="1870" min="5" max="15" chance="3.946" /> <!-- Coal -->
-				<item id="1871" min="9" max="27" chance="2.235" /> <!-- Charcoal -->
-				<item id="4114" min="1" max="1" chance="0.75" /> <!-- Damascus Sword Blade -->
-				<item id="4116" min="1" max="1" chance="0.75" /> <!-- Deadman's Glory Stone -->
-			</drop>
-			<spoil>
-				<item id="948" min="1" max="1" chance="2.453" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="947" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-			</spoil>
-		</dropLists>
-	</npc>
-	<npc id="29025" level="75" type="Folk" name="Baium">
-		<race>HUMANOID</race>
-		<sex>MALE</sex>
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="1709400" hpRegen="8.5" mp="18000" mpRegen="3" />
-			<attack physical="874.18" magical="596.95" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="233.61" magical="233.61" />
-			<speed>
-				<walk ground="50" />
-				<run ground="120" />
-			</speed>
-			<abnormalResist physical="230" magical="230" />
-		</stats>
-		<status attackable="false" undying="true" />
-		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1692,7 +1527,44 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4071" level="5" /> <!-- Bow/Crossbow Resistance -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+		</skillList>
+		<exCrtEffect>true</exCrtEffect>
+		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="29025" level="75" type="Folk" name="Baium">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="1709400" hpRegen="718" mp="18000" mpRegen="99" />
+			<attack physical="1874.18" magical="1596.95" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3300" magical="2200" />
+			<speed>
+				<walk ground="50" />
+				<run ground="120" />
+			</speed>
+			<hitTime>60</hitTime>
+			<abnormalResist physical="230" magical="230" />
+		</stats>
+		<status attackable="false" undying="true" />
+		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="300" aggroRange="4296" />
@@ -1712,7 +1584,7 @@
 		<equipment rhand="232" /> <!-- Dark Elven Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1933" hpRegen="6.5" mp="804" mpRegen="2.4" />
-			<attack physical="420" magical="328" random="10" critical="8" accuracy="40" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
+			<attack physical="420" magical="328" random="5" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="272" magical="199" />
 			<speed>
 				<walk ground="14" />
@@ -1721,9 +1593,9 @@
 			<hitTime>760</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1731,10 +1603,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="7" /> <!-- Daggers -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4415" level="7" /> <!-- Dagger -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1754,7 +1624,7 @@
 		<equipment rhand="225" /> <!-- Mithril Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1776" hpRegen="6.5" mp="584" mpRegen="2.1" />
-			<attack physical="371" magical="289" random="10" critical="8" accuracy="40" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
+			<attack physical="371" magical="289" random="5" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="256" magical="187" />
 			<speed>
 				<walk ground="11" />
@@ -1763,9 +1633,9 @@
 			<hitTime>740</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1773,10 +1643,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="7" /> <!-- Daggers -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4415" level="7" /> <!-- Dagger -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1785,28 +1653,27 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="29066" level="1" type="GrandBoss" name="Antharas">
+	<npc id="29066" level="75" type="GrandBoss" name="Antharas">
 		<parameters>
 			<param name="ultra_respawn_time" value="8" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<acquire exp="262720917" sp="63053" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="6100000" hpRegen="2" mp="1800000" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="6100000" hpRegen="1100" mp="1800000" mpRegen="1000" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3456" magical="862.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1815,8 +1682,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1827,75 +1695,29 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists> <!-- CT2.5 -->
-			<drop>
-				<item id="8620" min="10" max="30" chance="50" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="80" min="1" max="2" chance="25" /> <!-- Tallum Blade -->
-				<item id="98" min="1" max="2" chance="25" /> <!-- Halberd -->
-				<item id="269" min="1" max="2" chance="25" /> <!-- Blood Tornado -->
-				<item id="2504" min="1" max="2" chance="25" /> <!-- Meteor Shower -->
-				<item id="235" min="1" max="2" chance="25" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="2" chance="25" /> <!-- Carnage Bow -->
-				<item id="150" min="1" max="2" chance="25" /> <!-- Elemental Sword -->
-				<item id="212" min="1" max="2" chance="25" /> <!-- Dasparion's Staff -->
-				<item id="81" min="1" max="2" chance="25" /> <!-- Dragon Slayer -->
-				<item id="151" min="1" max="2" chance="25" /> <!-- Sword of Miracles -->
-				<item id="2500" min="1" max="2" chance="25" /> <!-- Dark Legion's Edge -->
-				<item id="164" min="1" max="2" chance="25" /> <!-- Elysian -->
-				<item id="236" min="1" max="2" chance="20" /> <!-- Soul Separator -->
-				<item id="270" min="1" max="2" chance="20" /> <!-- Dragon Grinder -->
-				<item id="289" min="1" max="2" chance="20" /> <!-- Soul Bow -->
-				<item id="213" min="1" max="2" chance="20" /> <!-- Branch of the Mother Tree -->
-				<item id="305" min="1" max="2" chance="20" /> <!-- Tallum Glaive -->
-				<item id="6326" min="1" max="5" chance="30" /> <!-- Sealed Majestic Necklace -->
-				<item id="6327" min="1" max="5" chance="35" /> <!-- Sealed Majestic Earring -->
-				<item id="6328" min="1" max="5" chance="35" /> <!-- Sealed Majestic Ring -->
-				<item id="6323" min="1" max="5" chance="30" /> <!-- Sealed Phoenix Necklace -->
-				<item id="6324" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Earring -->
-				<item id="6325" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Ring -->
-				<item id="5287" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5297" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5304" min="1" max="3" chance="25" /> <!-- Sealed Tallum Tunic -->
-				<item id="5311" min="1" max="3" chance="35" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5320" min="1" max="3" chance="35" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="30" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="3" chance="25" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5301" min="1" max="3" chance="25" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5308" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5316" min="1" max="3" chance="8" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5323" min="1" max="3" chance="8" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5329" min="1" max="3" chance="9" /> <!-- Sealed Majestic Robe -->
-				<item id="5288" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5298" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="30" /> <!-- Sealed Tallum Stockings -->
-				<item id="5289" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5294" min="1" max="3" chance="25" /> <!-- Sealed Tallum Helmet -->
-				<item id="5312" min="1" max="3" chance="25" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5317" min="1" max="3" chance="25" /> <!-- Sealed Majestic Circlet -->
-				<item id="5291" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5296" min="1" max="3" chance="25" /> <!-- Sealed Tallum Boots -->
-				<item id="5314" min="1" max="3" chance="25" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5319" min="1" max="3" chance="25" /> <!-- Sealed Majestic Boots -->
-				<item id="5290" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5295" min="1" max="3" chance="25" /> <!-- Sealed Tallum Gloves -->
-				<item id="5313" min="1" max="3" chance="25" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5318" min="1" max="3" chance="25" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5292" min="1" max="3" chance="40" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="40" /> <!-- Sealed Shield of Nightmare -->
-				<item id="729" min="1" max="19" chance="100" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="1538" min="1" max="59" chance="100" /> <!-- Blessed Scroll of Escape -->
-				<item id="3936" min="1" max="39" chance="100" /> <!-- Blessed Scroll of Resurrection -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="9000000" max="13000000" chance="100" /> <!-- Adena -->
-			</drop>
-		</dropLists>
 	</npc>
-	<npc id="29067" level="1" type="GrandBoss" name="Antharas">
+	<npc id="29061" displayId="31842" level="70" type="Teleporter" name="Teleportation Cubic">
+		<race>ETC</race>
+		<sex>ETC</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2444" hpRegen="7.5" mp="1345" mpRegen="2.7" />
+			<attack physical="688.86373" magical="470.40463" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="295.91597" magical="216.53847" />
+			<speed>
+				<walk ground="50" />
+				<run ground="120" />
+			</speed>
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="false" />
+		<exCrtEffect>true</exCrtEffect>
+		<ai type="BALANCED" clanHelpRange="300" isAggressive="true" aggroRange="500" />
+		<collision>
+			<radius normal="40" />
+			<height normal="80" />
+		</collision>
+	</npc>
+	<npc id="29067" level="75" type="GrandBoss" name="Antharas">
 		<parameters>
 			<param name="ultra_respawn_time" value="5" />
 		</parameters>
@@ -1904,19 +1726,18 @@
 		<acquire exp="262720918" sp="29116376" raidPoints="30780" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="6800000" hpRegen="1100" mp="1800000" mpRegen="1000" />
-			<attack physical="4900" magical="2550" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3456" magical="862.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1925,8 +1746,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1937,116 +1759,40 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="5292" min="1" max="1" chance="51.25" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="1" chance="50.84" /> <!-- Sealed Shield of Nightmare -->
-				<item id="90992" min="1" max="1" chance="29.03" /> <!-- Antharas' Earring -->
-				<item id="5329" min="1" max="1" chance="20.5" /> <!-- Sealed Majestic Robe -->
-				<item id="5311" min="1" max="1" chance="20.37" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5323" min="1" max="1" chance="20.04" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5320" min="1" max="1" chance="19.68" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="1" chance="19.57" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="1" chance="19.15" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5316" min="1" max="1" chance="19.09" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="7900" min="1" max="1" chance="17.8" /> <!-- Ice Storm Hammer -->
-				<item id="5308" min="1" max="1" chance="17.77" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="7892" min="1" max="1" chance="17.72" /> <!-- Spell Breaker -->
-				<item id="5301" min="1" max="1" chance="17.33" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="7883" min="1" max="1" chance="16.92" /> <!-- Guardian's Sword -->
-				<item id="7893" min="1" max="1" chance="16.91" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="16.68" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="15.89" /> <!-- Star Buster -->
-				<item id="5319" min="1" max="1" chance="13.64" /> <!-- Sealed Majestic Boots -->
-				<item id="5313" min="1" max="1" chance="13.35" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5312" min="1" max="1" chance="13.17" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5288" min="1" max="1" chance="13.03" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5314" min="1" max="1" chance="12.9" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5318" min="1" max="1" chance="12.85" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5305" min="1" max="1" chance="12.76" /> <!-- Sealed Tallum Stockings -->
-				<item id="5295" min="1" max="1" chance="12.67" /> <!-- Sealed Tallum Gloves -->
-				<item id="5289" min="1" max="1" chance="12.66" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5317" min="1" max="1" chance="12.7" /> <!-- Sealed Majestic Circlet -->
-				<item id="5298" min="1" max="1" chance="12.59" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5296" min="1" max="1" chance="12.45" /> <!-- Sealed Tallum Boots -->
-				<item id="5304" min="1" max="1" chance="12.44" /> <!-- Sealed Tallum Tunic -->
-				<item id="5294" min="1" max="1" chance="12.34" /> <!-- Sealed Tallum Helmet -->
-				<item id="5297" min="1" max="1" chance="12.19" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5287" min="1" max="1" chance="11.92" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5291" min="1" max="1" chance="10.018" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5290" min="1" max="1" chance="9.982" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="2500" min="1" max="1" chance="9.154" /> <!-- Dark Legion's Edge -->
-				<item id="7902" min="1" max="1" chance="9.146" /> <!-- Doom Crusher -->
-				<item id="81" min="1" max="1" chance="9.146" /> <!-- Dragon Slayer -->
-				<item id="80" min="1" max="1" chance="9.144" /> <!-- Tallum Blade -->
-				<item id="7895" min="1" max="1" chance="9.136" /> <!-- Flaming Dragon Skull -->
-				<item id="213" min="1" max="1" chance="9.134" /> <!-- Branch of the Mother Tree -->
-				<item id="236" min="1" max="1" chance="9.13" /> <!-- Soul Separator -->
-				<item id="7899" min="1" max="1" chance="9.129" /> <!-- Destroyer Hammer -->
-				<item id="2504" min="1" max="1" chance="9.126" /> <!-- Meteor Shower -->
-				<item id="305" min="1" max="1" chance="9.124" /> <!-- Tallum Glaive -->
-				<item id="164" min="1" max="1" chance="9.124" /> <!-- Elysian -->
-				<item id="270" min="1" max="1" chance="9.122" /> <!-- Dragon Grinder -->
-				<item id="150" min="1" max="1" chance="9.103" /> <!-- Elemental Sword -->
-				<item id="235" min="1" max="1" chance="9.095" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="1" chance="9.08" /> <!-- Carnage Bow -->
-				<item id="269" min="1" max="1" chance="9.077" /> <!-- Blood Tornado -->
-				<item id="7884" min="1" max="1" chance="9.073" /> <!-- Infernal Master -->
-				<item id="98" min="1" max="1" chance="9.07" /> <!-- Halberd -->
-				<item id="7894" min="1" max="1" chance="9.067" /> <!-- Spiritual Eye -->
-				<item id="212" min="1" max="1" chance="9.029" /> <!-- Dasparion's Staff -->
-				<item id="289" min="1" max="1" chance="9.025" /> <!-- Soul Bow -->
-				<item id="151" min="1" max="1" chance="9.024" /> <!-- Sword of Miracles -->
-				<item id="8683" min="1" max="1" chance="8.378" /> <!-- Tiphon's Spear -->
-				<item id="8684" min="1" max="1" chance="8.378" /> <!-- Shyeed's Bow -->
-				<item id="8682" min="1" max="1" chance="8.368" /> <!-- Naga Storm -->
-				<item id="8688" min="1" max="1" chance="8.356" /> <!-- Daimon Crystal -->
-				<item id="8678" min="1" max="1" chance="8.356" /> <!-- Sirra's Blade -->
-				<item id="8680" min="1" max="1" chance="8.331" /> <!-- Barakiel's Axe -->
-				<item id="8681" min="1" max="1" chance="8.328" /> <!-- Behemoth' Tuning Fork -->
-				<item id="8686" min="1" max="1" chance="8.324" /> <!-- Themis' Tongue -->
-				<item id="8679" min="1" max="1" chance="8.317" /> <!-- Sword of Ipos -->
-				<item id="8687" min="1" max="1" chance="8.295" /> <!-- Cabrio's Hand -->
-				<item id="5706" min="1" max="1" chance="8.273" /> <!-- Damascus*Damascus -->
-				<item id="8685" min="1" max="1" chance="8.268" /> <!-- Sobekk's Hurricane -->
-				<item id="90998" min="1" max="3" chance="100" /> <!-- Balthus Knights' Glittering Varnish -->
-				<item id="90997" min="3" max="7" chance="100" /> <!-- Balthus Knights' Shining Varnish -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="3" max="7" chance="100" /> <!-- Cloth Piece -->
-				<item id="33815" min="2" max="4" chance="50.21" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
-				<item id="33814" min="2" max="4" chance="49.99" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33809" min="2" max="4" chance="49.83" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
-				<item id="33807" min="2" max="4" chance="49.36" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
-				<item id="33813" min="2" max="4" chance="48.95" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
-				<item id="33808" min="2" max="4" chance="48.94" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="90899" min="1" max="1" chance="2.932" /> <!-- Blessed Agathion's Soul -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29068" level="84" type="GrandBoss" name="Antharas" title="Land Dragon">
-		<!-- Todo: CT2.5 -->
 		<parameters>
 			<param name="ultra_respawn_time" value="3" />
 		</parameters>
 		<race>DRAGON</race>
 		<sex>MALE</sex>
-		<acquire exp="2147483647" sp="9759416" raidPoints="1000" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="197047999.75369" hpRegen="319.2293199" mp="3440344.575" mpRegen="3" />
-			<attack physical="4799.20533" magical="263.60854" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3974.13793" magical="496.01325" />
+		<acquire exp="40664236032" sp="9759416" raidPoints="1000" />
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="355555555" hpRegen="38535.45" mp="2025740" mpRegen="1000" />
+			<attack physical="35810" magical="3783.6" random="5" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2505.43352601156" magical="1452.04745968969" />
 			<speed>
 				<walk ground="50" />
 				<run ground="279" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
+		<status attackable="true" noSleepMode="true" isDeathPenalty="true" />
 		<skillList>
-			<skill id="4112" level="1" /> <!-- Ordinary Attack -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
 			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
+			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
+			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
+			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -2059,92 +1805,118 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="5315" min="1" max="3" chance="50.99" /> <!-- Sealed Shield of Nightmare -->
-				<item id="5292" min="1" max="3" chance="50.95" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="90992" min="1" max="1" chance="29.88" /> <!-- Antharas' Earring -->
-				<item id="5316" min="1" max="3" chance="20.86" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5311" min="1" max="3" chance="20.54" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5329" min="1" max="3" chance="20.4" /> <!-- Sealed Majestic Robe -->
-				<item id="5320" min="1" max="3" chance="20.14" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5293" min="1" max="3" chance="20.1" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5326" min="1" max="3" chance="19.88" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5323" min="1" max="3" chance="19.85" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="7900" min="1" max="3" chance="17.69" /> <!-- Ice Storm Hammer -->
-				<item id="5308" min="1" max="3" chance="16.76" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="7883" min="1" max="3" chance="16.68" /> <!-- Guardian's Sword -->
-				<item id="5301" min="1" max="3" chance="16.72" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="7889" min="1" max="3" chance="16.52" /> <!-- Wizard's Tear -->
-				<item id="7892" min="1" max="3" chance="16.33" /> <!-- Spell Breaker -->
-				<item id="7893" min="1" max="3" chance="16.28" /> <!-- Kaim Vanul's Bones -->
-				<item id="7901" min="1" max="3" chance="15.56" /> <!-- Star Buster -->
-				<item id="5317" min="1" max="3" chance="13.99" /> <!-- Sealed Majestic Circlet -->
-				<item id="5314" min="1" max="3" chance="13.51" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5318" min="1" max="3" chance="13.37" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5313" min="1" max="3" chance="13.21" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5319" min="1" max="3" chance="13.14" /> <!-- Sealed Majestic Boots -->
-				<item id="5305" min="1" max="3" chance="13" /> <!-- Sealed Tallum Stockings -->
-				<item id="5289" min="1" max="3" chance="12.9" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5295" min="1" max="3" chance="12.88" /> <!-- Sealed Tallum Gloves -->
-				<item id="5312" min="1" max="3" chance="12.87" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5298" min="1" max="3" chance="12.7" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5287" min="1" max="3" chance="12.53" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5294" min="1" max="3" chance="12.08" /> <!-- Sealed Tallum Helmet -->
-				<item id="5296" min="1" max="3" chance="11.98" /> <!-- Sealed Tallum Boots -->
-				<item id="5304" min="1" max="3" chance="11.96" /> <!-- Sealed Tallum Tunic -->
-				<item id="5288" min="1" max="3" chance="11.96" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5297" min="1" max="3" chance="11.89" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5291" min="1" max="3" chance="10.065" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5290" min="1" max="3" chance="9.981" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="2504" min="1" max="1" chance="9.16" /> <!-- Meteor Shower -->
-				<item id="81" min="1" max="1" chance="9.147" /> <!-- Dragon Slayer -->
-				<item id="151" min="1" max="1" chance="9.138" /> <!-- Sword of Miracles -->
-				<item id="236" min="1" max="1" chance="9.133" /> <!-- Soul Separator -->
-				<item id="213" min="1" max="1" chance="9.127" /> <!-- Branch of the Mother Tree -->
-				<item id="7895" min="1" max="1" chance="9.122" /> <!-- Flaming Dragon Skull -->
-				<item id="7894" min="1" max="1" chance="9.115" /> <!-- Spiritual Eye -->
-				<item id="270" min="1" max="1" chance="9.102" /> <!-- Dragon Grinder -->
-				<item id="289" min="1" max="1" chance="9.101" /> <!-- Soul Bow -->
-				<item id="7899" min="1" max="1" chance="9.086" /> <!-- Destroyer Hammer -->
-				<item id="2500" min="1" max="1" chance="9.085" /> <!-- Dark Legion's Edge -->
-				<item id="98" min="1" max="1" chance="9.084" /> <!-- Halberd -->
-				<item id="7884" min="1" max="1" chance="9.083" /> <!-- Infernal Master -->
-				<item id="305" min="1" max="1" chance="9.071" /> <!-- Tallum Glaive -->
-				<item id="150" min="1" max="1" chance="9.07" /> <!-- Elemental Sword -->
-				<item id="288" min="1" max="1" chance="9.068" /> <!-- Carnage Bow -->
-				<item id="164" min="1" max="1" chance="9.044" /> <!-- Elysian -->
-				<item id="235" min="1" max="1" chance="9.041" /> <!-- Bloody Orchid -->
-				<item id="212" min="1" max="1" chance="9.037" /> <!-- Dasparion's Staff -->
-				<item id="7902" min="1" max="1" chance="9.032" /> <!-- Doom Crusher -->
-				<item id="80" min="1" max="1" chance="9.03" /> <!-- Tallum Blade -->
-				<item id="269" min="1" max="1" chance="9.026" /> <!-- Blood Tornado -->
-				<item id="8680" min="1" max="1" chance="8.4" /> <!-- Barakiel's Axe -->
-				<item id="8682" min="1" max="1" chance="8.396" /> <!-- Naga Storm -->
-				<item id="8687" min="1" max="1" chance="8.386" /> <!-- Cabrio's Hand -->
-				<item id="8686" min="1" max="1" chance="8.354" /> <!-- Themis' Tongue -->
-				<item id="8679" min="1" max="1" chance="8.325" /> <!-- Sword of Ipos -->
-				<item id="8683" min="1" max="1" chance="8.323" /> <!-- Tiphon's Spear -->
-				<item id="5706" min="1" max="1" chance="8.308" /> <!-- Damascus*Damascus -->
-				<item id="8688" min="1" max="1" chance="8.3" /> <!-- Daimon Crystal -->
-				<item id="8684" min="1" max="1" chance="8.283" /> <!-- Shyeed's Bow -->
-				<item id="8678" min="1" max="1" chance="8.276" /> <!-- Sirra's Blade -->
-				<item id="8685" min="1" max="1" chance="8.271" /> <!-- Sobekk's Hurricane -->
-				<item id="8681" min="1" max="1" chance="8.266" /> <!-- Behemoth' Tuning Fork -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="3" max="7" chance="100" /> <!-- Cloth Piece -->
-				<item id="90998" min="1" max="3" chance="100" /> <!-- Balthus Knights' Glittering Varnish -->
-				<item id="90997" min="2" max="8" chance="100" /> <!-- Balthus Knights' Shining Varnish -->
-				<item id="33814" min="2" max="8" chance="50.61" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33807" min="2" max="8" chance="50.61" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
-				<item id="33815" min="2" max="4" chance="50.1" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
-				<item id="33808" min="2" max="8" chance="49.65" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="33813" min="2" max="8" chance="48.97" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
-				<item id="33809" min="2" max="4" chance="48.8" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
-				<item id="90899" min="1" max="1" chance="3.01" /> <!-- Blessed Agathion's Soul -->
+				<group chance="100">
+					<item id="80" min="1" max="1" chance="9.1" /> <!-- Tallum Blade -->
+					<item id="98" min="1" max="1" chance="9.09" /> <!-- Halberd -->
+					<item id="150" min="1" max="1" chance="9.09" /> <!-- Elemental Sword -->
+					<item id="212" min="1" max="1" chance="9.09" /> <!-- Dasparion's Staff -->
+					<item id="235" min="1" max="1" chance="9.09" /> <!-- Bloody Orchid -->
+					<item id="269" min="1" max="1" chance="9.09" /> <!-- Blood Tornado -->
+					<item id="288" min="1" max="1" chance="9.09" /> <!-- Carnage Bow -->
+					<item id="2504" min="1" max="1" chance="9.09" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="1" chance="9.09" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="1" chance="9.09" /> <!-- Spiritual Eye -->
+					<item id="7899" min="1" max="1" chance="9.09" /> <!-- Destroyer Hammer -->
+				</group>
+				<group chance="100">
+					<item id="81" min="1" max="1" chance="9.1" /> <!-- Dragon Slayer -->
+					<item id="151" min="1" max="1" chance="9.09" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="1" chance="9.09" /> <!-- Elysian -->
+					<item id="213" min="1" max="1" chance="9.09" /> <!-- Branch of the Mother Tree -->
+					<item id="236" min="1" max="1" chance="9.09" /> <!-- Soul Separator -->
+					<item id="270" min="1" max="1" chance="9.09" /> <!-- Dragon Grinder -->
+					<item id="289" min="1" max="1" chance="9.09" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="1" chance="9.09" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="1" chance="9.09" /> <!-- Dark Legion's Edge -->
+					<item id="7895" min="1" max="1" chance="9.09" /> <!-- Flaming Dragon Skull -->
+					<item id="7902" min="1" max="1" chance="9.09" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="100">
+					<item id="7883" min="1" max="3" chance="17" /> <!-- Guardian's Sword -->
+					<item id="7889" min="1" max="3" chance="16" /> <!-- Wizard's Tear -->
+					<item id="7892" min="1" max="3" chance="17" /> <!-- Spell Breaker -->
+					<item id="7893" min="1" max="3" chance="17" /> <!-- Kaim Vanul's Bones -->
+					<item id="7900" min="1" max="3" chance="17" /> <!-- Ice Storm Hammer -->
+					<item id="7901" min="1" max="3" chance="16" /> <!-- Star Buster -->
+				</group>
+				<group chance="100">
+					<item id="8678" min="1" max="1" chance="8.34" /> <!-- Sirra's Blade -->
+					<item id="8679" min="1" max="1" chance="8.33" /> <!-- Sword of Ipos -->
+					<item id="8680" min="1" max="1" chance="8.33" /> <!-- Barakiel's Axe -->
+					<item id="8681" min="1" max="1" chance="8.33" /> <!-- Behemoth' Tuning Fork -->
+					<item id="8682" min="1" max="1" chance="8.34" /> <!-- Naga Storm -->
+					<item id="8683" min="1" max="1" chance="8.33" /> <!-- Tiphon's Spear -->
+					<item id="8684" min="1" max="1" chance="8.34" /> <!-- Shyeed's Bow -->
+					<item id="8685" min="1" max="1" chance="8.33" /> <!-- Sobekk's Hurricane -->
+					<item id="8686" min="1" max="1" chance="8.34" /> <!-- Themis' Tongue -->
+					<item id="8687" min="1" max="1" chance="8.33" /> <!-- Cabrio's Hand -->
+					<item id="8688" min="1" max="1" chance="8.33" /> <!-- Daimon Crystal -->
+					<item id="5706" min="1" max="1" chance="8.33" /> <!-- Damascus*Damascus -->
+				</group>
+				<group chance="100">
+					<item id="5287" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="3" chance="10" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="3" chance="10" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5297" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5308" min="1" max="3" chance="17.5" /> <!-- Sealed Dark Crystal Robe -->
+				</group>
+				<group chance="100">
+					<item id="5293" min="1" max="3" chance="20" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Boots -->
+					<item id="5301" min="1" max="3" chance="17.5" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Stockings -->
+				</group>
+				<group chance="100">
+					<item id="5311" min="1" max="3" chance="20" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="3" chance="13.34" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="3" chance="13.33" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="3" chance="13.33" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5320" min="1" max="3" chance="20" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5326" min="1" max="3" chance="20" /> <!-- Sealed Robe of Nightmare -->
+				</group>
+				<group chance="100">
+					<item id="5316" min="1" max="3" chance="20" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="3" chance="13.34" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="3" chance="13.33" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="3" chance="13.33" /> <!-- Sealed Majestic Boots -->
+					<item id="5323" min="1" max="3" chance="20" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5329" min="1" max="3" chance="20" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="100">
+					<item id="5292" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5315" min="1" max="3" chance="50" /> <!-- Sealed Shield of Nightmare -->
+				</group>
+				<group chance="100">
+					<item id="33809" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
+					<item id="33815" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="100">
+					<item id="33808" min="2" max="8" chance="50" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
+					<item id="33814" min="2" max="8" chance="50" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="33807" min="2" max="8" chance="50" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
+					<item id="33813" min="2" max="8" chance="50" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
+				</group>
+				<group chance="100">
+					<item id="90997" min="2" max="8" chance="100" /> <!-- Balthus Knights' Shining Varnish -->
+				</group>
+				<group chance="100">
+					<item id="90998" min="1" max="3" chance="100" /> <!-- Balthus Knights' Glittering Varnish -->
+				</group>
+				<group chance="30">
+					<item id="90992" min="1" max="1" chance="100" /> <!-- Antharas' Earring -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
 	<npc id="29069" level="84" type="Monster" name="Behemoth Dragon">
-		<!-- Todo: CT2.5 -->
 		<parameters>
 			<param name="RootingManage" value="0" />
 			<skill name="PhysicalSpecial" id="5095" level="1" />
@@ -2153,21 +1925,31 @@
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="369465" hpRegen="8.5" mp="24863.19" mpRegen="3" />
-			<attack physical="3584.56902102981" magical="1386.66000087809" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="1071.29474264312" magical="522.626863116263" evasion="-18" />
+			<vitals hp="949367" hpRegen="22" mp="22800" mpRegen="30" />
+			<attack physical="14519" magical="11667" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="1370" magical="851" />
 			<speed>
-				<walk ground="180" />
+				<walk ground="55" />
 				<run ground="180" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" isDeathPenalty="true" />
 		<skillList>
-			<skill id="5095" level="1" /> <!-- Antharas Subordinate Melee Attack -->
-			<skill id="5096" level="1" /> <!-- Antharas Subordinate Remote Attack -->
 			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="5095" level="1" /> <!-- Antharas Subordinate Melee Attack -->
+			<skill id="5096" level="1" /> <!-- Antharas Subordinate Remote Attack -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="300" isAggressive="true">
@@ -2178,26 +1960,27 @@
 			<height normal="54" />
 		</collision>
 	</npc>
-	<npc id="29070" level="79" type="Monster" name="Dragon Bomber">
-		<!-- Todo: CT2.5 -->
+	<npc id="29070" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1353" hpRegen="8.5" mp="1809" mpRegen="3" />
-			<attack physical="1094.11758465172" magical="4902.24" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<vitals hp="1353.6766" hpRegen="8.5" mp="1809" mpRegen="3" />
+			<attack physical="1094.11758465172" magical="4902.24" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.098247547707" magical="261.308998696584" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="250" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2206,10 +1989,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2218,25 +1999,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29071" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29071" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="245" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2245,9 +2027,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2256,25 +2037,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29072" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29072" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="255" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2283,9 +2065,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2294,25 +2075,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29073" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29073" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="247" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2321,9 +2103,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2332,25 +2113,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29074" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29074" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="252" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2359,9 +2141,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2370,25 +2151,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29075" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29075" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="243" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2397,9 +2179,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2408,25 +2189,27 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29076" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29076" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1353" hpRegen="2" mp="1809" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1353.6766" hpRegen="8.5" mp="1809" mpRegen="3" />
+			<attack physical="1094.11758465172" magical="4902.24" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="357.098247547707" magical="261.308998696584" />
 			<speed>
-				<walk ground="200" />
+				<walk ground="35" />
 				<run ground="250" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2435,9 +2218,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="200" clanHelpRange="300" isAggressive="true" />
@@ -2446,7 +2228,7 @@
 			<height normal="34.5" />
 		</collision>
 	</npc>
-	<npc id="29077" level="78" type="Monster" name="">
+	<npc id="29077" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="177456" />
 			<param name="suicide2_x" value="177120" />
@@ -2466,19 +2248,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2487,7 +2270,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2496,7 +2279,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29078" level="78" type="Monster" name="">
+	<npc id="29078" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175952" />
 			<param name="suicide2_x" value="175712" />
@@ -2516,19 +2299,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2537,7 +2321,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2546,7 +2330,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29079" level="78" type="Monster" name="">
+	<npc id="29079" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175120" />
 			<param name="suicide2_x" value="175024" />
@@ -2566,19 +2350,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2587,7 +2372,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2596,7 +2381,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29080" level="78" type="Monster" name="">
+	<npc id="29080" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="174640" />
 			<param name="suicide2_x" value="174576" />
@@ -2616,19 +2401,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2637,7 +2423,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2646,7 +2432,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29081" level="78" type="Monster" name="">
+	<npc id="29081" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="173968" />
 			<param name="suicide2_x" value="173856" />
@@ -2666,19 +2452,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2687,7 +2474,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2696,7 +2483,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29082" level="78" type="Monster" name="">
+	<npc id="29082" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="173920" />
 			<param name="suicide2_x" value="174064" />
@@ -2716,19 +2503,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2737,7 +2525,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2746,7 +2534,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29083" level="78" type="Monster" name="">
+	<npc id="29083" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="174704" />
 			<param name="suicide2_x" value="174800" />
@@ -2766,19 +2554,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2787,7 +2576,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2796,7 +2585,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29084" level="78" type="Monster" name="">
+	<npc id="29084" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175424" />
 			<param name="suicide2_x" value="175632" />
@@ -2816,19 +2605,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2837,7 +2627,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2846,7 +2636,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29085" level="78" type="Monster" name="">
+	<npc id="29085" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="176880" />
 			<param name="suicide2_x" value="177200" />
@@ -2866,19 +2656,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2887,7 +2678,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2896,7 +2687,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29086" level="78" type="Monster" name="">
+	<npc id="29086" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="178368" />
 			<param name="suicide2_x" value="178592" />
@@ -2916,19 +2707,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2937,7 +2729,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2946,7 +2738,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29087" level="78" type="Monster" name="">
+	<npc id="29087" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="179696" />
 			<param name="suicide2_x" value="179920" />
@@ -2966,19 +2758,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2987,7 +2780,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2996,7 +2789,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29088" level="78" type="Monster" name="">
+	<npc id="29088" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180592" />
 			<param name="suicide2_x" value="180752" />
@@ -3016,19 +2809,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3037,7 +2831,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3046,7 +2840,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29089" level="78" type="Monster" name="">
+	<npc id="29089" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180896" />
 			<param name="suicide2_x" value="180784" />
@@ -3066,19 +2860,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3087,7 +2882,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3096,7 +2891,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29090" level="78" type="Monster" name="">
+	<npc id="29090" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180496" />
 			<param name="suicide2_x" value="180512" />
@@ -3116,19 +2911,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3137,7 +2933,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3146,7 +2942,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29091" level="78" type="Monster" name="">
+	<npc id="29091" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180896" />
 			<param name="suicide2_x" value="181040" />
@@ -3166,19 +2962,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3187,7 +2984,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3196,7 +2993,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29092" level="78" type="Monster" name="">
+	<npc id="29092" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180720" />
 			<param name="suicide2_x" value="180640" />
@@ -3216,19 +3013,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3237,7 +3035,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3246,7 +3044,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29093" level="78" type="Monster" name="">
+	<npc id="29093" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180048" />
 			<param name="suicide2_x" value="179920" />
@@ -3266,19 +3064,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3287,7 +3086,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3296,7 +3095,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29094" level="78" type="Monster" name="">
+	<npc id="29094" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="178848" />
 			<param name="suicide2_x" value="178560" />
@@ -3316,19 +3115,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3337,7 +3137,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3346,23 +3146,37 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29099" level="85" type="Folk" name="Baium">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+	<npc id="29099" level="80" type="RaidBoss" name="Baium">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="35555555.2" hpRegen="2629" mp="18000" mpRegen="99" />
+			<attack physical="13829.6" magical="4375.2" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2048.8" magical="1365.6" />
 			<speed>
-				<walk ground="60" />
+				<walk ground="80" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>60</hitTime>
+			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4256" level="1" /> <!-- Stun Resistance -->
+		</skillList>
 		<collision>
-			<radius normal="5" />
-			<height normal="12" />
+			<radius normal="65" />
+			<height normal="174" />
 		</collision>
 	</npc>
 </list>
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/29100-29199.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/29100-29199.xml
index 83fcc5d8c7..8d664b44bb 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/29100-29199.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/29100-29199.xml
@@ -6,7 +6,7 @@
 		<equipment rhand="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="290966.74193" hpRegen="8.5" mp="1608.045" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="50" />
@@ -47,7 +47,7 @@
 		<acquire exp="0" sp="0" raidPoints="1000" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="24630999.75369" hpRegen="319.2293199" mp="3440344.575" mpRegen="3" />
-			<attack physical="3152.927754" magical="1289.681983" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="3152.927754" magical="1289.681983" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3500.450389" magical="1707.68215" />
 			<speed>
 				<walk ground="50" />
@@ -69,7 +69,7 @@
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="197048" hpRegen="8.5" mp="24863.19" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="55" />
@@ -90,7 +90,7 @@
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="394096" hpRegen="8.5" mp="24863.19" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="55" />
@@ -112,7 +112,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="60" />
@@ -206,7 +206,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="80" />
@@ -298,7 +298,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="60" />
@@ -390,7 +390,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="40" />
@@ -677,7 +677,7 @@
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="11083949.50738" hpRegen="310.756323" mp="20787.765" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="42" />
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/36700-36799.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/36700-36799.xml
index 0d051f375a..d646c4c5c7 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/36700-36799.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/npcs/36700-36799.xml
@@ -466,7 +466,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -493,7 +493,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -520,7 +520,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -547,7 +547,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -596,7 +596,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -623,7 +623,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -650,7 +650,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -677,7 +677,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/02000-02099.xml
index fe25f57309..490a390bda 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/02000-02099.xml
@@ -231,10 +231,16 @@
 	</skill>
 	<skill id="2013" toLevel="2" name="Scroll of Escape">
 		<icon>icon.skill0000</icon>
-		<hitTime>20000</hitTime>
+		<hitTime>
+			<value level="1">20000</value>
+			<value level="2">1000</value>
+		</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>736</itemConsumeId> <!-- Scroll of Escape -->
+		<itemConsumeId>
+			<value level="1">736</value> <!-- Scroll of Escape -->
+			<value level="2">49087</value> <!-- Improved Scroll of Escape -->
+		</itemConsumeId>
 		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/39000-39099.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/39000-39099.xml
index d32aac5b09..dbfbdf4481 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/39000-39099.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/39000-39099.xml
@@ -1234,7 +1234,7 @@
 		<hitTime>1000</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>49087</itemConsumeId> <!-- Improved Scroll of Escape -->
+		<itemConsumeId>49500</itemConsumeId> <!-- Greater Scroll of Escape -->
 		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/39100-39199.xml
index 43f1457689..e70a34fa4b 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/39100-39199.xml
@@ -57,7 +57,19 @@
 	</skill>
 	<skill id="39103" toLevel="1" name="Warrior's Quick Healing Potion">
 		<icon>icon.etc_reagent_white_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<amount>500</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39104" toLevel="1" name="Hero Cube - 7-day">
 		<icon>icon.sa_cube</icon>
@@ -91,7 +103,7 @@
 		<icon>icon.etc_scroll_of_resurrection_i01</icon>
 		<castRange>400</castRange>
 		<effectPoint>1</effectPoint>
-		<effectRange>600</effectRange>
+		<effectRange>900</effectRange>
 		<hitTime>1000</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
@@ -104,6 +116,9 @@
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpResurrection" />
+			<condition name="TargetMyParty">
+				<includeMe>false</includeMe>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="Resurrection">
@@ -2199,6 +2214,59 @@
 	</skill>
 	<skill id="39199" toLevel="1" name="Hero's Wondrous Cubic - 7-day">
 		<icon>icon.sa_cube</icon>
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<reuseDelay>-1</reuseDelay>
+		<hitTime>500</hitTime>
+		<coolTime>500</coolTime>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpEncumbered">
+				<weightPercent>20</weightPercent>
+				<slotsPercent>10</slotsPercent>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="RestorationRandom">
+				<items>
+					<item chance="16">
+						<item id="49487" count="2"/> <!-- Soulshot Ticket -->
+					</item>
+					<item chance="4">
+						<item id="49772" count="1"/> <!-- Scroll of Mood Melody -->
+					</item>
+					<item chance="16.49">
+						<item id="49488" count="5"/> <!-- Major Healing Potion -->
+					</item>
+					<item chance="20">
+						<item id="35669" count="1"/> <!-- Angel Cat's Blessing -->
+					</item>
+					<item chance="5">
+						<item id="49533" count="1"/> <!-- Quick Hero Healing Potion -->
+					</item>
+					<item chance="10">
+						<item id="49542" count="1"/> <!-- Improved Scroll of Resurrection -->
+					</item>
+					<item chance="14.5">
+						<item id="49536" count="1"/> <!-- Box of Scroll of Escape to the Base -->
+					</item>
+					<item chance="2">
+						<item id="49489" count="3"/> <!-- Parts of Enchantment Scrolls Chest -->
+					</item>
+					<item chance="10">
+						<item id="49416" count="1"/> <!-- Blade Spirit -->
+					</item>
+					<item chance="0.01">
+						<item id="49859" count="1"/> <!-- Weapon Exchange Coupon -->
+					</item>
+					<item chance="2">
+						<item id="49490" count="1"/> <!-- Fishing Kit -->
+					</item>
+				</items>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/55200-55299.xml b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/55200-55299.xml
index dd03bf2fce..acf6c5afd0 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/55200-55299.xml
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/55200-55299.xml
@@ -500,7 +500,7 @@
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>ATTACK_TIME_DOWN</abnormalType>
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer’s Potion -->
+		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer's Potion -->
 		<mpConsume>75</mpConsume>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/documentation.txt
index 75ca527e5c..dedd05b216 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/stats/skills/documentation.txt
@@ -10,6 +10,8 @@ AddHate: Instant effect that increases target's hate towards you.
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -196,7 +198,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/Config.java
index 0506e61840..14e62140f2 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/Config.java
@@ -1202,6 +1202,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static boolean AUTO_PLAY_PREMIUM;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
@@ -1277,6 +1278,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2512,6 +2514,7 @@ public class Config
 			ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 			AUTO_PLAY_PREMIUM = autoPlayConfig.getBoolean("AutoPlayPremium", false);
 			DISABLED_AUTO_SKILLS.clear();
 			final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
@@ -3268,6 +3271,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index a50cbb8033..8378c362cb 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index 603e7d33be..dd968ed772 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -549,9 +549,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 2260001e17..380989e049 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index 91a35da584..2a6169578d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -61,7 +61,7 @@ public class DailyTaskManager
 	private static final Set<Integer> RESET_SKILLS = new HashSet<>();
 	static
 	{
-		// No known skills.
+		RESET_SKILLS.add(39199); // Hero's Wondrous Cubic
 	}
 	public static final Set<Integer> RESET_ITEMS = new HashSet<>();
 	static
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 36f3461010..efc07efb38 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -230,7 +230,7 @@ public class ShortCuts implements IRestorable
 			if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL))
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
index b87b1738d0..f87a32e4d2 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1288,7 +1288,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2816,7 +2816,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2829,178 +2829,140 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						player.refreshExpertisePenalty();
-						sendPacket(info);
+					}
+					player.refreshExpertisePenalty();
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java
index ba50df47e6..b82a25f5d9 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4517,7 +4517,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8215,9 +8215,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Summon.java
index cc23c2a6f2..98b7163e50 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -846,7 +847,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -867,7 +868,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -892,7 +900,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -900,7 +908,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -946,7 +961,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index ea1abbff9b..074a4ae995 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -863,15 +862,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -882,8 +879,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -892,7 +893,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -965,33 +966,6 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
@@ -1001,9 +975,17 @@ public class CreatureStat
 		// Notify recalculation to child classes.
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 3155a27f10..ec3d03a6f5 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0b6092b2d9..1e393ec4bf 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2216,6 +2216,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index 281d957b09..ba369c8c2e 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -39,6 +39,7 @@ import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AgathionData;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -52,6 +53,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -71,12 +73,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPi
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
 import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -91,6 +95,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1637,7 +1642,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2557,6 +2564,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2581,6 +2593,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2606,6 +2620,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index dbaefe08f8..519689348a 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -757,7 +757,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -909,7 +910,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 1692c9fcd7..ec97ae1f75 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -652,7 +652,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -675,7 +675,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -710,7 +710,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 7865a0b67f..1629a2dcf9 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -130,7 +130,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index c305987ba6..c29c9ba398 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -93,6 +93,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index c5257ff589..1aff35bfd5 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index c9171e54c0..e874d9e233 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -701,7 +701,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList();
 		player.updateShortCuts(_id, _level, 0);
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index c16d3301f0..7c284015a5 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -63,6 +63,6 @@ public class RequestShortCutReg implements ClientPacket
 		
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 	}
 }
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index 93f16169bc..07ed7641a9 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,127 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 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, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index dcc44cb9f3..2e152e2e29 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -207,7 +207,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		ServerPackets.EX_PET_INFO.writeId(this);
 		writeInt(_summon.getObjectId());
-		writeByte(_value); // // 0=teleported 1=default 2=summoned
+		writeByte(_value); // 0=teleported 1=default 2=summoned
 		writeShort(37); // mask_bits_37
 		writeBytes(_masks);
 		// Block 1
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index f93c9e5e69..03909a2746 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
deleted file mode 100644
index 52a4032d14..0000000000
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
new file mode 100644
index 0000000000..62bb425a5a
--- /dev/null
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -0,0 +1,182 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeByte(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 83e29f7bed..3ee2b1ef96 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,19 +19,19 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
 	}
 	
@@ -53,8 +53,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 8872c0cf63..c2b8c8f51a 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -42,13 +48,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -59,8 +68,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 68ca369edf..37f3211b0a 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1f54b5040f..0d5d066d25 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,6 +25,7 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -95,6 +98,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							if (player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -120,23 +134,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -144,6 +167,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -178,32 +204,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -302,6 +351,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 7cd7dd9696..c56221841f 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
@@ -51,7 +52,6 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +381,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/buffer_schemes.sql
index 1784421092..bd964c8cc2 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/buffer_schemes.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL,
     PRIMARY KEY (`object_id`,`scheme_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle.sql
index 0109cb8ab4..082a199079 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_spirits.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_spirits.sql
index ac73d8dbe3..bb4044039f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_spirits.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_spirits.sql
@@ -11,6 +11,5 @@ CREATE TABLE `character_spirits`
     `crit_rate_points`   TINYINT      NOT NULL DEFAULT 0,
     `crit_damage_points` TINYINT      NOT NULL DEFAULT 0,
     `in_use`             BOOLEAN      NOT NULL DEFAULT FALSE,
-    PRIMARY KEY (`charId`, `type`),
-    FOREIGN KEY FK_CHARACTER_SPIRITS (`charId`) REFERENCES characters (`charId`) ON DELETE CASCADE
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+    PRIMARY KEY (`charId`, `type`)
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/characters.sql
index ea2aace011..60e1a786a2 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/characters.sql
@@ -60,4 +60,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort.sql
index 43de96f562..b4c76f8a7d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort_siege_guards.sql
index 19df57a3b9..43763210b4 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort_spawnlist.sql
index 22303a9b09..144979acd9 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,4 +11,4 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/grandboss_data.sql
index 9ad3ae33ce..bc319dc49e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/heroes.sql
index 2fc8753f90..49a371cbd5 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/heroes.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/items.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/olympiad_fights.sql
index ccd4ac94ec..f25cc4c1fa 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(4) NOT NULL DEFAULT 0,
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/Character.ini b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/Character.ini
index 1f79cac9fd..8b31c63f05 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/Character.ini
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/Character.ini
@@ -285,8 +285,8 @@ MaxMAtk = 999999
 MaxPCritRate = 500
 
 # Maximum character Magic Critical Rate. (10 = 1%)
-# Default: 200
-MaxMCritRate = 200
+# Classic Default: 320
+MaxMCritRate = 320
 
 # Maximum character Attack Speed.
 # Default: 1500
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/Custom/AutoPlay.ini b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/Custom/AutoPlay.ini
index 9a4fd4bf2e..6e9d9628be 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/Custom/AutoPlay.ini
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/Custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # Enable .play command only for premium players.
 # Premium System must be enabled.
 # Default: False
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/General.ini b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/General.ini
index 978c3fce97..659ece7db8 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/General.ini
@@ -430,8 +430,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/ActionData.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/ActionData.xml
index b287bbf8fd..3d07752d2c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/ActionData.xml
@@ -1,218 +1,248 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
-	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
-	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
-	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
-	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
-	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
-	<action id="70" handler="AirshipAction" option="4" /> <!-- Exit Airship -->
-	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
-	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
-	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
-	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
-	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Nightshade - Shade Sacrifice -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
-	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="0" handler="SitStand" /> <!-- Toggle Sit/Stand. (Command: /sit, /stand) -->
+	<action id="1" handler="RunWalk" /> <!-- Toggle Walk/Run. (Command: /walk, /run) -->
+	<action id="2" handler="None" /> <!-- Attacks selected target(s), or takes a general action if the target cannot be attacked. Hold down the Ctrl key and click to attack by force. (Command: /attack, /attackforce) -->
+	<action id="3" handler="None" /> <!-- Request a trade from the selected target. (Command: /trade) -->
+	<action id="4" handler="None" /> <!-- Select the nearest attackable target. (Command: /targetnext) -->
+	<action id="5" handler="None" /> <!-- Pick up items that are scattered nearby. (Command: /pickup) -->
+	<action id="6" handler="None" /> <!-- Change to the target of the currently selected player. (Command: /assist) -->
+	<action id="7" handler="None" /> <!-- Invite the selected person to your party. (Command: /invite) -->
+	<action id="8" handler="None" /> <!-- Leave the party. (Command: /leave) -->
+	<action id="9" handler="None" /> <!-- If you are the leader of the party, dismiss selected members from your party. (Command: /dismiss) -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Sets up a private store to sell your items. (Command: /vendor) -->
+	<action id="11" handler="None" /> <!-- Display the party matching window to search for parties or to add members to your party. (Command: /partymatching) -->
+	<action id="12" handler="SocialAction" option="2" /> <!-- Emote: Greet others with a kind "hello." (Command: /socialhello) -->
+	<action id="13" handler="SocialAction" option="3" /> <!-- Emote: Let everyone know that you or someone else is victorious! (Command: /socialvictory) -->
+	<action id="14" handler="SocialAction" option="4" /> <!-- Emote: Rouse your allies and charge! (Command: /socialcharge) -->
+	<action id="15" handler="PetHold" /> <!-- Have your pet follow you or stay and hold its ground. -->
+	<action id="16" handler="PetAttack" /> <!-- Attack target. -->
+	<action id="17" handler="PetStop" /> <!-- Stop current action. -->
+	<action id="18" handler="None" /> <!-- Pick up nearby items. -->
+	<action id="19" handler="UnsummonPet" /> <!-- Returns your pet back to its home. -->
+	<action id="20" handler="None" /> <!-- Use special skill. -->
+	<action id="21" handler="ServitorHold" /> <!-- Have your summons follow you or stay and hold its ground. -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attack target. -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="24" handler="SocialAction" option="6" /> <!-- Emote: Respond positively. (Command: /socialyes) -->
+	<action id="25" handler="SocialAction" option="5" /> <!-- Emote: Respond negatively. (Command: /socialno) -->
+	<action id="26" handler="SocialAction" option="7" /> <!-- Emote: Show your respect and bow. (Command: /socialbow) -->
+	<action id="27" handler="None" /> <!-- Use special skill. -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Sets up a private store to purchase items. (Command: /buy) -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Emote: You have no idea what's going on. (Command: /socialunaware) -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Emote: I'm waiting... (Command: /socialwaiting) -->
+	<action id="31" handler="SocialAction" option="10" /> <!-- Emote: Have a good laugh. (Command: /sociallaugh) -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Toggle between Attack/Move modes. -->
+	<action id="33" handler="SocialAction" option="11" /> <!-- Emote: Applaud. (Command: /socialapplause) -->
+	<action id="34" handler="SocialAction" option="12" /> <!-- Emote: Serve them up your best dance moves. (Command: /socialdance) -->
+	<action id="35" handler="SocialAction" option="13" /> <!-- Emote: Show grief. (Command: /socialsad) -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Poison gas attack. -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Set up a private workshop that creates items by using Dwarven recipes in exchange for a fee. (Command: /dwarvenmanufacture) -->
+	<action id="38" handler="Ride" /> <!-- Toggle mount/dismount when near or on an NPC that can be ridden. (Commands: /mount, /dismount, /mountdismount) -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Exploding corpse attack. -->
+	<action id="40" handler="None" /> <!-- Enhances a target's evaluation score. (Command: /evaluate) -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Attacks castle gates, walls, or headquarters by shooting a cannon. -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Reflects damage back to an enemy. -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Attacks target and nearby enemies by creating a whirling surge of water. -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Attacks an enemy with a powerful explosion. -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Restores the summoner's MP. -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Attacks an enemy by summoning up a devastating storm. -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Damages an enemy and heals the servitor at the same time. -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Attacks the enemy by shooting a cannon. -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Attack with a fit of rage. -->
+	<action id="50" handler="None" /> <!-- The selected party member will become the new party leader. (Command: /changepartyleader) -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Removes shackles from the Servitor and sets him free. -->
+	<action id="53" handler="ServitorMove" /> <!-- Move to the target. -->
+	<action id="54" handler="PetMove" /> <!-- Move to the target. -->
+	<action id="55" handler="None" /> <!-- Toggle recording and stop recording of replay files. (Commands: /replayrecstart, /replayrecstop, /replayrecstartstop) -->
+	<action id="56" handler="None" /> <!-- Invite the selected target to a command channel. (Command: /channelinvite) -->
+	<action id="57" handler="None" /> <!-- Highlights private store and private workshop messages that contain the search word. (Command: /findprivatestore) -->
+	<action id="58" handler="None" /> <!-- Challenges another character to a duel. (Command: /duel) -->
+	<action id="59" handler="None" /> <!-- Withdrawing from a duel means losing it. (Command: /withdraw) -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Open a personal store for package sale. (Command: /packagesale) -->
+	<action id="62" handler="SocialAction" option="14" /> <!-- Charm Pose. (Command: /charm) -->
+	<action id="64" handler="TeleportBookmark" /> <!-- Displays My Teleports window you can use to save and manage teleport locations. (Command: /teleportbookmark) -->
+	<action id="65" handler="BotReport" /> <!-- Reports the targeted player as a suspected bot. (Command: /botreport) -->
+	<action id="66" handler="SocialAction" option="15" /> <!-- Allows character to strike shy pose. (Command: /socialshy) -->
+	<action id="67" handler="AirshipAction" option="1" /> <!-- Allows you to control the Airship. -->
+	<action id="68" handler="AirshipAction" option="2" /> <!-- Relinquishes control of the Airship. -->
+	<action id="69" handler="AirshipAction" option="3" /> <!-- Choose from pre-designated locations. -->
+	<action id="70" handler="AirshipAction" option="4" /> <!-- Disembarks from the Airship. -->
+	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange bows with another person. (Command: /couplebow) -->
+	<action id="72" handler="SocialAction" option="17" /> <!-- High Five another person. (Command: /couplehighfive) -->
+	<action id="73" handler="SocialAction" option="18" /> <!-- Dance with another player. (Command: /coupledance) -->
+	<action id="76" handler="None" /> <!-- Invite the selected target as friends. (Commands: /friendinvite, /friendadd, /friendreg) -->
+	<action id="77" handler="None" /> <!-- Start or end recording videos. (Commands: /recstart, /recstop, /recstartstop) -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Applies Token 1 to the target. Can be only used in a group. (Command: /tacticalsign1) -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Applies Token 2 to the target. Can be only used in a group. (Command: /tacticalsign2) -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Applies Token 3 to the target. Can be only used in a group. (Command: /tacticalsign3) -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Applies Token 4 to the target. Can be only used in a group. (Command: /tacticalsign4) -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Automatically focuses on the target marked with Token 1. Can be only used in a group. (Command: /targettacticalsign1) -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Automatically focuses on the target marked with Token 2. Can be only used in a group. (Command: /targettacticalsign2) -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Automatically focuses on the target marked with Token 3. Can be only used in a group. (Command: /targettacticalsign3) -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Automatically focuses on the target marked with Token 4. Can be only used in a group. (Command: /targettacticalsign4) -->
+	<action id="87" handler="SocialAction" option="28" /> <!-- Gesture of Proposal (Command: /socialpropose) -->
+	<action id="88" handler="SocialAction" option="29" /> <!-- Gesture of Provocation (Command: /socialprovocation) -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off (Command: /socialbeauty) -->
+	<action id="92" handler="None" /> <!-- Selects the previous target. (Command: /targetprev) -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Attacks castle gates, walls, or headquarters with a powerful strike. -->
+	<action id="1001" handler="None" /> <!-- A reckless yet powerful attack that must be used with extreme caution. -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Incites those around the summon to attack you. -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Instantly increases P. Def. and M. Def. significantly. Character is immovable while this skill is in effect. -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- A magical attack. -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Recovers the pet's HP. -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Temporarily increases party members' P. Critical Rate/ Damage. -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Temporarily increases party members' P. Atk. and P. Accuracy. -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Has a chance to remove curses from party members. -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Temporarily increases party members' MP Recovery Bonus. -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Temporarily reduces party members' M. Skill Cooldown. -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Remove a curse from your party. -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Provokes the enemy to attack and then casts a curse that decreases P./ M. Def. -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Provokes nearby enemies to attack and then casts a curse that decreases their P./ M. Def. -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Sacrifice one's own HP to restore HP of a nearby allies. -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- A powerful blow on the enemy's vital points -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- A stunning blow that inflicts damage and instantly throws an enemy into a state of stun. -->
+	
+	<!-- Actions 1018 to 1030 are present in the Client, but are not used in Classic. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Inflict a deadly curse on an enemy that absorbs their HP. -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kat the Cat -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mew the Cat -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kai the Cat -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Boxer the Unicorn -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mirage the Unicorn -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Merrow the Unicorn. -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Shadow. -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by Shadow. -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Silhouette -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by reanimated man -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by reanimated man -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by corrupted man -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King: A powerful slashing attack. Over-hit is possible. -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King: Slashes at surrounding enemies while spinning in the air. Over-hit is possible. -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King: Immobilizes the surrounding enemies. -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn: Powerful rear kicks that stun and damage an enemy. Over-hit is possible. -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn: Pounds the target and surrounding enemies with a tremendous onrush of water. -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord: Detonates a corpse, inflicting damage to nearby enemies. -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord: Blades attached to each arm slash out in a devastating attack. Over-hit is possible. -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord: Curses nearby enemies, poisoning them and reducing their Atk. Spd. -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon: Fires a projectile a short distance. Consumes 4 Flash Gunpowder. -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon: Fires a projectile a long distance. Consumes 5 Flash Gunpowder. -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Viciously bite an enemy. -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Scratch an enemy with both paws. Causes bleeding. -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awaken hidden powers. -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Decrease a nearby enemy's P. Atk./M. Atk. with a wolf cry. -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Decrease a nearby enemy's attack speed/magic speed with a strider roar. -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Viciously bite an enemy. -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Cause both damage and shock at the same time. Instantly stuns an enemy. -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Breath fire in front of you. -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Increases maximum HP temporarily. -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Increases maximum MP temporarily. -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Increases Atk. Spd. temporarily. -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Increases Casting Spd. temporarily. -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Temporarily decreases the target's MP consumption of skills. Consumes Spirit Ore. -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Increases M. Atk. power temporarily. -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Temporarily increases the critical rate of damage attack magic. -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Temporarily increases the critical attack power. -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Temporarily increases the probability of critical attack. -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Temporarily increases Accuracy. -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Rapidly attacks the enemy twice. -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Inflicts shock and damage to the enemy at the same time with a powerful spin attack. -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Attacks nearby enemies with a doll heap attack. -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakens a hidden ability. -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of thunder. -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack on nearby enemies when hit. -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Control put in place to prevent the use of a buff upon the master. 5-minute duration. -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Powerfully attacks the target. -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- A powerful attack that pierces through a target. -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies by spinning your own body like a whirlwind. -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Attacks a front-line enemy with a powerful lance thrust. -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Shouts a victory cry that increases your abilities. -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Powerfully attacks the target. -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Gathers energy into your body, then releases it in a destructive blast. -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Hits enemies with a powerful wave of force. -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Emits a loud roar that amplifies your abilities. -->
+	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Charges toward the enemy and inflicts damage. -->
+	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Cancels the target's de-buff. -->
+	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Emits a spread of ring-shaped flames. -->
+	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Attacks the enemy with a powerful flaming beak. -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Toggles you between Attack and Support modes. -->
+	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- At a certain probability, removes one or several buffs from an enemy. -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Decreases the enemy's Dark attribute by 25. -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Strike multiple enemies at the front with the tail. -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Viciously bite an enemy. -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Causes nearby enemies to flee in fear. -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Increases your speed. -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Greatly increases its master's speed. -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Increases the speed of its master and their party. -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Teleports its master to the Seed of Annihilation. -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Teleports its master and their party to the Seed of Annihilation. -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attack the target. -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move to a designated location. -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Make the servitor disappear by cancelling the summoning. -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Do not counter-attack. -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Counter-attack when the master or itself is attacked. -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Damages and provokes the target. -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Rolls over and delivers a shock to the ground stunning the surrounding targets. -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Bites the target to inflict damage. -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Damages the target and absorbs some of its HP. -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Attacks the surrounding enemies and blocks their physical skills. -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Flourishes claws and frontally attacks enemies. -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Dashes toward enemies to inflict damage and Stun them. -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Inflicts damage onto the enemies with a flame. -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Flies straight into the enemy. -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Purifies the master. -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Attack the enemy by darting a feather. -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Hurt the enemy by attacking them with sharp claws. -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Recover the targets near the tree and clear any debuff. -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Attacks nearby targets with a powerful punch. -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Provokes nearby enemies. -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Bites the enemy. -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Provokes nearby enemies. -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Bites the enemy. -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Provokes nearby enemies. -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Bites the enemy. -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Attacks nearby enemies and blocks their P. Skills. -->
+	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Rushes to the enemy to inflict damage and Stun. -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Can express affection to Rudolph. Affection Level rises by 25%. Warning: Can be used only when a Rudolph requests expression of affection, and cannot be used while transformed! -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Increases Max HP by 20%, Max MP by 20%, and the Speed by 20% for 5 minutes. Increases the Debuff Resistance by 10%. Reuse delay 10 minutes. Consumes 3 Rose Essence(s) during skill use. Doesn't overlap with other buffs except Critical Seduction. -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- For 30 minutes, increases party members' Max HP by 30%, Max MP by 30%, Max CP by 30%, P. Def. by 30%, magic M. Def. by 30%, Speed by 20, P. Atk. by 10%, and magic M. Atk. by 20%. Decreases MP consumption for skill use by 15%. Reuse delay 5 minutes. Consumes 10 Rose Essence(s) during skill use. -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of lightning. -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack upon contacted enemies nearby. -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Restricts to prevent the use of a buff upon the master. 5 minute duration. -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Inflicts a powerful attack that seems to pierce through the target. -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies. -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impales an enemy with a sword. -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Raises one's own abilities. -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Gathered energy within ones self can be focused and used to attack an enemy. -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Fires a shock wave to attack enemies at the front. -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Raises one's own abilities. -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switches between attack mode and support mode. -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Instantly restores the master's HP by 10%. Increases the master's Debuff Resistance by 80%, Buff-canceling Attack Resistance by 40%, Speed by 10, P. Def. by 20%, and M. Def. by 20%, and decreases MP consumption for all skills by 50% for 1 minute. -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/AttendanceRewards.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/AttendanceRewards.xml
index a0e71cbdea..8af1ecd126 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/AttendanceRewards.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/AttendanceRewards.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/AttendanceRewards.xsd">
-	<item id="29564" count="50" /> <!-- Attendance Coin -->
-	<item id="29553" count="3" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29565" count="3" /> <!-- XP/SP Scroll -->
-	<item id="29584" count="2" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29585" count="1" /> <!-- Refined Romantic Chapeau -->
+	<item id="49490" count="1" /> <!-- Fishing Kit -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49488" count="5" /> <!-- Major Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49500" count="1" /> <!-- Greater Scroll of Escape -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="100" /> <!-- Attendance Coin -->
-	<item id="29553" count="3" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29519" count="3" /> <!-- XP/SP Scroll - Medium -->
-	<item id="29584" count="2" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="49512" count="1" /> <!-- Amulet: Prosperity -->
+	<item id="90007" count="1" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49533" count="5" /> <!-- Quick Hero Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49500" count="1" /> <!-- Greater Scroll of Escape -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="150" /> <!-- Attendance Coin -->
-	<item id="29553" count="6" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29519" count="3" /> <!-- XP/SP Scroll - Medium -->
-	<item id="29584" count="4" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29578" count="1" /> <!-- Rare Accessory Pack -->
+	<item id="90007" count="2" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49488" count="5" /> <!-- Major Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49542" count="1" /> <!-- Improved Scroll of Resurrection -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="300" /> <!-- Attendance Coin -->
-	<item id="29553" count="6" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29650" count="5" /> <!-- XP/SP Scroll - High -->
-	<item id="29584" count="4" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29587" count="1" /> <!-- Agathion - Singer & Dancer -->
+	<item id="90007" count="3" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49533" count="5" /> <!-- Quick Hero Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49542" count="1" /> <!-- Improved Scroll of Resurrection -->
+	<item id="49860" count="1" /> <!-- Hero's Wondrous Cubic (7-day) -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 5b501b1f1b..bcc74a8afe 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -254,6 +255,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 25f1799035..1dc5ebd6f1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -41,6 +41,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AgathionSlot", AgathionSlot::new);
@@ -228,7 +230,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index cd446ab812..2775ff29a4 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -182,6 +182,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()))
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 43be5cfc4a..ae0fba5834 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,55 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..798a363468 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,46 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/experience.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/experience.xml
index 52fe49f568..9ef9e70e83 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/experience.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/experience.xml
@@ -2,89 +2,89 @@
 <table maxLevel="107" maxPetLevel="99" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/experience.xsd">
 	<experience level="1" tolevel="0" trainingRate="0" />
 	<experience level="2" tolevel="68" trainingRate="0" />
-	<experience level="3" tolevel="363" trainingRate="0" />
-	<experience level="4" tolevel="1168" trainingRate="0" />
-	<experience level="5" tolevel="2884" trainingRate="0" />
-	<experience level="6" tolevel="6038" trainingRate="0" />
-	<experience level="7" tolevel="11287" trainingRate="0" />
-	<experience level="8" tolevel="19423" trainingRate="0" />
-	<experience level="9" tolevel="31378" trainingRate="0" />
-	<experience level="10" tolevel="48229" trainingRate="0" />
-	<experience level="11" tolevel="71202" trainingRate="0" />
-	<experience level="12" tolevel="101677" trainingRate="0" />
-	<experience level="13" tolevel="141193" trainingRate="0" />
-	<experience level="14" tolevel="191454" trainingRate="0" />
-	<experience level="15" tolevel="254330" trainingRate="0" />
-	<experience level="16" tolevel="331867" trainingRate="0" />
-	<experience level="17" tolevel="426288" trainingRate="0" />
-	<experience level="18" tolevel="540000" trainingRate="0" />
-	<experience level="19" tolevel="675596" trainingRate="0.4" />
-	<experience level="20" tolevel="835862" trainingRate="0.4" />
-	<experience level="21" tolevel="1023784" trainingRate="0.4" />
-	<experience level="22" tolevel="1439214" trainingRate="0.4" />
-	<experience level="23" tolevel="1948496" trainingRate="0.4" />
-	<experience level="24" tolevel="2568849" trainingRate="0.4" />
-	<experience level="25" tolevel="3320624" trainingRate="0.4" />
-	<experience level="26" tolevel="4227171" trainingRate="0.4" />
-	<experience level="27" tolevel="5315160" trainingRate="0.4" />
-	<experience level="28" tolevel="6614928" trainingRate="0.4" />
-	<experience level="29" tolevel="8161928" trainingRate="0.4" />
-	<experience level="30" tolevel="9995811" trainingRate="0.4" />
-	<experience level="31" tolevel="12162654" trainingRate="0.4" />
-	<experience level="32" tolevel="14713776" trainingRate="0.4" />
-	<experience level="33" tolevel="17708474" trainingRate="0.4" />
-	<experience level="34" tolevel="21213444" trainingRate="0.4" />
-	<experience level="35" tolevel="25304462" trainingRate="0.4" />
-	<experience level="36" tolevel="30067484" trainingRate="0.4" />
-	<experience level="37" tolevel="35599857" trainingRate="0.4" />
-	<experience level="38" tolevel="42010311" trainingRate="0.4" />
-	<experience level="39" tolevel="49421365" trainingRate="0.4" />
-	<experience level="40" tolevel="57972426" trainingRate="0.4" />
-	<experience level="41" tolevel="67818552" trainingRate="0.4" />
-	<experience level="42" tolevel="79135430" trainingRate="0.4" />
-	<experience level="43" tolevel="92117895" trainingRate="0.4" />
-	<experience level="44" tolevel="106985762" trainingRate="0.4" />
-	<experience level="45" tolevel="123986755" trainingRate="0.4" />
-	<experience level="46" tolevel="143394644" trainingRate="0.4" />
-	<experience level="47" tolevel="165516617" trainingRate="0.4" />
-	<experience level="48" tolevel="190696910" trainingRate="0.4" />
-	<experience level="49" tolevel="219317612" trainingRate="0.4" />
-	<experience level="50" tolevel="251805373" trainingRate="0.4" />
-	<experience level="51" tolevel="288635908" trainingRate="0.4" />
-	<experience level="52" tolevel="330338847" trainingRate="0.4" />
-	<experience level="53" tolevel="377507025" trainingRate="0.4" />
-	<experience level="54" tolevel="430790085" trainingRate="0.4" />
-	<experience level="55" tolevel="490916802" trainingRate="0.4" />
-	<experience level="56" tolevel="558693889" trainingRate="0.4" />
-	<experience level="57" tolevel="635018115" trainingRate="0.3" />
-	<experience level="58" tolevel="720879369" trainingRate="0.3" />
-	<experience level="59" tolevel="817380318" trainingRate="0.3" />
-	<experience level="60" tolevel="925741334" trainingRate="0.2" />
-	<experience level="61" tolevel="1047311008" trainingRate="0.2" />
-	<experience level="62" tolevel="1183577348" trainingRate="0.2" />
-	<experience level="63" tolevel="1336187066" trainingRate="0.2" />
-	<experience level="64" tolevel="1506967657" trainingRate="0.2" />
-	<experience level="65" tolevel="1697936135" trainingRate="0.2" />
-	<experience level="66" tolevel="1911306679" trainingRate="0.15" />
-	<experience level="67" tolevel="2149533464" trainingRate="0.15" />
-	<experience level="68" tolevel="2415323167" trainingRate="0.15" />
-	<experience level="69" tolevel="2711646439" trainingRate="0.1" />
-	<experience level="70" tolevel="3041801164" trainingRate="0.1" />
-	<experience level="71" tolevel="3409398454" trainingRate="0.1" />
-	<experience level="72" tolevel="3818421440" trainingRate="0.1" />
-	<experience level="73" tolevel="4273257147" trainingRate="0.1" />
-	<experience level="74" tolevel="4778730307" trainingRate="0.05" />
-	<experience level="75" tolevel="5340152663" trainingRate="0.05" />
-	<experience level="76" tolevel="5963335188" trainingRate="0.05" />
-	<experience level="77" tolevel="7138805249" trainingRate="0.05" />
-	<experience level="78" tolevel="9372198365" trainingRate="0.05" />
-	<experience level="79" tolevel="16072377712" trainingRate="0.05" />
-	<experience level="80" tolevel="38406308870" trainingRate="0.05" />
-	<experience level="81" tolevel="150075964660" trainingRate="0.025" />
-	<experience level="82" tolevel="279783329565" trainingRate="0.025" />
-	<experience level="83" tolevel="454748284484" trainingRate="0.025" />
-	<experience level="84" tolevel="673468617186" trainingRate="0.025" />
-	<experience level="85" tolevel="946585988577" trainingRate="0.025" />
-	<experience level="86" tolevel="959999999998" trainingRate="0.025" />
-	<experience level="87" tolevel="969999999998" trainingRate="0.025" />
+	<experience level="3" tolevel="364" trainingRate="0" />
+	<experience level="4" tolevel="1169" trainingRate="0" />
+	<experience level="5" tolevel="2885" trainingRate="0" />
+	<experience level="6" tolevel="6039" trainingRate="0" />
+	<experience level="7" tolevel="11288" trainingRate="0" />
+	<experience level="8" tolevel="19424" trainingRate="0" />
+	<experience level="9" tolevel="31379" trainingRate="0" />
+	<experience level="10" tolevel="48230" trainingRate="0" />
+	<experience level="11" tolevel="71203" trainingRate="0" />
+	<experience level="12" tolevel="101678" trainingRate="0" />
+	<experience level="13" tolevel="141194" trainingRate="0" />
+	<experience level="14" tolevel="191455" trainingRate="0" />
+	<experience level="15" tolevel="254331" trainingRate="0" />
+	<experience level="16" tolevel="331868" trainingRate="0" />
+	<experience level="17" tolevel="426289" trainingRate="0" />
+	<experience level="18" tolevel="540001" trainingRate="0" />
+	<experience level="19" tolevel="675597" trainingRate="0.4" />
+	<experience level="20" tolevel="835864" trainingRate="0.4" />
+	<experience level="21" tolevel="1023785" trainingRate="0.4" />
+	<experience level="22" tolevel="1439215" trainingRate="0.4" />
+	<experience level="23" tolevel="1948497" trainingRate="0.4" />
+	<experience level="24" tolevel="2568850" trainingRate="0.4" />
+	<experience level="25" tolevel="3320625" trainingRate="0.4" />
+	<experience level="26" tolevel="4227172" trainingRate="0.4" />
+	<experience level="27" tolevel="5315161" trainingRate="0.4" />
+	<experience level="28" tolevel="6614929" trainingRate="0.4" />
+	<experience level="29" tolevel="8161929" trainingRate="0.4" />
+	<experience level="30" tolevel="9995812" trainingRate="0.4" />
+	<experience level="31" tolevel="12162655" trainingRate="0.4" />
+	<experience level="32" tolevel="14713777" trainingRate="0.4" />
+	<experience level="33" tolevel="17708475" trainingRate="0.4" />
+	<experience level="34" tolevel="21213445" trainingRate="0.4" />
+	<experience level="35" tolevel="25304463" trainingRate="0.4" />
+	<experience level="36" tolevel="30067485" trainingRate="0.4" />
+	<experience level="37" tolevel="35599858" trainingRate="0.4" />
+	<experience level="38" tolevel="42010312" trainingRate="0.4" />
+	<experience level="39" tolevel="49421366" trainingRate="0.4" />
+	<experience level="40" tolevel="57972427" trainingRate="0.4" />
+	<experience level="41" tolevel="67818553" trainingRate="0.4" />
+	<experience level="42" tolevel="79135431" trainingRate="0.4" />
+	<experience level="43" tolevel="92117896" trainingRate="0.4" />
+	<experience level="44" tolevel="106985763" trainingRate="0.4" />
+	<experience level="45" tolevel="123986756" trainingRate="0.4" />
+	<experience level="46" tolevel="143394645" trainingRate="0.4" />
+	<experience level="47" tolevel="165516618" trainingRate="0.4" />
+	<experience level="48" tolevel="190696911" trainingRate="0.4" />
+	<experience level="49" tolevel="219317613" trainingRate="0.4" />
+	<experience level="50" tolevel="251805374" trainingRate="0.4" />
+	<experience level="51" tolevel="288635909" trainingRate="0.4" />
+	<experience level="52" tolevel="330338848" trainingRate="0.4" />
+	<experience level="53" tolevel="377507026" trainingRate="0.4" />
+	<experience level="54" tolevel="430790086" trainingRate="0.4" />
+	<experience level="55" tolevel="490916803" trainingRate="0.4" />
+	<experience level="56" tolevel="558693890" trainingRate="0.4" />
+	<experience level="57" tolevel="635018116" trainingRate="0.3" />
+	<experience level="58" tolevel="720879370" trainingRate="0.3" />
+	<experience level="59" tolevel="817380319" trainingRate="0.3" />
+	<experience level="60" tolevel="925741335" trainingRate="0.2" />
+	<experience level="61" tolevel="1047311009" trainingRate="0.2" />
+	<experience level="62" tolevel="1183577349" trainingRate="0.2" />
+	<experience level="63" tolevel="1336187067" trainingRate="0.2" />
+	<experience level="64" tolevel="1506967658" trainingRate="0.2" />
+	<experience level="65" tolevel="1697936136" trainingRate="0.2" />
+	<experience level="66" tolevel="1911306680" trainingRate="0.15" />
+	<experience level="67" tolevel="2149533465" trainingRate="0.15" />
+	<experience level="68" tolevel="2415323168" trainingRate="0.15" />
+	<experience level="69" tolevel="2711646440" trainingRate="0.1" />
+	<experience level="70" tolevel="3041801165" trainingRate="0.1" />
+	<experience level="71" tolevel="3409398455" trainingRate="0.1" />
+	<experience level="72" tolevel="3818421441" trainingRate="0.1" />
+	<experience level="73" tolevel="4273257148" trainingRate="0.1" />
+	<experience level="74" tolevel="4778730308" trainingRate="0.05" />
+	<experience level="75" tolevel="5340152664" trainingRate="0.05" />
+	<experience level="76" tolevel="5963335189" trainingRate="0.05" />
+	<experience level="77" tolevel="7138805250" trainingRate="0.05" />
+	<experience level="78" tolevel="9372198366" trainingRate="0.05" />
+	<experience level="79" tolevel="16072377713" trainingRate="0.05" />
+	<experience level="80" tolevel="38406308871" trainingRate="0.05" />
+	<experience level="81" tolevel="150075964661" trainingRate="0.025" />
+	<experience level="82" tolevel="279783329566" trainingRate="0.025" />
+	<experience level="83" tolevel="454748284485" trainingRate="0.025" />
+	<experience level="84" tolevel="673468617187" trainingRate="0.025" />
+	<experience level="85" tolevel="2020405851561" trainingRate="0.025" />
+	<experience level="86" tolevel="8755092023431" trainingRate="0.025" />
+	<experience level="87" tolevel="16836715429675" trainingRate="0.025" />
 </table>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/items/49000-49099.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/items/49000-49099.xml
index e57d454e55..612f04a00e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/items/49000-49099.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/items/49000-49099.xml
@@ -1217,7 +1217,7 @@
 		<set name="handler" val="ItemSkills" />
 		<set name="commissionItemType" val="SCROLL_OTHER" />
 		<skills>
-			<skill id="39075" level="1" /> <!-- Improved Scroll of Escape -->
+			<skill id="2013" level="2" /> <!-- Improved Scroll of Escape -->
 		</skills>
 	</item>
 	<item id="49088" name="Gold Medal" type="EtcItem">
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/items/49400-49499.xml
index fc9b3fbacc..f11e785b96 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/items/49400-49499.xml
@@ -1433,13 +1433,23 @@
 	<item id="49489" name="Parts of Enchantment Scrolls Chest" type="EtcItem">
 		<!-- Double-click to obtain one Part of Enchantment Scrolls. Cannot be exchanged, dropped, or sold in a private store. Can be stored in a private warehouse. Can be shared within account through Dimensional Merchant. <Note>. Items received cannot be exchanged, dropped or sold. -->
 		<set name="icon" val="icon.etc_treasure_box_i08" />
-		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="default_action" val="PEEL" />
 		<set name="material" val="FISH" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="49474" min="1" max="1" chance="20" /> <!-- Scroll Part: Enchant Weapon -->
+			<item id="49475" min="1" max="1" chance="50" /> <!-- Scroll Part: Enchant Armor -->
+			<item id="49476" min="1" max="1" chance="2" /> <!-- Refined Scroll Part: Enchant Weapon -->
+			<item id="49478" min="1" max="1" chance="13" /> <!-- Refined Scroll Part: Enchant Armor -->
+			<item id="49479" min="1" max="1" chance="2" /> <!-- Solid Scroll Part: Enchant Weapon -->
+			<item id="49480" min="1" max="1" chance="13" /> <!-- Solid Scroll Part: Enchant Armor -->
+		</capsuled_items>
 	</item>
 	<item id="49490" name="Fishing kit" type="EtcItem">
 		<!-- Double-click to obtain 1 Fishing Rod (1-day), Bait (720 pcs), 1 Hero's Dual Swords, 1 Soulshot Ticket. Cannot be exchanged, dropped, or sold in a private store. Can be stored in a private warehouse. Can be shared within account through Dimensional Merchant. <Note>. Be careful before opening the items as their relocation is restricted. -->
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/items/49500-49599.xml
index 5d6a4151eb..03008428ef 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/items/49500-49599.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/items/49500-49599.xml
@@ -8,6 +8,13 @@
 		<set name="weight" val="120" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="commissionItemType" val="SCROLL_OTHER" />
+		<skills>
+			<skill id="39075" level="1" /> <!-- Improved Scroll of Escape -->
+		</skills>
 	</item>
 	<item id="49501" name="Fish Stew. The guild's gratitude." type="EtcItem">
 		<!-- For 20 min. XP/SP +10% while hunting. Cannot be dropped. -->
@@ -400,6 +407,8 @@
 		<!-- Magic potion that quickly restores HP. Instant cooldown. Cannot be used when HP is full. Cannot be exchanged, dropped, or sold. Can be stored in a private warehouse. Can be shared within account through Dimensional Merchant. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="LIQUID" />
 		<set name="weight" val="180" />
 		<set name="is_tradable" val="false" />
@@ -407,6 +416,12 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="is_event_restricted" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<skills>
+			<skill id="39103" level="1" /> <!-- Quick Hero Healing Potion -->
+		</skills>
 	</item>
 	<item id="49534" name="Hero Cube" additionalName="7-day" type="EtcItem">
 		<!-- 7-day item. Available at level 20 or higher. Double-click the Cube to receive Soulshot Ticket, Buff Scrolls Chest, Major Healing Potion, Warrior's Quick Healing Potion, Warrior's Quick Healing Potion, Angel Cat's Blessing, Improved Scroll of Resurrection, Parts of Enchantment Scrolls Chest, Fishing kit chest, My Teleport to the Base Package, Blade Spirit, Spellbook Box. (Can be used only once per day.) Cannot be exchanged, dropped, destroyed, or sold. Can be stored in a private warehouse. -->
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/items/49800-49899.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/items/49800-49899.xml
index 5ca932ae11..74fd0d62bf 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/items/49800-49899.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/items/49800-49899.xml
@@ -678,6 +678,10 @@
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="time" val="10080" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39199" level="1" /> <!-- Hero's Wondrous Cubic -->
+		</skills>
 	</item>
 	<item id="49861" name="Life Stone - Tester" additionalName="Tester" type="EtcItem">
 		<!-- Tester -->
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/18100-18199.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/18100-18199.xml
index 382309e159..20a6f078db 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/18100-18199.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/18100-18199.xml
@@ -417,7 +417,7 @@
 		<acquire exp="5695973" sp="85439" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -444,7 +444,7 @@
 		<acquire exp="5977531" sp="89662" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -472,7 +472,7 @@
 		<acquire exp="6185394" sp="92780" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20136.294068333" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -501,7 +501,7 @@
 		<acquire exp="6382637" sp="95739" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="19725.349291429" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -530,7 +530,7 @@
 		<acquire exp="2334831" sp="35022" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -556,7 +556,7 @@
 		<acquire exp="2345235" sp="35178" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -582,7 +582,7 @@
 		<acquire exp="2351087" sp="35266" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -608,7 +608,7 @@
 		<acquire exp="2345235" sp="35178" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -633,7 +633,7 @@
 		<acquire exp="2282377" sp="34235" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1328,7 +1328,7 @@
 		<acquire exp="2796075" sp="41941" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="22" />
@@ -1353,7 +1353,7 @@
 		<acquire exp="2796075" sp="41941" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="22" />
@@ -1556,7 +1556,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -1583,7 +1583,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -1610,7 +1610,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -1637,7 +1637,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/18200-18299.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/18200-18299.xml
index 96d0ef735d..08d34f1a21 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/18200-18299.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/18200-18299.xml
@@ -6,7 +6,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -33,7 +33,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -60,7 +60,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -87,7 +87,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -114,7 +114,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -141,7 +141,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -168,7 +168,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -195,7 +195,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -222,7 +222,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -249,7 +249,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -276,7 +276,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -303,7 +303,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -606,7 +606,7 @@
 		<acquire exp="2979228" sp="44688" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="70" />
@@ -631,7 +631,7 @@
 		<acquire exp="2979228" sp="44688" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="70" />
@@ -656,7 +656,7 @@
 		<acquire exp="2979228" sp="44688" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="70" />
@@ -681,7 +681,7 @@
 		<acquire exp="2979228" sp="44688" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="70" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20000-20099.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20000-20099.xml
index 63006e3b2f..51cd8c6ec4 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20000-20099.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20000-20099.xml
@@ -7,7 +7,7 @@
 		<acquire exp="30" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="20" />
@@ -84,7 +84,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -136,7 +136,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="60" />
@@ -188,7 +188,7 @@
 		<acquire exp="310" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="60" />
@@ -246,7 +246,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -5386,7 +5386,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -5442,7 +5442,7 @@
 		<acquire exp="441" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -5542,7 +5542,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20100-20199.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20100-20199.xml
index 18ac599ad5..ac592a769e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20100-20199.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20100-20199.xml
@@ -1135,7 +1135,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -1179,7 +1179,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="50" />
@@ -1229,7 +1229,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -1281,7 +1281,7 @@
 		<acquire exp="309" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -4346,7 +4346,7 @@
 		<acquire exp="1882" sp="57" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="636.798" hpRegen="3.5" mp="365.715" mpRegen="1.5" />
-			<attack physical="92.64226" magical="63.26266" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="92.64226" magical="63.26266" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.46427" magical="86.68702" />
 			<speed>
 				<walk ground="35" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20200-20299.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20200-20299.xml
index 7344709fa0..043dc1b0f7 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20200-20299.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20200-20299.xml
@@ -4066,7 +4066,7 @@
 		<acquire exp="2009" sp="61" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="670.347" hpRegen="4.5" mp="381.969" mpRegen="1.8" />
-			<attack physical="99.21986" magical="67.7543" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="99.21986" magical="67.7543" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="121.98819" magical="89.26566" />
 			<speed>
 				<walk ground="80" />
@@ -4133,7 +4133,7 @@
 		<acquire exp="2141" sp="65" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="705.162" hpRegen="4.5" mp="398.223" mpRegen="1.8" />
-			<attack physical="106.16525" magical="72.49711" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="106.16525" magical="72.49711" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="125.57727" magical="91.89199" />
 			<speed>
 				<walk ground="45" />
@@ -4201,7 +4201,7 @@
 		<acquire exp="2417" sp="73" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="777.324" hpRegen="4.5" mp="430.731" mpRegen="1.8" />
-			<attack physical="121.20802" magical="82.76936" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="121.20802" magical="82.76936" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="132.9486" magical="97.28601" />
 			<speed>
 				<walk ground="50" />
@@ -4267,7 +4267,7 @@
 		<acquire exp="2582" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="815.304" hpRegen="4.5" mp="446.985" mpRegen="1.8" />
-			<attack physical="129.32896" magical="88.31491" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="129.32896" magical="88.31491" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="136.72948" magical="100.0527" />
 			<speed>
 				<walk ground="80" />
@@ -4338,7 +4338,7 @@
 		<acquire exp="2295" sp="69" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="739.977" hpRegen="4.5" mp="413.574" mpRegen="1.8" />
-			<attack physical="113.49065" magical="77.49941" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="113.49065" magical="77.49941" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="129.23095" magical="94.5656" />
 			<speed>
 				<walk ground="80" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20300-20399.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20300-20399.xml
index a3d64dedb4..df6ebc20aa 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20300-20399.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20300-20399.xml
@@ -512,7 +512,7 @@
 		<acquire exp="266" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="60" />
@@ -569,7 +569,7 @@
 		<acquire exp="310" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="60" />
@@ -625,7 +625,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
@@ -808,7 +808,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="24" />
@@ -897,7 +897,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1002,7 +1002,7 @@
 		<acquire exp="441" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -1056,7 +1056,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -1158,7 +1158,7 @@
 		<acquire exp="441" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -1214,7 +1214,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1266,7 +1266,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -1316,7 +1316,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1527,7 +1527,7 @@
 		<acquire exp="454" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1733,7 +1733,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -2059,7 +2059,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="50" />
@@ -3004,7 +3004,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3225,7 +3225,7 @@
 		<acquire exp="354" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="70" />
@@ -3570,7 +3570,7 @@
 		<acquire exp="452" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3826,7 +3826,7 @@
 		<acquire exp="691" sp="21" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="86.088" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -3883,7 +3883,7 @@
 		<acquire exp="183" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="40" />
@@ -4103,7 +4103,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -4267,7 +4267,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -4317,7 +4317,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20400-20499.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20400-20499.xml
index 05f9fbee6e..3a04f0c0f8 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20400-20499.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20400-20499.xml
@@ -1286,7 +1286,7 @@
 		<acquire exp="439" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1350,7 +1350,7 @@
 		<acquire exp="292" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1579,7 +1579,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
@@ -2063,7 +2063,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="24" />
@@ -2230,7 +2230,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -2282,7 +2282,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -2333,7 +2333,7 @@
 		<acquire exp="309" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -2733,7 +2733,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -3324,7 +3324,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -3374,7 +3374,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -3426,7 +3426,7 @@
 		<acquire exp="309" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -3477,7 +3477,7 @@
 		<acquire exp="439" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3706,7 +3706,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -3810,7 +3810,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="24" />
@@ -3971,7 +3971,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
@@ -4029,7 +4029,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20500-20599.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20500-20599.xml
index 22fa4645b6..d012045b96 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20500-20599.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20500-20599.xml
@@ -1348,7 +1348,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -1555,7 +1555,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1602,7 +1602,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1647,7 +1647,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1874,7 +1874,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1919,7 +1919,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1964,7 +1964,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2009,7 +2009,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2276,7 +2276,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2326,7 +2326,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20700-20799.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20700-20799.xml
index ac4b14646e..b293a6a65a 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20700-20799.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20700-20799.xml
@@ -3575,7 +3575,7 @@
 		<acquire exp="46335" sp="1390" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1380.32124" hpRegen="8.5" mp="2629.335" mpRegen="3" />
-			<attack physical="469.5384" magical="416.6452173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="469.5384" magical="416.6452173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="958.284" magical="1597.14" />
 			<speed>
 				<walk ground="25" />
@@ -3624,7 +3624,7 @@
 		<acquire exp="50337" sp="1510" attributeExp="770" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.99191" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.131" magical="1641.885" />
 			<speed>
 				<walk ground="25" />
@@ -3672,7 +3672,7 @@
 		<acquire exp="88472" sp="2654" attributeExp="770" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.99191" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.131" magical="1641.885" />
 			<speed>
 				<walk ground="25" />
@@ -3725,7 +3725,7 @@
 		<acquire exp="91880" sp="2756" attributeExp="858" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.72623" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="488.6718" magical="433.67086956522" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="488.6718" magical="433.67086956522" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="997.443" magical="1662.405" />
 			<speed>
 				<walk ground="25" />
@@ -3777,7 +3777,7 @@
 		<acquire exp="93340" sp="2800" attributeExp="858" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.849385" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="488.7117" magical="433.70804347826" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="488.7117" magical="433.70804347826" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="997.5285" magical="1662.5475" />
 			<speed>
 				<walk ground="35" />
@@ -3827,7 +3827,7 @@
 		<acquire exp="96610" sp="2898" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1009.413" magical="1682.355" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20800-20899.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20800-20899.xml
index 293263d1a3..d4a1c92a6f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20800-20899.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20800-20899.xml
@@ -17,7 +17,7 @@
 		<acquire exp="131997" sp="3959" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2423.3825125" hpRegen="8.5" mp="3104.58" mpRegen="3" />
-			<attack physical="808.61705" magical="731.48967391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="808.61705" magical="731.48967391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1682.42625" magical="2804.04375" />
 			<speed>
 				<walk ground="70" />
@@ -65,7 +65,7 @@
 		<acquire exp="136896" sp="4106" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2827.269335" hpRegen="8.5" mp="3415.215" mpRegen="3" />
-			<attack physical="939.4691" magical="853.40152173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="939.4691" magical="853.40152173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1962.8235" magical="3271.3725" />
 			<speed>
 				<walk ground="60" />
@@ -117,7 +117,7 @@
 		<acquire exp="168844" sp="5065" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="4120.56" mpRegen="3" />
-			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2103.00075" magical="3505.00125" />
 			<speed>
 				<walk ground="45" />
@@ -169,7 +169,7 @@
 		<acquire exp="190141" sp="5704" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2940.744352" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2041.6032" magical="3402.672" />
 			<speed>
 				<walk ground="80" />
@@ -3393,7 +3393,7 @@
 		<acquire exp="141914" sp="4257" attributeExp="1134" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.5997675" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1701.32175" magical="2835.53625" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20900-20999.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20900-20999.xml
index 3f2c73ee05..ca001c8469 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20900-20999.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/20900-20999.xml
@@ -5167,7 +5167,7 @@
 		<acquire exp="187075" sp="5612" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="3104.58" mpRegen="3" />
-			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2041.6032" magical="3402.672" />
 			<speed>
 				<walk ground="45" />
@@ -5217,7 +5217,7 @@
 		<equipment rhand="94" /> <!-- Bec de Corbin -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="3104.58" mpRegen="3" />
-			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2103.00075" magical="3505.00125" />
 			<speed>
 				<walk ground="80" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/21300-21399.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/21300-21399.xml
index 4cc4720c86..519d36f076 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/21300-21399.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/21300-21399.xml
@@ -6,7 +6,7 @@
 		<acquire exp="680551" sp="10208" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -51,7 +51,7 @@
 		<acquire exp="1355598" sp="20333" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/21400-21499.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/21400-21499.xml
index 48d5edfae6..d706dd826e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/21400-21499.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/21400-21499.xml
@@ -6,7 +6,7 @@
 		<acquire exp="993837" sp="14907" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -53,7 +53,7 @@
 		<acquire exp="1943222" sp="29148" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -78,7 +78,7 @@
 		<acquire exp="993837" sp="14907" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="37" />
@@ -125,7 +125,7 @@
 		<acquire exp="1980478" sp="29707" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="37" />
@@ -152,7 +152,7 @@
 		<acquire exp="993837" sp="14907" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -199,7 +199,7 @@
 		<acquire exp="1980478" sp="29707" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -227,7 +227,7 @@
 		<acquire exp="691558" sp="10373" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="40" />
@@ -268,7 +268,7 @@
 		<acquire exp="1375920" sp="20638" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="40" />
@@ -295,7 +295,7 @@
 		<acquire exp="708492" sp="10627" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="50" />
@@ -339,7 +339,7 @@
 		<acquire exp="1387139" sp="20807" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="50" />
@@ -367,7 +367,7 @@
 		<acquire exp="1010772" sp="15161" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -410,7 +410,7 @@
 		<acquire exp="1991697" sp="29875" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -439,7 +439,7 @@
 		<acquire exp="993837" sp="14907" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="37" />
@@ -480,7 +480,7 @@
 		<acquire exp="1980478" sp="29707" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="37" />
@@ -508,7 +508,7 @@
 		<acquire exp="758237" sp="11373" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="80" />
@@ -548,7 +548,7 @@
 		<acquire exp="1397934" sp="20969" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="80" />
@@ -575,7 +575,7 @@
 		<acquire exp="789989" sp="11849" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="39" />
@@ -617,7 +617,7 @@
 		<acquire exp="1442599" sp="21638" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="39" />
@@ -646,7 +646,7 @@
 		<acquire exp="705317" sp="10579" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="27" />
@@ -686,7 +686,7 @@
 		<acquire exp="1388620" sp="20829" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="27" />
@@ -713,7 +713,7 @@
 		<acquire exp="1330194" sp="19952" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="41" />
@@ -750,7 +750,7 @@
 		<acquire exp="2640882" sp="39613" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="41" />
@@ -776,7 +776,7 @@
 		<acquire exp="767945" sp="11519" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="80" />
@@ -816,7 +816,7 @@
 		<acquire exp="1430983" sp="21464" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="80" />
@@ -843,7 +843,7 @@
 		<acquire exp="1059474" sp="15892" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="41" />
@@ -881,7 +881,7 @@
 		<acquire exp="2076464" sp="31146" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="41" />
@@ -907,7 +907,7 @@
 		<acquire exp="1059474" sp="15892" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -945,7 +945,7 @@
 		<acquire exp="2076464" sp="31146" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -971,7 +971,7 @@
 		<acquire exp="1357938" sp="20369" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -1010,7 +1010,7 @@
 		<acquire exp="2673394" sp="40100" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -1038,7 +1038,7 @@
 		<acquire exp="1452658" sp="21789" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="35" />
@@ -1077,7 +1077,7 @@
 		<acquire exp="2697670" sp="40465" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="35" />
@@ -1103,7 +1103,7 @@
 		<acquire exp="2878656" sp="43179" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1146,7 +1146,7 @@
 		<acquire exp="2669276" sp="40039" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1188,7 +1188,7 @@
 		<acquire exp="3792041" sp="56880" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -1229,7 +1229,7 @@
 		<acquire exp="1701921" sp="25528" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="39" />
@@ -1270,7 +1270,7 @@
 		<acquire exp="1701921" sp="25528" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="39" />
@@ -1310,7 +1310,7 @@
 		<acquire exp="2056090" sp="30841" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1336,7 +1336,7 @@
 		<acquire exp="702678" sp="10540" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="16911.39829" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="40" />
@@ -1360,7 +1360,7 @@
 		<acquire exp="702678" sp="10540" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="16911.39829" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="40" />
@@ -1383,7 +1383,7 @@
 		<acquire exp="702678" sp="10540" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="16911.39829" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="15" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/21600-21699.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/21600-21699.xml
index f7b5096ea3..6d2f41db0f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/21600-21699.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/21600-21699.xml
@@ -2716,7 +2716,7 @@
 		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
-			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="22" />
@@ -2773,7 +2773,7 @@
 		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
-			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="60" />
@@ -2810,7 +2810,7 @@
 		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
-			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="80" />
@@ -2858,7 +2858,7 @@
 		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
-			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="80" />
@@ -2905,7 +2905,7 @@
 		<acquire exp="2711" sp="82" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1201.434" hpRegen="5.5" mp="650.16" mpRegen="2.1" />
-			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="173.43552" magical="126.91259" />
 			<speed>
 				<walk ground="100" />
@@ -2954,7 +2954,7 @@
 		<acquire exp="2835" sp="86" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1248.276" hpRegen="5.5" mp="679.056" mpRegen="2.1" />
-			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="177.78746" magical="130.09715" />
 			<speed>
 				<walk ground="45" />
@@ -3003,7 +3003,7 @@
 		<acquire exp="2963" sp="89" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1297.017" hpRegen="5.5" mp="708.855" mpRegen="2.1" />
-			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="182.18816" magical="133.31739" />
 			<speed>
 				<walk ground="80" />
@@ -3052,7 +3052,7 @@
 		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
-			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="27" />
@@ -3101,7 +3101,7 @@
 		<acquire exp="3226" sp="97" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1396.398" hpRegen="5.5" mp="770.259" mpRegen="2.1" />
-			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="191.12803" magical="139.8592" />
 			<speed>
 				<walk ground="60" />
@@ -3145,7 +3145,7 @@
 		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
-			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="80" />
@@ -3232,7 +3232,7 @@
 		<acquire exp="3362" sp="101" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1447.038" hpRegen="5.5" mp="800.961" mpRegen="2.1" />
-			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="195.66302" magical="143.17771" />
 			<speed>
 				<walk ground="70" />
@@ -3630,7 +3630,7 @@
 		<acquire exp="124807" sp="3744" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2423.3825125" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="808.61705" magical="731.48967391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="808.61705" magical="731.48967391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1682.42625" magical="2804.04375" />
 			<speed>
 				<walk ground="25" />
@@ -3679,7 +3679,7 @@
 		<acquire exp="127803" sp="3834" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2103.00075" magical="3505.00125" />
 			<attribute>
 				<attack type="FIRE" value="100" />
@@ -3727,7 +3727,7 @@
 		<acquire exp="163526" sp="4905" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="3104.58" mpRegen="3" />
-			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2103.00075" magical="3505.00125" />
 			<speed>
 				<walk ground="25" />
@@ -3768,7 +3768,7 @@
 		<acquire exp="168076" sp="5042" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2908.034384" hpRegen="8.5" mp="3415.215" mpRegen="3" />
-			<attack physical="965.63552" magical="877.78017391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="965.63552" magical="877.78017391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2018.8944" magical="3364.824" />
 			<speed>
 				<walk ground="37" />
@@ -3809,7 +3809,7 @@
 		<acquire exp="172838" sp="5185" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2908.034384" hpRegen="8.5" mp="3415.215" mpRegen="3" />
-			<attack physical="965.63552" magical="877.78017391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="965.63552" magical="877.78017391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2018.8944" magical="3364.824" />
 			<speed>
 				<walk ground="45" />
@@ -3851,7 +3851,7 @@
 		<acquire exp="206169" sp="6185" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2827.269335" hpRegen="8.5" mp="3753.285" mpRegen="3" />
-			<attack physical="939.4691" magical="853.40152173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="939.4691" magical="853.40152173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1962.8235" magical="3271.3725" />
 			<speed>
 				<walk ground="45" />
@@ -3894,7 +3894,7 @@
 		<acquire exp="178288" sp="5348" attributeExp="1134" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.5997675" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1701.32175" magical="2835.53625" />
 			<speed>
 				<walk ground="40" />
@@ -3936,7 +3936,7 @@
 		<acquire exp="181044" sp="5431" attributeExp="1134" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3063.234315" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1016.2039" magical="924.62673913043" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1016.2039" magical="924.62673913043" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2126.6415" magical="3544.4025" />
 			<speed>
 				<walk ground="80" />
@@ -3973,7 +3973,7 @@
 		<acquire exp="172383" sp="5171" attributeExp="1134" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.5997675" hpRegen="8.5" mp="3828.51" mpRegen="3" />
-			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1701.32175" magical="2835.53625" />
 			<speed>
 				<walk ground="70" />
@@ -4006,7 +4006,7 @@
 		<acquire exp="222900" sp="6687" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2940.744352" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2041.6032" magical="3402.672" />
 			<speed>
 				<walk ground="23" />
@@ -4048,7 +4048,7 @@
 		<acquire exp="227862" sp="6835" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2859.043325" hpRegen="8.5" mp="3166.53" mpRegen="3" />
-			<attack physical="950.0497" magical="862.99239130435" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="950.0497" magical="862.99239130435" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1984.8825" magical="3308.1375" />
 			<speed>
 				<walk ground="13" />
@@ -4090,7 +4090,7 @@
 		<acquire exp="222497" sp="6674" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2859.043325" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="950.0497" magical="862.99239130435" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="950.0497" magical="862.99239130435" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1984.8825" magical="3308.1375" />
 			<attribute>
 				<attack type="DARK" value="100" />
@@ -4134,7 +4134,7 @@
 		<acquire exp="40651" sp="1219" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1380.32124" hpRegen="8.5" mp="2629.335" mpRegen="3" />
-			<attack physical="469.5384" magical="416.6452173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="469.5384" magical="416.6452173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="958.284" magical="1597.14" />
 			<attribute>
 				<attack type="DARK" value="100" />
@@ -4174,7 +4174,7 @@
 		<acquire exp="79188" sp="2375" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1399.77973" hpRegen="8.5" mp="2683.32" mpRegen="3" />
-			<attack physical="476.129" magical="422.51869565217" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="476.129" magical="422.51869565217" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="971.793" magical="1619.655" />
 			<speed>
 				<walk ground="37" />
@@ -4201,7 +4201,7 @@
 		<acquire exp="82030" sp="2460" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.868755" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="482.5999" magical="428.28065217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.5999" magical="428.28065217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.0455" magical="1641.7425" />
 			<speed>
 				<walk ground="41" />
@@ -4229,7 +4229,7 @@
 		<acquire exp="52115" sp="1563" attributeExp="770" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.99191" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.131" magical="1641.885" />
 			<speed>
 				<walk ground="35" />
@@ -4275,7 +4275,7 @@
 		<acquire exp="50479" sp="1514" attributeExp="770" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.72623" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="488.6718" magical="433.67086956522" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="488.6718" magical="433.67086956522" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="997.443" magical="1662.405" />
 			<speed>
 				<walk ground="57" />
@@ -4439,7 +4439,7 @@
 		<acquire exp="94946" sp="2848" attributeExp="858" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.849385" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="482.5999" magical="428.28065217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.5999" magical="428.28065217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.0455" magical="1641.7425" />
 			<speed>
 				<walk ground="41" />
@@ -4467,7 +4467,7 @@
 		<acquire exp="95603" sp="2868" attributeExp="858" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1009.413" magical="1682.355" />
 			<speed>
 				<walk ground="57" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/21700-21799.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/21700-21799.xml
index 9ca5fe87cf..5d10dcf155 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/21700-21799.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/21700-21799.xml
@@ -1278,7 +1278,7 @@
 		<acquire exp="266169" sp="7186" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.9098066667" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="60" />
@@ -1381,7 +1381,7 @@
 		<acquire exp="1772332" sp="47852" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2758.7130516667" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="60" />
@@ -2511,7 +2511,7 @@
 		<acquire exp="240547" sp="7216" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1009.413" magical="1682.355" />
 			<speed>
 				<walk ground="39" />
@@ -2543,7 +2543,7 @@
 		<acquire exp="374272" sp="11228" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.6202933333" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="817.728" magical="739.71130434783" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="817.728" magical="739.71130434783" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1701.336" magical="2835.56" />
 			<speed>
 				<walk ground="13" />
@@ -2957,7 +2957,7 @@
 		<acquire exp="101142" sp="3034" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2423.44409" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="54" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/24000-24099.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/24000-24099.xml
index a6398ea53b..4af39f870f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/24000-24099.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/24000-24099.xml
@@ -441,7 +441,7 @@
 		<acquire exp="39238" sp="1177" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1360.493285" hpRegen="8.5" mp="2574.465" mpRegen="3" />
-			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="328.27073" magical="240.21427" />
 			<speed>
 				<walk ground="27" />
@@ -704,7 +704,7 @@
 		<acquire exp="129880" sp="3896" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1360.493285" hpRegen="8.5" mp="2574.465" mpRegen="3" />
-			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="328.27073" magical="240.21427" />
 			<speed>
 				<walk ground="27" />
@@ -1595,7 +1595,7 @@
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="314.65987" magical="230.25444" />
 			<hitTime>840</hitTime>
 		</stats>
@@ -1614,7 +1614,7 @@
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1620.4119125" hpRegen="8.5" mp="2412.51" mpRegen="3" />
-			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="314.65987" magical="230.25444" />
 			<speed>
 				<walk ground="30" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/25200-25299.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/25200-25299.xml
index 3c54a67870..3d9f24090c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/25200-25299.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/25200-25299.xml
@@ -3964,7 +3964,7 @@
 		<acquire exp="1008600000" sp="30258000" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="53409375" hpRegen="319.2293199" mp="31191.426" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="45" />
@@ -4175,7 +4175,7 @@
 		<acquire exp="1008600000" sp="30258000" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="53409375" hpRegen="319.2293199" mp="31191.426" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/25700-25799.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/25700-25799.xml
index 3df491abfe..dc25ffa9dd 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/25700-25799.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/25700-25799.xml
@@ -72,7 +72,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="45" />
@@ -134,7 +134,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="50" />
@@ -235,7 +235,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="30" />
@@ -296,7 +296,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="90" />
@@ -357,7 +357,7 @@
 		<acquire exp="52925400" sp="1587762" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="420467.42646" hpRegen="178.4276342" mp="515402.76" mpRegen="2.4" />
-			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1495.843372" magical="729.7418166" />
 			<speed>
 				<walk ground="60" />
@@ -401,7 +401,7 @@
 		<acquire exp="52925400" sp="1587762" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="420467.42646" hpRegen="178.4276342" mp="515402.76" mpRegen="2.4" />
-			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1495.843372" magical="729.7418166" />
 			<speed>
 				<walk ground="24" />
@@ -444,7 +444,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="50" />
@@ -508,7 +508,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="40" />
@@ -572,7 +572,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="50" />
@@ -636,7 +636,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="60" />
@@ -701,7 +701,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="60" />
@@ -766,7 +766,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="40" />
@@ -870,7 +870,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="13" />
@@ -913,7 +913,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="39" />
@@ -956,7 +956,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="80" />
@@ -999,7 +999,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="39" />
@@ -1042,7 +1042,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="50" />
@@ -1085,7 +1085,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="60" />
@@ -1128,7 +1128,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="25" />
@@ -1171,7 +1171,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="45" />
@@ -1215,7 +1215,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="79" />
@@ -1258,7 +1258,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="60" />
@@ -1341,7 +1341,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="45" />
@@ -1416,7 +1416,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="52" />
@@ -1491,7 +1491,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="38" />
@@ -1566,7 +1566,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="40" />
@@ -1642,7 +1642,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="30" />
@@ -1737,7 +1737,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -1812,7 +1812,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -1887,7 +1887,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -1962,7 +1962,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -2037,7 +2037,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="42" />
@@ -2113,7 +2113,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="48" />
@@ -2208,7 +2208,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="60" />
@@ -2268,7 +2268,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="50" />
@@ -2328,7 +2328,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="50" />
@@ -2388,7 +2388,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="55" />
@@ -2448,7 +2448,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="55" />
@@ -2508,7 +2508,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="55" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/29000-29099.xml
index 1ea7429146..6a9e33738d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/29000-29099.xml
@@ -11,8 +11,8 @@
 		<sex>FEMALE</sex>
 		<acquire exp="2179535" sp="65386" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="214133.04684" hpRegen="85.09694484" mp="509.76" mpRegen="1.8" />
-			<attack physical="105" magical="8" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="386384" hpRegen="208" mp="300.8" mpRegen="2.1" />
+			<attack physical="105" magical="8" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1252" magical="229" />
 			<speed>
 				<walk ground="80" />
@@ -21,11 +21,9 @@
 			<hitTime>370</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4019" level="1" /> <!-- Decrease Speed -->
-			<skill id="4021" level="1" /> <!-- Queen Ant -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -34,8 +32,11 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4021" level="1" /> <!-- Queen Ant -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4017" level="1" /> <!-- Queen Ant's Blow -->
+			<skill id="4018" level="1" /> <!-- Decrease Speed -->
+			<skill id="4019" level="1" /> <!-- Decrease Speed -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -50,115 +51,138 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="851" min="1" max="3" chance="34.67" /> <!-- Onyx Beast's Eye Earring -->
-				<item id="355" min="1" max="1" chance="34.47" /> <!-- Dwarven Chain Mail Shirt -->
-				<item id="2496" min="1" max="1" chance="34.07" /> <!-- Dwarven Chain Shield -->
-				<item id="914" min="1" max="1" chance="33.63" /> <!-- Dark Necklace -->
-				<item id="916" min="1" max="1" chance="33.55" /> <!-- Necklace of Protection -->
-				<item id="882" min="1" max="3" chance="33.34" /> <!-- Mithril Ring -->
-				<item id="852" min="1" max="3" chance="33.11" /> <!-- Moonstone Earring -->
-				<item id="883" min="1" max="3" chance="32.56" /> <!-- Aquastone Ring -->
-				<item id="853" min="1" max="3" chance="32.54" /> <!-- Earring of Protection -->
-				<item id="382" min="1" max="1" chance="32.12" /> <!-- Dwarven Chain Gaiters -->
-				<item id="884" min="1" max="3" chance="31.83" /> <!-- Ring of Protection -->
-				<item id="915" min="1" max="1" chance="31.77" /> <!-- Aquastone Necklace -->
-				<item id="399" min="1" max="1" chance="25.81" /> <!-- Rind Leather Armor -->
-				<item id="500" min="1" max="1" chance="25.63" /> <!-- Great Helmet -->
-				<item id="419" min="1" max="1" chance="24.75" /> <!-- Rind Leather Gaiters -->
-				<item id="440" min="1" max="1" chance="24.04" /> <!-- Robe of Seal -->
-				<item id="6660" min="1" max="1" chance="20.51" /> <!-- Queen Ant's Ring -->
-				<item id="498" min="1" max="3" chance="17.3" /> <!-- Steel Plate Helmet -->
-				<item id="2455" min="1" max="3" chance="17.21" /> <!-- Plated Leather Gloves -->
-				<item id="1126" min="1" max="3" chance="16.7" /> <!-- Crimson Boots -->
-				<item id="398" min="1" max="1" chance="16.59" /> <!-- Plated Leather Armor -->
-				<item id="418" min="1" max="1" chance="16.3" /> <!-- Plated Leather Gaiters -->
-				<item id="632" min="1" max="3" chance="16.2" /> <!-- Knight's Shield -->
-				<item id="1125" min="1" max="3" chance="7.218" /> <!-- Assault Boots -->
-				<item id="2412" min="1" max="3" chance="7.211" /> <!-- Plate Helmet -->
-				<item id="2451" min="1" max="3" chance="7.209" /> <!-- Sage's Worn Gloves -->
-				<item id="2427" min="1" max="3" chance="7.208" /> <!-- Salamander Skin Boots -->
-				<item id="297" min="1" max="1" chance="7.205" /> <!-- Glaive -->
-				<item id="187" min="1" max="1" chance="7.194" /> <!-- Atuba Hammer -->
-				<item id="188" min="1" max="1" chance="7.193" /> <!-- Ghost Staff -->
-				<item id="262" min="1" max="1" chance="7.189" /> <!-- Scallop Jamadhr -->
-				<item id="322" min="1" max="1" chance="7.184" /> <!-- Vajra Wand -->
-				<item id="396" min="1" max="1" chance="7.18" /> <!-- Salamander Skin Mail -->
-				<item id="321" min="1" max="1" chance="7.171" /> <!-- Demon's Fangs -->
-				<item id="225" min="1" max="1" chance="7.15" /> <!-- Mithril Dagger -->
-				<item id="380" min="1" max="1" chance="7.147" /> <!-- Plate Gaiters -->
-				<item id="438" min="1" max="3" chance="7.14" /> <!-- Sage's Rags -->
-				<item id="630" min="1" max="3" chance="7.133" /> <!-- Square Shield -->
-				<item id="61" min="1" max="3" chance="7.123" /> <!-- Mithril Gloves -->
-				<item id="189" min="1" max="1" chance="7.121" /> <!-- Staff of Life -->
-				<item id="2428" min="1" max="3" chance="7.116" /> <!-- Plate Boots -->
-				<item id="159" min="1" max="1" chance="7.114" /> <!-- Bonebreaker -->
-				<item id="320" min="1" max="1" chance="7.111" /> <!-- Blue Crystal Skull -->
-				<item id="190" min="1" max="1" chance="7.101" /> <!-- Atuba Mace -->
-				<item id="280" min="1" max="1" chance="7.1" /> <!-- Light Crossbow -->
-				<item id="2499" min="1" max="1" chance="7.086" /> <!-- Elven Long Sword -->
-				<item id="353" min="1" max="1" chance="7.091" /> <!-- Half Plate Armor -->
-				<item id="70" min="1" max="1" chance="7.088" /> <!-- Claymore -->
-				<item id="607" min="1" max="3" chance="7.086" /> <!-- Ogre Power Gauntlets -->
-				<item id="497" min="1" max="3" chance="7.083" /> <!-- Chain Helmet -->
-				<item id="2494" min="1" max="3" chance="6.983" /> <!-- Plate Shield -->
-				<item id="74" min="1" max="1" chance="6.432" /> <!-- Katana -->
-				<item id="282" min="1" max="1" chance="6.395" /> <!-- Elemental Bow -->
-				<item id="131" min="1" max="1" chance="6.388" /> <!-- Spirit Sword -->
-				<item id="94" min="1" max="1" chance="6.375" /> <!-- Bec de Corbin -->
-				<item id="242" min="1" max="1" chance="6.371" /> <!-- Soulfire Dirk -->
-				<item id="227" min="1" max="1" chance="6.356" /> <!-- Stiletto -->
-				<item id="195" min="1" max="1" chance="6.329" /> <!-- Cursed Staff -->
-				<item id="73" min="1" max="1" chance="6.312" /> <!-- Shamshir -->
-				<item id="325" min="1" max="1" chance="6.307" /> <!-- Horn of Glory -->
-				<item id="285" min="1" max="1" chance="6.301" /> <!-- Noble Elven Bow -->
-				<item id="133" min="1" max="1" chance="6.298" /> <!-- Raid Sword -->
-				<item id="631" min="1" max="3" chance="5.684" /> <!-- Eldarake -->
-				<item id="302" min="1" max="1" chance="5.67" /> <!-- Body Slasher -->
-				<item id="160" min="1" max="1" chance="5.62" /> <!-- Battle Axe -->
-				<item id="62" min="1" max="3" chance="5.618" /> <!-- Reinforced Mithril Boots -->
-				<item id="89" min="1" max="1" chance="5.615" /> <!-- Big Hammer -->
-				<item id="192" min="1" max="1" chance="5.614" /> <!-- Crystal Staff -->
-				<item id="2454" min="1" max="3" chance="5.613" /> <!-- Karmian Gloves -->
-				<item id="2429" min="1" max="3" chance="5.603" /> <!-- Chain Boots -->
-				<item id="2453" min="1" max="3" chance="5.597" /> <!-- Chain Gloves -->
-				<item id="72" min="1" max="1" chance="5.592" /> <!-- Stormbringer -->
-				<item id="263" min="1" max="1" chance="5.585" /> <!-- Chakram -->
-				<item id="2431" min="1" max="3" chance="5.584" /> <!-- Plated Leather Boots -->
-				<item id="2432" min="1" max="3" chance="5.583" /> <!-- Dwarven Chain Boots -->
-				<item id="2430" min="1" max="3" chance="5.58" /> <!-- Karmian Boots -->
-				<item id="226" min="1" max="1" chance="5.578" /> <!-- Cursed Dagger -->
-				<item id="354" min="1" max="1" chance="5.547" /> <!-- Chain Mail Shirt -->
-				<item id="2452" min="1" max="3" chance="5.546" /> <!-- Reinforced Mithril Gloves -->
-				<item id="439" min="1" max="1" chance="5.545" /> <!-- Karmian Tunic -->
-				<item id="2433" min="1" max="3" chance="5.543" /> <!-- Boots of Seal -->
-				<item id="397" min="1" max="1" chance="5.542" /> <!-- Reinforced Mithril Shirt -->
-				<item id="71" min="1" max="1" chance="5.539" /> <!-- Flamberge -->
-				<item id="298" min="1" max="1" chance="5.538" /> <!-- Orcish Glaive -->
-				<item id="230" min="1" max="1" chance="5.531" /> <!-- Needle Wolverine -->
-				<item id="281" min="1" max="1" chance="5.53" /> <!-- Crystallized Ice Bow -->
-				<item id="471" min="1" max="1" chance="5.528" /> <!-- Karmian Stockings -->
-				<item id="193" min="1" max="1" chance="5.523" /> <!-- Stick of Faith -->
-				<item id="232" min="1" max="1" chance="5.522" /> <!-- Dark Elven Dagger -->
-				<item id="96" min="1" max="1" chance="5.521" /> <!-- Scythe -->
-				<item id="161" min="1" max="1" chance="5.521" /> <!-- Silver Axe -->
-				<item id="2495" min="1" max="3" chance="5.497" /> <!-- Chain Shield -->
-				<item id="191" min="1" max="1" chance="5.495" /> <!-- Heavy Doom Hammer -->
-				<item id="2387" min="1" max="1" chance="5.491" /> <!-- Reinforced Mithril Gaiters -->
-				<item id="381" min="1" max="1" chance="5.488" /> <!-- Chain Gaiters -->
-				<item id="173" min="1" max="1" chance="5.483" /> <!-- Skull Graver -->
-				<item id="194" min="1" max="1" chance="5.482" /> <!-- Heavy Doom Axe -->
-				<item id="2413" min="1" max="3" chance="5.481" /> <!-- Chain Hood -->
-				<item id="70000" min="76" max="228" chance="100" /> <!-- Sealed Rune - Stage 1 -->
+				<group chance="100">
+					<item id="320" min="1" max="1" chance="7.15" /> <!-- Blue Crystal Skull -->
+					<item id="321" min="1" max="1" chance="7.15" /> <!-- Demon's Fangs -->
+					<item id="70" min="1" max="1" chance="7.15" /> <!-- Claymore -->
+					<item id="159" min="1" max="1" chance="7.15" /> <!-- Bonebreaker -->
+					<item id="187" min="1" max="1" chance="7.15" /> <!-- Atuba Hammer -->
+					<item id="188" min="1" max="1" chance="7.15" /> <!-- Ghost Staff -->
+					<item id="189" min="1" max="1" chance="7.15" /> <!-- Staff of Life -->
+					<item id="190" min="1" max="1" chance="7.15" /> <!-- Atuba Mace -->
+					<item id="225" min="1" max="1" chance="7.15" /> <!-- Mithril Dagger -->
+					<item id="262" min="1" max="1" chance="7.15" /> <!-- Scallop Jamadhr -->
+					<item id="280" min="1" max="1" chance="7.15" /> <!-- Light Crossbow -->
+					<item id="297" min="1" max="1" chance="7.15" /> <!-- Glaive -->
+					<item id="322" min="1" max="1" chance="7.15" /> <!-- Vajra Wand -->
+					<item id="2499" min="1" max="1" chance="7.05" /> <!-- Elven Long Sword -->
+				</group>
+				<group chance="100">
+					<item id="438" min="1" max="3" chance="7.15" /> <!-- Sage's Rags -->
+					<item id="61" min="1" max="3" chance="7.15" /> <!-- Mithril Gloves -->
+					<item id="353" min="1" max="1" chance="7.15" /> <!-- Half Plate Armor -->
+					<item id="380" min="1" max="1" chance="7.15" /> <!-- Plate Gaiters -->
+					<item id="396" min="1" max="1" chance="7.15" /> <!-- Salamander Skin Mail -->
+					<item id="497" min="1" max="3" chance="7.15" /> <!-- Chain Helmet -->
+					<item id="607" min="1" max="3" chance="7.15" /> <!-- Ogre Power Gauntlets -->
+					<item id="630" min="1" max="3" chance="7.15" /> <!-- Square Shield -->
+					<item id="1125" min="1" max="3" chance="7.15" /> <!-- Assault Boots -->
+					<item id="2412" min="1" max="3" chance="7.15" /> <!-- Plate Helmet -->
+					<item id="2427" min="1" max="3" chance="7.15" /> <!-- Salamander Skin Boots -->
+					<item id="2428" min="1" max="3" chance="7.15" /> <!-- Plate Boots -->
+					<item id="2451" min="1" max="3" chance="7.15" /> <!-- Sage's Worn Gloves -->
+					<item id="2494" min="1" max="3" chance="7.05" /> <!-- Plate Shield -->
+				</group>
+				<group chance="100">
+					<item id="851" min="1" max="3" chance="33.33" /> <!-- Onyx Beast's Eye Earring -->
+					<item id="882" min="1" max="3" chance="33.33" /> <!-- Mithril Ring -->
+					<item id="914" min="1" max="1" chance="33.34" /> <!-- Dark Necklace -->
+				</group>
+				<group chance="100">
+					<item id="71" min="1" max="1" chance="5.55" /> <!-- Flamberge -->
+					<item id="72" min="1" max="1" chance="5.55" /> <!-- Stormbringer -->
+					<item id="89" min="1" max="1" chance="5.55" /> <!-- Big Hammer -->
+					<item id="96" min="1" max="1" chance="5.55" /> <!-- Scythe -->
+					<item id="160" min="1" max="1" chance="5.55" /> <!-- Battle Axe -->
+					<item id="161" min="1" max="1" chance="5.55" /> <!-- Silver Axe -->
+					<item id="173" min="1" max="1" chance="5.55" /> <!-- Skull Graver -->
+					<item id="191" min="1" max="1" chance="5.55" /> <!-- Heavy Doom Hammer -->
+					<item id="192" min="1" max="1" chance="5.55" /> <!-- Crystal Staff -->
+					<item id="193" min="1" max="1" chance="5.55" /> <!-- Stick of Faith -->
+					<item id="194" min="1" max="1" chance="5.55" /> <!-- Heavy Doom Axe -->
+					<item id="226" min="1" max="1" chance="5.55" /> <!-- Cursed Dagger -->
+					<item id="230" min="1" max="1" chance="5.55" /> <!-- Needle Wolverine -->
+					<item id="232" min="1" max="1" chance="5.55" /> <!-- Dark Elven Dagger -->
+					<item id="263" min="1" max="1" chance="5.55" /> <!-- Chakram -->
+					<item id="281" min="1" max="1" chance="5.55" /> <!-- Crystallized Ice Bow -->
+					<item id="298" min="1" max="1" chance="5.55" /> <!-- Orcish Glaive -->
+					<item id="302" min="1" max="1" chance="5.65" /> <!-- Body Slasher -->
+				</group>
+				<group chance="100">
+					<item id="2387" min="1" max="1" chance="5.55" /> <!-- Reinforced Mithril Gaiters -->
+					<item id="2413" min="1" max="3" chance="5.55" /> <!-- Chain Hood -->
+					<item id="2429" min="1" max="3" chance="5.55" /> <!-- Chain Boots -->
+					<item id="2430" min="1" max="3" chance="5.55" /> <!-- Karmian Boots -->
+					<item id="2431" min="1" max="3" chance="5.55" /> <!-- Plated Leather Boots -->
+					<item id="2432" min="1" max="3" chance="5.55" /> <!-- Dwarven Chain Boots -->
+					<item id="2433" min="1" max="3" chance="5.55" /> <!-- Boots of Seal -->
+					<item id="2452" min="1" max="3" chance="5.55" /> <!-- Reinforced Mithril Gloves -->
+					<item id="2453" min="1" max="3" chance="5.55" /> <!-- Chain Gloves -->
+					<item id="2454" min="1" max="3" chance="5.55" /> <!-- Karmian Gloves -->
+					<item id="2495" min="1" max="3" chance="5.55" /> <!-- Chain Shield -->
+					<item id="62" min="1" max="3" chance="5.55" /> <!-- Reinforced Mithril Boots -->
+					<item id="354" min="1" max="1" chance="5.55" /> <!-- Chain Mail Shirt -->
+					<item id="381" min="1" max="1" chance="5.55" /> <!-- Chain Gaiters -->
+					<item id="397" min="1" max="1" chance="5.55" /> <!-- Reinforced Mithril Shirt -->
+					<item id="439" min="1" max="1" chance="5.55" /> <!-- Karmian Tunic -->
+					<item id="471" min="1" max="1" chance="5.55" /> <!-- Karmian Stockings -->
+					<item id="631" min="1" max="3" chance="5.65" /> <!-- Eldarake -->
+				</group>
+				<group chance="100">
+					<item id="852" min="1" max="3" chance="33.33" /> <!-- Moonstone Earring -->
+					<item id="883" min="1" max="3" chance="33.33" /> <!-- Aquastone Ring -->
+					<item id="915" min="1" max="1" chance="33.34" /> <!-- Aquastone Necklace -->
+				</group>
+				<group chance="70">
+					<item id="73" min="1" max="1" chance="9.09" /> <!-- Shamshir -->
+					<item id="74" min="1" max="1" chance="9.09" /> <!-- Katana -->
+					<item id="94" min="1" max="1" chance="9.09" /> <!-- Bec de Corbin -->
+					<item id="131" min="1" max="1" chance="9.09" /> <!-- Spirit Sword -->
+					<item id="133" min="1" max="1" chance="9.09" /> <!-- Raid Sword -->
+					<item id="195" min="1" max="1" chance="9.09" /> <!-- Cursed Staff -->
+					<item id="227" min="1" max="1" chance="9.09" /> <!-- Stiletto -->
+					<item id="242" min="1" max="1" chance="9.09" /> <!-- Soulfire Dirk -->
+					<item id="282" min="1" max="1" chance="9.09" /> <!-- Elemental Bow -->
+					<item id="285" min="1" max="1" chance="9.09" /> <!-- Noble Elven Bow -->
+					<item id="325" min="1" max="1" chance="9.1" /> <!-- Horn of Glory -->
+				</group>
+				<group chance="100">
+					<item id="355" min="1" max="1" chance="33.33" /> <!-- Dwarven Chain Mail Shirt -->
+					<item id="382" min="1" max="1" chance="33.33" /> <!-- Dwarven Chain Gaiters -->
+					<item id="2496" min="1" max="1" chance="33.34" /> <!-- Dwarven Chain Shield -->
+				</group>
+				<group chance="100">
+					<item id="399" min="1" max="1" chance="25" /> <!-- Rind Leather Armor -->
+					<item id="419" min="1" max="1" chance="25" /> <!-- Rind Leather Gaiters -->
+					<item id="440" min="1" max="1" chance="25" /> <!-- Robe of Seal -->
+					<item id="500" min="1" max="1" chance="25" /> <!-- Great Helmet -->
+				</group>
+				<group chance="100">
+					<item id="632" min="1" max="3" chance="16.66" /> <!-- Knight's Shield -->
+					<item id="1126" min="1" max="3" chance="16.66" /> <!-- Crimson Boots -->
+					<item id="498" min="1" max="3" chance="16.66" /> <!-- Steel Plate Helmet -->
+					<item id="398" min="1" max="1" chance="16.66" /> <!-- Plated Leather Armor -->
+					<item id="418" min="1" max="1" chance="16.66" /> <!-- Plated Leather Gaiters -->
+					<item id="2455" min="1" max="3" chance="16.7" /> <!-- Plated Leather Gloves -->
+				</group>
+				<group chance="100">
+					<item id="853" min="1" max="3" chance="33.33" /> <!-- Earring of Protection -->
+					<item id="884" min="1" max="3" chance="33.33" /> <!-- Ring of Protection -->
+					<item id="916" min="1" max="1" chance="33.34" /> <!-- Necklace of Protection -->
+				</group>
+				<group chance="20">
+					<item id="6660" min="1" max="1" chance="100" /> <!-- Queen Ant's Ring -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29002" level="29" type="Monster" name="Queen Ant Larva">
+	<npc id="29002" level="38" type="Monster" name="Queen Ant Larva">
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="591" hpRegen="3.5" mp="315" mpRegen="1.5" />
-			<attack physical="89.21" magical="59.01" random="30" critical="7" accuracy="40" attackSpeed="257" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="591.9" hpRegen="3.5" mp="315.1" mpRegen="1.5" />
+			<attack physical="89.21" magical="59.01" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.72" magical="84.16" />
 			<speed>
 				<walk ground="40" />
@@ -167,9 +191,9 @@
 			<hitTime>350</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="true" />
+		<status attackable="true" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -178,7 +202,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="4500" aggroRange="450">
@@ -195,9 +219,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4000" hpRegen="108" mp="402" mpRegen="1.8" />
-			<attack physical="637" magical="395" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="4000" hpRegen="108" mp="402.6" mpRegen="1.8" />
+			<attack physical="637" magical="395" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="547" magical="200" />
 			<speed>
 				<walk ground="40" />
@@ -206,9 +230,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -217,7 +241,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4020" level="1" /> <!-- Recovery -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
@@ -240,9 +264,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4343" hpRegen="115" mp="432" mpRegen="1.8" />
-			<attack physical="178" magical="27" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="4343" hpRegen="115" mp="432.7" mpRegen="1.8" />
+			<attack physical="178" magical="27" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="578" magical="211" />
 			<speed>
 				<walk ground="40" />
@@ -251,9 +275,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -262,7 +286,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="700" isAggressive="true">
@@ -284,9 +308,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="7051" hpRegen="122" mp="463" mpRegen="1.8" />
-			<attack physical="1190" magical="1074" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="7051" hpRegen="122" mp="463.3" mpRegen="1.8" />
+			<attack physical="1190" magical="1074" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="610" magical="223" />
 			<speed>
 				<walk ground="40" />
@@ -295,9 +319,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -306,7 +330,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="700" aggroRange="450">
@@ -331,18 +355,19 @@
 		<sex>MALE</sex>
 		<acquire exp="2041407" sp="61242" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="289902.43642" hpRegen="145.2219912" mp="2901.03" mpRegen="2.1" />
-			<attack physical="722.31" magical="1398.68" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="523103.852" hpRegen="441.65" mp="1708.8" mpRegen="20" />
+			<attack physical="722.31" magical="1398.68" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1602" magical="293" />
 			<speed>
 				<walk ground="50" />
 				<run ground="110" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -351,7 +376,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>10</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -366,82 +391,107 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="608" min="1" max="3" chance="34.99" /> <!-- Mithril Gauntlets -->
-				<item id="854" min="1" max="3" chance="33.46" /> <!-- Earring of Seal -->
-				<item id="1127" min="1" max="3" chance="33.3" /> <!-- Forgotten Boots -->
-				<item id="885" min="1" max="3" chance="32.95" /> <!-- Ring of Ages -->
-				<item id="917" min="1" max="1" chance="32.52" /> <!-- Necklace of Mermaid -->
-				<item id="1149" min="1" max="3" chance="31.87" /> <!-- Shining Circlet -->
-				<item id="420" min="1" max="1" chance="26.08" /> <!-- Theca Leather Gaiters -->
-				<item id="472" min="1" max="1" chance="25.78" /> <!-- Demon's Stockings -->
-				<item id="400" min="1" max="1" chance="25.47" /> <!-- Theca Leather Armor -->
-				<item id="2460" min="1" max="1" chance="25.23" /> <!-- Theca Leather Gloves -->
-				<item id="2435" min="1" max="1" chance="25.04" /> <!-- Demon's Boots -->
-				<item id="2436" min="1" max="1" chance="24.9" /> <!-- Theca Leather Boots -->
-				<item id="441" min="1" max="1" chance="24.26" /> <!-- Demon's Tunic -->
-				<item id="2459" min="1" max="1" chance="24.03" /> <!-- Demon's Gloves -->
-				<item id="499" min="1" max="3" chance="20.88" /> <!-- Mithril Helmet -->
-				<item id="473" min="1" max="1" chance="20.74" /> <!-- Divine Stockings -->
-				<item id="401" min="1" max="1" chance="20.66" /> <!-- Drake Leather Armor -->
-				<item id="2437" min="1" max="1" chance="20.65" /> <!-- Drake Leather Boots -->
-				<item id="2462" min="1" max="1" chance="20.64" /> <!-- Full Plate Gauntlets -->
-				<item id="103" min="1" max="3" chance="20.48" /> <!-- Tower Shield -->
-				<item id="2468" min="1" max="3" chance="20.26" /> <!-- Blessed Gloves -->
-				<item id="356" min="1" max="1" chance="20.16" /> <!-- Full Plate Armor -->
-				<item id="2414" min="1" max="1" chance="20.08" /> <!-- Full Plate Helmet -->
-				<item id="6662" min="1" max="1" chance="20.05" /> <!-- Ring of Core -->
-				<item id="442" min="1" max="1" chance="19.81" /> <!-- Divine Tunic -->
-				<item id="2497" min="1" max="1" chance="19.76" /> <!-- Full Plate Shield -->
-				<item id="107" min="1" max="3" chance="19.74" /> <!-- Compound Shield -->
-				<item id="2438" min="1" max="1" chance="19.71" /> <!-- Full Plate Boots -->
-				<item id="60" min="1" max="1" chance="19.71" /> <!-- Compound Armor -->
-				<item id="2461" min="1" max="1" chance="19.52" /> <!-- Drake Leather Gloves -->
-				<item id="603" min="1" max="3" chance="19.51" /> <!-- Divine Boots -->
-				<item id="64" min="1" max="1" chance="19.47" /> <!-- Compound Boots -->
-				<item id="1128" min="1" max="3" chance="19.4" /> <!-- Adamantite Boots -->
-				<item id="517" min="1" max="3" chance="19.29" /> <!-- Compound Helmet -->
-				<item id="2463" min="1" max="1" chance="19.28" /> <!-- Divine Gloves -->
-				<item id="119" min="1" max="1" chance="17.35" /> <!-- Necklace of Seal -->
-				<item id="919" min="1" max="1" chance="17.23" /> <!-- Blessed Necklace -->
-				<item id="886" min="1" max="3" chance="17.2" /> <!-- Ring of Seal -->
-				<item id="857" min="1" max="3" chance="16.47" /> <!-- Holy Earring -->
-				<item id="855" min="1" max="3" chance="16.2" /> <!-- Nassen's Earring -->
-				<item id="888" min="1" max="3" chance="16.04" /> <!-- Blessed Ring -->
-				<item id="135" min="1" max="1" chance="11.58" /> <!-- Samurai Long Sword -->
-				<item id="299" min="1" max="1" chance="11.56" /> <!-- Orcish Poleaxe -->
-				<item id="206" min="1" max="1" chance="11.45" /> <!-- Demon's Staff -->
-				<item id="2503" min="1" max="1" chance="11.42" /> <!-- Yaksa Mace -->
-				<item id="205" min="1" max="1" chance="11.22" /> <!-- Ghoul's Staff -->
-				<item id="266" min="1" max="1" chance="11.2" /> <!-- Great Pata -->
-				<item id="204" min="1" max="1" chance="10.73" /> <!-- Deadman's Staff -->
-				<item id="228" min="1" max="1" chance="10.63" /> <!-- Crystal Dagger -->
-				<item id="286" min="1" max="1" chance="10.61" /> <!-- Eminence Bow -->
-				<item id="303" min="1" max="1" chance="4.364" /> <!-- Widow Maker -->
-				<item id="162" min="1" max="1" chance="4.23" /> <!-- War Axe -->
-				<item id="301" min="1" max="1" chance="4.227" /> <!-- scorpion -->
-				<item id="203" min="1" max="1" chance="4.22" /> <!-- Pa'agrio Axe -->
-				<item id="95" min="1" max="1" chance="4.219" /> <!-- Poleaxe -->
-				<item id="283" min="1" max="1" chance="4.205" /> <!-- Akat Longbow -->
-				<item id="202" min="1" max="1" chance="4.201" /> <!-- Mace of Underworld -->
-				<item id="199" min="1" max="1" chance="4.188" /> <!-- Pa'agrio Hammer -->
-				<item id="231" min="1" max="1" chance="4.184" /> <!-- Grace Dagger -->
-				<item id="134" min="1" max="1" chance="4.175" /> <!-- Sword of Nightmare -->
-				<item id="233" min="1" max="1" chance="4.171" /> <!-- Dark Screamer -->
-				<item id="174" min="1" max="1" chance="4.153" /> <!-- Nirvana Axe -->
-				<item id="265" min="1" max="1" chance="4.136" /> <!-- Fisted Blade -->
-				<item id="201" min="1" max="1" chance="4.131" /> <!-- Club of Nature -->
-				<item id="196" min="1" max="1" chance="4.13" /> <!-- Stick of Eternity -->
-				<item id="75" min="1" max="1" chance="4.129" /> <!-- Caliburs -->
-				<item id="197" min="1" max="1" chance="4.114" /> <!-- Paradia Staff -->
-				<item id="76" min="1" max="1" chance="4.113" /> <!-- Sword of Delusion -->
-				<item id="84" min="1" max="1" chance="4.109" /> <!-- Homunkulus' Sword -->
-				<item id="200" min="1" max="1" chance="4.108" /> <!-- Sage's Staff -->
-				<item id="132" min="1" max="1" chance="4.105" /> <!-- Ultimate Sword -->
-				<item id="77" min="1" max="1" chance="4.097" /> <!-- Tsurugi -->
-				<item id="198" min="1" max="1" chance="4.095" /> <!-- Inferno Staff -->
-				<item id="145" min="1" max="1" chance="4.093" /> <!-- Sword of Whispering Death -->
-				<item id="70000" min="297" max="891" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="8620" min="1" max="3" chance="50.85" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				<group chance="100">
+					<item id="75" min="1" max="1" chance="4.16" /> <!-- Caliburs -->
+					<item id="76" min="1" max="1" chance="4.16" /> <!-- Sword of Delusion -->
+					<item id="77" min="1" max="1" chance="4.16" /> <!-- Tsurugi -->
+					<item id="84" min="1" max="1" chance="4.16" /> <!-- Homunkulus' Sword -->
+					<item id="95" min="1" max="1" chance="4.16" /> <!-- Poleaxe -->
+					<item id="132" min="1" max="1" chance="4.16" /> <!-- Ultimate Sword -->
+					<item id="134" min="1" max="1" chance="4.16" /> <!-- Sword of Nightmare -->
+					<item id="145" min="1" max="1" chance="4.16" /> <!-- Sword of Whispering Death -->
+					<item id="162" min="1" max="1" chance="4.16" /> <!-- War Axe -->
+					<item id="174" min="1" max="1" chance="4.16" /> <!-- Nirvana Axe -->
+					<item id="196" min="1" max="1" chance="4.16" /> <!-- Stick of Eternity -->
+					<item id="197" min="1" max="1" chance="4.16" /> <!-- Paradia Staff -->
+					<item id="198" min="1" max="1" chance="4.16" /> <!-- Inferno Staff -->
+					<item id="199" min="1" max="1" chance="4.16" /> <!-- Pa'agrio Hammer -->
+					<item id="200" min="1" max="1" chance="4.16" /> <!-- Sage's Staff -->
+					<item id="201" min="1" max="1" chance="4.16" /> <!-- Club of Nature -->
+					<item id="202" min="1" max="1" chance="4.16" /> <!-- Mace of Underworld -->
+					<item id="231" min="1" max="1" chance="4.16" /> <!-- Grace Dagger -->
+					<item id="233" min="1" max="1" chance="4.16" /> <!-- Dark Screamer -->
+					<item id="265" min="1" max="1" chance="4.16" /> <!-- Fisted Blade -->
+					<item id="283" min="1" max="1" chance="4.16" /> <!-- Akat Longbow -->
+					<item id="203" min="1" max="1" chance="4.16" /> <!-- Pa'agrio Axe -->
+					<item id="301" min="1" max="1" chance="4.16" /> <!-- scorpion -->
+					<item id="303" min="1" max="1" chance="4.32" /> <!-- Widow Maker -->
+				</group>
+				<group chance="100">
+					<item id="60" min="1" max="1" chance="20" /> <!-- Compound Armor -->
+					<item id="64" min="1" max="1" chance="20" /> <!-- Compound Boots -->
+					<item id="103" min="1" max="3" chance="20" /> <!-- Tower Shield -->
+					<item id="107" min="1" max="3" chance="20" /> <!-- Compound Shield -->
+					<item id="517" min="1" max="3" chance="20" /> <!-- Compound Helmet -->
+				</group>
+				<group chance="100">
+					<item id="608" min="1" max="3" chance="33.33" /> <!-- Mithril Gauntlets -->
+					<item id="1127" min="1" max="3" chance="33.33" /> <!-- Forgotten Boots -->
+					<item id="1149" min="1" max="3" chance="33.34" /> <!-- Shining Circlet -->
+				</group>
+				<group chance="100">
+					<item id="400" min="1" max="1" chance="25" /> <!-- Theca Leather Armor -->
+					<item id="420" min="1" max="1" chance="25" /> <!-- Theca Leather Gaiters -->
+					<item id="2436" min="1" max="1" chance="25" /> <!-- Theca Leather Boots -->
+					<item id="2460" min="1" max="1" chance="25" /> <!-- Theca Leather Gloves -->
+				</group>
+				<group chance="100">
+					<item id="441" min="1" max="1" chance="25" /> <!-- Demon's Tunic -->
+					<item id="472" min="1" max="1" chance="25" /> <!-- Demon's Stockings -->
+					<item id="2435" min="1" max="1" chance="25" /> <!-- Demon's Boots -->
+					<item id="2459" min="1" max="1" chance="25" /> <!-- Demon's Gloves -->
+				</group>
+				<group chance="100">
+					<item id="854" min="1" max="3" chance="33.33" /> <!-- Earring of Seal -->
+					<item id="885" min="1" max="3" chance="33.33" /> <!-- Ring of Ages -->
+					<item id="917" min="1" max="1" chance="33.34" /> <!-- Necklace of Mermaid -->
+				</group>
+				<group chance="100">
+					<item id="135" min="1" max="1" chance="11.11" /> <!-- Samurai Long Sword -->
+					<item id="204" min="1" max="1" chance="11.11" /> <!-- Deadman's Staff -->
+					<item id="205" min="1" max="1" chance="11.11" /> <!-- Ghoul's Staff -->
+					<item id="206" min="1" max="1" chance="11.11" /> <!-- Demon's Staff -->
+					<item id="228" min="1" max="1" chance="11.11" /> <!-- Crystal Dagger -->
+					<item id="266" min="1" max="1" chance="11.11" /> <!-- Great Pata -->
+					<item id="286" min="1" max="1" chance="11.11" /> <!-- Eminence Bow -->
+					<item id="299" min="1" max="1" chance="11.11" /> <!-- Orcish Poleaxe -->
+					<item id="2503" min="1" max="1" chance="11.12" /> <!-- Yaksa Mace -->
+				</group>
+				<group chance="100">
+					<item id="356" min="1" max="1" chance="20" /> <!-- Full Plate Armor -->
+					<item id="2414" min="1" max="1" chance="20" /> <!-- Full Plate Helmet -->
+					<item id="2438" min="1" max="1" chance="20" /> <!-- Full Plate Boots -->
+					<item id="2462" min="1" max="1" chance="20" /> <!-- Full Plate Gauntlets -->
+					<item id="2497" min="1" max="1" chance="20" /> <!-- Full Plate Shield -->
+				</group>
+				<group chance="100">
+					<item id="401" min="1" max="1" chance="20" /> <!-- Drake Leather Armor -->
+					<item id="2437" min="1" max="1" chance="20" /> <!-- Drake Leather Boots -->
+					<item id="2461" min="1" max="1" chance="20" /> <!-- Drake Leather Gloves -->
+					<item id="499" min="1" max="3" chance="20" /> <!-- Mithril Helmet -->
+					<item id="1128" min="1" max="3" chance="20" /> <!-- Adamantite Boots -->
+				</group>
+				<group chance="100">
+					<item id="442" min="1" max="1" chance="20" /> <!-- Divine Tunic -->
+					<item id="473" min="1" max="1" chance="20" /> <!-- Divine Stockings -->
+					<item id="2463" min="1" max="1" chance="20" /> <!-- Divine Gloves -->
+					<item id="2468" min="1" max="3" chance="20" /> <!-- Blessed Gloves -->
+					<item id="603" min="1" max="3" chance="20" /> <!-- Divine Boots -->
+				</group>
+				<group chance="100">
+					<item id="119" min="1" max="1" chance="16.66" /> <!-- Necklace of Seal -->
+					<item id="855" min="1" max="3" chance="16.66" /> <!-- Nassen's Earring -->
+					<item id="857" min="1" max="3" chance="16.66" /> <!-- Holy Earring -->
+					<item id="886" min="1" max="3" chance="16.66" /> <!-- Ring of Seal -->
+					<item id="888" min="1" max="3" chance="16.66" /> <!-- Blessed Ring -->
+					<item id="919" min="1" max="1" chance="16.7" /> <!-- Blessed Necklace -->
+				</group>
+				<group chance="20">
+					<item id="6662" min="1" max="1" chance="100" /> <!-- Ring of Core -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -455,9 +505,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="75" /> <!-- Caliburs -->
 		<acquire exp="13947" sp="418" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="13817" hpRegen="166" mp="747" mpRegen="2.1" />
-			<attack physical="410" magical="69" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="13817" hpRegen="166" mp="747.8" mpRegen="2.1" />
+			<attack physical="410" magical="69" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="801" magical="293" />
 			<speed>
 				<walk ground="27" />
@@ -466,9 +516,9 @@
 			<hitTime>710</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -477,9 +527,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="2300" isAggressive="true">
@@ -491,40 +539,6 @@
 			<radius normal="12" grown="14.5" />
 			<height normal="31" grown="36" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="162" min="1" max="1" chance="0.003" /> <!-- War Axe -->
-				<item id="174" min="1" max="1" chance="0.003" /> <!-- Nirvana Axe -->
-				<item id="196" min="1" max="1" chance="0.003" /> <!-- Stick of Eternity -->
-				<item id="197" min="1" max="1" chance="0.003" /> <!-- Paradia Staff -->
-				<item id="199" min="1" max="1" chance="0.003" /> <!-- Pa'agrio Hammer -->
-				<item id="200" min="1" max="1" chance="0.003" /> <!-- Sage's Staff -->
-				<item id="201" min="1" max="1" chance="0.003" /> <!-- Club of Nature -->
-				<item id="202" min="1" max="1" chance="0.003" /> <!-- Mace of Underworld -->
-				<item id="57" min="1160" max="2714" chance="70" /> <!-- Adena -->
-				<item id="1872" min="1" max="3" chance="16.14" /> <!-- Animal Bone -->
-				<item id="1865" min="1" max="3" chance="8.492" /> <!-- Varnish -->
-				<item id="1882" min="1" max="1" chance="5.7" /> <!-- Leather -->
-				<item id="2508" min="2" max="6" chance="5.317" /> <!-- Cursed Bone -->
-				<item id="1876" min="1" max="1" chance="5.163" /> <!-- Mithril Ore -->
-				<item id="2952" min="1" max="1" chance="2.172" /> <!-- Demon's Boot Fabric -->
-				<item id="3005" min="1" max="1" chance="0.97" /> <!-- Recipe: Demon's Boots -->
-				<item id="2100" min="1" max="1" chance="0.3" /> <!-- Paradia Staff Head -->
-				<item id="2097" min="1" max="1" chance="0.3" /> <!-- War Axe Blade -->
-				<item id="2098" min="1" max="1" chance="0.3" /> <!-- Nirvana Axe Blade -->
-				<item id="2231" min="1" max="1" chance="0.3" /> <!-- Recipe: Full Plate Armor -->
-				<item id="2105" min="1" max="1" chance="0.3" /> <!-- Mace of Underworld Head -->
-				<item id="2104" min="1" max="1" chance="0.3" /> <!-- Club of Nature Head -->
-				<item id="2103" min="1" max="1" chance="0.3" /> <!-- Sage's Staff Head -->
-				<item id="2099" min="1" max="1" chance="0.3" /> <!-- Stick of Eternity Shaft -->
-				<item id="2102" min="1" max="1" chance="0.3" /> <!-- Pa'agrio Hammer Head -->
-				<item id="2360" min="1" max="1" chance="0.03" /> <!-- Recipe: Orcish Poleaxe -->
-			</drop>
-			<spoil>
-				<item id="1914" min="1" max="1" chance="46.21" /> <!-- Earring of Seal Gemstone -->
-				<item id="3011" min="1" max="1" chance="22.96" /> <!-- Recipe: Divine Boots -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29008" level="55" type="Monster" name="Doom Wraith">
 		<parameters>
@@ -537,9 +551,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="1472" /> <!-- Dreadbane -->
 		<acquire exp="15169" sp="501" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="16012" hpRegen="185" mp="889" mpRegen="2.4" />
-			<attack physical="470" magical="715" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="16012" hpRegen="185" mp="889.8" mpRegen="2.4" />
+			<attack physical="470" magical="715" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="895" magical="327" />
 			<speed>
 				<walk ground="100" />
@@ -548,21 +562,19 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="5" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="5" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="700" isAggressive="true">
@@ -585,9 +597,9 @@
 		<race>PLANT</race>
 		<sex>FEMALE</sex>
 		<acquire exp="11480" sp="344" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="12544" hpRegen="154" mp="665" mpRegen="2.1" />
-			<attack physical="354" magical="60" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<attack physical="354" magical="60" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="747" magical="273" />
 			<speed>
 				<walk ground="80" />
@@ -596,19 +608,19 @@
 			<hitTime>130</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4035" level="4" /> <!-- Poison -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4035" level="4" /> <!-- Poison -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="800" isAggressive="true">
@@ -620,34 +632,6 @@
 			<radius normal="12" />
 			<height normal="25.5" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="1126" min="1" max="1" chance="0.075" /> <!-- Crimson Boots -->
-				<item id="2434" min="1" max="1" chance="0.075" /> <!-- Rind Leather Boots -->
-				<item id="2455" min="1" max="1" chance="0.075" /> <!-- Plated Leather Gloves -->
-				<item id="2457" min="1" max="1" chance="0.075" /> <!-- Gloves of Seal -->
-				<item id="2458" min="1" max="1" chance="0.075" /> <!-- Rind Leather Gloves -->
-				<item id="57" min="996" max="2323" chance="70" /> <!-- Adena -->
-				<item id="1866" min="1" max="1" chance="13.34" /> <!-- Suede -->
-				<item id="1342" min="30" max="90" chance="12.95" /> <!-- Steel Arrow -->
-				<item id="1867" min="2" max="6" chance="6.416" /> <!-- Animal Skin -->
-				<item id="2951" min="1" max="1" chance="4.388" /> <!-- Rind Leather Glove Design -->
-				<item id="2950" min="1" max="1" chance="4.348" /> <!-- Gloves of Seal Pattern -->
-				<item id="2948" min="1" max="1" chance="4.342" /> <!-- Rind Leather Boot Lining -->
-				<item id="1882" min="1" max="1" chance="4.245" /> <!-- Leather -->
-				<item id="1868" min="5" max="15" chance="3.845" /> <!-- Thread -->
-				<item id="2946" min="1" max="1" chance="2.929" /> <!-- Plated Leather Glove Design -->
-				<item id="2508" min="3" max="9" chance="2.632" /> <!-- Cursed Bone -->
-				<item id="1974" min="1" max="3" chance="2.22" /> <!-- Crimson Boot Fabric -->
-				<item id="1885" min="1" max="1" chance="1.585" /> <!-- High-grade Suede -->
-				<item id="2350" min="1" max="1" chance="0.03" /> <!-- Recipe: Pa'agrio Axe -->
-				<item id="2339" min="1" max="1" chance="0.03" /> <!-- Recipe: Inferno Staff -->
-			</drop>
-			<spoil>
-				<item id="1895" min="1" max="5" chance="66.24" /> <!-- Metallic Fiber -->
-				<item id="2944" min="1" max="1" chance="62.28" /> <!-- Karmian Glove Fabric -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29010" level="46" type="Monster" name="Validus">
 		<parameters>
@@ -658,29 +642,29 @@
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<acquire exp="11032" sp="330" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="12130" hpRegen="150" mp="637" mpRegen="2.1" />
-			<attack physical="337" magical="58" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="12130" hpRegen="150" mp="637.8" mpRegen="2.1" />
+			<attack physical="337" magical="58" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="729" magical="267" />
 			<speed>
 				<walk ground="70" />
 				<run ground="110" />
 			</speed>
-			<hitTime>300</hitTime>
+			<hitTime>30</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="3" /> <!-- Beasts -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="3" /> <!-- Beasts -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="1200" isAggressive="true">
@@ -692,29 +676,6 @@
 			<radius normal="15" />
 			<height normal="29" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="354" min="1" max="1" chance="0.03" /> <!-- Chain Mail Shirt -->
-				<item id="232" min="1" max="1" chance="0.0075" /> <!-- Dark Elven Dagger -->
-				<item id="281" min="1" max="1" chance="0.0075" /> <!-- Crystallized Ice Bow -->
-				<item id="57" min="914" max="2141" chance="70" /> <!-- Adena -->
-				<item id="1866" min="1" max="1" chance="15.89" /> <!-- Suede -->
-				<item id="1878" min="1" max="1" chance="9.186" /> <!-- Durable Braid -->
-				<item id="1864" min="3" max="9" chance="7.663" /> <!-- Stem -->
-				<item id="1865" min="2" max="6" chance="5.755" /> <!-- Varnish -->
-				<item id="2508" min="2" max="6" chance="3.839" /> <!-- Cursed Bone -->
-				<item id="1959" min="1" max="1" chance="2.104" /> <!-- Chain Mail Shirt Material -->
-				<item id="2072" min="1" max="1" chance="0.75" /> <!-- Dark Elven Dagger Edge -->
-				<item id="2074" min="1" max="1" chance="0.75" /> <!-- Crystallized Ice Bow Shaft -->
-				<item id="2319" min="1" max="1" chance="0.075" /> <!-- Recipe: Raid Sword -->
-				<item id="951" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Weapon (C-grade) -->
-			</drop>
-			<spoil>
-				<item id="1873" min="1" max="3" chance="88.74" /> <!-- Silver Nugget -->
-				<item id="2060" min="1" max="1" chance="3.464" /> <!-- Stormbringer Blade -->
-				<item id="2067" min="1" max="1" chance="3.185" /> <!-- Crystal Staff Head -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29011" level="49" type="Monster" name="Susceptor">
 		<parameters>
@@ -725,10 +686,10 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="13389" hpRegen="162" mp="720" mpRegen="2.1" />
-			<attack physical="391" magical="66" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<attack physical="391" magical="66" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="783" magical="286" />
 			<speed>
 				<walk ground="27" />
@@ -737,10 +698,9 @@
 			<hitTime>430</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -749,7 +709,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="1500" isAggressive="true">
@@ -772,9 +733,9 @@
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<acquire exp="16035" sp="481" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="12964" hpRegen="158" mp="692" mpRegen="2.1" />
-			<attack physical="372" magical="63" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="12964" hpRegen="158" mp="692.4" mpRegen="2.1" />
+			<attack physical="372" magical="63" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="765" magical="280" />
 			<speed>
 				<walk ground="20" />
@@ -783,22 +744,22 @@
 			<hitTime>410</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4273" level="3" /> <!-- Resist Daggers/Rapier Weapon -->
-			<skill id="4274" level="1" /> <!-- Blunt Weapon Weak Point -->
-			<skill id="4408" level="12" /> <!-- HP Increase (4x) -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
-			<skill id="4444" level="2" /> <!-- Higher Resist Bow/Crossbow Weapons -->
+			<skill id="4444" level="2" /> <!-- Greater Bow/Crossbow Resistance -->
+			<skill id="4273" level="3" /> <!-- Dagger/Rapier Resistance -->
+			<skill id="4274" level="1" /> <!-- Blunt Weapon Vulnerability -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="800" isAggressive="true">
@@ -810,35 +771,6 @@
 			<radius normal="18" />
 			<height normal="34" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="1126" min="1" max="1" chance="0.075" /> <!-- Crimson Boots -->
-				<item id="2434" min="1" max="1" chance="0.075" /> <!-- Rind Leather Boots -->
-				<item id="2455" min="1" max="1" chance="0.075" /> <!-- Plated Leather Gloves -->
-				<item id="2457" min="1" max="1" chance="0.075" /> <!-- Gloves of Seal -->
-				<item id="2458" min="1" max="1" chance="0.075" /> <!-- Rind Leather Gloves -->
-				<item id="57" min="1447" max="3374" chance="70" /> <!-- Adena -->
-				<item id="1873" min="1" max="1" chance="12.81" /> <!-- Silver Nugget -->
-				<item id="1865" min="1" max="3" chance="10.09" /> <!-- Varnish -->
-				<item id="2508" min="2" max="6" chance="6.579" /> <!-- Cursed Bone -->
-				<item id="1965" min="1" max="1" chance="4.208" /> <!-- Metal Plate Helmet Material -->
-				<item id="2946" min="1" max="1" chance="3.494" /> <!-- Plated Leather Glove Design -->
-				<item id="1880" min="1" max="1" chance="3.151" /> <!-- Steel -->
-				<item id="1869" min="5" max="15" chance="3.142" /> <!-- Iron Ore -->
-				<item id="1974" min="1" max="3" chance="2.735" /> <!-- Crimson Boot Fabric -->
-				<item id="1874" min="1" max="1" chance="2.061" /> <!-- Oriharukon Ore -->
-				<item id="2948" min="1" max="3" chance="1.772" /> <!-- Rind Leather Boot Lining -->
-				<item id="2950" min="2" max="6" chance="1.296" /> <!-- Gloves of Seal Pattern -->
-				<item id="2951" min="2" max="6" chance="1.067" /> <!-- Rind Leather Glove Design -->
-				<item id="1973" min="3" max="9" chance="0.75" /> <!-- Pa'agrio Hand Design -->
-				<item id="2344" min="1" max="1" chance="0.075" /> <!-- Recipe: Grace Dagger -->
-				<item id="951" min="1" max="1" chance="0.075" /> <!-- Scroll: Enchant Weapon (C-grade) -->
-			</drop>
-			<spoil>
-				<item id="2073" min="1" max="1" chance="7.894" /> <!-- Chakram Edge -->
-				<item id="2352" min="1" max="1" chance="2.107" /> <!-- Recipe: Widow Maker -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29013" level="45" type="Monster" name="Premo">
 		<parameters>
@@ -849,9 +781,9 @@
 		<race>GIANT</race>
 		<sex>MALE</sex>
 		<acquire exp="10351" sp="310" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="11721" hpRegen="146" mp="610" mpRegen="2.1" />
-			<attack physical="320" magical="55" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="11721" hpRegen="146" mp="610.8" mpRegen="2.1" />
+			<attack physical="320" magical="55" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="711" magical="260" />
 			<speed>
 				<walk ground="55" />
@@ -860,10 +792,10 @@
 			<hitTime>610</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="11" /> <!-- Giant -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
@@ -871,7 +803,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="11" /> <!-- Giants -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="1200" aggroRange="450">
@@ -883,30 +815,6 @@
 			<radius normal="21" grown="25" />
 			<height normal="35" grown="43" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="631" min="1" max="1" chance="0.3" /> <!-- Eldarake -->
-				<item id="2495" min="1" max="1" chance="0.3" /> <!-- Chain Shield -->
-				<item id="2413" min="1" max="1" chance="0.075" /> <!-- Chain Hood -->
-				<item id="57" min="859" max="2006" chance="70" /> <!-- Adena -->
-				<item id="1868" min="1" max="3" chance="17.95" /> <!-- Thread -->
-				<item id="1866" min="1" max="1" chance="12.31" /> <!-- Suede -->
-				<item id="1867" min="1" max="3" chance="8.405" /> <!-- Animal Skin -->
-				<item id="1964" min="1" max="1" chance="6.108" /> <!-- Eldarake Temper -->
-				<item id="2945" min="1" max="1" chance="6.014" /> <!-- Chain Shield Fragment -->
-				<item id="2936" min="1" max="1" chance="5.526" /> <!-- Chain Hood Pattern -->
-				<item id="1882" min="1" max="1" chance="4.181" /> <!-- Leather -->
-				<item id="1885" min="1" max="1" chance="1.519" /> <!-- High-grade Suede -->
-				<item id="2207" min="1" max="1" chance="0.3" /> <!-- Recipe: Karmian Tunic -->
-				<item id="2323" min="1" max="1" chance="0.075" /> <!-- Recipe: Elemental Bow -->
-				<item id="2326" min="1" max="1" chance="0.075" /> <!-- Recipe: Horn of Glory -->
-			</drop>
-			<spoil>
-				<item id="1876" min="1" max="1" chance="80.65" /> <!-- Mithril Ore -->
-				<item id="1962" min="1" max="1" chance="13.24" /> <!-- Karmian Tunic Pattern -->
-				<item id="2073" min="1" max="1" chance="3.192" /> <!-- Chakram Edge -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29014" level="50" type="GrandBoss" name="Orfen">
 		<parameters>
@@ -917,13 +825,13 @@
 				<npc id="29016" count="4" respawnTime="360" weightPoint="1" />
 			</minions>
 		</parameters>
-		<race>ELEMENTAL</race>
+		<race>FAIRY</race>
 		<sex>FEMALE</sex>
 		<acquire exp="8872500" sp="266175" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="289902.43642" hpRegen="145.2219912" mp="2901.03" mpRegen="2.1" />
-			<attack physical="722.31" magical="1398.68" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="1602" magical="293" />
+			<vitals hp="523103.852" hpRegen="441.65" mp="1708.8" mpRegen="20" />
+			<attack physical="3652" magical="1535" random="10" critical="4" accuracy="0" attackSpeed="253" type="SWORD" range="80" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -931,12 +839,9 @@
 			<hitTime>710</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4062" level="1" /> <!-- Orfen -->
-			<skill id="4063" level="1" /> <!-- Paralysis -->
-			<skill id="4064" level="1" /> <!-- Paralysis -->
+			<skill id="4416" level="13" /> <!-- Fairies -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -945,7 +850,10 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="13" /> <!-- Fairies -->
+			<skill id="4062" level="1" /> <!-- Orfen -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4063" level="1" /> <!-- Paralysis -->
+			<skill id="4064" level="1" /> <!-- Paralysis -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -960,56 +868,79 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="918" min="1" max="1" chance="33.35" /> <!-- Adamantite Necklace -->
-				<item id="856" min="1" max="3" chance="33.1" /> <!-- Adamantite Earring -->
-				<item id="887" min="1" max="3" chance="32.11" /> <!-- Adamantite Ring -->
-				<item id="673" min="1" max="1" chance="25.95" /> <!-- Avadon Shield -->
-				<item id="2379" min="1" max="1" chance="25.86" /> <!-- Avadon Gaiters -->
-				<item id="2376" min="1" max="1" chance="25.13" /> <!-- Avadon Breastplate -->
-				<item id="2415" min="1" max="1" chance="24.74" /> <!-- Sealed Avadon Circlet -->
-				<item id="2414" min="1" max="1" chance="20.98" /> <!-- Full Plate Helmet -->
-				<item id="603" min="1" max="3" chance="20.87" /> <!-- Divine Boots -->
-				<item id="2463" min="1" max="1" chance="20.81" /> <!-- Divine Gloves -->
-				<item id="356" min="1" max="1" chance="20.6" /> <!-- Full Plate Armor -->
-				<item id="1128" min="1" max="3" chance="20.45" /> <!-- Adamantite Boots -->
-				<item id="2438" min="1" max="1" chance="20.42" /> <!-- Full Plate Boots -->
-				<item id="6661" min="1" max="1" chance="20.12" /> <!-- Orfen's Earring -->
-				<item id="2437" min="1" max="1" chance="20.12" /> <!-- Drake Leather Boots -->
-				<item id="442" min="1" max="1" chance="20.08" /> <!-- Divine Tunic -->
-				<item id="2462" min="1" max="1" chance="19.79" /> <!-- Full Plate Gauntlets -->
-				<item id="499" min="1" max="3" chance="19.79" /> <!-- Mithril Helmet -->
-				<item id="401" min="1" max="1" chance="19.78" /> <!-- Drake Leather Armor -->
-				<item id="2461" min="1" max="1" chance="19.7" /> <!-- Drake Leather Gloves -->
-				<item id="2468" min="1" max="3" chance="19.32" /> <!-- Blessed Gloves -->
-				<item id="473" min="1" max="1" chance="19.15" /> <!-- Divine Stockings -->
-				<item id="2497" min="1" max="3" chance="19.15" /> <!-- Full Plate Shield -->
-				<item id="119" min="1" max="1" chance="16.97" /> <!-- Necklace of Seal -->
-				<item id="855" min="1" max="3" chance="16.5" /> <!-- Nassen's Earring -->
-				<item id="888" min="1" max="3" chance="16.16" /> <!-- Blessed Ring -->
-				<item id="857" min="1" max="3" chance="16.02" /> <!-- Holy Earring -->
-				<item id="919" min="1" max="1" chance="16.01" /> <!-- Blessed Necklace -->
-				<item id="886" min="1" max="3" chance="15.9" /> <!-- Ring of Seal -->
-				<item id="228" min="1" max="1" chance="11.59" /> <!-- Crystal Dagger -->
-				<item id="266" min="1" max="1" chance="11.58" /> <!-- Great Pata -->
-				<item id="299" min="1" max="1" chance="11.37" /> <!-- Orcish Poleaxe -->
-				<item id="204" min="1" max="1" chance="10.99" /> <!-- Deadman's Staff -->
-				<item id="286" min="1" max="1" chance="10.89" /> <!-- Eminence Bow -->
-				<item id="206" min="1" max="1" chance="10.83" /> <!-- Demon's Staff -->
-				<item id="2503" min="1" max="1" chance="10.7" /> <!-- Yaksa Mace -->
-				<item id="205" min="1" max="1" chance="10.62" /> <!-- Ghoul's Staff -->
-				<item id="135" min="1" max="1" chance="10.6" /> <!-- Samurai Long Sword -->
-				<item id="947" min="2" max="8" chance="100" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-				<item id="70000" min="198" max="593" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="948" min="10" max="30" chance="100" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="8620" min="1" max="3" chance="50.1" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="4065" min="20" max="80" chance="13.09" /> <!-- Avadon Gaiter Material -->
-				<item id="4071" min="20" max="80" chance="12.62" /> <!-- Avadon Robe Fabric -->
-				<item id="4050" min="20" max="80" chance="12.62" /> <!-- Adamantite Ring Wire -->
-				<item id="4064" min="20" max="80" chance="12.61" /> <!-- Avadon Breastplate Part -->
-				<item id="4072" min="20" max="80" chance="12.6" /> <!-- Sealed Avadon Circlet Pattern -->
-				<item id="4049" min="20" max="80" chance="12.14" /> <!-- Adamantite Earring Gemstone -->
-				<item id="4051" min="20" max="80" chance="12.12" /> <!-- Adamantite Necklace Chain -->
-				<item id="4439" min="20" max="80" chance="11.89" /> <!-- Avadon Shield Fragment -->
+				<group chance="100">
+					<item id="135" min="1" max="1" chance="11.11" /> <!-- Samurai Long Sword -->
+					<item id="204" min="1" max="1" chance="11.11" /> <!-- Deadman's Staff -->
+					<item id="205" min="1" max="1" chance="11.11" /> <!-- Ghoul's Staff -->
+					<item id="206" min="1" max="1" chance="11.11" /> <!-- Demon's Staff -->
+					<item id="228" min="1" max="1" chance="11.11" /> <!-- Crystal Dagger -->
+					<item id="266" min="1" max="1" chance="11.11" /> <!-- Great Pata -->
+					<item id="286" min="1" max="1" chance="11.11" /> <!-- Eminence Bow -->
+					<item id="299" min="1" max="1" chance="11.11" /> <!-- Orcish Poleaxe -->
+					<item id="2503" min="1" max="1" chance="11.12" /> <!-- Yaksa Mace -->
+				</group>
+				<group chance="100">
+					<item id="356" min="1" max="1" chance="20" /> <!-- Full Plate Armor -->
+					<item id="2497" min="1" max="3" chance="20" /> <!-- Full Plate Shield -->
+					<item id="2414" min="1" max="1" chance="20" /> <!-- Full Plate Helmet -->
+					<item id="2438" min="1" max="1" chance="20" /> <!-- Full Plate Boots -->
+					<item id="2462" min="1" max="1" chance="20" /> <!-- Full Plate Gauntlets -->
+				</group>
+				<group chance="100">
+					<item id="2461" min="1" max="1" chance="20" /> <!-- Drake Leather Gloves -->
+					<item id="2437" min="1" max="1" chance="20" /> <!-- Drake Leather Boots -->
+					<item id="401" min="1" max="1" chance="20" /> <!-- Drake Leather Armor -->
+					<item id="603" min="1" max="3" chance="20" /> <!-- Divine Boots -->
+					<item id="1128" min="1" max="3" chance="20" /> <!-- Adamantite Boots -->
+				</group>
+				<group chance="100">
+					<item id="442" min="1" max="1" chance="20" /> <!-- Divine Tunic -->
+					<item id="473" min="1" max="1" chance="20" /> <!-- Divine Stockings -->
+					<item id="2463" min="1" max="1" chance="20" /> <!-- Divine Gloves -->
+					<item id="2468" min="1" max="3" chance="20" /> <!-- Blessed Gloves -->
+					<item id="499" min="1" max="3" chance="20" /> <!-- Mithril Helmet -->
+				</group>
+				<group chance="100">
+					<item id="119" min="1" max="1" chance="16.66" /> <!-- Necklace of Seal -->
+					<item id="855" min="1" max="3" chance="16.66" /> <!-- Nassen's Earring -->
+					<item id="857" min="1" max="3" chance="16.66" /> <!-- Holy Earring -->
+					<item id="886" min="1" max="3" chance="16.66" /> <!-- Ring of Seal -->
+					<item id="888" min="1" max="3" chance="16.66" /> <!-- Blessed Ring -->
+					<item id="919" min="1" max="1" chance="16.7" /> <!-- Blessed Necklace -->
+				</group>
+				<group chance="100">
+					<item id="2376" min="1" max="1" chance="25" /> <!-- Avadon Breastplate -->
+					<item id="2379" min="1" max="1" chance="25" /> <!-- Avadon Gaiters -->
+					<item id="2415" min="1" max="1" chance="25" /> <!-- Sealed Avadon Circlet -->
+					<item id="673" min="1" max="1" chance="25" /> <!-- Avadon Shield -->
+				</group>
+				<group chance="100">
+					<item id="856" min="1" max="3" chance="33.33" /> <!-- Adamantite Earring -->
+					<item id="887" min="1" max="3" chance="33.33" /> <!-- Adamantite Ring -->
+					<item id="918" min="1" max="1" chance="33.34" /> <!-- Adamantite Necklace -->
+				</group>
+				<group chance="100">
+					<item id="4049" min="20" max="80" chance="12.5" /> <!-- Adamantite Earring Gemstone -->
+					<item id="4050" min="20" max="80" chance="12.5" /> <!-- Adamantite Ring Wire -->
+					<item id="4051" min="20" max="80" chance="12.5" /> <!-- Adamantite Necklace Chain -->
+					<item id="4064" min="20" max="80" chance="12.5" /> <!-- Avadon Breastplate Part -->
+					<item id="4065" min="20" max="80" chance="12.5" /> <!-- Avadon Gaiter Material -->
+					<item id="4071" min="20" max="80" chance="12.5" /> <!-- Avadon Robe Fabric -->
+					<item id="4072" min="20" max="80" chance="12.5" /> <!-- Sealed Avadon Circlet Pattern -->
+					<item id="4439" min="20" max="80" chance="12.5" /> <!-- Avadon Shield Fragment -->
+				</group>
+				<group chance="20">
+					<item id="6661" min="1" max="1" chance="100" /> <!-- Orfen's Earring -->
+				</group>
+				<group chance="100">
+					<item id="947" min="2" max="8" chance="100" /> <!-- Scroll: Enchant Weapon (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="948" min="10" max="30" chance="100" /> <!-- Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -1019,13 +950,13 @@
 			<param name="MoveAroundSocial1" value="70" />
 			<param name="MoveAroundSocial2" value="70" />
 		</parameters>
-		<race>BEAST</race>
+		<race>BUG</race>
 		<sex>MALE</sex>
-		<acquire exp="16035" sp="481" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="16035" sp="481" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="158" mp="36936" mpRegen="2.1" />
-			<attack physical="298" magical="40" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="765" magical="280" />
+			<attack physical="298" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1033,9 +964,9 @@
 			<hitTime>540</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1044,7 +975,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="2500" aggroRange="450">
@@ -1063,13 +994,13 @@
 			<param name="MoveAroundSocial1" value="70" />
 			<param name="MoveAroundSocial2" value="70" />
 		</parameters>
-		<race>BEAST</race>
+		<race>BUG</race>
 		<sex>MALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="162" mp="36936" mpRegen="2.1" />
-			<attack physical="1058" magical="1563" random="30" critical="15" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="783" magical="286" />
+			<attack physical="1058" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1077,9 +1008,9 @@
 			<hitTime>540</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1088,7 +1019,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="2700" aggroRange="450">
@@ -1109,11 +1040,11 @@
 		</parameters>
 		<race>BUG</race>
 		<sex>FEMALE</sex>
-		<acquire exp="16035" sp="481" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="16035" sp="481" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="158" mp="36936" mpRegen="2.1" />
-			<attack physical="298" magical="40" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="765" magical="280" />
+			<attack physical="298" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1121,9 +1052,9 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1132,7 +1063,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="2700" aggroRange="450">
@@ -1148,11 +1079,11 @@
 	<npc id="29018" level="49" type="Monster" name="Riba Iren">
 		<race>BUG</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="162" mp="36936" mpRegen="2.1" />
-			<attack physical="1058" magical="1563" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="783" magical="286" />
+			<attack physical="1058" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1160,9 +1091,9 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1171,8 +1102,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
-			<skill id="4516" level="1" /> <!-- Orfen Heal -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="2900" isAggressive="true">
@@ -1190,27 +1120,19 @@
 		<sex>MALE</sex>
 		<acquire exp="262720917" sp="63053" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="7500000" hpRegen="1000" mp="18000" mpRegen="99" />
-			<attack physical="3260" magical="1700" random="30" critical="4" accuracy="40" attackSpeed="206" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="440" magical="440" />
+			<vitals hp="7000000" hpRegen="1000" mp="18000" mpRegen="99" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3840" magical="825" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4106" level="1" /> <!-- Antharas Stun -->
-			<skill id="4108" level="1" /> <!-- Antharas Terror -->
-			<skill id="4109" level="1" /> <!-- Curse of Antharas -->
-			<skill id="4110" level="2" /> <!-- Breath Attack -->
-			<skill id="4111" level="1" /> <!-- Antharas Fossilization -->
-			<skill id="4112" level="1" /> <!-- Ordinary Attack -->
-			<skill id="4113" level="1" /> <!-- Animal doing ordinary attack -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1219,9 +1141,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5092" level="1" /> <!-- Antharas Terror -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1230,92 +1152,36 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists> <!-- CT2.5 -->
-			<drop>
-				<item id="8620" min="10" max="30" chance="50" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="80" min="1" max="2" chance="25" /> <!-- Tallum Blade -->
-				<item id="98" min="1" max="2" chance="25" /> <!-- Halberd -->
-				<item id="269" min="1" max="2" chance="25" /> <!-- Blood Tornado -->
-				<item id="2504" min="1" max="2" chance="25" /> <!-- Meteor Shower -->
-				<item id="235" min="1" max="2" chance="25" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="2" chance="25" /> <!-- Carnage Bow -->
-				<item id="150" min="1" max="2" chance="25" /> <!-- Elemental Sword -->
-				<item id="212" min="1" max="2" chance="25" /> <!-- Dasparion's Staff -->
-				<item id="81" min="1" max="2" chance="25" /> <!-- Dragon Slayer -->
-				<item id="151" min="1" max="2" chance="25" /> <!-- Sword of Miracles -->
-				<item id="2500" min="1" max="2" chance="25" /> <!-- Dark Legion's Edge -->
-				<item id="164" min="1" max="2" chance="25" /> <!-- Elysian -->
-				<item id="236" min="1" max="2" chance="20" /> <!-- Soul Separator -->
-				<item id="270" min="1" max="2" chance="20" /> <!-- Dragon Grinder -->
-				<item id="289" min="1" max="2" chance="20" /> <!-- Soul Bow -->
-				<item id="213" min="1" max="2" chance="20" /> <!-- Branch of the Mother Tree -->
-				<item id="305" min="1" max="2" chance="20" /> <!-- Tallum Glaive -->
-				<item id="6326" min="1" max="5" chance="30" /> <!-- Sealed Majestic Necklace -->
-				<item id="6327" min="1" max="5" chance="35" /> <!-- Sealed Majestic Earring -->
-				<item id="6328" min="1" max="5" chance="35" /> <!-- Sealed Majestic Ring -->
-				<item id="6323" min="1" max="5" chance="30" /> <!-- Sealed Phoenix Necklace -->
-				<item id="6324" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Earring -->
-				<item id="6325" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Ring -->
-				<item id="5287" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5297" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5304" min="1" max="3" chance="25" /> <!-- Sealed Tallum Tunic -->
-				<item id="5311" min="1" max="3" chance="35" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5320" min="1" max="3" chance="35" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="30" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="3" chance="25" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5301" min="1" max="3" chance="25" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5308" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5316" min="1" max="3" chance="8" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5323" min="1" max="3" chance="8" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5329" min="1" max="3" chance="9" /> <!-- Sealed Majestic Robe -->
-				<item id="5288" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5298" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="30" /> <!-- Sealed Tallum Stockings -->
-				<item id="5289" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5294" min="1" max="3" chance="25" /> <!-- Sealed Tallum Helmet -->
-				<item id="5312" min="1" max="3" chance="25" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5317" min="1" max="3" chance="25" /> <!-- Sealed Majestic Circlet -->
-				<item id="5291" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5296" min="1" max="3" chance="25" /> <!-- Sealed Tallum Boots -->
-				<item id="5314" min="1" max="3" chance="25" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5319" min="1" max="3" chance="25" /> <!-- Sealed Majestic Boots -->
-				<item id="5290" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5295" min="1" max="3" chance="25" /> <!-- Sealed Tallum Gloves -->
-				<item id="5313" min="1" max="3" chance="25" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5318" min="1" max="3" chance="25" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5292" min="1" max="3" chance="40" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="40" /> <!-- Sealed Shield of Nightmare -->
-				<item id="729" min="1" max="19" chance="100" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="1538" min="1" max="59" chance="100" /> <!-- Blessed Scroll of Escape -->
-				<item id="3936" min="1" max="39" chance="100" /> <!-- Blessed Scroll of Resurrection -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="9000000" max="13000000" chance="100" /> <!-- Adena -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29020" level="80" type="GrandBoss" name="Baium">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<acquire exp="1024738848" sp="30742165" raidPoints="450" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="73892999.75369" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="3374.18" magical="2200" random="30" critical="4" accuracy="40" attackSpeed="206" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3300" magical="2200" />
+			<vitals hp="133333333" hpRegen="6666" mp="18000" mpRegen="99" />
+			<attack physical="25931" magical="8204" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3202" magical="2134" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4127" level="1" /> <!-- Baium: General Attack -->
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4256" level="1" /> <!-- Stun Resistance -->
+			<skill id="4127" level="1" /> <!-- Baium: General Attack -->
 		</skillList>
 		<corpseTime>13</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1328,80 +1194,95 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="6328" min="1" max="3" chance="52.39" /> <!-- Sealed Majestic Ring -->
-				<item id="49580" min="1" max="1" chance="30.2" /> <!-- Baium's Ring -->
-				<item id="6327" min="1" max="1" chance="19.65" /> <!-- Sealed Majestic Earring -->
-				<item id="7892" min="1" max="1" chance="17.6" /> <!-- Spell Breaker -->
-				<item id="7883" min="1" max="1" chance="17.19" /> <!-- Guardian's Sword -->
-				<item id="7900" min="1" max="1" chance="16.32" /> <!-- Ice Storm Hammer -->
-				<item id="7901" min="1" max="1" chance="16.13" /> <!-- Star Buster -->
-				<item id="7893" min="1" max="1" chance="16.19" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="15.46" /> <!-- Wizard's Tear -->
-				<item id="6325" min="1" max="3" chance="15.03" /> <!-- Sealed Phoenix Ring -->
-				<item id="6326" min="1" max="1" chance="8.062" /> <!-- Sealed Majestic Necklace -->
-				<item id="5292" min="1" max="3" chance="6.998" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="1" chance="6.054" /> <!-- Sealed Shield of Nightmare -->
-				<item id="98" min="1" max="1" chance="5.069" /> <!-- Halberd -->
-				<item id="7899" min="1" max="1" chance="5.053" /> <!-- Destroyer Hammer -->
-				<item id="151" min="1" max="1" chance="5.047" /> <!-- Sword of Miracles -->
-				<item id="2504" min="1" max="1" chance="5.045" /> <!-- Meteor Shower -->
-				<item id="269" min="1" max="1" chance="5.045" /> <!-- Blood Tornado -->
-				<item id="5289" min="1" max="3" chance="5.04" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5291" min="1" max="3" chance="5.037" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5295" min="1" max="3" chance="5.029" /> <!-- Sealed Tallum Gloves -->
-				<item id="5290" min="1" max="3" chance="5.017" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="288" min="1" max="1" chance="4.993" /> <!-- Carnage Bow -->
-				<item id="5294" min="1" max="3" chance="4.974" /> <!-- Sealed Tallum Helmet -->
-				<item id="5296" min="1" max="3" chance="4.973" /> <!-- Sealed Tallum Boots -->
-				<item id="235" min="1" max="1" chance="4.964" /> <!-- Bloody Orchid -->
-				<item id="7884" min="1" max="1" chance="4.961" /> <!-- Infernal Master -->
-				<item id="80" min="1" max="1" chance="4.956" /> <!-- Tallum Blade -->
-				<item id="150" min="1" max="1" chance="4.952" /> <!-- Elemental Sword -->
-				<item id="289" min="1" max="1" chance="4.937" /> <!-- Soul Bow -->
-				<item id="7894" min="1" max="1" chance="4.937" /> <!-- Spiritual Eye -->
-				<item id="305" min="1" max="1" chance="4.07" /> <!-- Tallum Glaive -->
-				<item id="7895" min="1" max="1" chance="4.07" /> <!-- Flaming Dragon Skull -->
-				<item id="81" min="1" max="1" chance="4.07" /> <!-- Dragon Slayer -->
-				<item id="164" min="1" max="1" chance="4.067" /> <!-- Elysian -->
-				<item id="270" min="1" max="1" chance="4.064" /> <!-- Dragon Grinder -->
-				<item id="236" min="1" max="1" chance="4.054" /> <!-- Soul Separator -->
-				<item id="213" min="1" max="1" chance="4.008" /> <!-- Branch of the Mother Tree -->
-				<item id="2500" min="1" max="1" chance="3.998" /> <!-- Dark Legion's Edge -->
-				<item id="212" min="1" max="1" chance="3.963" /> <!-- Dasparion's Staff -->
-				<item id="7902" min="1" max="1" chance="3.939" /> <!-- Doom Crusher -->
-				<item id="6324" min="1" max="1" chance="3.937" /> <!-- Sealed Phoenix Earring -->
-				<item id="5314" min="1" max="1" chance="3.05" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5301" min="1" max="1" chance="3.029" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="49683" min="1" max="1" chance="3.027" /> <!-- Talisman of Baium -->
-				<item id="5304" min="1" max="1" chance="3.024" /> <!-- Sealed Tallum Tunic -->
-				<item id="5293" min="1" max="1" chance="3.023" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5297" min="1" max="1" chance="3.013" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5288" min="1" max="1" chance="3.004" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5308" min="1" max="1" chance="3.003" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5317" min="1" max="1" chance="2.998" /> <!-- Sealed Majestic Circlet -->
-				<item id="5318" min="1" max="1" chance="2.996" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5298" min="1" max="1" chance="2.989" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5287" min="1" max="1" chance="2.974" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5313" min="1" max="1" chance="2.966" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5319" min="1" max="1" chance="2.96" /> <!-- Sealed Majestic Boots -->
-				<item id="5312" min="1" max="1" chance="2.948" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5305" min="1" max="1" chance="2.933" /> <!-- Sealed Tallum Stockings -->
-				<item id="5326" min="1" max="1" chance="2.054" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5311" min="1" max="1" chance="2.047" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5329" min="1" max="1" chance="2.047" /> <!-- Sealed Majestic Robe -->
-				<item id="5323" min="1" max="1" chance="2.019" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5316" min="1" max="1" chance="2.017" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5320" min="1" max="1" chance="1.973" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="6323" min="1" max="1" chance="0.75" /> <!-- Sealed Phoenix Necklace -->
-				<item id="8621" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Version) -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="2" max="4" chance="50.91" /> <!-- Cloth Piece -->
-				<item id="33808" min="1" max="1" chance="50.79" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="33814" min="2" max="4" chance="50.72" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="729" min="1" max="1" chance="49.79" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="730" min="1" max="1" chance="49.6" /> <!-- Scroll: Enchant Armor (A-grade) -->
-				<item id="49682" min="1" max="1" chance="26.83" /> <!-- Baium? Soul -->
-				<item id="90899" min="1" max="1" chance="2.959" /> <!-- Blessed Agathion's Soul -->
+				<group chance="100">
+					<item id="80" min="1" max="1" chance="5" /> <!-- Tallum Blade -->
+					<item id="81" min="1" max="1" chance="4" /> <!-- Dragon Slayer -->
+					<item id="98" min="1" max="1" chance="5" /> <!-- Halberd -->
+					<item id="150" min="1" max="1" chance="5" /> <!-- Elemental Sword -->
+					<item id="151" min="1" max="1" chance="5" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="1" chance="4" /> <!-- Elysian -->
+					<item id="212" min="1" max="1" chance="4" /> <!-- Dasparion's Staff -->
+					<item id="213" min="1" max="1" chance="4" /> <!-- Branch of the Mother Tree -->
+					<item id="235" min="1" max="1" chance="5" /> <!-- Bloody Orchid -->
+					<item id="236" min="1" max="1" chance="4" /> <!-- Soul Separator -->
+					<item id="269" min="1" max="1" chance="5" /> <!-- Blood Tornado -->
+					<item id="270" min="1" max="1" chance="4" /> <!-- Dragon Grinder -->
+					<item id="288" min="1" max="1" chance="5" /> <!-- Carnage Bow -->
+					<item id="289" min="1" max="1" chance="5" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="1" chance="4" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="1" chance="4" /> <!-- Dark Legion's Edge -->
+					<item id="2504" min="1" max="1" chance="5" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="1" chance="5" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="1" chance="5" /> <!-- Spiritual Eye -->
+					<item id="7895" min="1" max="1" chance="4" /> <!-- Flaming Dragon Skull -->
+					<item id="7899" min="1" max="1" chance="5" /> <!-- Destroyer Hammer -->
+					<item id="7902" min="1" max="1" chance="4" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="100">
+					<item id="7883" min="1" max="1" chance="17" /> <!-- Guardian's Sword -->
+					<item id="7889" min="1" max="1" chance="16" /> <!-- Wizard's Tear -->
+					<item id="7892" min="1" max="1" chance="17" /> <!-- Spell Breaker -->
+					<item id="7893" min="1" max="1" chance="17" /> <!-- Kaim Vanul's Bones -->
+					<item id="7900" min="1" max="1" chance="17" /> <!-- Ice Storm Hammer -->
+					<item id="7901" min="1" max="1" chance="16" /> <!-- Star Buster -->
+				</group>
+				<group chance="100">
+					<item id="5287" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5292" min="1" max="3" chance="7" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5293" min="1" max="1" chance="3" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="3" chance="5" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="3" chance="5" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="3" chance="5" /> <!-- Sealed Tallum Boots -->
+					<item id="5297" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5301" min="1" max="1" chance="3" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="1" chance="3" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="1" chance="3" /> <!-- Sealed Tallum Stockings -->
+					<item id="5308" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Robe -->
+					<item id="5311" min="1" max="1" chance="2" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="1" chance="3" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="1" chance="3" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="1" chance="3" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5315" min="1" max="1" chance="6" /> <!-- Sealed Shield of Nightmare -->
+					<item id="5316" min="1" max="1" chance="2" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="1" chance="3" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="1" chance="3" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="1" chance="3" /> <!-- Sealed Majestic Boots -->
+					<item id="5320" min="1" max="1" chance="2" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5323" min="1" max="1" chance="2" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5326" min="1" max="1" chance="2" /> <!-- Sealed Robe of Nightmare -->
+					<item id="5329" min="1" max="1" chance="2" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="100">
+					<item id="6323" min="1" max="1" chance="1" /> <!-- Sealed Phoenix Necklace -->
+					<item id="6324" min="1" max="1" chance="4" /> <!-- Sealed Phoenix Earring -->
+					<item id="6325" min="1" max="3" chance="15" /> <!-- Sealed Phoenix Ring -->
+					<item id="6326" min="1" max="1" chance="8" /> <!-- Sealed Majestic Necklace -->
+					<item id="6327" min="1" max="1" chance="20" /> <!-- Sealed Majestic Earring -->
+					<item id="6328" min="1" max="3" chance="52" /> <!-- Sealed Majestic Ring -->
+				</group>
+				<group chance="100">
+					<item id="33808" min="1" max="1" chance="50" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
+					<item id="33814" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="729" min="1" max="1" chance="50" /> <!-- Scroll: Enchant Weapon (A-grade) -->
+					<item id="730" min="1" max="1" chance="50" /> <!-- Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="30">
+					<item id="49580" min="1" max="1" chance="100" /> <!-- Baium's Ring -->
+				</group>
+				<group chance="30">
+					<item id="49683" min="1" max="1" chance="10" /> <!-- Talisman of Baium -->
+					<item id="49682" min="1" max="1" chance="90" /> <!-- Baium's Soul -->
+				</group>
+				<group chance="100">
+					<item id="8621" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Version) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -1410,9 +1291,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="93" /> <!-- Winged Spear -->
 		<acquire exp="11520" sp="2" />
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="290966.74193" hpRegen="8.5" mp="1608.045" mpRegen="3" />
-			<attack physical="395" magical="371" random="30" critical="4" accuracy="40" attackSpeed="206" type="POLE" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="747660" hpRegen="158" mp="1475" mpRegen="3" />
+			<attack physical="4185" magical="371" random="10" critical="4" accuracy="0" attackSpeed="253" type="POLE" range="80" distance="80" width="120" />
 			<defence physical="5108" magical="1686" />
 			<speed>
 				<walk ground="50" />
@@ -1421,11 +1302,18 @@
 			<hitTime>760</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4132" level="1" /> <!-- Spear: Pound the Ground -->
-			<skill id="4133" level="1" /> <!-- Heal -->
 			<skill id="4416" level="8" /> <!-- Angel -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="11" /> <!-- Spear -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="300" isAggressive="true">
@@ -1443,9 +1331,9 @@
 		<sex>MALE</sex>
 		<acquire exp="102487500" sp="3074625" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="36946499.75369" hpRegen="310.756323" mp="20787.765" mpRegen="3" />
-			<attack physical="33864" magical="42273" random="30" critical="4" accuracy="40" attackSpeed="206" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3680" magical="4661" />
+			<vitals hp="66666666.6666667" hpRegen="2981.0298102981" mp="12240" mpRegen="10" />
+			<attack physical="15182.9268292683" magical="6600.03819341452" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2692.68292682927" magical="1794.92939666239" />
 			<speed>
 				<walk ground="42" />
 				<run ground="190" />
@@ -1453,13 +1341,19 @@
 			<hitTime>590</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4221" level="1" /> <!-- Range Dual Attack -->
-			<skill id="4220" level="1" /> <!-- Dual Attack -->
-			<skill id="4218" level="1" /> <!-- Drain -->
-			<skill id="4219" level="1" /> <!-- Hold -->
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1470,81 +1364,95 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="6328" min="1" max="3" chance="50.42" /> <!-- Sealed Majestic Ring -->
-				<item id="6327" min="1" max="3" chance="19.4" /> <!-- Sealed Majestic Earring -->
-				<item id="90763" min="1" max="1" chance="19.02" /> <!-- Zaken's Earring -->
-				<item id="7892" min="1" max="3" chance="17.3" /> <!-- Spell Breaker -->
-				<item id="7893" min="1" max="3" chance="17.14" /> <!-- Kaim Vanul's Bones -->
-				<item id="7883" min="1" max="3" chance="16.6" /> <!-- Guardian's Sword -->
-				<item id="7900" min="1" max="3" chance="16.49" /> <!-- Ice Storm Hammer -->
-				<item id="7889" min="1" max="3" chance="15.72" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="3" chance="15.06" /> <!-- Star Buster -->
-				<item id="6325" min="1" max="3" chance="14.33" /> <!-- Sealed Phoenix Ring -->
-				<item id="6326" min="1" max="3" chance="7.881" /> <!-- Sealed Majestic Necklace -->
-				<item id="5292" min="1" max="3" chance="6.897" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="5.815" /> <!-- Sealed Shield of Nightmare -->
-				<item id="5291" min="1" max="3" chance="4.97" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="269" min="1" max="3" chance="4.969" /> <!-- Blood Tornado -->
-				<item id="5295" min="1" max="3" chance="4.969" /> <!-- Sealed Tallum Gloves -->
-				<item id="5289" min="1" max="3" chance="4.965" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5294" min="1" max="3" chance="4.948" /> <!-- Sealed Tallum Helmet -->
-				<item id="80" min="1" max="3" chance="4.946" /> <!-- Tallum Blade -->
-				<item id="98" min="1" max="3" chance="4.933" /> <!-- Halberd -->
-				<item id="7884" min="1" max="3" chance="4.931" /> <!-- Infernal Master -->
-				<item id="7894" min="1" max="3" chance="4.907" /> <!-- Spiritual Eye -->
-				<item id="288" min="1" max="3" chance="4.897" /> <!-- Carnage Bow -->
-				<item id="235" min="1" max="3" chance="4.894" /> <!-- Bloody Orchid -->
-				<item id="5290" min="1" max="3" chance="4.87" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="289" min="1" max="3" chance="4.853" /> <!-- Soul Bow -->
-				<item id="7899" min="1" max="3" chance="4.847" /> <!-- Destroyer Hammer -->
-				<item id="150" min="1" max="3" chance="4.845" /> <!-- Elemental Sword -->
-				<item id="2504" min="1" max="3" chance="4.84" /> <!-- Meteor Shower -->
-				<item id="5296" min="1" max="3" chance="4.836" /> <!-- Sealed Tallum Boots -->
-				<item id="151" min="1" max="3" chance="4.831" /> <!-- Sword of Miracles -->
-				<item id="81" min="1" max="3" chance="3.984" /> <!-- Dragon Slayer -->
-				<item id="2500" min="1" max="3" chance="3.975" /> <!-- Dark Legion's Edge -->
-				<item id="7895" min="1" max="3" chance="3.938" /> <!-- Flaming Dragon Skull -->
-				<item id="7902" min="1" max="3" chance="3.929" /> <!-- Doom Crusher -->
-				<item id="6324" min="1" max="3" chance="3.916" /> <!-- Sealed Phoenix Earring -->
-				<item id="270" min="1" max="3" chance="3.905" /> <!-- Dragon Grinder -->
-				<item id="236" min="1" max="3" chance="3.903" /> <!-- Soul Separator -->
-				<item id="213" min="1" max="3" chance="3.902" /> <!-- Branch of the Mother Tree -->
-				<item id="164" min="1" max="3" chance="3.892" /> <!-- Elysian -->
-				<item id="305" min="1" max="3" chance="3.877" /> <!-- Tallum Glaive -->
-				<item id="212" min="1" max="3" chance="3.874" /> <!-- Dasparion's Staff -->
-				<item id="5313" min="1" max="3" chance="3.004" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5293" min="1" max="3" chance="2.988" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5317" min="1" max="3" chance="2.975" /> <!-- Sealed Majestic Circlet -->
-				<item id="5288" min="1" max="3" chance="2.966" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5319" min="1" max="3" chance="2.956" /> <!-- Sealed Majestic Boots -->
-				<item id="5304" min="1" max="3" chance="2.93" /> <!-- Sealed Tallum Tunic -->
-				<item id="5287" min="1" max="3" chance="2.929" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5312" min="1" max="3" chance="2.916" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5318" min="1" max="3" chance="2.916" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5308" min="1" max="3" chance="2.915" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5298" min="1" max="3" chance="2.906" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="2.889" /> <!-- Sealed Tallum Stockings -->
-				<item id="5301" min="1" max="3" chance="2.889" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5297" min="1" max="3" chance="2.889" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5314" min="1" max="3" chance="2.874" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5316" min="1" max="3" chance="2.028" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5311" min="1" max="3" chance="1.958" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5323" min="1" max="3" chance="1.956" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5329" min="1" max="3" chance="1.936" /> <!-- Sealed Majestic Robe -->
-				<item id="5320" min="1" max="3" chance="1.91" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="1.898" /> <!-- Sealed Robe of Nightmare -->
-				<item id="6323" min="1" max="3" chance="0.75" /> <!-- Sealed Phoenix Necklace -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="1" max="3" chance="100" /> <!-- Cloth Piece -->
-				<item id="33814" min="5" max="15" chance="50.84" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="729" min="2" max="4" chance="50.56" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="730" min="6" max="12" chance="50.48" /> <!-- Scroll: Enchant Armor (A-grade) -->
-				<item id="33808" min="2" max="4" chance="49.66" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="90899" min="1" max="1" chance="2.93" /> <!-- Blessed Agathion's Soul -->
+				<group chance="98">
+					<item id="80" min="1" max="3" chance="5" /> <!-- Tallum Blade -->
+					<item id="81" min="1" max="3" chance="4" /> <!-- Dragon Slayer -->
+					<item id="98" min="1" max="3" chance="5" /> <!-- Halberd -->
+					<item id="150" min="1" max="3" chance="5" /> <!-- Elemental Sword -->
+					<item id="151" min="1" max="3" chance="5" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="3" chance="4" /> <!-- Elysian -->
+					<item id="212" min="1" max="3" chance="4" /> <!-- Dasparion's Staff -->
+					<item id="213" min="1" max="3" chance="4" /> <!-- Branch of the Mother Tree -->
+					<item id="235" min="1" max="3" chance="5" /> <!-- Bloody Orchid -->
+					<item id="236" min="1" max="3" chance="4" /> <!-- Soul Separator -->
+					<item id="269" min="1" max="3" chance="5" /> <!-- Blood Tornado -->
+					<item id="270" min="1" max="3" chance="4" /> <!-- Dragon Grinder -->
+					<item id="288" min="1" max="3" chance="5" /> <!-- Carnage Bow -->
+					<item id="289" min="1" max="3" chance="5" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="3" chance="4" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="3" chance="4" /> <!-- Dark Legion's Edge -->
+					<item id="2504" min="1" max="3" chance="5" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="3" chance="5" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="3" chance="5" /> <!-- Spiritual Eye -->
+					<item id="7895" min="1" max="3" chance="4" /> <!-- Flaming Dragon Skull -->
+					<item id="7899" min="1" max="3" chance="5" /> <!-- Destroyer Hammer -->
+					<item id="7902" min="1" max="3" chance="4" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="98">
+					<item id="7883" min="1" max="3" chance="17" /> <!-- Guardian's Sword -->
+					<item id="7889" min="1" max="3" chance="16" /> <!-- Wizard's Tear -->
+					<item id="7892" min="1" max="3" chance="17" /> <!-- Spell Breaker -->
+					<item id="7893" min="1" max="3" chance="17" /> <!-- Kaim Vanul's Bones -->
+					<item id="7900" min="1" max="3" chance="17" /> <!-- Ice Storm Hammer -->
+					<item id="7901" min="1" max="3" chance="16" /> <!-- Star Buster -->
+				</group>
+				<group chance="98">
+					<item id="5287" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5292" min="1" max="3" chance="7" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5293" min="1" max="3" chance="3" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="3" chance="5" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="3" chance="5" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="3" chance="5" /> <!-- Sealed Tallum Boots -->
+					<item id="5297" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5301" min="1" max="3" chance="3" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="3" chance="3" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="3" chance="3" /> <!-- Sealed Tallum Stockings -->
+					<item id="5308" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Robe -->
+					<item id="5311" min="1" max="3" chance="2" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="3" chance="3" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="3" chance="3" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="3" chance="3" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5315" min="1" max="3" chance="6" /> <!-- Sealed Shield of Nightmare -->
+					<item id="5316" min="1" max="3" chance="2" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="3" chance="3" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="3" chance="3" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="3" chance="3" /> <!-- Sealed Majestic Boots -->
+					<item id="5320" min="1" max="3" chance="2" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5323" min="1" max="3" chance="2" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5326" min="1" max="3" chance="2" /> <!-- Sealed Robe of Nightmare -->
+					<item id="5329" min="1" max="3" chance="2" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="98">
+					<item id="6323" min="1" max="3" chance="1" /> <!-- Sealed Phoenix Necklace -->
+					<item id="6324" min="1" max="3" chance="4" /> <!-- Sealed Phoenix Earring -->
+					<item id="6325" min="1" max="3" chance="15" /> <!-- Sealed Phoenix Ring -->
+					<item id="6326" min="1" max="3" chance="8" /> <!-- Sealed Majestic Necklace -->
+					<item id="6327" min="1" max="3" chance="20" /> <!-- Sealed Majestic Earring -->
+					<item id="6328" min="1" max="3" chance="52" /> <!-- Sealed Majestic Ring -->
+				</group>
+				<group chance="100">
+					<item id="33808" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
+					<item id="33814" min="5" max="15" chance="50" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="729" min="2" max="4" chance="50" /> <!-- Scroll: Enchant Weapon (A-grade) -->
+					<item id="730" min="6" max="12" chance="50" /> <!-- Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="20">
+					<item id="90763" min="1" max="1" chance="100" /> <!-- Zaken's Earring -->
+				</group>
+				<group chance="100">
+					<item id="49756" min="1" max="3" chance="100" /> <!-- Cloth Piece -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29023" level="74" type="Monster" name="Maiden Doll">
+	<npc id="29023" level="58" type="Monster" name="Maiden Doll">
 		<parameters>
 			<param name="MoveAroundSocial" value="50" />
 			<param name="MoveAroundSocial1" value="50" />
@@ -1555,33 +1463,31 @@
 		<equipment rhand="5129" /> <!-- Doll Knife -->
 		<acquire exp="129198" sp="3875" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1828" hpRegen="6.5" mp="832" mpRegen="2.4" />
-			<attack physical="442" magical="302" random="30" critical="4" accuracy="40" attackSpeed="253" type="DUAL" range="40" distance="80" width="120" />
+			<vitals hp="1828" hpRegen="6.5" mp="832.4" mpRegen="2.4" />
+			<attack physical="442" magical="302" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="DUAL" range="40" distance="80" width="120" />
 			<defence physical="261" magical="191" />
 			<speed>
 				<walk ground="22" />
 				<run ground="150" />
 			</speed>
-			<hitTime>500</hitTime>
+			<hitTime>50</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="5" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4085" level="1" /> <!-- Critical Damage -->
-			<skill id="4086" level="1" /> <!-- Critical Chance -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="9" /> <!-- Average M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="19" /> <!-- Dual-Sword Weapons -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4333" level="5" /> <!-- Dark Attack Resistance -->
-			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4415" level="19" /> <!-- Dual Sword -->
+			<skill id="4071" level="5" /> <!-- Bow/Crossbow Resistance -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1589,22 +1495,8 @@
 			<radius normal="6" />
 			<height normal="12" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="97" min="1" max="1" chance="0.0075" /> <!-- Lance -->
-				<item id="268" min="1" max="1" chance="0.0075" /> <!-- Bellion Cestus -->
-				<item id="57" min="2433" max="5685" chance="70" /> <!-- Adena -->
-				<item id="1887" min="1" max="1" chance="10.68" /> <!-- Varnish of Purity -->
-				<item id="4120" min="1" max="1" chance="1.603" /> <!-- Bellion Cestus Edge -->
-				<item id="4115" min="1" max="1" chance="1.574" /> <!-- Lance Blade -->
-			</drop>
-			<spoil>
-				<item id="948" min="1" max="1" chance="4.296" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="947" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-			</spoil>
-		</dropLists>
 	</npc>
-	<npc id="29024" level="74" type="Monster" name="Veil Master">
+	<npc id="29024" level="59" type="Monster" name="Veil Master">
 		<parameters>
 			<param name="MoveAroundSocial" value="114" />
 			<param name="MoveAroundSocial1" value="114" />
@@ -1615,7 +1507,7 @@
 		<acquire exp="90904" sp="2727" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1880" hpRegen="6.5" mp="861" mpRegen="2.4" />
-			<attack physical="461" magical="315" random="30" critical="4" accuracy="40" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="461" magical="315" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="267" magical="195" />
 			<speed>
 				<walk ground="70" />
@@ -1624,66 +1516,9 @@
 			<hitTime>740</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="5" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4085" level="1" /> <!-- Critical Damage -->
-			<skill id="4086" level="1" /> <!-- Critical Chance -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4333" level="5" /> <!-- Dark Attack Resistance -->
 			<skill id="4416" level="9" /> <!-- Demons -->
-		</skillList>
-		<exCrtEffect>true</exCrtEffect>
-		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
-		<collision>
-			<radius normal="12" />
-			<height normal="40" />
-		</collision>
-		<dropLists>
-			<drop>
-				<item id="79" min="1" max="1" chance="0.003" /> <!-- Damascus -->
-				<item id="171" min="1" max="1" chance="0.003" /> <!-- Deadman's Glory -->
-				<item id="57" min="1372" max="3205" chance="70" /> <!-- Adena -->
-				<item id="1895" min="1" max="1" chance="11.11" /> <!-- Metallic Fiber -->
-				<item id="1876" min="1" max="1" chance="8.019" /> <!-- Mithril Ore -->
-				<item id="1866" min="2" max="6" chance="6.628" /> <!-- Suede -->
-				<item id="1879" min="1" max="1" chance="6.623" /> <!-- Cokes -->
-				<item id="1870" min="5" max="15" chance="3.946" /> <!-- Coal -->
-				<item id="1871" min="9" max="27" chance="2.235" /> <!-- Charcoal -->
-				<item id="4114" min="1" max="1" chance="0.75" /> <!-- Damascus Sword Blade -->
-				<item id="4116" min="1" max="1" chance="0.75" /> <!-- Deadman's Glory Stone -->
-			</drop>
-			<spoil>
-				<item id="948" min="1" max="1" chance="2.453" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="947" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-			</spoil>
-		</dropLists>
-	</npc>
-	<npc id="29025" level="75" type="Folk" name="Baium">
-		<race>HUMANOID</race>
-		<sex>MALE</sex>
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="1709400" hpRegen="8.5" mp="18000" mpRegen="3" />
-			<attack physical="874.18" magical="596.95" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="233.61" magical="233.61" />
-			<speed>
-				<walk ground="50" />
-				<run ground="120" />
-			</speed>
-			<abnormalResist physical="230" magical="230" />
-		</stats>
-		<status attackable="false" undying="true" />
-		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1692,7 +1527,44 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4071" level="5" /> <!-- Bow/Crossbow Resistance -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+		</skillList>
+		<exCrtEffect>true</exCrtEffect>
+		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="29025" level="75" type="Folk" name="Baium">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="1709400" hpRegen="718" mp="18000" mpRegen="99" />
+			<attack physical="1874.18" magical="1596.95" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3300" magical="2200" />
+			<speed>
+				<walk ground="50" />
+				<run ground="120" />
+			</speed>
+			<hitTime>60</hitTime>
+			<abnormalResist physical="230" magical="230" />
+		</stats>
+		<status attackable="false" undying="true" />
+		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="300" aggroRange="4296" />
@@ -1712,7 +1584,7 @@
 		<equipment rhand="232" /> <!-- Dark Elven Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1933" hpRegen="6.5" mp="804" mpRegen="2.4" />
-			<attack physical="420" magical="328" random="10" critical="8" accuracy="40" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
+			<attack physical="420" magical="328" random="5" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="272" magical="199" />
 			<speed>
 				<walk ground="14" />
@@ -1721,9 +1593,9 @@
 			<hitTime>760</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1731,10 +1603,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="7" /> <!-- Daggers -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4415" level="7" /> <!-- Dagger -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1754,7 +1624,7 @@
 		<equipment rhand="225" /> <!-- Mithril Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1776" hpRegen="6.5" mp="584" mpRegen="2.1" />
-			<attack physical="371" magical="289" random="10" critical="8" accuracy="40" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
+			<attack physical="371" magical="289" random="5" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="256" magical="187" />
 			<speed>
 				<walk ground="11" />
@@ -1763,9 +1633,9 @@
 			<hitTime>740</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1773,10 +1643,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="7" /> <!-- Daggers -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4415" level="7" /> <!-- Dagger -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1785,28 +1653,27 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="29066" level="1" type="GrandBoss" name="Antharas">
+	<npc id="29066" level="75" type="GrandBoss" name="Antharas">
 		<parameters>
 			<param name="ultra_respawn_time" value="8" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<acquire exp="262720917" sp="63053" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="6100000" hpRegen="2" mp="1800000" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="6100000" hpRegen="1100" mp="1800000" mpRegen="1000" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3456" magical="862.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1815,8 +1682,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1827,75 +1695,29 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists> <!-- CT2.5 -->
-			<drop>
-				<item id="8620" min="10" max="30" chance="50" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="80" min="1" max="2" chance="25" /> <!-- Tallum Blade -->
-				<item id="98" min="1" max="2" chance="25" /> <!-- Halberd -->
-				<item id="269" min="1" max="2" chance="25" /> <!-- Blood Tornado -->
-				<item id="2504" min="1" max="2" chance="25" /> <!-- Meteor Shower -->
-				<item id="235" min="1" max="2" chance="25" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="2" chance="25" /> <!-- Carnage Bow -->
-				<item id="150" min="1" max="2" chance="25" /> <!-- Elemental Sword -->
-				<item id="212" min="1" max="2" chance="25" /> <!-- Dasparion's Staff -->
-				<item id="81" min="1" max="2" chance="25" /> <!-- Dragon Slayer -->
-				<item id="151" min="1" max="2" chance="25" /> <!-- Sword of Miracles -->
-				<item id="2500" min="1" max="2" chance="25" /> <!-- Dark Legion's Edge -->
-				<item id="164" min="1" max="2" chance="25" /> <!-- Elysian -->
-				<item id="236" min="1" max="2" chance="20" /> <!-- Soul Separator -->
-				<item id="270" min="1" max="2" chance="20" /> <!-- Dragon Grinder -->
-				<item id="289" min="1" max="2" chance="20" /> <!-- Soul Bow -->
-				<item id="213" min="1" max="2" chance="20" /> <!-- Branch of the Mother Tree -->
-				<item id="305" min="1" max="2" chance="20" /> <!-- Tallum Glaive -->
-				<item id="6326" min="1" max="5" chance="30" /> <!-- Sealed Majestic Necklace -->
-				<item id="6327" min="1" max="5" chance="35" /> <!-- Sealed Majestic Earring -->
-				<item id="6328" min="1" max="5" chance="35" /> <!-- Sealed Majestic Ring -->
-				<item id="6323" min="1" max="5" chance="30" /> <!-- Sealed Phoenix Necklace -->
-				<item id="6324" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Earring -->
-				<item id="6325" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Ring -->
-				<item id="5287" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5297" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5304" min="1" max="3" chance="25" /> <!-- Sealed Tallum Tunic -->
-				<item id="5311" min="1" max="3" chance="35" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5320" min="1" max="3" chance="35" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="30" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="3" chance="25" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5301" min="1" max="3" chance="25" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5308" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5316" min="1" max="3" chance="8" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5323" min="1" max="3" chance="8" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5329" min="1" max="3" chance="9" /> <!-- Sealed Majestic Robe -->
-				<item id="5288" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5298" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="30" /> <!-- Sealed Tallum Stockings -->
-				<item id="5289" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5294" min="1" max="3" chance="25" /> <!-- Sealed Tallum Helmet -->
-				<item id="5312" min="1" max="3" chance="25" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5317" min="1" max="3" chance="25" /> <!-- Sealed Majestic Circlet -->
-				<item id="5291" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5296" min="1" max="3" chance="25" /> <!-- Sealed Tallum Boots -->
-				<item id="5314" min="1" max="3" chance="25" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5319" min="1" max="3" chance="25" /> <!-- Sealed Majestic Boots -->
-				<item id="5290" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5295" min="1" max="3" chance="25" /> <!-- Sealed Tallum Gloves -->
-				<item id="5313" min="1" max="3" chance="25" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5318" min="1" max="3" chance="25" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5292" min="1" max="3" chance="40" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="40" /> <!-- Sealed Shield of Nightmare -->
-				<item id="729" min="1" max="19" chance="100" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="1538" min="1" max="59" chance="100" /> <!-- Blessed Scroll of Escape -->
-				<item id="3936" min="1" max="39" chance="100" /> <!-- Blessed Scroll of Resurrection -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="9000000" max="13000000" chance="100" /> <!-- Adena -->
-			</drop>
-		</dropLists>
 	</npc>
-	<npc id="29067" level="1" type="GrandBoss" name="Antharas">
+	<npc id="29061" displayId="31842" level="70" type="Teleporter" name="Teleportation Cubic">
+		<race>ETC</race>
+		<sex>ETC</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2444" hpRegen="7.5" mp="1345" mpRegen="2.7" />
+			<attack physical="688.86373" magical="470.40463" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="295.91597" magical="216.53847" />
+			<speed>
+				<walk ground="50" />
+				<run ground="120" />
+			</speed>
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="false" />
+		<exCrtEffect>true</exCrtEffect>
+		<ai type="BALANCED" clanHelpRange="300" isAggressive="true" aggroRange="500" />
+		<collision>
+			<radius normal="40" />
+			<height normal="80" />
+		</collision>
+	</npc>
+	<npc id="29067" level="75" type="GrandBoss" name="Antharas">
 		<parameters>
 			<param name="ultra_respawn_time" value="5" />
 		</parameters>
@@ -1904,19 +1726,18 @@
 		<acquire exp="262720918" sp="29116376" raidPoints="30780" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="6800000" hpRegen="1100" mp="1800000" mpRegen="1000" />
-			<attack physical="4900" magical="2550" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3456" magical="862.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1925,8 +1746,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1937,91 +1759,6 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="5292" min="1" max="1" chance="51.25" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="1" chance="50.84" /> <!-- Sealed Shield of Nightmare -->
-				<item id="90992" min="1" max="1" chance="29.03" /> <!-- Antharas' Earring -->
-				<item id="5329" min="1" max="1" chance="20.5" /> <!-- Sealed Majestic Robe -->
-				<item id="5311" min="1" max="1" chance="20.37" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5323" min="1" max="1" chance="20.04" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5320" min="1" max="1" chance="19.68" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="1" chance="19.57" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="1" chance="19.15" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5316" min="1" max="1" chance="19.09" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="7900" min="1" max="1" chance="17.8" /> <!-- Ice Storm Hammer -->
-				<item id="5308" min="1" max="1" chance="17.77" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="7892" min="1" max="1" chance="17.72" /> <!-- Spell Breaker -->
-				<item id="5301" min="1" max="1" chance="17.33" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="7883" min="1" max="1" chance="16.92" /> <!-- Guardian's Sword -->
-				<item id="7893" min="1" max="1" chance="16.91" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="16.68" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="15.89" /> <!-- Star Buster -->
-				<item id="5319" min="1" max="1" chance="13.64" /> <!-- Sealed Majestic Boots -->
-				<item id="5313" min="1" max="1" chance="13.35" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5312" min="1" max="1" chance="13.17" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5288" min="1" max="1" chance="13.03" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5314" min="1" max="1" chance="12.9" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5318" min="1" max="1" chance="12.85" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5305" min="1" max="1" chance="12.76" /> <!-- Sealed Tallum Stockings -->
-				<item id="5295" min="1" max="1" chance="12.67" /> <!-- Sealed Tallum Gloves -->
-				<item id="5289" min="1" max="1" chance="12.66" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5317" min="1" max="1" chance="12.7" /> <!-- Sealed Majestic Circlet -->
-				<item id="5298" min="1" max="1" chance="12.59" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5296" min="1" max="1" chance="12.45" /> <!-- Sealed Tallum Boots -->
-				<item id="5304" min="1" max="1" chance="12.44" /> <!-- Sealed Tallum Tunic -->
-				<item id="5294" min="1" max="1" chance="12.34" /> <!-- Sealed Tallum Helmet -->
-				<item id="5297" min="1" max="1" chance="12.19" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5287" min="1" max="1" chance="11.92" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5291" min="1" max="1" chance="10.018" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5290" min="1" max="1" chance="9.982" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="2500" min="1" max="1" chance="9.154" /> <!-- Dark Legion's Edge -->
-				<item id="7902" min="1" max="1" chance="9.146" /> <!-- Doom Crusher -->
-				<item id="81" min="1" max="1" chance="9.146" /> <!-- Dragon Slayer -->
-				<item id="80" min="1" max="1" chance="9.144" /> <!-- Tallum Blade -->
-				<item id="7895" min="1" max="1" chance="9.136" /> <!-- Flaming Dragon Skull -->
-				<item id="213" min="1" max="1" chance="9.134" /> <!-- Branch of the Mother Tree -->
-				<item id="236" min="1" max="1" chance="9.13" /> <!-- Soul Separator -->
-				<item id="7899" min="1" max="1" chance="9.129" /> <!-- Destroyer Hammer -->
-				<item id="2504" min="1" max="1" chance="9.126" /> <!-- Meteor Shower -->
-				<item id="305" min="1" max="1" chance="9.124" /> <!-- Tallum Glaive -->
-				<item id="164" min="1" max="1" chance="9.124" /> <!-- Elysian -->
-				<item id="270" min="1" max="1" chance="9.122" /> <!-- Dragon Grinder -->
-				<item id="150" min="1" max="1" chance="9.103" /> <!-- Elemental Sword -->
-				<item id="235" min="1" max="1" chance="9.095" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="1" chance="9.08" /> <!-- Carnage Bow -->
-				<item id="269" min="1" max="1" chance="9.077" /> <!-- Blood Tornado -->
-				<item id="7884" min="1" max="1" chance="9.073" /> <!-- Infernal Master -->
-				<item id="98" min="1" max="1" chance="9.07" /> <!-- Halberd -->
-				<item id="7894" min="1" max="1" chance="9.067" /> <!-- Spiritual Eye -->
-				<item id="212" min="1" max="1" chance="9.029" /> <!-- Dasparion's Staff -->
-				<item id="289" min="1" max="1" chance="9.025" /> <!-- Soul Bow -->
-				<item id="151" min="1" max="1" chance="9.024" /> <!-- Sword of Miracles -->
-				<item id="8683" min="1" max="1" chance="8.378" /> <!-- Tiphon's Spear -->
-				<item id="8684" min="1" max="1" chance="8.378" /> <!-- Shyeed's Bow -->
-				<item id="8682" min="1" max="1" chance="8.368" /> <!-- Naga Storm -->
-				<item id="8688" min="1" max="1" chance="8.356" /> <!-- Daimon Crystal -->
-				<item id="8678" min="1" max="1" chance="8.356" /> <!-- Sirra's Blade -->
-				<item id="8680" min="1" max="1" chance="8.331" /> <!-- Barakiel's Axe -->
-				<item id="8681" min="1" max="1" chance="8.328" /> <!-- Behemoth' Tuning Fork -->
-				<item id="8686" min="1" max="1" chance="8.324" /> <!-- Themis' Tongue -->
-				<item id="8679" min="1" max="1" chance="8.317" /> <!-- Sword of Ipos -->
-				<item id="8687" min="1" max="1" chance="8.295" /> <!-- Cabrio's Hand -->
-				<item id="5706" min="1" max="1" chance="8.273" /> <!-- Damascus*Damascus -->
-				<item id="8685" min="1" max="1" chance="8.268" /> <!-- Sobekk's Hurricane -->
-				<item id="90998" min="1" max="3" chance="100" /> <!-- Balthus Knights' Glittering Varnish -->
-				<item id="90997" min="3" max="7" chance="100" /> <!-- Balthus Knights' Shining Varnish -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="3" max="7" chance="100" /> <!-- Cloth Piece -->
-				<item id="33815" min="2" max="4" chance="50.21" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
-				<item id="33814" min="2" max="4" chance="49.99" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33809" min="2" max="4" chance="49.83" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
-				<item id="33807" min="2" max="4" chance="49.36" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
-				<item id="33813" min="2" max="4" chance="48.95" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
-				<item id="33808" min="2" max="4" chance="48.94" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="90899" min="1" max="1" chance="2.932" /> <!-- Blessed Agathion's Soul -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29068" level="84" type="GrandBoss" name="Antharas" title="Land Dragon">
 		<parameters>
@@ -2031,21 +1768,31 @@
 		<sex>MALE</sex>
 		<acquire exp="40664236032" sp="9759416" raidPoints="1000" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="197047999.75369" hpRegen="319.2293199" mp="3440344.575" mpRegen="3" />
-			<attack physical="4799.20533" magical="263.60854" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3974.13793" magical="496.01325" />
+			<vitals hp="355555555" hpRegen="38535.45" mp="2025740" mpRegen="1000" />
+			<attack physical="35810" magical="3783.6" random="5" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2505.43352601156" magical="1452.04745968969" />
 			<speed>
 				<walk ground="50" />
 				<run ground="279" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
+		<status attackable="true" noSleepMode="true" isDeathPenalty="true" />
 		<skillList>
-			<skill id="4112" level="1" /> <!-- Ordinary Attack -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
 			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
+			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
+			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4412" level="14" /> <!-- Strong P. Def. -->
+			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow/Crossbow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -2058,92 +1805,118 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="5315" min="1" max="3" chance="50.99" /> <!-- Sealed Shield of Nightmare -->
-				<item id="5292" min="1" max="3" chance="50.95" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="90992" min="1" max="1" chance="29.88" /> <!-- Antharas' Earring -->
-				<item id="5316" min="1" max="3" chance="20.86" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5311" min="1" max="3" chance="20.54" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5329" min="1" max="3" chance="20.4" /> <!-- Sealed Majestic Robe -->
-				<item id="5320" min="1" max="3" chance="20.14" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5293" min="1" max="3" chance="20.1" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5326" min="1" max="3" chance="19.88" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5323" min="1" max="3" chance="19.85" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="7900" min="1" max="3" chance="17.69" /> <!-- Ice Storm Hammer -->
-				<item id="5308" min="1" max="3" chance="16.76" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="7883" min="1" max="3" chance="16.68" /> <!-- Guardian's Sword -->
-				<item id="5301" min="1" max="3" chance="16.72" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="7889" min="1" max="3" chance="16.52" /> <!-- Wizard's Tear -->
-				<item id="7892" min="1" max="3" chance="16.33" /> <!-- Spell Breaker -->
-				<item id="7893" min="1" max="3" chance="16.28" /> <!-- Kaim Vanul's Bones -->
-				<item id="7901" min="1" max="3" chance="15.56" /> <!-- Star Buster -->
-				<item id="5317" min="1" max="3" chance="13.99" /> <!-- Sealed Majestic Circlet -->
-				<item id="5314" min="1" max="3" chance="13.51" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5318" min="1" max="3" chance="13.37" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5313" min="1" max="3" chance="13.21" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5319" min="1" max="3" chance="13.14" /> <!-- Sealed Majestic Boots -->
-				<item id="5305" min="1" max="3" chance="13" /> <!-- Sealed Tallum Stockings -->
-				<item id="5289" min="1" max="3" chance="12.9" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5295" min="1" max="3" chance="12.88" /> <!-- Sealed Tallum Gloves -->
-				<item id="5312" min="1" max="3" chance="12.87" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5298" min="1" max="3" chance="12.7" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5287" min="1" max="3" chance="12.53" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5294" min="1" max="3" chance="12.08" /> <!-- Sealed Tallum Helmet -->
-				<item id="5296" min="1" max="3" chance="11.98" /> <!-- Sealed Tallum Boots -->
-				<item id="5304" min="1" max="3" chance="11.96" /> <!-- Sealed Tallum Tunic -->
-				<item id="5288" min="1" max="3" chance="11.96" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5297" min="1" max="3" chance="11.89" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5291" min="1" max="3" chance="10.065" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5290" min="1" max="3" chance="9.981" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="2504" min="1" max="1" chance="9.16" /> <!-- Meteor Shower -->
-				<item id="81" min="1" max="1" chance="9.147" /> <!-- Dragon Slayer -->
-				<item id="151" min="1" max="1" chance="9.138" /> <!-- Sword of Miracles -->
-				<item id="236" min="1" max="1" chance="9.133" /> <!-- Soul Separator -->
-				<item id="213" min="1" max="1" chance="9.127" /> <!-- Branch of the Mother Tree -->
-				<item id="7895" min="1" max="1" chance="9.122" /> <!-- Flaming Dragon Skull -->
-				<item id="7894" min="1" max="1" chance="9.115" /> <!-- Spiritual Eye -->
-				<item id="270" min="1" max="1" chance="9.102" /> <!-- Dragon Grinder -->
-				<item id="289" min="1" max="1" chance="9.101" /> <!-- Soul Bow -->
-				<item id="7899" min="1" max="1" chance="9.086" /> <!-- Destroyer Hammer -->
-				<item id="2500" min="1" max="1" chance="9.085" /> <!-- Dark Legion's Edge -->
-				<item id="98" min="1" max="1" chance="9.084" /> <!-- Halberd -->
-				<item id="7884" min="1" max="1" chance="9.083" /> <!-- Infernal Master -->
-				<item id="305" min="1" max="1" chance="9.071" /> <!-- Tallum Glaive -->
-				<item id="150" min="1" max="1" chance="9.07" /> <!-- Elemental Sword -->
-				<item id="288" min="1" max="1" chance="9.068" /> <!-- Carnage Bow -->
-				<item id="164" min="1" max="1" chance="9.044" /> <!-- Elysian -->
-				<item id="235" min="1" max="1" chance="9.041" /> <!-- Bloody Orchid -->
-				<item id="212" min="1" max="1" chance="9.037" /> <!-- Dasparion's Staff -->
-				<item id="7902" min="1" max="1" chance="9.032" /> <!-- Doom Crusher -->
-				<item id="80" min="1" max="1" chance="9.03" /> <!-- Tallum Blade -->
-				<item id="269" min="1" max="1" chance="9.026" /> <!-- Blood Tornado -->
-				<item id="8680" min="1" max="1" chance="8.4" /> <!-- Barakiel's Axe -->
-				<item id="8682" min="1" max="1" chance="8.396" /> <!-- Naga Storm -->
-				<item id="8687" min="1" max="1" chance="8.386" /> <!-- Cabrio's Hand -->
-				<item id="8686" min="1" max="1" chance="8.354" /> <!-- Themis' Tongue -->
-				<item id="8679" min="1" max="1" chance="8.325" /> <!-- Sword of Ipos -->
-				<item id="8683" min="1" max="1" chance="8.323" /> <!-- Tiphon's Spear -->
-				<item id="5706" min="1" max="1" chance="8.308" /> <!-- Damascus*Damascus -->
-				<item id="8688" min="1" max="1" chance="8.3" /> <!-- Daimon Crystal -->
-				<item id="8684" min="1" max="1" chance="8.283" /> <!-- Shyeed's Bow -->
-				<item id="8678" min="1" max="1" chance="8.276" /> <!-- Sirra's Blade -->
-				<item id="8685" min="1" max="1" chance="8.271" /> <!-- Sobekk's Hurricane -->
-				<item id="8681" min="1" max="1" chance="8.266" /> <!-- Behemoth' Tuning Fork -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="3" max="7" chance="100" /> <!-- Cloth Piece -->
-				<item id="90998" min="1" max="3" chance="100" /> <!-- Balthus Knights' Glittering Varnish -->
-				<item id="90997" min="2" max="8" chance="100" /> <!-- Balthus Knights' Shining Varnish -->
-				<item id="33814" min="2" max="8" chance="50.61" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33807" min="2" max="8" chance="50.61" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
-				<item id="33815" min="2" max="4" chance="50.1" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
-				<item id="33808" min="2" max="8" chance="49.65" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="33813" min="2" max="8" chance="48.97" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
-				<item id="33809" min="2" max="4" chance="48.8" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
-				<item id="90899" min="1" max="1" chance="3.01" /> <!-- Blessed Agathion's Soul -->
+				<group chance="100">
+					<item id="80" min="1" max="1" chance="9.1" /> <!-- Tallum Blade -->
+					<item id="98" min="1" max="1" chance="9.09" /> <!-- Halberd -->
+					<item id="150" min="1" max="1" chance="9.09" /> <!-- Elemental Sword -->
+					<item id="212" min="1" max="1" chance="9.09" /> <!-- Dasparion's Staff -->
+					<item id="235" min="1" max="1" chance="9.09" /> <!-- Bloody Orchid -->
+					<item id="269" min="1" max="1" chance="9.09" /> <!-- Blood Tornado -->
+					<item id="288" min="1" max="1" chance="9.09" /> <!-- Carnage Bow -->
+					<item id="2504" min="1" max="1" chance="9.09" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="1" chance="9.09" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="1" chance="9.09" /> <!-- Spiritual Eye -->
+					<item id="7899" min="1" max="1" chance="9.09" /> <!-- Destroyer Hammer -->
+				</group>
+				<group chance="100">
+					<item id="81" min="1" max="1" chance="9.1" /> <!-- Dragon Slayer -->
+					<item id="151" min="1" max="1" chance="9.09" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="1" chance="9.09" /> <!-- Elysian -->
+					<item id="213" min="1" max="1" chance="9.09" /> <!-- Branch of the Mother Tree -->
+					<item id="236" min="1" max="1" chance="9.09" /> <!-- Soul Separator -->
+					<item id="270" min="1" max="1" chance="9.09" /> <!-- Dragon Grinder -->
+					<item id="289" min="1" max="1" chance="9.09" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="1" chance="9.09" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="1" chance="9.09" /> <!-- Dark Legion's Edge -->
+					<item id="7895" min="1" max="1" chance="9.09" /> <!-- Flaming Dragon Skull -->
+					<item id="7902" min="1" max="1" chance="9.09" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="100">
+					<item id="7883" min="1" max="3" chance="17" /> <!-- Guardian's Sword -->
+					<item id="7889" min="1" max="3" chance="16" /> <!-- Wizard's Tear -->
+					<item id="7892" min="1" max="3" chance="17" /> <!-- Spell Breaker -->
+					<item id="7893" min="1" max="3" chance="17" /> <!-- Kaim Vanul's Bones -->
+					<item id="7900" min="1" max="3" chance="17" /> <!-- Ice Storm Hammer -->
+					<item id="7901" min="1" max="3" chance="16" /> <!-- Star Buster -->
+				</group>
+				<group chance="100">
+					<item id="8678" min="1" max="1" chance="8.34" /> <!-- Sirra's Blade -->
+					<item id="8679" min="1" max="1" chance="8.33" /> <!-- Sword of Ipos -->
+					<item id="8680" min="1" max="1" chance="8.33" /> <!-- Barakiel's Axe -->
+					<item id="8681" min="1" max="1" chance="8.33" /> <!-- Behemoth' Tuning Fork -->
+					<item id="8682" min="1" max="1" chance="8.34" /> <!-- Naga Storm -->
+					<item id="8683" min="1" max="1" chance="8.33" /> <!-- Tiphon's Spear -->
+					<item id="8684" min="1" max="1" chance="8.34" /> <!-- Shyeed's Bow -->
+					<item id="8685" min="1" max="1" chance="8.33" /> <!-- Sobekk's Hurricane -->
+					<item id="8686" min="1" max="1" chance="8.34" /> <!-- Themis' Tongue -->
+					<item id="8687" min="1" max="1" chance="8.33" /> <!-- Cabrio's Hand -->
+					<item id="8688" min="1" max="1" chance="8.33" /> <!-- Daimon Crystal -->
+					<item id="5706" min="1" max="1" chance="8.33" /> <!-- Damascus*Damascus -->
+				</group>
+				<group chance="100">
+					<item id="5287" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="3" chance="10" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="3" chance="10" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5297" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5308" min="1" max="3" chance="17.5" /> <!-- Sealed Dark Crystal Robe -->
+				</group>
+				<group chance="100">
+					<item id="5293" min="1" max="3" chance="20" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Boots -->
+					<item id="5301" min="1" max="3" chance="17.5" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Stockings -->
+				</group>
+				<group chance="100">
+					<item id="5311" min="1" max="3" chance="20" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="3" chance="13.34" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="3" chance="13.33" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="3" chance="13.33" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5320" min="1" max="3" chance="20" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5326" min="1" max="3" chance="20" /> <!-- Sealed Robe of Nightmare -->
+				</group>
+				<group chance="100">
+					<item id="5316" min="1" max="3" chance="20" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="3" chance="13.34" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="3" chance="13.33" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="3" chance="13.33" /> <!-- Sealed Majestic Boots -->
+					<item id="5323" min="1" max="3" chance="20" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5329" min="1" max="3" chance="20" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="100">
+					<item id="5292" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5315" min="1" max="3" chance="50" /> <!-- Sealed Shield of Nightmare -->
+				</group>
+				<group chance="100">
+					<item id="33809" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
+					<item id="33815" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="100">
+					<item id="33808" min="2" max="8" chance="50" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
+					<item id="33814" min="2" max="8" chance="50" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="33807" min="2" max="8" chance="50" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
+					<item id="33813" min="2" max="8" chance="50" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
+				</group>
+				<group chance="100">
+					<item id="90997" min="2" max="8" chance="100" /> <!-- Balthus Knights' Shining Varnish -->
+				</group>
+				<group chance="100">
+					<item id="90998" min="1" max="3" chance="100" /> <!-- Balthus Knights' Glittering Varnish -->
+				</group>
+				<group chance="30">
+					<item id="90992" min="1" max="1" chance="100" /> <!-- Antharas' Earring -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
 	<npc id="29069" level="84" type="Monster" name="Behemoth Dragon">
-		<!-- Todo: CT2.5 -->
 		<parameters>
 			<param name="RootingManage" value="0" />
 			<skill name="PhysicalSpecial" id="5095" level="1" />
@@ -2152,21 +1925,31 @@
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="369465" hpRegen="8.5" mp="24863.19" mpRegen="3" />
-			<attack physical="3584.56902102981" magical="1386.66000087809" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="1071.29474264312" magical="522.626863116263" evasion="-18" />
+			<vitals hp="949367" hpRegen="22" mp="22800" mpRegen="30" />
+			<attack physical="14519" magical="11667" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="1370" magical="851" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" isDeathPenalty="true" />
 		<skillList>
-			<skill id="5095" level="1" /> <!-- Antharas Subordinate Melee Attack -->
-			<skill id="5096" level="1" /> <!-- Antharas Subordinate Remote Attack -->
 			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="5095" level="1" /> <!-- Antharas Subordinate Melee Attack -->
+			<skill id="5096" level="1" /> <!-- Antharas Subordinate Remote Attack -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="300" isAggressive="true">
@@ -2177,26 +1960,27 @@
 			<height normal="54" />
 		</collision>
 	</npc>
-	<npc id="29070" level="79" type="Monster" name="Dragon Bomber">
-		<!-- Todo: CT2.5 -->
+	<npc id="29070" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1353" hpRegen="8.5" mp="1809" mpRegen="3" />
-			<attack physical="1094.11758465172" magical="4902.24" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<vitals hp="1353.6766" hpRegen="8.5" mp="1809" mpRegen="3" />
+			<attack physical="1094.11758465172" magical="4902.24" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.098247547707" magical="261.308998696584" />
 			<speed>
 				<walk ground="35" />
 				<run ground="250" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2205,10 +1989,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2217,25 +1999,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29071" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29071" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="245" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2244,9 +2027,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2255,25 +2037,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29072" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29072" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="255" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2282,9 +2065,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2293,25 +2075,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29073" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29073" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="247" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2320,9 +2103,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2331,25 +2113,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29074" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29074" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="252" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2358,9 +2141,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2369,25 +2151,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29075" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29075" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="243" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2396,9 +2179,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2407,25 +2189,27 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29076" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29076" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1353" hpRegen="2" mp="1809" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1353.6766" hpRegen="8.5" mp="1809" mpRegen="3" />
+			<attack physical="1094.11758465172" magical="4902.24" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="357.098247547707" magical="261.308998696584" />
 			<speed>
 				<walk ground="35" />
 				<run ground="250" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2434,9 +2218,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="200" clanHelpRange="300" isAggressive="true" />
@@ -2445,7 +2228,7 @@
 			<height normal="34.5" />
 		</collision>
 	</npc>
-	<npc id="29077" level="78" type="Monster" name="">
+	<npc id="29077" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="177456" />
 			<param name="suicide2_x" value="177120" />
@@ -2465,19 +2248,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2486,7 +2270,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2495,7 +2279,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29078" level="78" type="Monster" name="">
+	<npc id="29078" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175952" />
 			<param name="suicide2_x" value="175712" />
@@ -2515,19 +2299,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2536,7 +2321,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2545,7 +2330,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29079" level="78" type="Monster" name="">
+	<npc id="29079" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175120" />
 			<param name="suicide2_x" value="175024" />
@@ -2565,19 +2350,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2586,7 +2372,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2595,7 +2381,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29080" level="78" type="Monster" name="">
+	<npc id="29080" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="174640" />
 			<param name="suicide2_x" value="174576" />
@@ -2615,19 +2401,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2636,7 +2423,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2645,7 +2432,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29081" level="78" type="Monster" name="">
+	<npc id="29081" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="173968" />
 			<param name="suicide2_x" value="173856" />
@@ -2665,19 +2452,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2686,7 +2474,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2695,7 +2483,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29082" level="78" type="Monster" name="">
+	<npc id="29082" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="173920" />
 			<param name="suicide2_x" value="174064" />
@@ -2715,19 +2503,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2736,7 +2525,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2745,7 +2534,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29083" level="78" type="Monster" name="">
+	<npc id="29083" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="174704" />
 			<param name="suicide2_x" value="174800" />
@@ -2765,19 +2554,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2786,7 +2576,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2795,7 +2585,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29084" level="78" type="Monster" name="">
+	<npc id="29084" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175424" />
 			<param name="suicide2_x" value="175632" />
@@ -2815,19 +2605,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2836,7 +2627,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2845,7 +2636,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29085" level="78" type="Monster" name="">
+	<npc id="29085" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="176880" />
 			<param name="suicide2_x" value="177200" />
@@ -2865,19 +2656,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2886,7 +2678,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2895,7 +2687,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29086" level="78" type="Monster" name="">
+	<npc id="29086" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="178368" />
 			<param name="suicide2_x" value="178592" />
@@ -2915,19 +2707,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2936,7 +2729,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2945,7 +2738,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29087" level="78" type="Monster" name="">
+	<npc id="29087" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="179696" />
 			<param name="suicide2_x" value="179920" />
@@ -2965,19 +2758,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2986,7 +2780,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -2995,7 +2789,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29088" level="78" type="Monster" name="">
+	<npc id="29088" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180592" />
 			<param name="suicide2_x" value="180752" />
@@ -3015,19 +2809,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3036,7 +2831,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3045,7 +2840,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29089" level="78" type="Monster" name="">
+	<npc id="29089" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180896" />
 			<param name="suicide2_x" value="180784" />
@@ -3065,19 +2860,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3086,7 +2882,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3095,7 +2891,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29090" level="78" type="Monster" name="">
+	<npc id="29090" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180496" />
 			<param name="suicide2_x" value="180512" />
@@ -3115,19 +2911,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3136,7 +2933,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3145,7 +2942,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29091" level="78" type="Monster" name="">
+	<npc id="29091" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180896" />
 			<param name="suicide2_x" value="181040" />
@@ -3165,19 +2962,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3186,7 +2984,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3195,7 +2993,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29092" level="78" type="Monster" name="">
+	<npc id="29092" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180720" />
 			<param name="suicide2_x" value="180640" />
@@ -3215,19 +3013,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3236,7 +3035,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3245,7 +3044,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29093" level="78" type="Monster" name="">
+	<npc id="29093" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180048" />
 			<param name="suicide2_x" value="179920" />
@@ -3265,19 +3064,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3286,7 +3086,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3295,7 +3095,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29094" level="78" type="Monster" name="">
+	<npc id="29094" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="178848" />
 			<param name="suicide2_x" value="178560" />
@@ -3315,19 +3115,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3336,7 +3137,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3345,20 +3146,34 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29099" level="80" type="Folk" name="Baium">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="53342293" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+	<npc id="29099" level="80" type="RaidBoss" name="Baium">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="35555555.2" hpRegen="2629" mp="18000" mpRegen="99" />
+			<attack physical="13829.6" magical="4375.2" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2048.8" magical="1365.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>60</hitTime>
+			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4256" level="1" /> <!-- Stun Resistance -->
+		</skillList>
 		<collision>
 			<radius normal="65" />
 			<height normal="174" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/29100-29199.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/29100-29199.xml
index 63e9cdb374..017c456818 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/29100-29199.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/29100-29199.xml
@@ -6,7 +6,7 @@
 		<equipment rhand="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="290966.74193" hpRegen="8.5" mp="1608.045" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="50" />
@@ -47,7 +47,7 @@
 		<acquire exp="0" sp="0" raidPoints="1000" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="24630999.75369" hpRegen="319.2293199" mp="3440344.575" mpRegen="3" />
-			<attack physical="3152.927754" magical="1289.681983" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="3152.927754" magical="1289.681983" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3500.450389" magical="1707.68215" />
 			<speed>
 				<walk ground="50" />
@@ -69,7 +69,7 @@
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="197048" hpRegen="8.5" mp="24863.19" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="55" />
@@ -90,7 +90,7 @@
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="394096" hpRegen="8.5" mp="24863.19" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="55" />
@@ -112,7 +112,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="60" />
@@ -208,7 +208,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="80" />
@@ -302,7 +302,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="60" />
@@ -396,7 +396,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="40" />
@@ -685,7 +685,7 @@
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="11083949.50738" hpRegen="310.756323" mp="20787.765" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="42" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/36700-36799.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/36700-36799.xml
index 12151829f8..6942dd0a84 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/36700-36799.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/npcs/36700-36799.xml
@@ -466,7 +466,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -493,7 +493,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -520,7 +520,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -547,7 +547,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -597,7 +597,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -624,7 +624,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -651,7 +651,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -678,7 +678,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/02000-02099.xml
index 2a1054a9ad..ee1c132b9c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/02000-02099.xml
@@ -231,10 +231,16 @@
 	</skill>
 	<skill id="2013" toLevel="2" name="Scroll of Escape">
 		<icon>icon.skill0000</icon>
-		<hitTime>20000</hitTime>
+		<hitTime>
+			<value level="1">20000</value>
+			<value level="2">1000</value>
+		</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>736</itemConsumeId> <!-- Scroll of Escape -->
+		<itemConsumeId>
+			<value level="1">736</value> <!-- Scroll of Escape -->
+			<value level="2">49087</value> <!-- Improved Scroll of Escape -->
+		</itemConsumeId>
 		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/39000-39099.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/39000-39099.xml
index fdd68c9841..8a99fcd1f1 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/39000-39099.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/39000-39099.xml
@@ -1234,7 +1234,7 @@
 		<hitTime>1000</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>49087</itemConsumeId> <!-- Improved Scroll of Escape -->
+		<itemConsumeId>49500</itemConsumeId> <!-- Greater Scroll of Escape -->
 		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/39100-39199.xml
index a0a69878d9..13727754b9 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/39100-39199.xml
@@ -57,7 +57,19 @@
 	</skill>
 	<skill id="39103" toLevel="1" name="Warrior's Quick Healing Potion">
 		<icon>icon.etc_reagent_white_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<amount>500</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39104" toLevel="1" name="Hero Cube - 7-day">
 		<icon>icon.sa_cube</icon>
@@ -91,7 +103,7 @@
 		<icon>icon.etc_scroll_of_resurrection_i01</icon>
 		<castRange>400</castRange>
 		<effectPoint>1</effectPoint>
-		<effectRange>600</effectRange>
+		<effectRange>900</effectRange>
 		<hitTime>1000</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
@@ -104,6 +116,9 @@
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpResurrection" />
+			<condition name="TargetMyParty">
+				<includeMe>false</includeMe>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="Resurrection">
@@ -2199,6 +2214,59 @@
 	</skill>
 	<skill id="39199" toLevel="1" name="Hero's Wondrous Cubic - 7-day">
 		<icon>icon.sa_cube</icon>
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<reuseDelay>-1</reuseDelay>
+		<hitTime>500</hitTime>
+		<coolTime>500</coolTime>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpEncumbered">
+				<weightPercent>20</weightPercent>
+				<slotsPercent>10</slotsPercent>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="RestorationRandom">
+				<items>
+					<item chance="16">
+						<item id="49487" count="2"/> <!-- Soulshot Ticket -->
+					</item>
+					<item chance="4">
+						<item id="49772" count="1"/> <!-- Scroll of Mood Melody -->
+					</item>
+					<item chance="16.49">
+						<item id="49488" count="5"/> <!-- Major Healing Potion -->
+					</item>
+					<item chance="20">
+						<item id="35669" count="1"/> <!-- Angel Cat's Blessing -->
+					</item>
+					<item chance="5">
+						<item id="49533" count="1"/> <!-- Quick Hero Healing Potion -->
+					</item>
+					<item chance="10">
+						<item id="49542" count="1"/> <!-- Improved Scroll of Resurrection -->
+					</item>
+					<item chance="14.5">
+						<item id="49536" count="1"/> <!-- Box of Scroll of Escape to the Base -->
+					</item>
+					<item chance="2">
+						<item id="49489" count="3"/> <!-- Parts of Enchantment Scrolls Chest -->
+					</item>
+					<item chance="10">
+						<item id="49416" count="1"/> <!-- Blade Spirit -->
+					</item>
+					<item chance="0.01">
+						<item id="49859" count="1"/> <!-- Weapon Exchange Coupon -->
+					</item>
+					<item chance="2">
+						<item id="49490" count="1"/> <!-- Fishing Kit -->
+					</item>
+				</items>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/55200-55299.xml b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/55200-55299.xml
index 76838e7127..34a92461de 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/55200-55299.xml
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/55200-55299.xml
@@ -500,7 +500,7 @@
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>ATTACK_TIME_DOWN</abnormalType>
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer’s Potion -->
+		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer's Potion -->
 		<mpConsume>75</mpConsume>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/documentation.txt
index 56b793ae01..ebd313e4b6 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/stats/skills/documentation.txt
@@ -10,6 +10,8 @@ AddHate: Instant effect that increases target's hate towards you.
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -199,7 +201,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/Config.java
index 0506e61840..14e62140f2 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/Config.java
@@ -1202,6 +1202,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static boolean AUTO_PLAY_PREMIUM;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
@@ -1277,6 +1278,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2512,6 +2514,7 @@ public class Config
 			ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 			AUTO_PLAY_PREMIUM = autoPlayConfig.getBoolean("AutoPlayPremium", false);
 			DISABLED_AUTO_SKILLS.clear();
 			final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
@@ -3268,6 +3271,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index a50cbb8033..8378c362cb 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index 603e7d33be..dd968ed772 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -549,9 +549,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 2260001e17..380989e049 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index 91a35da584..2a6169578d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -61,7 +61,7 @@ public class DailyTaskManager
 	private static final Set<Integer> RESET_SKILLS = new HashSet<>();
 	static
 	{
-		// No known skills.
+		RESET_SKILLS.add(39199); // Hero's Wondrous Cubic
 	}
 	public static final Set<Integer> RESET_ITEMS = new HashSet<>();
 	static
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
index 543c76f7c1..d936f9b1e6 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
@@ -100,6 +100,7 @@ public class IdManager
 				cleanCount += statement.executeUpdate("DELETE FROM character_shortcuts WHERE character_shortcuts.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_skills WHERE character_skills.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_skills_save WHERE character_skills_save.charId NOT IN (SELECT charId FROM characters);");
+				cleanCount += statement.executeUpdate("DELETE FROM character_spirits WHERE character_spirits.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_subclasses WHERE character_subclasses.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_instance_time WHERE character_instance_time.charId NOT IN (SELECT charId FROM characters);");
 				
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 36f3461010..efc07efb38 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -230,7 +230,7 @@ public class ShortCuts implements IRestorable
 			if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL))
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 4dc627e30b..6165d65376 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1289,7 +1289,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2817,7 +2817,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2830,190 +2830,152 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
-								case ELEMENTAL_SPIRIT_EARTH_ATTACK:
-								case ELEMENTAL_SPIRIT_EARTH_DEFENSE:
-								case ELEMENTAL_SPIRIT_FIRE_ATTACK:
-								case ELEMENTAL_SPIRIT_FIRE_DEFENSE:
-								case ELEMENTAL_SPIRIT_WATER_ATTACK:
-								case ELEMENTAL_SPIRIT_WATER_DEFENSE:
-								case ELEMENTAL_SPIRIT_WIND_ATTACK:
-								case ELEMENTAL_SPIRIT_WIND_DEFENSE:
-								{
-									info.addComponentType(UserInfoType.ATT_SPIRITS);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
+							}
+							case ELEMENTAL_SPIRIT_EARTH_ATTACK:
+							case ELEMENTAL_SPIRIT_EARTH_DEFENSE:
+							case ELEMENTAL_SPIRIT_FIRE_ATTACK:
+							case ELEMENTAL_SPIRIT_FIRE_DEFENSE:
+							case ELEMENTAL_SPIRIT_WATER_ATTACK:
+							case ELEMENTAL_SPIRIT_WATER_DEFENSE:
+							case ELEMENTAL_SPIRIT_WIND_ATTACK:
+							case ELEMENTAL_SPIRIT_WIND_DEFENSE:
+							{
+								info.addComponentType(UserInfoType.ATT_SPIRITS);
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						player.refreshExpertisePenalty();
-						sendPacket(info);
+					}
+					player.refreshExpertisePenalty();
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java
index 9ec7376244..c76a595f52 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4544,7 +4544,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8258,9 +8258,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 532bbe1e9d..adc6bca76d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -846,7 +847,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -867,7 +868,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -892,7 +900,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -900,7 +908,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -946,7 +961,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index ea1abbff9b..074a4ae995 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -863,15 +862,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -882,8 +879,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -892,7 +893,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -965,33 +966,6 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
@@ -1001,9 +975,17 @@ public class CreatureStat
 		// Notify recalculation to child classes.
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 3155a27f10..ec3d03a6f5 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
index 97397f753f..9d5faa0c61 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
@@ -57,7 +57,10 @@ public enum CommissionItemType
 	NECKLACE(31),
 	BELT(32),
 	BRACELET(33),
+	AGATHION(62),
 	HAIR_ACCESSORY(34),
+	BROOCH_JEWEL(63),
+	ARTIFACT(64),
 	// Supplies
 	POTION(35),
 	SCROLL_ENCHANT_WEAPON(36),
@@ -65,6 +68,7 @@ public enum CommissionItemType
 	SCROLL_OTHER(38),
 	SOULSHOT(39),
 	SPIRITSHOT(40),
+	OTHER_SUPPLIES(41),
 	// Pet Goods
 	PET_EQUIPMENT(42),
 	PET_SUPPLIES(43),
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
index eb10918430..3a194d1660 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
@@ -47,8 +47,8 @@ public enum CommissionTreeType
 		CommissionItemType.SPEAR,
 		CommissionItemType.OTHER_WEAPON),
 	ARMOR(1, CommissionItemType.HELMET, CommissionItemType.ARMOR_TOP, CommissionItemType.ARMOR_PANTS, CommissionItemType.FULL_BODY, CommissionItemType.GLOVES, CommissionItemType.FEET, CommissionItemType.SHIELD, CommissionItemType.SIGIL, CommissionItemType.UNDERWEAR, CommissionItemType.CLOAK),
-	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.HAIR_ACCESSORY),
-	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT),
+	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.AGATHION, CommissionItemType.HAIR_ACCESSORY, CommissionItemType.BROOCH_JEWEL, CommissionItemType.ARTIFACT),
+	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT, CommissionItemType.OTHER_SUPPLIES),
 	PET_GOODS(4, CommissionItemType.PET_EQUIPMENT, CommissionItemType.PET_SUPPLIES),
 	MISC(
 		5,
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0b6092b2d9..1e393ec4bf 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2216,6 +2216,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index 281d957b09..ba369c8c2e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -39,6 +39,7 @@ import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AgathionData;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -52,6 +53,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -71,12 +73,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPi
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
 import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -91,6 +95,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1637,7 +1642,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2557,6 +2564,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2581,6 +2593,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2606,6 +2620,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index c135128d72..22328e53d7 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -780,7 +780,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -932,7 +933,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 1692c9fcd7..ec97ae1f75 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -652,7 +652,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -675,7 +675,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -710,7 +710,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 550ec01da3..a1b86fb20b 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -143,7 +143,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index c305987ba6..c29c9ba398 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -93,6 +93,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index c5257ff589..1aff35bfd5 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index dc65c817d5..1f12075a29 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -701,7 +701,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList();
 		player.updateShortCuts(_id, _level, 0);
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index c16d3301f0..7c284015a5 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -63,6 +63,6 @@ public class RequestShortCutReg implements ClientPacket
 		
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 	}
 }
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index 93f16169bc..07ed7641a9 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,127 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 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, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index dcc44cb9f3..2e152e2e29 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -207,7 +207,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		ServerPackets.EX_PET_INFO.writeId(this);
 		writeInt(_summon.getObjectId());
-		writeByte(_value); // // 0=teleported 1=default 2=summoned
+		writeByte(_value); // 0=teleported 1=default 2=summoned
 		writeShort(37); // mask_bits_37
 		writeBytes(_masks);
 		// Block 1
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
index a4539909c2..f7ac12028d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
@@ -167,7 +167,7 @@ public class FakePlayerInfo extends ServerPacket
 		writeByte(_npc.getTeam().getId());
 		writeInt(_clan != null ? _clan.getCrestLargeId() : 0);
 		writeByte(_fpcHolder.getNobleLevel());
-		writeByte(_fpcHolder.isHero());
+		writeByte(_fpcHolder.isHero() ? 2 : 0); // 152 - Value for enabled changed to 2
 		writeByte(_fpcHolder.isFishing());
 		writeInt(_fpcHolder.getBaitLocationX());
 		writeInt(_fpcHolder.getBaitLocationY());
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index f93c9e5e69..03909a2746 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
deleted file mode 100644
index 52a4032d14..0000000000
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
new file mode 100644
index 0000000000..62bb425a5a
--- /dev/null
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -0,0 +1,182 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeByte(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 83e29f7bed..3ee2b1ef96 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,19 +19,19 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
 	}
 	
@@ -53,8 +53,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 8872c0cf63..c2b8c8f51a 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -42,13 +48,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -59,8 +68,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 68ca369edf..37f3211b0a 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1f54b5040f..0d5d066d25 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,6 +25,7 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -95,6 +98,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							if (player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -120,23 +134,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -144,6 +167,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -178,32 +204,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -302,6 +351,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 7cd7dd9696..c56221841f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
@@ -51,7 +52,6 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +381,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/buffer_schemes.sql
index 1784421092..bd964c8cc2 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/buffer_schemes.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL,
     PRIMARY KEY (`object_id`,`scheme_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle.sql
index 0109cb8ab4..082a199079 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_spirits.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_spirits.sql
index ac73d8dbe3..bb4044039f 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_spirits.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_spirits.sql
@@ -11,6 +11,5 @@ CREATE TABLE `character_spirits`
     `crit_rate_points`   TINYINT      NOT NULL DEFAULT 0,
     `crit_damage_points` TINYINT      NOT NULL DEFAULT 0,
     `in_use`             BOOLEAN      NOT NULL DEFAULT FALSE,
-    PRIMARY KEY (`charId`, `type`),
-    FOREIGN KEY FK_CHARACTER_SPIRITS (`charId`) REFERENCES characters (`charId`) ON DELETE CASCADE
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+    PRIMARY KEY (`charId`, `type`)
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/characters.sql
index ea2aace011..60e1a786a2 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/characters.sql
@@ -60,4 +60,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort.sql
index 43de96f562..b4c76f8a7d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort_siege_guards.sql
index 19df57a3b9..43763210b4 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort_spawnlist.sql
index 22303a9b09..144979acd9 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,4 +11,4 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/grandboss_data.sql
index 9ad3ae33ce..bc319dc49e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/heroes.sql
index 2fc8753f90..49a371cbd5 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/heroes.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/items.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/olympiad_fights.sql
index ccd4ac94ec..f25cc4c1fa 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(4) NOT NULL DEFAULT 0,
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/Character.ini b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/Character.ini
index 7c11569fb6..ce23eb5cd6 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/Character.ini
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/Character.ini
@@ -285,8 +285,8 @@ MaxMAtk = 999999
 MaxPCritRate = 500
 
 # Maximum character Magic Critical Rate. (10 = 1%)
-# Default: 200
-MaxMCritRate = 200
+# Classic Default: 320
+MaxMCritRate = 320
 
 # Maximum character Attack Speed.
 # Default: 1500
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/General.ini b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/General.ini
index 477e6d2fc4..8770e08477 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/General.ini
@@ -430,8 +430,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
@@ -633,6 +633,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 
 # ---------------------------------------------------------------------------
 # Developer Settings
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/ActionData.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/ActionData.xml
index 677c57eb99..75b9af975b 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/ActionData.xml
@@ -1,218 +1,251 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
-	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
-	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
-	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
-	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
-	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
-	<action id="70" handler="AirshipAction" option="4" /> <!-- Exit Airship -->
-	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
-	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
-	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
-	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
-	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="50094" /> <!-- Nightshade - Shadow's Despair -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
-	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="0" handler="SitStand" /> <!-- Toggle Sit/Stand. (/sit, /stand) -->
+	<action id="1" handler="RunWalk" /> <!-- Toggle Walk/Run. (/walk, /run) -->
+	<action id="2" handler="None" /> <!-- Attacks selected target(s), or takes a general action if the target cannot be attacked. Hold down the Ctrl key and click to attack by force. (/attack, /attackforce) -->
+	<action id="3" handler="None" /> <!-- Request a trade from the selected target. (/trade) -->
+	<action id="4" handler="None" /> <!-- Selects the nearest attackable target within a 600 range. (Command: /targetnext) -->
+	<action id="5" handler="None" /> <!-- Pick up items that are scattered nearby. (/pickup) -->
+	<action id="6" handler="None" /> <!-- Change to the target of the currently selected player. (/assist) -->
+	<action id="7" handler="None" /> <!-- Invite the selected person to your party. (/invite) -->
+	<action id="8" handler="None" /> <!-- Leave the party. (/leave) -->
+	<action id="9" handler="None" /> <!-- If you are the leader of the party, dismiss selected members from your party. (/dismiss) -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Sets up a private store to sell your items. (/vendor) -->
+	<action id="11" handler="None" /> <!-- Display the party matching window to search for parties or to add members to your party. (/partymatching) -->
+	<action id="12" handler="SocialAction" option="2" /> <!-- Emote: Greet others with a kind "hello." (/socialhello) -->
+	<action id="13" handler="SocialAction" option="3" /> <!-- Emote: Let everyone know that you or someone else is victorious! (/socialvictory) -->
+	<action id="14" handler="SocialAction" option="4" /> <!-- Emote: Rouse your allies and charge! (/socialcharge) -->
+	<action id="15" handler="PetHold" /> <!-- Have your pet follow you or stay and hold its ground. -->
+	<action id="16" handler="PetAttack" /> <!-- Attack target. -->
+	<action id="17" handler="PetStop" /> <!-- Stop current action. -->
+	<action id="18" handler="None" /> <!-- Pick up nearby items. -->
+	<action id="19" handler="UnsummonPet" /> <!-- Returns your pet back to its home. -->
+	<action id="20" handler="None" /> <!-- Use special skill. -->
+	<action id="21" handler="ServitorHold" /> <!-- Have your summons follow you or stay and hold its ground. -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attack target. -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="24" handler="SocialAction" option="6" /> <!-- Emote: Respond positively. (/socialyes) -->
+	<action id="25" handler="SocialAction" option="5" /> <!-- Emote: Respond negatively. (/socialno) -->
+	<action id="26" handler="SocialAction" option="7" /> <!-- Emote: Show your respect and bow. (/socialbow) -->
+	<action id="27" handler="None" /> <!-- Use special skill. -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Sets up a private store to purchase items. (/buy) -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Emote: You have no idea what's going on. (/socialunaware) -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Emote: I'm waiting... (/socialwaiting) -->
+	<action id="31" handler="SocialAction" option="10" /> <!-- Emote: Have a good laugh. (/sociallaugh) -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Toggle between Attack/Move modes. -->
+	<action id="33" handler="SocialAction" option="11" /> <!-- Emote: Applaud. (/socialapplause) -->
+	<action id="34" handler="SocialAction" option="12" /> <!-- Emote: Serve them up your best dance moves. (/socialdance) -->
+	<action id="35" handler="SocialAction" option="13" /> <!-- Emote: Show grief. (/socialsad) -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Poison gas attack. -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Set up a private workshop that creates items by using Dwarven recipes in exchange for a fee. (/dwarvenmanufacture) -->
+	<action id="38" handler="Ride" /> <!-- Toggle mount/dismount when near or on an NPC that can be ridden. (/mount, /dismount, /mountdismount) -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Exploding corpse attack. -->
+	<action id="40" handler="None" /> <!-- Enhances a target's evaluation score. (/evaluate) -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Attacks castle gates, walls, or headquarters by shooting a cannon. -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Temporarily returns some of the received damage back to the enemy. -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Attacks an enemy by creating a whirling surge of water. -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Attacks an enemy with a powerful explosion. -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Restores the summoner's MP. -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Attacks an enemy by summoning up a devastating storm. -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Damages an enemy and absorbs some of the HP. -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Attacks the enemy by shooting a cannon. -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Attack with a fit of rage. -->
+	<action id="50" handler="None" /> <!-- The selected party member will become the new party leader. (/changepartyleader) -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Removes the bonds from the summons and releases it. -->
+	<action id="53" handler="ServitorMove" /> <!-- Move to the target. -->
+	<action id="54" handler="PetMove" /> <!-- Move to the target. -->
+	<action id="55" handler="None" /> <!-- Toggle recording and stop recording of replay files. (/start_replayrecording, /stop_replayrecording, /startstop_replayrecording) -->
+	<action id="56" handler="None" /> <!-- Invite the selected target to a command channel. (/channelinvite) -->
+	<action id="57" handler="None" /> <!-- Highlights private store and private workshop messages that contain the search word. (/findprivatestore) -->
+	<action id="58" handler="None" /> <!-- Challenges another character to a duel. (Command: /duel) -->
+	<action id="59" handler="None" /> <!-- Withdrawing from a duel means losing it. (Command: /withdraw) -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Open a personal store for package sale. (/packagesale) -->
+	<action id="62" handler="SocialAction" option="14" /> <!-- Charm Pose (Command: /charm) -->
+	<action id="64" handler="TeleportBookmark" /> <!-- Displays My Teleports window you can use to save and manage my teleport locations (command: /myteleport). -->
+	<action id="66" handler="SocialAction" option="15" /> <!-- Allows character to strike shy pose. (command: /shyness) -->
+	<action id="67" handler="AirshipAction" option="1" /> <!-- Allows you to control the Airship. -->
+	<action id="68" handler="AirshipAction" option="2" /> <!-- Relinquishes control of the Airship. -->
+	<action id="69" handler="AirshipAction" option="3" /> <!-- Choose from pre-designated locations. -->
+	<action id="70" handler="AirshipAction" option="4" /> <!-- Disembarks from the Airship. -->
+	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange bows with another person. (command: /two-personbow) -->
+	<action id="72" handler="SocialAction" option="17" /> <!-- High Five another person. (command: /hi-five) -->
+	<action id="73" handler="SocialAction" option="18" /> <!-- Dance with another player. (command: /coupledance) -->
+	<action id="76" handler="None" /> <!-- Invite the selected target as friends. (Commands: /friendinvite, /addfriend, /registerfriend) -->
+	<action id="77" handler="None" /> <!-- Start or end recording videos. (Commands: /startrecording, /stoprecording, /startstoprecording) -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Applies Token 1 to the target. Can be only used in a group. (Command: /tacticalsign1) -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Applies Token 2 to the target. Can be only used in a group. (Command: /tacticalsign2) -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Applies Token 3 to the target. Can be only used in a group. (Command: /tacticalsign3) -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Applies Token 4 to the target. Can be only used in a group. (Command: /tacticalsign4) -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Automatically focuses on the target marked with Token 1. Can be only used in a group. (Command: /targettacticalsign1) -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Automatically focuses on the target marked with Token 2. Can be only used in a group. (Command: /targettacticalsign2) -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Automatically focuses on the target marked with Token 3. Can be only used in a group. (Command: /targettacticalsign3) -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Automatically focuses on the target marked with Token 4. Can be only used in a group. (Command: /targettacticalsign4) -->
+	<action id="87" handler="SocialAction" option="28" /> <!-- Gesture of Proposal (Command: /Propose) -->
+	<action id="88" handler="SocialAction" option="29" /> <!-- Gesture of Provocation (Command: /Provoke) -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off (Command: /showoff) -->
+	<action id="92" handler="None" /> <!-- Selects the previously selected target within a 600 range. (Command: /targetprev) -->
+	<action id="93" handler="None" /> <!-- Selects the nearest attackable target within a 1400 range. (Command: /targetnext2) -->
+	<action id="94" handler="None" /> <!-- Selects the previously selected target within a 1400 range. (Command: /targetprev2) -->
+	<action id="96" handler="None" /> <!-- Selects a target that attacked you. (/counterattack) -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Attacks castle gates, walls, or headquarters with a powerful strike. -->
+	<action id="1001" handler="None" /> <!-- A reckless yet powerful attack that must be used with extreme caution. -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Instills animosity in others to make yourself the target. -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Instantly increases P. Def. and M. Def. significantly. Character is immovable while this skill is in effect. -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- A magical attack. -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Recovers the pet's HP. -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Increases a party member's P. Critical Rate and P. Critical Damage. -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Increases a party member's P. Atk. and Accuracy. -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Removes P. Accuracy, P. Atk./M. Atk., Atk. Spd./Casting Spd., and Decrease Movement Speed debuffs from your party member. -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Increases a party member's MP Recovery Rate and M. Critical Rate. -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Temporarily shortens a party member's spell cooldown and increases M. Atk. -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Removes Sleep/Hold/Stun/Paralysis/MEN Attack debuffs from a party member. -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Provokes an opponent to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Provokes multiple enemies around the caster to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1015" handler="ServitorSkillUse" option="50094" /> <!-- Decreases nearby enemies’ resistance to Sleep/Hold/Stun/Paralysis/MEN Attack/Pull/Knock Down attacks. -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Attempt a powerful, critical attack on an opponent. -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	
+	<!-- Actions 1018 to 1030 are present in the Client, but are not used in Classic. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Inflict a deadly curse on an enemy that absorbs their HP. -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kat the Cat -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mew the Cat -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kai the Cat -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Boxer the Unicorn -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mirage the Unicorn -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Skill 2 that is used by Merrow the Unicorn -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Skill 1 that is used by Shadow -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Skill 2 that is used by Shadow -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Skill 2 that is used by Silhouette -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by reanimated man -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by reanimated man -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by corrupted man -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- A powerful slashing attack. -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Spins rapidly to attack surrounding enemies. -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Immobilizes nearby enemies. -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Launches powerful rear kicks that stun and damage an enemy. -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Pounds multiple enemies with a tremendous water attack. -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Detonates a corpse, inflicting damage to nearby enemies. -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Blades attached to each arm slash out in a devastating attack. There is a small chance to untarget the enemy. -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Curses nearby enemies, decreasing their Atk. Spd. and Casting Spd. and inflicting damage over time. -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon: Fires a projectile a short distance. Consumes 4 Flash Gunpowder. -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon: Fires a projectile a long distance. Consumes 5 Flash Gunpowder. -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Viciously bite an enemy. -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Scratch an enemy with both paws. Causes bleeding. -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awaken hidden powers. -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Decrease a nearby enemy's P. Atk./M. Atk. with a wolf cry. -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Decrease a nearby enemy's attack speed/magic speed with a strider roar. -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Viciously bite an enemy. -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Causes both damage and shock at the same time. Instantly stuns an enemy. -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Breath fire in front of you. -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Increases maximum HP temporarily. -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Increases maximum MP temporarily. -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Increases Atk. Spd. temporarily. -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Increases Casting Spd. temporarily. -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Temporarily decreases the target's MP consumption of skills. Consumes Spirit Ore. -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Increases M. Atk. power temporarily. -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Momentarily increases the Critical Rate of magic attacks. -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Temporarily increases the critical attack power. -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Temporarily increases the probability of critical attack. -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Temporarily increases Accuracy. -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Rapidly attacks the enemy twice. -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Inflicts shock and damage to the enemy at the same time with a powerful spin attack. -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Attacks nearby enemies with a doll heap attack. -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakens a hidden ability. -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of thunder. -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack on nearby enemies when hit. -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Control put in place to prevent the use of a buff upon the master. 5-minute duration. -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Powerfully attacks the target. -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- A powerful attack that pierces through a target. -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies by spinning your own body like a whirlwind. -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Attacks a front-line enemy with a powerful lance thrust. -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Shouts a victory cry that increases your abilities. -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Gathers energy into your body, then releases it in a destructive blast. -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Hits enemies with a powerful wave of force. -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Emits a loud roar that amplifies your abilities. -->
+	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Charges toward the enemy and inflicts damage. -->
+	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Cancels the target's de-buff. -->
+	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Emits a spread of ring-shaped flames. -->
+	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Attacks the enemy with a powerful flaming beak. -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Toggles you between Attack and Support modes. -->
+	<action id="1085" handler="ServitorSkillUse" option="4707" /> <!-- Sacrifices HP in order to restore the HP of party members around you. -->
+	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Cancels one or more of the enemy's buffs. -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Decreases enemy’s Dark Attack by 25. -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Strike multiple enemies at the front with the tail. -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Bites the enemies at the front. -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Causes nearby enemies to flee in fear. -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Increases your speed. -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Greatly increases its master's speed. -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Increases the speed of its master and their party. -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Teleports its master to the Seed of Annihilation. -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Teleports its master and their party to the Seed of Annihilation. -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attack the target. -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move to a designated location. -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Make the servitor disappear by cancelling the summoning. -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Do not counter-attack. -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Counter-attack when the master or itself is attacked. -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Attacks and provokes the target. -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Rolls over and delivers a shock to the ground, stunning nearby targets. -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Bites the target to inflict damage. -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Pounces on the target to inflict damage and decreases their Movement Speed by 100. -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Attacks the enemy and drains HP. -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Attacks nearby enemies and blocks their P. Skills. -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Flourishes claws and frontally attacks enemies. -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Charges the enemy to inflict damage and stun it. -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Inflicts damage onto the enemies with a flame. -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Flies straight into the enemy. -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Purifies the master. -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Attack the enemy by darting a feather. -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Hurt the enemy by attacking them with sharp claws. -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Recover the targets near the tree and clear any debuff. -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Attacks nearby targets with a powerful punch. -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Provokes nearby enemies. -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Bites the enemy. -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Pounces on the target to inflict damage and decreases their Movement Speed by 100. -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Provokes nearby enemies. -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Bites the enemy. -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Pounces on the target to inflict damage and decreases their Movement Speed by 100. -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Provokes nearby enemies. -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Bites the enemy. -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Pounces on the target to inflict damage and decreases their Movement Speed by 100. -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Attacks nearby enemies and blocks their P. Skills. -->
+	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Charges the enemy to inflict damage and stun it. -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Can express affection to Rudolph. Affection Level rises by 25%. Warning: Can be used only when a Rudolph requests expression of affection, and cannot be used while transformed! -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Max HP +20%, Max MP +20%, and Movement Speed +20% for 5 minutes. Debuff Resistance +10%. Cooldown is 10 minutes. Consumes 3 Rose Essences during skill use. Doesn't overlap with other buffs except Art of Seduction. -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Party member's Max HP +30%, Max MP +30%, Max CP +30%, P. Def. +30%, M. Def +30%, Movement Speed +20, P. Atk. +10%, M. Atk. +20%, and MP Consumption for skill use -15% for 30 minutes. Cooldown is 5 minutes. Consumes 10 Rose Essences during skill use. -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of lightning. -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack upon contacted enemies nearby. -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Restricts to prevent the use of a buff upon the master. 5 minute duration. -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Inflicts a powerful attack that seems to pierce through the target. -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies. -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impales an enemy with a sword. -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Raises one's own abilities. -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Gathered energy within ones self can be focused and used to attack an enemy. -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Fires a shock wave to attack enemies at the front. -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Amplifies one's own abilities. -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switches between attack mode and support mode. -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Instantly restores the master's HP by 10%. Master's Debuff Resistance +80%, Buff-canceling Attack Resistance +40%, Movement Speed +10, P. Def. +20%, M. Def. +20%, and MP Consumption for all skills -50% for 1 minute thanks to Cat the Ranger's power. Available when Movement Speed's HP is 30% and below. Cooldown is 10 minutes. -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/AttendanceRewards.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/AttendanceRewards.xml
index a0e71cbdea..8af1ecd126 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/AttendanceRewards.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/AttendanceRewards.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/AttendanceRewards.xsd">
-	<item id="29564" count="50" /> <!-- Attendance Coin -->
-	<item id="29553" count="3" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29565" count="3" /> <!-- XP/SP Scroll -->
-	<item id="29584" count="2" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29585" count="1" /> <!-- Refined Romantic Chapeau -->
+	<item id="49490" count="1" /> <!-- Fishing Kit -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49488" count="5" /> <!-- Major Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49500" count="1" /> <!-- Greater Scroll of Escape -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="100" /> <!-- Attendance Coin -->
-	<item id="29553" count="3" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29519" count="3" /> <!-- XP/SP Scroll - Medium -->
-	<item id="29584" count="2" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="49512" count="1" /> <!-- Amulet: Prosperity -->
+	<item id="90007" count="1" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49533" count="5" /> <!-- Quick Hero Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49500" count="1" /> <!-- Greater Scroll of Escape -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="150" /> <!-- Attendance Coin -->
-	<item id="29553" count="6" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29519" count="3" /> <!-- XP/SP Scroll - Medium -->
-	<item id="29584" count="4" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29578" count="1" /> <!-- Rare Accessory Pack -->
+	<item id="90007" count="2" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49488" count="5" /> <!-- Major Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49542" count="1" /> <!-- Improved Scroll of Resurrection -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="300" /> <!-- Attendance Coin -->
-	<item id="29553" count="6" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29650" count="5" /> <!-- XP/SP Scroll - High -->
-	<item id="29584" count="4" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29587" count="1" /> <!-- Agathion - Singer & Dancer -->
+	<item id="90007" count="3" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49533" count="5" /> <!-- Quick Hero Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49542" count="1" /> <!-- Improved Scroll of Resurrection -->
+	<item id="49860" count="1" /> <!-- Hero's Wondrous Cubic (7-day) -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 5b501b1f1b..bcc74a8afe 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -254,6 +255,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 25f1799035..1dc5ebd6f1 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -41,6 +41,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AgathionSlot", AgathionSlot::new);
@@ -228,7 +230,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index cd446ab812..2775ff29a4 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -182,6 +182,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()))
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 170322f554..b8111e655b 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,61 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_YOUR_PET_WHEN_ITS_HUNGER_GAUGE_IS_AT_0);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetHold.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetHold.java
index 5df458fa8b..5f92b7ae92 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetHold.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetHold.java
@@ -52,4 +52,10 @@ public class PetHold implements IPlayerActionHandler
 			((SummonAI) pet.getAI()).notifyFollowStatusChange();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetMove.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetMove.java
index 5e4c058c25..9995146200 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetMove.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetMove.java
@@ -53,4 +53,10 @@ public class PetMove implements IPlayerActionHandler
 			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, player.getTarget().getLocation());
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
index 55ce28b671..63938f29b6 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
@@ -77,4 +77,10 @@ public class PetSkillUse implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetStop.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetStop.java
index e3bb5a2ecd..d9588d7d25 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetStop.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetStop.java
@@ -51,4 +51,10 @@ public class PetStop implements IPlayerActionHandler
 			pet.cancelAction();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..b681353b73 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,52 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorHold.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
index bc32c24750..83b8f824d5 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
@@ -48,4 +48,10 @@ public class ServitorHold implements IPlayerActionHandler
 			((SummonAI) s.getAI()).notifyFollowStatusChange();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorMode.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
index 285d766a50..6dc9476247 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
@@ -68,4 +68,10 @@ public class ServitorMode implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorMove.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
index d9277b758e..80f59f231c 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
@@ -56,4 +56,10 @@ public class ServitorMove implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
index acd342bad9..60fa7d6066 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
@@ -62,4 +62,10 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			}
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorStop.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
index a42bae7d82..d5288cd129 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
@@ -47,4 +47,10 @@ public class ServitorStop implements IPlayerActionHandler
 			s.cancelAction();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
index 64d86eeab2..97c8de610f 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
@@ -62,4 +62,10 @@ public class UnsummonPet implements IPlayerActionHandler
 			pet.unSummon(player);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
index 30fc6eb54c..c5d2782f22 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
@@ -69,4 +69,10 @@ public class UnsummonServitor implements IPlayerActionHandler
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/skillTrees/fishingSkillTree.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/skillTrees/fishingSkillTree.xml
index 74aecc1262..37793d81b2 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/skillTrees/fishingSkillTree.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/skillTrees/fishingSkillTree.xml
@@ -64,5 +64,20 @@
 		<skill skillName="Expand Trade" skillId="1370" skillLevel="3" getLevel="65" learnedByNpc="true">
 			<item id="45481" count="2822" /> <!-- Fresh Blue Mackerel -->
 		</skill>
+		<skill skillName="Expand Inventory" skillId="1372" skillLevel="1" getLevel="10" learnedByNpc="true">
+			<item id="91113" count="1" /> <!-- Inventory Expansion Ticket - Lv. 1 -->
+		</skill>
+		<skill skillName="Expand Inventory" skillId="1372" skillLevel="2" getLevel="20" learnedByNpc="true">
+			<item id="91114" count="1" /> <!-- Inventory Expansion Ticket - Lv. 2 -->
+		</skill>
+		<skill skillName="Expand Inventory" skillId="1372" skillLevel="3" getLevel="30" learnedByNpc="true">
+			<item id="91115" count="1" /> <!-- Inventory Expansion Ticket - Lv. 3 -->
+		</skill>
+		<skill skillName="Expand Inventory" skillId="1372" skillLevel="4" getLevel="30" learnedByNpc="true">
+			<item id="91296" count="1" /> <!-- Inventory Expansion Ticket - Lv. 4 -->
+		</skill>
+		<skill skillName="Expand Inventory" skillId="1372" skillLevel="5" getLevel="30" learnedByNpc="true">
+			<item id="91297" count="1" /> <!-- Inventory Expansion Ticket - Lv. 5 -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/experience.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/experience.xml
index fbe36995b9..9ef9e70e83 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/experience.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/experience.xml
@@ -84,10 +84,7 @@
 	<experience level="82" tolevel="279783329566" trainingRate="0.025" />
 	<experience level="83" tolevel="454748284485" trainingRate="0.025" />
 	<experience level="84" tolevel="673468617187" trainingRate="0.025" />
-	<experience level="85" tolevel="1548349947995" trainingRate="0.025" />
-	<experience level="86" tolevel="5922756602035" trainingRate="0.025" />
-	<experience level="87" tolevel="12484366583095" trainingRate="0.025" />
-	<experience level="88" tolevel="22982942552791" trainingRate="0.025" />
-	<experience level="89" tolevel="35581233716426" trainingRate="0.025" />
-	<experience level="90" tolevel="50699183112788" trainingRate="0.025" />
+	<experience level="85" tolevel="2020405851561" trainingRate="0.025" />
+	<experience level="86" tolevel="8755092023431" trainingRate="0.025" />
+	<experience level="87" tolevel="16836715429675" trainingRate="0.025" />
 </table>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/items/49000-49099.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/items/49000-49099.xml
index 6912ffd453..7ca7b8d4dd 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/items/49000-49099.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/items/49000-49099.xml
@@ -1217,7 +1217,7 @@
 		<set name="handler" val="ItemSkills" />
 		<set name="commissionItemType" val="SCROLL_OTHER" />
 		<skills>
-			<skill id="39075" level="1" /> <!-- Improved Scroll of Escape -->
+			<skill id="2013" level="2" /> <!-- Improved Scroll of Escape -->
 		</skills>
 	</item>
 	<item id="49088" name="Gold Medal" type="EtcItem">
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/items/49400-49499.xml
index 8d1104343f..470565a0f6 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/items/49400-49499.xml
@@ -1433,13 +1433,23 @@
 	<item id="49489" name="Parts of Enchantment Scrolls Chest" type="EtcItem">
 		<!-- Double-click to receive one Part of Enchantment Scrolls. -->
 		<set name="icon" val="icon.etc_treasure_box_i08" />
-		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="default_action" val="PEEL" />
 		<set name="material" val="FISH" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="49474" min="1" max="1" chance="20" /> <!-- Scroll Part: Enchant Weapon -->
+			<item id="49475" min="1" max="1" chance="50" /> <!-- Scroll Part: Enchant Armor -->
+			<item id="49476" min="1" max="1" chance="2" /> <!-- Refined Scroll Part: Enchant Weapon -->
+			<item id="49478" min="1" max="1" chance="13" /> <!-- Refined Scroll Part: Enchant Armor -->
+			<item id="49479" min="1" max="1" chance="2" /> <!-- Solid Scroll Part: Enchant Weapon -->
+			<item id="49480" min="1" max="1" chance="13" /> <!-- Solid Scroll Part: Enchant Armor -->
+		</capsuled_items>
 	</item>
 	<item id="49490" name="Fishing kit" type="EtcItem">
 		<!-- Double-click to receive 1 Fishing Rod (1-day), Bait (720 pcs), 1 Hero's Dual Swords, 1 Soulshot Ticket.. <Note>. Be careful before opening the items as their relocation is restricted. -->
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/items/49500-49599.xml
index 4bb8ae4d7c..ecd3bf801a 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/items/49500-49599.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/items/49500-49599.xml
@@ -8,6 +8,13 @@
 		<set name="weight" val="120" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="commissionItemType" val="SCROLL_OTHER" />
+		<skills>
+			<skill id="39075" level="1" /> <!-- Improved Scroll of Escape -->
+		</skills>
 	</item>
 	<item id="49501" name="Fish Stew. The guild's gratitude." type="EtcItem">
 		<!-- Increases XP and SP obtained from hunting by 10% for 20 min. -->
@@ -400,6 +407,8 @@
 		<!-- Magic potion that quickly restores HP. Instant cooldown. Cannot be used when HP is full. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="LIQUID" />
 		<set name="weight" val="180" />
 		<set name="is_tradable" val="false" />
@@ -407,6 +416,12 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="is_event_restricted" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<skills>
+			<skill id="39103" level="1" /> <!-- Quick Hero Healing Potion -->
+		</skills>
 	</item>
 	<item id="49534" name="Hero Cube" additionalName="7-day" type="EtcItem">
 		<!-- 7-day item. Available at level 20 or higher. Double-click the Cube to receive Soulshot Ticket, Buff Scrolls Chest, Major Healing Potion, Warrior's Quick Healing Potion, Warrior's Quick Healing Potion, Angel Cat's Blessing, Improved Scroll of Resurrection, Parts of Enchantment Scrolls Chest, Fishing kit chest, My Teleport to the Base Package, Blade Spirit, Spellbook Box. (Can be used only once per day.) -->
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/items/49800-49899.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/items/49800-49899.xml
index d0140f3c1f..9212ed9466 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/items/49800-49899.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/items/49800-49899.xml
@@ -678,6 +678,10 @@
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="time" val="10080" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39199" level="1" /> <!-- Hero's Wondrous Cubic -->
+		</skills>
 	</item>
 	<item id="49861" name="Life Stone - Tester" additionalName="Tester" type="EtcItem">
 		<!-- Tester -->
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18100-18199.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18100-18199.xml
index 555bd57645..9ca4fd00ee 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18100-18199.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18100-18199.xml
@@ -417,7 +417,7 @@
 		<acquire exp="5695973" sp="85439" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -444,7 +444,7 @@
 		<acquire exp="5977531" sp="89662" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -472,7 +472,7 @@
 		<acquire exp="6185394" sp="92780" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20136.294068333" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -501,7 +501,7 @@
 		<acquire exp="6382637" sp="95739" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="19725.349291429" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -530,7 +530,7 @@
 		<acquire exp="2334831" sp="35022" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -556,7 +556,7 @@
 		<acquire exp="2345235" sp="35178" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -582,7 +582,7 @@
 		<acquire exp="2351087" sp="35266" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -608,7 +608,7 @@
 		<acquire exp="2345235" sp="35178" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -633,7 +633,7 @@
 		<acquire exp="2282377" sp="34235" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1328,7 +1328,7 @@
 		<acquire exp="2796075" sp="41941" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="22" />
@@ -1353,7 +1353,7 @@
 		<acquire exp="2796075" sp="41941" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="22" />
@@ -1556,7 +1556,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -1583,7 +1583,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -1610,7 +1610,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -1637,7 +1637,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18200-18299.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18200-18299.xml
index cba72c9e13..353e5d0f52 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18200-18299.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18200-18299.xml
@@ -6,7 +6,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -33,7 +33,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -60,7 +60,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -87,7 +87,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -114,7 +114,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -141,7 +141,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -168,7 +168,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -195,7 +195,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -222,7 +222,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -249,7 +249,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -276,7 +276,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -303,7 +303,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -606,7 +606,7 @@
 		<acquire exp="2979228" sp="44688" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="70" />
@@ -631,7 +631,7 @@
 		<acquire exp="2979228" sp="44688" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="70" />
@@ -656,7 +656,7 @@
 		<acquire exp="2979228" sp="44688" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="70" />
@@ -681,7 +681,7 @@
 		<acquire exp="2979228" sp="44688" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="70" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20000-20099.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20000-20099.xml
index 8c9f9c9ddc..2c69f8c1a6 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20000-20099.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20000-20099.xml
@@ -7,7 +7,7 @@
 		<acquire exp="30" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="20" />
@@ -84,7 +84,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -136,7 +136,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="60" />
@@ -188,7 +188,7 @@
 		<acquire exp="310" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="60" />
@@ -246,7 +246,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -5386,7 +5386,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -5442,7 +5442,7 @@
 		<acquire exp="441" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -5542,7 +5542,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20100-20199.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20100-20199.xml
index 7d01d0b556..c670d8d751 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20100-20199.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20100-20199.xml
@@ -1138,7 +1138,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -1182,7 +1182,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="37" />
@@ -1232,7 +1232,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -1284,7 +1284,7 @@
 		<acquire exp="309" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -4349,7 +4349,7 @@
 		<acquire exp="1882" sp="57" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="636.798" hpRegen="3.5" mp="365.715" mpRegen="1.5" />
-			<attack physical="92.64226" magical="63.26266" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="92.64226" magical="63.26266" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.46427" magical="86.68702" />
 			<speed>
 				<walk ground="35" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20200-20299.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20200-20299.xml
index a8d336d17b..8738d9ee2c 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20200-20299.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20200-20299.xml
@@ -4066,7 +4066,7 @@
 		<acquire exp="2009" sp="61" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="670.347" hpRegen="4.5" mp="381.969" mpRegen="1.8" />
-			<attack physical="99.21986" magical="67.7543" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="99.21986" magical="67.7543" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="121.98819" magical="89.26566" />
 			<speed>
 				<walk ground="80" />
@@ -4133,7 +4133,7 @@
 		<acquire exp="2141" sp="65" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="705.162" hpRegen="4.5" mp="398.223" mpRegen="1.8" />
-			<attack physical="106.16525" magical="72.49711" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="106.16525" magical="72.49711" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="125.57727" magical="91.89199" />
 			<speed>
 				<walk ground="45" />
@@ -4201,7 +4201,7 @@
 		<acquire exp="2417" sp="73" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="777.324" hpRegen="4.5" mp="430.731" mpRegen="1.8" />
-			<attack physical="121.20802" magical="82.76936" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="121.20802" magical="82.76936" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="132.9486" magical="97.28601" />
 			<speed>
 				<walk ground="50" />
@@ -4267,7 +4267,7 @@
 		<acquire exp="2582" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="815.304" hpRegen="4.5" mp="446.985" mpRegen="1.8" />
-			<attack physical="129.32896" magical="88.31491" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="129.32896" magical="88.31491" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="136.72948" magical="100.0527" />
 			<speed>
 				<walk ground="80" />
@@ -4338,7 +4338,7 @@
 		<acquire exp="2295" sp="69" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="739.977" hpRegen="4.5" mp="413.574" mpRegen="1.8" />
-			<attack physical="113.49065" magical="77.49941" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="113.49065" magical="77.49941" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="129.23095" magical="94.5656" />
 			<speed>
 				<walk ground="80" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20300-20399.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20300-20399.xml
index 4c82d08853..dff8e03fbd 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20300-20399.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20300-20399.xml
@@ -512,7 +512,7 @@
 		<acquire exp="266" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="60" />
@@ -569,7 +569,7 @@
 		<acquire exp="310" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="60" />
@@ -625,7 +625,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
@@ -808,7 +808,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="24" />
@@ -897,7 +897,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1002,7 +1002,7 @@
 		<acquire exp="441" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -1056,7 +1056,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -1158,7 +1158,7 @@
 		<acquire exp="441" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -1214,7 +1214,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1266,7 +1266,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -1316,7 +1316,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1527,7 +1527,7 @@
 		<acquire exp="454" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1733,7 +1733,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -2059,7 +2059,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="50" />
@@ -3004,7 +3004,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3225,7 +3225,7 @@
 		<acquire exp="354" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="70" />
@@ -3570,7 +3570,7 @@
 		<acquire exp="452" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3826,7 +3826,7 @@
 		<acquire exp="691" sp="21" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="86.088" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -3883,7 +3883,7 @@
 		<acquire exp="183" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="40" />
@@ -4103,7 +4103,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -4267,7 +4267,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -4317,7 +4317,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20400-20499.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20400-20499.xml
index 232f43fe2d..02f5fb6f13 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20400-20499.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20400-20499.xml
@@ -1286,7 +1286,7 @@
 		<acquire exp="439" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1350,7 +1350,7 @@
 		<acquire exp="292" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1579,7 +1579,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
@@ -2063,7 +2063,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="24" />
@@ -2230,7 +2230,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -2282,7 +2282,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -2333,7 +2333,7 @@
 		<acquire exp="309" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -2733,7 +2733,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -3324,7 +3324,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -3374,7 +3374,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -3426,7 +3426,7 @@
 		<acquire exp="309" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -3477,7 +3477,7 @@
 		<acquire exp="439" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3706,7 +3706,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -3810,7 +3810,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="24" />
@@ -3971,7 +3971,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
@@ -4029,7 +4029,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20500-20599.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20500-20599.xml
index 2021ca327b..a28f83ebc6 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20500-20599.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20500-20599.xml
@@ -1348,7 +1348,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -1555,7 +1555,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1602,7 +1602,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1647,7 +1647,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1874,7 +1874,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1919,7 +1919,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1964,7 +1964,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2009,7 +2009,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2276,7 +2276,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2326,7 +2326,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20700-20799.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20700-20799.xml
index 1375be5cb1..b7a8ee7b3e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20700-20799.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20700-20799.xml
@@ -3596,7 +3596,7 @@
 		<acquire exp="46335" sp="1390" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1380.32124" hpRegen="8.5" mp="2629.335" mpRegen="3" />
-			<attack physical="469.5384" magical="416.6452173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="469.5384" magical="416.6452173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="958.284" magical="1597.14" />
 			<speed>
 				<walk ground="25" />
@@ -3645,7 +3645,7 @@
 		<acquire exp="50337" sp="1510" attributeExp="770" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.99191" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.131" magical="1641.885" />
 			<speed>
 				<walk ground="25" />
@@ -3693,7 +3693,7 @@
 		<acquire exp="88472" sp="2654" attributeExp="770" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.99191" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.131" magical="1641.885" />
 			<speed>
 				<walk ground="25" />
@@ -3746,7 +3746,7 @@
 		<acquire exp="91880" sp="2756" attributeExp="858" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.72623" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="488.6718" magical="433.67086956522" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="488.6718" magical="433.67086956522" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="997.443" magical="1662.405" />
 			<speed>
 				<walk ground="25" />
@@ -3798,7 +3798,7 @@
 		<acquire exp="93340" sp="2800" attributeExp="858" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.849385" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="488.7117" magical="433.70804347826" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="488.7117" magical="433.70804347826" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="997.5285" magical="1662.5475" />
 			<speed>
 				<walk ground="35" />
@@ -3848,7 +3848,7 @@
 		<acquire exp="96610" sp="2898" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1009.413" magical="1682.355" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20800-20899.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20800-20899.xml
index e09f1d8694..b067d58071 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20800-20899.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20800-20899.xml
@@ -17,7 +17,7 @@
 		<acquire exp="131997" sp="3959" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2423.3825125" hpRegen="8.5" mp="3104.58" mpRegen="3" />
-			<attack physical="808.61705" magical="731.48967391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="808.61705" magical="731.48967391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1682.42625" magical="2804.04375" />
 			<speed>
 				<walk ground="70" />
@@ -65,7 +65,7 @@
 		<acquire exp="136896" sp="4106" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2827.269335" hpRegen="8.5" mp="3415.215" mpRegen="3" />
-			<attack physical="939.4691" magical="853.40152173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="939.4691" magical="853.40152173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1962.8235" magical="3271.3725" />
 			<speed>
 				<walk ground="60" />
@@ -117,7 +117,7 @@
 		<acquire exp="168844" sp="5065" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="4120.56" mpRegen="3" />
-			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2103.00075" magical="3505.00125" />
 			<speed>
 				<walk ground="45" />
@@ -169,7 +169,7 @@
 		<acquire exp="190141" sp="5704" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2940.744352" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2041.6032" magical="3402.672" />
 			<speed>
 				<walk ground="80" />
@@ -3413,7 +3413,7 @@
 		<acquire exp="141914" sp="4257" attributeExp="1134" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.5997675" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1701.32175" magical="2835.53625" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20900-20999.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20900-20999.xml
index 62bdeb4c61..b88d9c103f 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20900-20999.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20900-20999.xml
@@ -5184,7 +5184,7 @@
 		<acquire exp="187075" sp="5612" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="3104.58" mpRegen="3" />
-			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2041.6032" magical="3402.672" />
 			<speed>
 				<walk ground="45" />
@@ -5234,7 +5234,7 @@
 		<equipment rhand="94" /> <!-- Bec de Corbin -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="3104.58" mpRegen="3" />
-			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2103.00075" magical="3505.00125" />
 			<speed>
 				<walk ground="80" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21300-21399.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21300-21399.xml
index 660b8c9eec..93f74ab36f 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21300-21399.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21300-21399.xml
@@ -6,7 +6,7 @@
 		<acquire exp="680551" sp="10208" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -51,7 +51,7 @@
 		<acquire exp="1355598" sp="20333" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -79,7 +79,7 @@
 		<acquire exp="680551" sp="20416" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -126,7 +126,7 @@
 		<acquire exp="1355598" sp="40667" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21400-21499.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21400-21499.xml
index 36ffb8e229..15e89270a5 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21400-21499.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21400-21499.xml
@@ -6,7 +6,7 @@
 		<acquire exp="993837" sp="14907" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -53,7 +53,7 @@
 		<acquire exp="1943222" sp="29148" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -78,7 +78,7 @@
 		<acquire exp="993837" sp="14907" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="37" />
@@ -125,7 +125,7 @@
 		<acquire exp="1980478" sp="29707" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="37" />
@@ -152,7 +152,7 @@
 		<acquire exp="993837" sp="14907" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -199,7 +199,7 @@
 		<acquire exp="1980478" sp="29707" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -227,7 +227,7 @@
 		<acquire exp="691558" sp="10373" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="40" />
@@ -268,7 +268,7 @@
 		<acquire exp="1375920" sp="20638" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="40" />
@@ -295,7 +295,7 @@
 		<acquire exp="708492" sp="10627" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="50" />
@@ -339,7 +339,7 @@
 		<acquire exp="1387139" sp="20807" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="50" />
@@ -367,7 +367,7 @@
 		<acquire exp="1010772" sp="15161" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -410,7 +410,7 @@
 		<acquire exp="1991697" sp="29875" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -439,7 +439,7 @@
 		<acquire exp="993837" sp="14907" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="37" />
@@ -480,7 +480,7 @@
 		<acquire exp="1980478" sp="29707" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="37" />
@@ -508,7 +508,7 @@
 		<acquire exp="758237" sp="11373" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="80" />
@@ -548,7 +548,7 @@
 		<acquire exp="1397934" sp="20969" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="80" />
@@ -575,7 +575,7 @@
 		<acquire exp="789989" sp="11849" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="39" />
@@ -617,7 +617,7 @@
 		<acquire exp="1442599" sp="21638" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="39" />
@@ -646,7 +646,7 @@
 		<acquire exp="705317" sp="10579" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="27" />
@@ -686,7 +686,7 @@
 		<acquire exp="1388620" sp="20829" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="27" />
@@ -713,7 +713,7 @@
 		<acquire exp="1330194" sp="19952" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="41" />
@@ -750,7 +750,7 @@
 		<acquire exp="2640882" sp="39613" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="41" />
@@ -776,7 +776,7 @@
 		<acquire exp="767945" sp="11519" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="80" />
@@ -816,7 +816,7 @@
 		<acquire exp="1430983" sp="21464" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="80" />
@@ -843,7 +843,7 @@
 		<acquire exp="1059474" sp="15892" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="41" />
@@ -881,7 +881,7 @@
 		<acquire exp="2076464" sp="31146" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="41" />
@@ -907,7 +907,7 @@
 		<acquire exp="1059474" sp="15892" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -945,7 +945,7 @@
 		<acquire exp="2076464" sp="31146" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -971,7 +971,7 @@
 		<acquire exp="1357938" sp="20369" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -1010,7 +1010,7 @@
 		<acquire exp="2673394" sp="40100" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -1038,7 +1038,7 @@
 		<acquire exp="1452658" sp="21789" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="35" />
@@ -1077,7 +1077,7 @@
 		<acquire exp="2697670" sp="40465" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="35" />
@@ -1103,7 +1103,7 @@
 		<acquire exp="2878656" sp="43179" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1146,7 +1146,7 @@
 		<acquire exp="2669276" sp="40039" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1188,7 +1188,7 @@
 		<acquire exp="3792041" sp="56880" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -1229,7 +1229,7 @@
 		<acquire exp="1701921" sp="25528" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="39" />
@@ -1272,7 +1272,7 @@
 		<acquire exp="1701921" sp="25528" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="39" />
@@ -1314,7 +1314,7 @@
 		<acquire exp="2056090" sp="30841" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1340,7 +1340,7 @@
 		<acquire exp="702678" sp="10540" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="16911.39829" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="40" />
@@ -1364,7 +1364,7 @@
 		<acquire exp="702678" sp="10540" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="16911.39829" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="40" />
@@ -1387,7 +1387,7 @@
 		<acquire exp="702678" sp="10540" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="16911.39829" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="15" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21600-21699.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21600-21699.xml
index 6e2b6fc1da..0df6d0cb5c 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21600-21699.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21600-21699.xml
@@ -2716,7 +2716,7 @@
 		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
-			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="22" />
@@ -2773,7 +2773,7 @@
 		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
-			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="60" />
@@ -2810,7 +2810,7 @@
 		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
-			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="80" />
@@ -2858,7 +2858,7 @@
 		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
-			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="80" />
@@ -2905,7 +2905,7 @@
 		<acquire exp="2711" sp="82" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1201.434" hpRegen="5.5" mp="650.16" mpRegen="2.1" />
-			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="173.43552" magical="126.91259" />
 			<speed>
 				<walk ground="100" />
@@ -2954,7 +2954,7 @@
 		<acquire exp="2835" sp="86" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1248.276" hpRegen="5.5" mp="679.056" mpRegen="2.1" />
-			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="177.78746" magical="130.09715" />
 			<speed>
 				<walk ground="45" />
@@ -3003,7 +3003,7 @@
 		<acquire exp="2963" sp="89" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1297.017" hpRegen="5.5" mp="708.855" mpRegen="2.1" />
-			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="182.18816" magical="133.31739" />
 			<speed>
 				<walk ground="80" />
@@ -3052,7 +3052,7 @@
 		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
-			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="27" />
@@ -3101,7 +3101,7 @@
 		<acquire exp="3226" sp="97" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1396.398" hpRegen="5.5" mp="770.259" mpRegen="2.1" />
-			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="191.12803" magical="139.8592" />
 			<speed>
 				<walk ground="60" />
@@ -3145,7 +3145,7 @@
 		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
-			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="80" />
@@ -3232,7 +3232,7 @@
 		<acquire exp="3362" sp="101" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1447.038" hpRegen="5.5" mp="800.961" mpRegen="2.1" />
-			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="195.66302" magical="143.17771" />
 			<speed>
 				<walk ground="70" />
@@ -3630,7 +3630,7 @@
 		<acquire exp="124807" sp="3744" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2423.3825125" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="808.61705" magical="731.48967391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="808.61705" magical="731.48967391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1682.42625" magical="2804.04375" />
 			<speed>
 				<walk ground="25" />
@@ -3679,7 +3679,7 @@
 		<acquire exp="127803" sp="3834" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2103.00075" magical="3505.00125" />
 			<attribute>
 				<attack type="FIRE" value="100" />
@@ -3727,7 +3727,7 @@
 		<acquire exp="163526" sp="4905" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="3104.58" mpRegen="3" />
-			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2103.00075" magical="3505.00125" />
 			<speed>
 				<walk ground="25" />
@@ -3768,7 +3768,7 @@
 		<acquire exp="168076" sp="5042" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2908.034384" hpRegen="8.5" mp="3415.215" mpRegen="3" />
-			<attack physical="965.63552" magical="877.78017391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="965.63552" magical="877.78017391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2018.8944" magical="3364.824" />
 			<speed>
 				<walk ground="37" />
@@ -3809,7 +3809,7 @@
 		<acquire exp="172838" sp="5185" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2908.034384" hpRegen="8.5" mp="3415.215" mpRegen="3" />
-			<attack physical="965.63552" magical="877.78017391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="965.63552" magical="877.78017391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2018.8944" magical="3364.824" />
 			<speed>
 				<walk ground="45" />
@@ -3851,7 +3851,7 @@
 		<acquire exp="206169" sp="6185" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2827.269335" hpRegen="8.5" mp="3753.285" mpRegen="3" />
-			<attack physical="939.4691" magical="853.40152173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="939.4691" magical="853.40152173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1962.8235" magical="3271.3725" />
 			<speed>
 				<walk ground="45" />
@@ -3894,7 +3894,7 @@
 		<acquire exp="178288" sp="5348" attributeExp="1134" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.5997675" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1701.32175" magical="2835.53625" />
 			<speed>
 				<walk ground="40" />
@@ -3936,7 +3936,7 @@
 		<acquire exp="181044" sp="5431" attributeExp="1134" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3063.234315" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1016.2039" magical="924.62673913043" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1016.2039" magical="924.62673913043" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2126.6415" magical="3544.4025" />
 			<speed>
 				<walk ground="80" />
@@ -3973,7 +3973,7 @@
 		<acquire exp="172383" sp="5171" attributeExp="1134" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.5997675" hpRegen="8.5" mp="3828.51" mpRegen="3" />
-			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1701.32175" magical="2835.53625" />
 			<speed>
 				<walk ground="70" />
@@ -4006,7 +4006,7 @@
 		<acquire exp="222900" sp="6687" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2940.744352" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2041.6032" magical="3402.672" />
 			<speed>
 				<walk ground="23" />
@@ -4048,7 +4048,7 @@
 		<acquire exp="227862" sp="6835" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2859.043325" hpRegen="8.5" mp="3166.53" mpRegen="3" />
-			<attack physical="950.0497" magical="862.99239130435" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="950.0497" magical="862.99239130435" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1984.8825" magical="3308.1375" />
 			<speed>
 				<walk ground="13" />
@@ -4090,7 +4090,7 @@
 		<acquire exp="222497" sp="6674" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2859.043325" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="950.0497" magical="862.99239130435" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="950.0497" magical="862.99239130435" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1984.8825" magical="3308.1375" />
 			<attribute>
 				<attack type="DARK" value="100" />
@@ -4134,7 +4134,7 @@
 		<acquire exp="40651" sp="1219" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1380.32124" hpRegen="8.5" mp="2629.335" mpRegen="3" />
-			<attack physical="469.5384" magical="416.6452173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="469.5384" magical="416.6452173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="958.284" magical="1597.14" />
 			<attribute>
 				<attack type="DARK" value="100" />
@@ -4174,7 +4174,7 @@
 		<acquire exp="79188" sp="2375" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1399.77973" hpRegen="8.5" mp="2683.32" mpRegen="3" />
-			<attack physical="476.129" magical="422.51869565217" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="476.129" magical="422.51869565217" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="971.793" magical="1619.655" />
 			<speed>
 				<walk ground="37" />
@@ -4201,7 +4201,7 @@
 		<acquire exp="82030" sp="2460" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.868755" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="482.5999" magical="428.28065217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.5999" magical="428.28065217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.0455" magical="1641.7425" />
 			<speed>
 				<walk ground="41" />
@@ -4229,7 +4229,7 @@
 		<acquire exp="52115" sp="1563" attributeExp="770" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.99191" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.131" magical="1641.885" />
 			<speed>
 				<walk ground="35" />
@@ -4275,7 +4275,7 @@
 		<acquire exp="50479" sp="1514" attributeExp="770" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.72623" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="488.6718" magical="433.67086956522" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="488.6718" magical="433.67086956522" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="997.443" magical="1662.405" />
 			<speed>
 				<walk ground="57" />
@@ -4439,7 +4439,7 @@
 		<acquire exp="94946" sp="2848" attributeExp="858" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.849385" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="482.5999" magical="428.28065217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.5999" magical="428.28065217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.0455" magical="1641.7425" />
 			<speed>
 				<walk ground="41" />
@@ -4467,7 +4467,7 @@
 		<acquire exp="95603" sp="2868" attributeExp="858" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1009.413" magical="1682.355" />
 			<speed>
 				<walk ground="57" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21700-21799.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21700-21799.xml
index 59b2419b20..b8039073e4 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21700-21799.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21700-21799.xml
@@ -1278,7 +1278,7 @@
 		<acquire exp="266169" sp="7186" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.9098066667" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="60" />
@@ -1381,7 +1381,7 @@
 		<acquire exp="1772332" sp="47852" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2758.7130516667" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="60" />
@@ -2511,7 +2511,7 @@
 		<acquire exp="240547" sp="7216" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1009.413" magical="1682.355" />
 			<speed>
 				<walk ground="30" />
@@ -2543,7 +2543,7 @@
 		<acquire exp="374272" sp="11228" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.6202933333" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="817.728" magical="739.71130434783" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="817.728" magical="739.71130434783" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1701.336" magical="2835.56" />
 			<speed>
 				<walk ground="13" />
@@ -2957,7 +2957,7 @@
 		<acquire exp="101142" sp="3034" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2423.44409" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="54" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/24000-24099.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/24000-24099.xml
index c4e9614fd6..fbf6d86e78 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/24000-24099.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/24000-24099.xml
@@ -441,7 +441,7 @@
 		<acquire exp="39238" sp="1177" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1360.493285" hpRegen="8.5" mp="2574.465" mpRegen="3" />
-			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="328.27073" magical="240.21427" />
 			<speed>
 				<walk ground="27" />
@@ -709,7 +709,7 @@
 		<acquire exp="129880" sp="3896" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1360.493285" hpRegen="8.5" mp="2574.465" mpRegen="3" />
-			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="328.27073" magical="240.21427" />
 			<speed>
 				<walk ground="27" />
@@ -1600,7 +1600,7 @@
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="314.65987" magical="230.25444" />
 			<hitTime>840</hitTime>
 		</stats>
@@ -1619,7 +1619,7 @@
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1620.4119125" hpRegen="8.5" mp="2412.51" mpRegen="3" />
-			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="314.65987" magical="230.25444" />
 			<speed>
 				<walk ground="30" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25200-25299.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25200-25299.xml
index 55eb67a048..7e079e2118 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25200-25299.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25200-25299.xml
@@ -4004,7 +4004,7 @@
 		<acquire exp="1008600000" sp="30258000" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="53409375" hpRegen="319.2293199" mp="31191.426" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="45" />
@@ -4218,7 +4218,7 @@
 		<acquire exp="1008600000" sp="30258000" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="53409375" hpRegen="319.2293199" mp="31191.426" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25700-25799.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25700-25799.xml
index bccc10be44..318b94a0ba 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25700-25799.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25700-25799.xml
@@ -72,7 +72,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="45" />
@@ -137,7 +137,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="50" />
@@ -241,7 +241,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="30" />
@@ -305,7 +305,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="90" />
@@ -369,7 +369,7 @@
 		<acquire exp="52925400" sp="1587762" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="420467.42646" hpRegen="178.4276342" mp="515402.76" mpRegen="2.4" />
-			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1495.843372" magical="729.7418166" />
 			<speed>
 				<walk ground="60" />
@@ -416,7 +416,7 @@
 		<acquire exp="52925400" sp="1587762" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="420467.42646" hpRegen="178.4276342" mp="515402.76" mpRegen="2.4" />
-			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1495.843372" magical="729.7418166" />
 			<speed>
 				<walk ground="24" />
@@ -462,7 +462,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="50" />
@@ -529,7 +529,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="40" />
@@ -596,7 +596,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="50" />
@@ -663,7 +663,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="60" />
@@ -731,7 +731,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="60" />
@@ -799,7 +799,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="40" />
@@ -906,7 +906,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="13" />
@@ -952,7 +952,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="39" />
@@ -998,7 +998,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="80" />
@@ -1044,7 +1044,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="39" />
@@ -1090,7 +1090,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="50" />
@@ -1136,7 +1136,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="60" />
@@ -1182,7 +1182,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="25" />
@@ -1228,7 +1228,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="45" />
@@ -1275,7 +1275,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="79" />
@@ -1321,7 +1321,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="60" />
@@ -1407,7 +1407,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="45" />
@@ -1485,7 +1485,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="52" />
@@ -1563,7 +1563,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="38" />
@@ -1641,7 +1641,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="40" />
@@ -1720,7 +1720,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="30" />
@@ -1818,7 +1818,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -1896,7 +1896,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -1974,7 +1974,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -2052,7 +2052,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -2130,7 +2130,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="42" />
@@ -2209,7 +2209,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="48" />
@@ -2307,7 +2307,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="60" />
@@ -2370,7 +2370,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="50" />
@@ -2433,7 +2433,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="50" />
@@ -2496,7 +2496,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="55" />
@@ -2559,7 +2559,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="55" />
@@ -2622,7 +2622,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="55" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/29000-29099.xml
index de070f86f2..64e7a5718d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/29000-29099.xml
@@ -11,8 +11,8 @@
 		<sex>FEMALE</sex>
 		<acquire exp="2179535" sp="65386" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="214133.04684" hpRegen="85.09694484" mp="509.76" mpRegen="1.8" />
-			<attack physical="105" magical="8" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="386384" hpRegen="208" mp="300.8" mpRegen="2.1" />
+			<attack physical="105" magical="8" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1252" magical="229" />
 			<speed>
 				<walk ground="80" />
@@ -21,11 +21,9 @@
 			<hitTime>370</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4019" level="1" /> <!-- Decrease Speed -->
-			<skill id="4021" level="1" /> <!-- Queen Ant -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -34,8 +32,11 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4021" level="1" /> <!-- Queen Ant -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4017" level="1" /> <!-- Queen Ant's Blow -->
+			<skill id="4018" level="1" /> <!-- Decrease Speed -->
+			<skill id="4019" level="1" /> <!-- Decrease Speed -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -50,118 +51,147 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="915" min="1" max="1" chance="34.81" /> <!-- Aquastone Necklace -->
-				<item id="914" min="1" max="1" chance="34.49" /> <!-- Dark Necklace -->
-				<item id="851" min="1" max="3" chance="34.18" /> <!-- Onyx Beast's Eye Earring -->
-				<item id="882" min="1" max="3" chance="33.98" /> <!-- Mithril Ring -->
-				<item id="884" min="1" max="3" chance="33.82" /> <!-- Ring of Protection -->
-				<item id="916" min="1" max="1" chance="33.3" /> <!-- Necklace of Protection -->
-				<item id="853" min="1" max="3" chance="33.09" /> <!-- Earring of Protection -->
-				<item id="883" min="1" max="3" chance="32.76" /> <!-- Aquastone Ring -->
-				<item id="2496" min="1" max="1" chance="32.23" /> <!-- Dwarven Chain Shield -->
-				<item id="355" min="1" max="1" chance="32.2" /> <!-- Dwarven Chain Mail Shirt -->
-				<item id="852" min="1" max="3" chance="32.13" /> <!-- Moonstone Earring -->
-				<item id="382" min="1" max="1" chance="31.77" /> <!-- Dwarven Chain Gaiters -->
-				<item id="399" min="1" max="1" chance="26.09" /> <!-- Rind Leather Armor -->
-				<item id="419" min="1" max="1" chance="25.86" /> <!-- Rind Leather Gaiters -->
-				<item id="500" min="1" max="1" chance="25.01" /> <!-- Great Helmet -->
-				<item id="440" min="1" max="1" chance="24.69" /> <!-- Robe of Seal -->
-				<item id="6660" min="1" max="1" chance="20.99" /> <!-- Queen Ant's Ring -->
-				<item id="1126" min="1" max="3" chance="17.27" /> <!-- Crimson Boots -->
-				<item id="418" min="1" max="1" chance="17.23" /> <!-- Plated Leather Gaiters -->
-				<item id="398" min="1" max="1" chance="16.98" /> <!-- Plated Leather Armor -->
-				<item id="2455" min="1" max="3" chance="16.87" /> <!-- Plated Leather Gloves -->
-				<item id="632" min="1" max="3" chance="16.77" /> <!-- Knight's Shield -->
-				<item id="498" min="1" max="3" chance="16.02" /> <!-- Steel Plate Helmet -->
-				<item id="70" min="1" max="1" chance="7.207" /> <!-- Claymore -->
-				<item id="396" min="1" max="1" chance="7.2" /> <!-- Salamander Skin Mail -->
-				<item id="187" min="1" max="1" chance="7.2" /> <!-- Atuba Hammer -->
-				<item id="607" min="1" max="3" chance="7.198" /> <!-- Ogre Power Gauntlets -->
-				<item id="225" min="1" max="1" chance="7.189" /> <!-- Mithril Dagger -->
-				<item id="1125" min="1" max="3" chance="7.183" /> <!-- Assault Boots -->
-				<item id="2428" min="1" max="3" chance="7.183" /> <!-- Plate Boots -->
-				<item id="320" min="1" max="1" chance="7.174" /> <!-- Blue Crystal Skull -->
-				<item id="322" min="1" max="1" chance="7.174" /> <!-- Vajra Wand -->
-				<item id="630" min="1" max="3" chance="7.174" /> <!-- Square Shield -->
-				<item id="280" min="1" max="1" chance="7.17" /> <!-- Light Crossbow -->
-				<item id="438" min="1" max="3" chance="7.161" /> <!-- Sage's Rags -->
-				<item id="159" min="1" max="1" chance="7.137" /> <!-- Bonebreaker -->
-				<item id="321" min="1" max="1" chance="7.13" /> <!-- Demon's Fangs -->
-				<item id="497" min="1" max="3" chance="7.113" /> <!-- Chain Helmet -->
-				<item id="2451" min="1" max="3" chance="7.112" /> <!-- Sage's Worn Gloves -->
-				<item id="2427" min="1" max="3" chance="7.109" /> <!-- Salamander Skin Boots -->
-				<item id="353" min="1" max="1" chance="7.105" /> <!-- Half Plate Armor -->
-				<item id="380" min="1" max="1" chance="7.101" /> <!-- Plate Gaiters -->
-				<item id="297" min="1" max="1" chance="7.099" /> <!-- Glaive -->
-				<item id="188" min="1" max="1" chance="7.099" /> <!-- Ghost Staff -->
-				<item id="2412" min="1" max="3" chance="7.096" /> <!-- Plate Helmet -->
-				<item id="190" min="1" max="1" chance="7.094" /> <!-- Atuba Mace -->
-				<item id="61" min="1" max="3" chance="7.093" /> <!-- Mithril Gloves -->
-				<item id="262" min="1" max="1" chance="7.091" /> <!-- Scallop Jamadhr -->
-				<item id="189" min="1" max="1" chance="7.08" /> <!-- Staff of Life -->
-				<item id="2499" min="1" max="1" chance="7.068" /> <!-- Elven Long Sword -->
-				<item id="2494" min="1" max="3" chance="7.019" /> <!-- Plate Shield -->
-				<item id="94" min="1" max="1" chance="6.428" /> <!-- Bec de Corbin -->
-				<item id="242" min="1" max="1" chance="6.419" /> <!-- Soulfire Dirk -->
-				<item id="73" min="1" max="1" chance="6.405" /> <!-- Shamshir -->
-				<item id="227" min="1" max="1" chance="6.364" /> <!-- Stiletto -->
-				<item id="282" min="1" max="1" chance="6.35" /> <!-- Elemental Bow -->
-				<item id="131" min="1" max="1" chance="6.332" /> <!-- Spirit Sword -->
-				<item id="133" min="1" max="1" chance="6.315" /> <!-- Raid Sword -->
-				<item id="195" min="1" max="1" chance="6.312" /> <!-- Cursed Staff -->
-				<item id="285" min="1" max="1" chance="6.311" /> <!-- Noble Elven Bow -->
-				<item id="325" min="1" max="1" chance="6.31" /> <!-- Horn of Glory -->
-				<item id="74" min="1" max="1" chance="6.298" /> <!-- Katana -->
-				<item id="631" min="1" max="3" chance="5.655" /> <!-- Eldarake -->
-				<item id="302" min="1" max="1" chance="5.651" /> <!-- Body Slasher -->
-				<item id="191" min="1" max="1" chance="5.62" /> <!-- Heavy Doom Hammer -->
-				<item id="354" min="1" max="1" chance="5.616" /> <!-- Chain Mail Shirt -->
-				<item id="2431" min="1" max="3" chance="5.612" /> <!-- Plated Leather Boots -->
-				<item id="2433" min="1" max="3" chance="5.612" /> <!-- Boots of Seal -->
-				<item id="160" min="1" max="1" chance="5.607" /> <!-- Battle Axe -->
-				<item id="2452" min="1" max="3" chance="5.602" /> <!-- Reinforced Mithril Gloves -->
-				<item id="230" min="1" max="1" chance="5.598" /> <!-- Needle Wolverine -->
-				<item id="2413" min="1" max="3" chance="5.596" /> <!-- Chain Hood -->
-				<item id="89" min="1" max="1" chance="5.596" /> <!-- Big Hammer -->
-				<item id="161" min="1" max="1" chance="5.592" /> <!-- Silver Axe -->
-				<item id="263" min="1" max="1" chance="5.591" /> <!-- Chakram -->
-				<item id="2432" min="1" max="3" chance="5.587" /> <!-- Dwarven Chain Boots -->
-				<item id="2454" min="1" max="3" chance="5.575" /> <!-- Karmian Gloves -->
-				<item id="173" min="1" max="1" chance="5.574" /> <!-- Skull Graver -->
-				<item id="62" min="1" max="3" chance="5.573" /> <!-- Reinforced Mithril Boots -->
-				<item id="2495" min="1" max="3" chance="5.573" /> <!-- Chain Shield -->
-				<item id="281" min="1" max="1" chance="5.57" /> <!-- Crystallized Ice Bow -->
-				<item id="2453" min="1" max="3" chance="5.57" /> <!-- Chain Gloves -->
-				<item id="71" min="1" max="1" chance="5.561" /> <!-- Flamberge -->
-				<item id="439" min="1" max="1" chance="5.559" /> <!-- Karmian Tunic -->
-				<item id="72" min="1" max="1" chance="5.553" /> <!-- Stormbringer -->
-				<item id="226" min="1" max="1" chance="5.542" /> <!-- Cursed Dagger -->
-				<item id="298" min="1" max="1" chance="5.54" /> <!-- Orcish Glaive -->
-				<item id="471" min="1" max="1" chance="5.538" /> <!-- Karmian Stockings -->
-				<item id="397" min="1" max="1" chance="5.531" /> <!-- Reinforced Mithril Shirt -->
-				<item id="232" min="1" max="1" chance="5.525" /> <!-- Dark Elven Dagger -->
-				<item id="193" min="1" max="1" chance="5.525" /> <!-- Stick of Faith -->
-				<item id="192" min="1" max="1" chance="5.523" /> <!-- Crystal Staff -->
-				<item id="2429" min="1" max="3" chance="5.523" /> <!-- Chain Boots -->
-				<item id="2430" min="1" max="3" chance="5.523" /> <!-- Karmian Boots -->
-				<item id="2387" min="1" max="1" chance="5.519" /> <!-- Reinforced Mithril Gaiters -->
-				<item id="194" min="1" max="1" chance="5.518" /> <!-- Heavy Doom Axe -->
-				<item id="96" min="1" max="1" chance="5.504" /> <!-- Scythe -->
-				<item id="381" min="1" max="1" chance="5.48" /> <!-- Chain Gaiters -->
-				<item id="70000" min="76" max="228" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="91527" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (D-grade) -->
-				<item id="91534" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (D-grade) -->
-				<item id="91541" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (D-grade) -->
+				<group chance="100">
+					<item id="320" min="1" max="1" chance="7.15" /> <!-- Blue Crystal Skull -->
+					<item id="321" min="1" max="1" chance="7.15" /> <!-- Demon's Fangs -->
+					<item id="70" min="1" max="1" chance="7.15" /> <!-- Claymore -->
+					<item id="159" min="1" max="1" chance="7.15" /> <!-- Bonebreaker -->
+					<item id="187" min="1" max="1" chance="7.15" /> <!-- Atuba Hammer -->
+					<item id="188" min="1" max="1" chance="7.15" /> <!-- Ghost Staff -->
+					<item id="189" min="1" max="1" chance="7.15" /> <!-- Staff of Life -->
+					<item id="190" min="1" max="1" chance="7.15" /> <!-- Atuba Mace -->
+					<item id="225" min="1" max="1" chance="7.15" /> <!-- Mithril Dagger -->
+					<item id="262" min="1" max="1" chance="7.15" /> <!-- Scallop Jamadhr -->
+					<item id="280" min="1" max="1" chance="7.15" /> <!-- Light Crossbow -->
+					<item id="297" min="1" max="1" chance="7.15" /> <!-- Glaive -->
+					<item id="322" min="1" max="1" chance="7.15" /> <!-- Vajra Wand -->
+					<item id="2499" min="1" max="1" chance="7.05" /> <!-- Elven Long Sword -->
+				</group>
+				<group chance="100">
+					<item id="438" min="1" max="3" chance="7.15" /> <!-- Sage's Rags -->
+					<item id="61" min="1" max="3" chance="7.15" /> <!-- Mithril Gloves -->
+					<item id="353" min="1" max="1" chance="7.15" /> <!-- Half Plate Armor -->
+					<item id="380" min="1" max="1" chance="7.15" /> <!-- Plate Gaiters -->
+					<item id="396" min="1" max="1" chance="7.15" /> <!-- Salamander Skin Mail -->
+					<item id="497" min="1" max="3" chance="7.15" /> <!-- Chain Helmet -->
+					<item id="607" min="1" max="3" chance="7.15" /> <!-- Ogre Power Gauntlets -->
+					<item id="630" min="1" max="3" chance="7.15" /> <!-- Square Shield -->
+					<item id="1125" min="1" max="3" chance="7.15" /> <!-- Assault Boots -->
+					<item id="2412" min="1" max="3" chance="7.15" /> <!-- Plate Helmet -->
+					<item id="2427" min="1" max="3" chance="7.15" /> <!-- Salamander Skin Boots -->
+					<item id="2428" min="1" max="3" chance="7.15" /> <!-- Plate Boots -->
+					<item id="2451" min="1" max="3" chance="7.15" /> <!-- Sage's Worn Gloves -->
+					<item id="2494" min="1" max="3" chance="7.05" /> <!-- Plate Shield -->
+				</group>
+				<group chance="100">
+					<item id="851" min="1" max="3" chance="33.33" /> <!-- Onyx Beast's Eye Earring -->
+					<item id="882" min="1" max="3" chance="33.33" /> <!-- Mithril Ring -->
+					<item id="914" min="1" max="1" chance="33.34" /> <!-- Dark Necklace -->
+				</group>
+				<group chance="100">
+					<item id="71" min="1" max="1" chance="5.55" /> <!-- Flamberge -->
+					<item id="72" min="1" max="1" chance="5.55" /> <!-- Stormbringer -->
+					<item id="89" min="1" max="1" chance="5.55" /> <!-- Big Hammer -->
+					<item id="96" min="1" max="1" chance="5.55" /> <!-- Scythe -->
+					<item id="160" min="1" max="1" chance="5.55" /> <!-- Battle Axe -->
+					<item id="161" min="1" max="1" chance="5.55" /> <!-- Silver Axe -->
+					<item id="173" min="1" max="1" chance="5.55" /> <!-- Skull Graver -->
+					<item id="191" min="1" max="1" chance="5.55" /> <!-- Heavy Doom Hammer -->
+					<item id="192" min="1" max="1" chance="5.55" /> <!-- Crystal Staff -->
+					<item id="193" min="1" max="1" chance="5.55" /> <!-- Stick of Faith -->
+					<item id="194" min="1" max="1" chance="5.55" /> <!-- Heavy Doom Axe -->
+					<item id="226" min="1" max="1" chance="5.55" /> <!-- Cursed Dagger -->
+					<item id="230" min="1" max="1" chance="5.55" /> <!-- Needle Wolverine -->
+					<item id="232" min="1" max="1" chance="5.55" /> <!-- Dark Elven Dagger -->
+					<item id="263" min="1" max="1" chance="5.55" /> <!-- Chakram -->
+					<item id="281" min="1" max="1" chance="5.55" /> <!-- Crystallized Ice Bow -->
+					<item id="298" min="1" max="1" chance="5.55" /> <!-- Orcish Glaive -->
+					<item id="302" min="1" max="1" chance="5.65" /> <!-- Body Slasher -->
+				</group>
+				<group chance="100">
+					<item id="2387" min="1" max="1" chance="5.55" /> <!-- Reinforced Mithril Gaiters -->
+					<item id="2413" min="1" max="3" chance="5.55" /> <!-- Chain Hood -->
+					<item id="2429" min="1" max="3" chance="5.55" /> <!-- Chain Boots -->
+					<item id="2430" min="1" max="3" chance="5.55" /> <!-- Karmian Boots -->
+					<item id="2431" min="1" max="3" chance="5.55" /> <!-- Plated Leather Boots -->
+					<item id="2432" min="1" max="3" chance="5.55" /> <!-- Dwarven Chain Boots -->
+					<item id="2433" min="1" max="3" chance="5.55" /> <!-- Boots of Seal -->
+					<item id="2452" min="1" max="3" chance="5.55" /> <!-- Reinforced Mithril Gloves -->
+					<item id="2453" min="1" max="3" chance="5.55" /> <!-- Chain Gloves -->
+					<item id="2454" min="1" max="3" chance="5.55" /> <!-- Karmian Gloves -->
+					<item id="2495" min="1" max="3" chance="5.55" /> <!-- Chain Shield -->
+					<item id="62" min="1" max="3" chance="5.55" /> <!-- Reinforced Mithril Boots -->
+					<item id="354" min="1" max="1" chance="5.55" /> <!-- Chain Mail Shirt -->
+					<item id="381" min="1" max="1" chance="5.55" /> <!-- Chain Gaiters -->
+					<item id="397" min="1" max="1" chance="5.55" /> <!-- Reinforced Mithril Shirt -->
+					<item id="439" min="1" max="1" chance="5.55" /> <!-- Karmian Tunic -->
+					<item id="471" min="1" max="1" chance="5.55" /> <!-- Karmian Stockings -->
+					<item id="631" min="1" max="3" chance="5.65" /> <!-- Eldarake -->
+				</group>
+				<group chance="100">
+					<item id="852" min="1" max="3" chance="33.33" /> <!-- Moonstone Earring -->
+					<item id="883" min="1" max="3" chance="33.33" /> <!-- Aquastone Ring -->
+					<item id="915" min="1" max="1" chance="33.34" /> <!-- Aquastone Necklace -->
+				</group>
+				<group chance="70">
+					<item id="73" min="1" max="1" chance="9.09" /> <!-- Shamshir -->
+					<item id="74" min="1" max="1" chance="9.09" /> <!-- Katana -->
+					<item id="94" min="1" max="1" chance="9.09" /> <!-- Bec de Corbin -->
+					<item id="131" min="1" max="1" chance="9.09" /> <!-- Spirit Sword -->
+					<item id="133" min="1" max="1" chance="9.09" /> <!-- Raid Sword -->
+					<item id="195" min="1" max="1" chance="9.09" /> <!-- Cursed Staff -->
+					<item id="227" min="1" max="1" chance="9.09" /> <!-- Stiletto -->
+					<item id="242" min="1" max="1" chance="9.09" /> <!-- Soulfire Dirk -->
+					<item id="282" min="1" max="1" chance="9.09" /> <!-- Elemental Bow -->
+					<item id="285" min="1" max="1" chance="9.09" /> <!-- Noble Elven Bow -->
+					<item id="325" min="1" max="1" chance="9.1" /> <!-- Horn of Glory -->
+				</group>
+				<group chance="100">
+					<item id="355" min="1" max="1" chance="33.33" /> <!-- Dwarven Chain Mail Shirt -->
+					<item id="382" min="1" max="1" chance="33.33" /> <!-- Dwarven Chain Gaiters -->
+					<item id="2496" min="1" max="1" chance="33.34" /> <!-- Dwarven Chain Shield -->
+				</group>
+				<group chance="100">
+					<item id="399" min="1" max="1" chance="25" /> <!-- Rind Leather Armor -->
+					<item id="419" min="1" max="1" chance="25" /> <!-- Rind Leather Gaiters -->
+					<item id="440" min="1" max="1" chance="25" /> <!-- Robe of Seal -->
+					<item id="500" min="1" max="1" chance="25" /> <!-- Great Helmet -->
+				</group>
+				<group chance="100">
+					<item id="632" min="1" max="3" chance="16.66" /> <!-- Knight's Shield -->
+					<item id="1126" min="1" max="3" chance="16.66" /> <!-- Crimson Boots -->
+					<item id="498" min="1" max="3" chance="16.66" /> <!-- Steel Plate Helmet -->
+					<item id="398" min="1" max="1" chance="16.66" /> <!-- Plated Leather Armor -->
+					<item id="418" min="1" max="1" chance="16.66" /> <!-- Plated Leather Gaiters -->
+					<item id="2455" min="1" max="3" chance="16.7" /> <!-- Plated Leather Gloves -->
+				</group>
+				<group chance="100">
+					<item id="853" min="1" max="3" chance="33.33" /> <!-- Earring of Protection -->
+					<item id="884" min="1" max="3" chance="33.33" /> <!-- Ring of Protection -->
+					<item id="916" min="1" max="1" chance="33.34" /> <!-- Necklace of Protection -->
+				</group>
+				<group chance="20">
+					<item id="6660" min="1" max="1" chance="100" /> <!-- Queen Ant's Ring -->
+				</group>
+				<group chance="100">
+					<item id="91527" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (D-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91534" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (D-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91541" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (D-grade) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29002" level="29" type="Monster" name="Queen Ant Larva">
+	<npc id="29002" level="38" type="Monster" name="Queen Ant Larva">
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="591" hpRegen="3.5" mp="315" mpRegen="1.5" />
-			<attack physical="89.21" magical="59.01" random="30" critical="7" accuracy="40" attackSpeed="257" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="591.9" hpRegen="3.5" mp="315.1" mpRegen="1.5" />
+			<attack physical="89.21" magical="59.01" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.72" magical="84.16" />
 			<speed>
 				<walk ground="40" />
@@ -170,9 +200,9 @@
 			<hitTime>350</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="true" />
+		<status attackable="true" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -181,7 +211,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="4500" aggroRange="450">
@@ -198,9 +228,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4000" hpRegen="108" mp="402" mpRegen="1.8" />
-			<attack physical="637" magical="395" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="4000" hpRegen="108" mp="402.6" mpRegen="1.8" />
+			<attack physical="637" magical="395" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="547" magical="200" />
 			<speed>
 				<walk ground="40" />
@@ -209,9 +239,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -220,7 +250,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4020" level="1" /> <!-- Recovery -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
@@ -243,9 +273,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4343" hpRegen="115" mp="432" mpRegen="1.8" />
-			<attack physical="178" magical="27" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="4343" hpRegen="115" mp="432.7" mpRegen="1.8" />
+			<attack physical="178" magical="27" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="578" magical="211" />
 			<speed>
 				<walk ground="40" />
@@ -254,9 +284,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -265,7 +295,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="700" isAggressive="true">
@@ -287,9 +317,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="7051" hpRegen="122" mp="463" mpRegen="1.8" />
-			<attack physical="1190" magical="1074" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="7051" hpRegen="122" mp="463.3" mpRegen="1.8" />
+			<attack physical="1190" magical="1074" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="610" magical="223" />
 			<speed>
 				<walk ground="40" />
@@ -298,9 +328,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -309,7 +339,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="700" aggroRange="450">
@@ -334,18 +364,19 @@
 		<sex>MALE</sex>
 		<acquire exp="2041407" sp="61242" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="289902.43642" hpRegen="145.2219912" mp="2901.03" mpRegen="2.1" />
-			<attack physical="722.31" magical="1398.68" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="523103.852" hpRegen="441.65" mp="1708.8" mpRegen="20" />
+			<attack physical="722.31" magical="1398.68" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1602" magical="293" />
 			<speed>
 				<walk ground="50" />
 				<run ground="110" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -354,7 +385,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>10</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -369,85 +400,116 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="917" min="1" max="1" chance="33.35" /> <!-- Necklace of Mermaid -->
-				<item id="1149" min="1" max="3" chance="32.97" /> <!-- Shining Circlet -->
-				<item id="608" min="1" max="3" chance="32.46" /> <!-- Mithril Gauntlets -->
-				<item id="854" min="1" max="3" chance="32.43" /> <!-- Earring of Seal -->
-				<item id="885" min="1" max="3" chance="32.34" /> <!-- Ring of Ages -->
-				<item id="1127" min="1" max="3" chance="31.87" /> <!-- Forgotten Boots -->
-				<item id="2459" min="1" max="1" chance="25.94" /> <!-- Demon's Gloves -->
-				<item id="2460" min="1" max="1" chance="25.53" /> <!-- Theca Leather Gloves -->
-				<item id="472" min="1" max="1" chance="25.22" /> <!-- Demon's Stockings -->
-				<item id="2436" min="1" max="1" chance="25.13" /> <!-- Theca Leather Boots -->
-				<item id="441" min="1" max="1" chance="24.97" /> <!-- Demon's Tunic -->
-				<item id="420" min="1" max="1" chance="24.96" /> <!-- Theca Leather Gaiters -->
-				<item id="400" min="1" max="1" chance="24.4" /> <!-- Theca Leather Armor -->
-				<item id="2435" min="1" max="1" chance="24.39" /> <!-- Demon's Boots -->
-				<item id="107" min="1" max="3" chance="20.86" /> <!-- Compound Shield -->
-				<item id="499" min="1" max="3" chance="20.67" /> <!-- Mithril Helmet -->
-				<item id="2462" min="1" max="1" chance="20.56" /> <!-- Full Plate Gauntlets -->
-				<item id="356" min="1" max="1" chance="20.4" /> <!-- Full Plate Armor -->
-				<item id="1128" min="1" max="3" chance="20.31" /> <!-- Adamantite Boots -->
-				<item id="2438" min="1" max="1" chance="20.28" /> <!-- Full Plate Boots -->
-				<item id="2497" min="1" max="1" chance="20.24" /> <!-- Full Plate Shield -->
-				<item id="517" min="1" max="3" chance="20.03" /> <!-- Compound Helmet -->
-				<item id="2414" min="1" max="1" chance="19.98" /> <!-- Full Plate Helmet -->
-				<item id="64" min="1" max="1" chance="19.93" /> <!-- Compound Boots -->
-				<item id="6662" min="1" max="1" chance="19.92" /> <!-- Ring of Core -->
-				<item id="442" min="1" max="1" chance="19.84" /> <!-- Divine Tunic -->
-				<item id="603" min="1" max="3" chance="19.8" /> <!-- Divine Boots -->
-				<item id="103" min="1" max="3" chance="19.7" /> <!-- Tower Shield -->
-				<item id="2437" min="1" max="1" chance="19.62" /> <!-- Drake Leather Boots -->
-				<item id="60" min="1" max="1" chance="19.61" /> <!-- Compound Armor -->
-				<item id="401" min="1" max="1" chance="19.48" /> <!-- Drake Leather Armor -->
-				<item id="2461" min="1" max="1" chance="19.47" /> <!-- Drake Leather Gloves -->
-				<item id="2468" min="1" max="3" chance="19.27" /> <!-- Blessed Gloves -->
-				<item id="2463" min="1" max="1" chance="19.08" /> <!-- Divine Gloves -->
-				<item id="473" min="1" max="1" chance="19.05" /> <!-- Divine Stockings -->
-				<item id="888" min="1" max="3" chance="17.17" /> <!-- Blessed Ring -->
-				<item id="119" min="1" max="1" chance="17" /> <!-- Necklace of Seal -->
-				<item id="855" min="1" max="3" chance="16.98" /> <!-- Nassen's Earring -->
-				<item id="919" min="1" max="1" chance="16.94" /> <!-- Blessed Necklace -->
-				<item id="886" min="1" max="3" chance="16.11" /> <!-- Ring of Seal -->
-				<item id="857" min="1" max="3" chance="15.88" /> <!-- Holy Earring -->
-				<item id="206" min="1" max="1" chance="11.62" /> <!-- Demon's Staff -->
-				<item id="2503" min="1" max="1" chance="11.55" /> <!-- Yaksa Mace -->
-				<item id="286" min="1" max="1" chance="11.51" /> <!-- Eminence Bow -->
-				<item id="205" min="1" max="1" chance="11.44" /> <!-- Ghoul's Staff -->
-				<item id="266" min="1" max="1" chance="11.18" /> <!-- Great Pata -->
-				<item id="135" min="1" max="1" chance="11.05" /> <!-- Samurai Long Sword -->
-				<item id="228" min="1" max="1" chance="11.01" /> <!-- Crystal Dagger -->
-				<item id="299" min="1" max="1" chance="10.99" /> <!-- Orcish Poleaxe -->
-				<item id="204" min="1" max="1" chance="10.93" /> <!-- Deadman's Staff -->
-				<item id="303" min="1" max="1" chance="4.312" /> <!-- Widow Maker -->
-				<item id="95" min="1" max="1" chance="4.229" /> <!-- Poleaxe -->
-				<item id="203" min="1" max="1" chance="4.225" /> <!-- Pa'agrio Axe -->
-				<item id="162" min="1" max="1" chance="4.223" /> <!-- War Axe -->
-				<item id="283" min="1" max="1" chance="4.212" /> <!-- Akat Longbow -->
-				<item id="77" min="1" max="1" chance="4.211" /> <!-- Tsurugi -->
-				<item id="145" min="1" max="1" chance="4.208" /> <!-- Sword of Whispering Death -->
-				<item id="134" min="1" max="1" chance="4.201" /> <!-- Sword of Nightmare -->
-				<item id="197" min="1" max="1" chance="4.2" /> <!-- Paradia Staff -->
-				<item id="76" min="1" max="1" chance="4.195" /> <!-- Sword of Delusion -->
-				<item id="84" min="1" max="1" chance="4.185" /> <!-- Homunkulus' Sword -->
-				<item id="198" min="1" max="1" chance="4.183" /> <!-- Inferno Staff -->
-				<item id="174" min="1" max="1" chance="4.173" /> <!-- Nirvana Axe -->
-				<item id="132" min="1" max="1" chance="4.163" /> <!-- Ultimate Sword -->
-				<item id="196" min="1" max="1" chance="4.159" /> <!-- Stick of Eternity -->
-				<item id="233" min="1" max="1" chance="4.154" /> <!-- Dark Screamer -->
-				<item id="202" min="1" max="1" chance="4.151" /> <!-- Mace of Underworld -->
-				<item id="201" min="1" max="1" chance="4.146" /> <!-- Club of Nature -->
-				<item id="301" min="1" max="1" chance="4.143" /> <!-- Scorpion -->
-				<item id="200" min="1" max="1" chance="4.139" /> <!-- Sage's Staff -->
-				<item id="75" min="1" max="1" chance="4.127" /> <!-- Caliburs -->
-				<item id="199" min="1" max="1" chance="4.127" /> <!-- Pa'agrio Hammer -->
-				<item id="231" min="1" max="1" chance="4.111" /> <!-- Grace Dagger -->
-				<item id="265" min="1" max="1" chance="4.099" /> <!-- Fisted Blade -->
-				<item id="70000" min="297" max="891" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="91529" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (C-grade) -->
-				<item id="91536" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (C-grade) -->
-				<item id="91543" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (C-grade) -->
-				<item id="8620" min="1" max="3" chance="49.64" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				<group chance="100">
+					<item id="75" min="1" max="1" chance="4.16" /> <!-- Caliburs -->
+					<item id="76" min="1" max="1" chance="4.16" /> <!-- Sword of Delusion -->
+					<item id="77" min="1" max="1" chance="4.16" /> <!-- Tsurugi -->
+					<item id="84" min="1" max="1" chance="4.16" /> <!-- Homunkulus' Sword -->
+					<item id="95" min="1" max="1" chance="4.16" /> <!-- Poleaxe -->
+					<item id="132" min="1" max="1" chance="4.16" /> <!-- Ultimate Sword -->
+					<item id="134" min="1" max="1" chance="4.16" /> <!-- Sword of Nightmare -->
+					<item id="145" min="1" max="1" chance="4.16" /> <!-- Sword of Whispering Death -->
+					<item id="162" min="1" max="1" chance="4.16" /> <!-- War Axe -->
+					<item id="174" min="1" max="1" chance="4.16" /> <!-- Nirvana Axe -->
+					<item id="196" min="1" max="1" chance="4.16" /> <!-- Stick of Eternity -->
+					<item id="197" min="1" max="1" chance="4.16" /> <!-- Paradia Staff -->
+					<item id="198" min="1" max="1" chance="4.16" /> <!-- Inferno Staff -->
+					<item id="199" min="1" max="1" chance="4.16" /> <!-- Pa'agrio Hammer -->
+					<item id="200" min="1" max="1" chance="4.16" /> <!-- Sage's Staff -->
+					<item id="201" min="1" max="1" chance="4.16" /> <!-- Club of Nature -->
+					<item id="202" min="1" max="1" chance="4.16" /> <!-- Mace of Underworld -->
+					<item id="231" min="1" max="1" chance="4.16" /> <!-- Grace Dagger -->
+					<item id="233" min="1" max="1" chance="4.16" /> <!-- Dark Screamer -->
+					<item id="265" min="1" max="1" chance="4.16" /> <!-- Fisted Blade -->
+					<item id="283" min="1" max="1" chance="4.16" /> <!-- Akat Longbow -->
+					<item id="203" min="1" max="1" chance="4.16" /> <!-- Pa'agrio Axe -->
+					<item id="301" min="1" max="1" chance="4.16" /> <!-- scorpion -->
+					<item id="303" min="1" max="1" chance="4.32" /> <!-- Widow Maker -->
+				</group>
+				<group chance="100">
+					<item id="60" min="1" max="1" chance="20" /> <!-- Compound Armor -->
+					<item id="64" min="1" max="1" chance="20" /> <!-- Compound Boots -->
+					<item id="103" min="1" max="3" chance="20" /> <!-- Tower Shield -->
+					<item id="107" min="1" max="3" chance="20" /> <!-- Compound Shield -->
+					<item id="517" min="1" max="3" chance="20" /> <!-- Compound Helmet -->
+				</group>
+				<group chance="100">
+					<item id="608" min="1" max="3" chance="33.33" /> <!-- Mithril Gauntlets -->
+					<item id="1127" min="1" max="3" chance="33.33" /> <!-- Forgotten Boots -->
+					<item id="1149" min="1" max="3" chance="33.34" /> <!-- Shining Circlet -->
+				</group>
+				<group chance="100">
+					<item id="400" min="1" max="1" chance="25" /> <!-- Theca Leather Armor -->
+					<item id="420" min="1" max="1" chance="25" /> <!-- Theca Leather Gaiters -->
+					<item id="2436" min="1" max="1" chance="25" /> <!-- Theca Leather Boots -->
+					<item id="2460" min="1" max="1" chance="25" /> <!-- Theca Leather Gloves -->
+				</group>
+				<group chance="100">
+					<item id="441" min="1" max="1" chance="25" /> <!-- Demon's Tunic -->
+					<item id="472" min="1" max="1" chance="25" /> <!-- Demon's Stockings -->
+					<item id="2435" min="1" max="1" chance="25" /> <!-- Demon's Boots -->
+					<item id="2459" min="1" max="1" chance="25" /> <!-- Demon's Gloves -->
+				</group>
+				<group chance="100">
+					<item id="854" min="1" max="3" chance="33.33" /> <!-- Earring of Seal -->
+					<item id="885" min="1" max="3" chance="33.33" /> <!-- Ring of Ages -->
+					<item id="917" min="1" max="1" chance="33.34" /> <!-- Necklace of Mermaid -->
+				</group>
+				<group chance="100">
+					<item id="135" min="1" max="1" chance="11.11" /> <!-- Samurai Long Sword -->
+					<item id="204" min="1" max="1" chance="11.11" /> <!-- Deadman's Staff -->
+					<item id="205" min="1" max="1" chance="11.11" /> <!-- Ghoul's Staff -->
+					<item id="206" min="1" max="1" chance="11.11" /> <!-- Demon's Staff -->
+					<item id="228" min="1" max="1" chance="11.11" /> <!-- Crystal Dagger -->
+					<item id="266" min="1" max="1" chance="11.11" /> <!-- Great Pata -->
+					<item id="286" min="1" max="1" chance="11.11" /> <!-- Eminence Bow -->
+					<item id="299" min="1" max="1" chance="11.11" /> <!-- Orcish Poleaxe -->
+					<item id="2503" min="1" max="1" chance="11.12" /> <!-- Yaksa Mace -->
+				</group>
+				<group chance="100">
+					<item id="356" min="1" max="1" chance="20" /> <!-- Full Plate Armor -->
+					<item id="2414" min="1" max="1" chance="20" /> <!-- Full Plate Helmet -->
+					<item id="2438" min="1" max="1" chance="20" /> <!-- Full Plate Boots -->
+					<item id="2462" min="1" max="1" chance="20" /> <!-- Full Plate Gauntlets -->
+					<item id="2497" min="1" max="1" chance="20" /> <!-- Full Plate Shield -->
+				</group>
+				<group chance="100">
+					<item id="401" min="1" max="1" chance="20" /> <!-- Drake Leather Armor -->
+					<item id="2437" min="1" max="1" chance="20" /> <!-- Drake Leather Boots -->
+					<item id="2461" min="1" max="1" chance="20" /> <!-- Drake Leather Gloves -->
+					<item id="499" min="1" max="3" chance="20" /> <!-- Mithril Helmet -->
+					<item id="1128" min="1" max="3" chance="20" /> <!-- Adamantite Boots -->
+				</group>
+				<group chance="100">
+					<item id="442" min="1" max="1" chance="20" /> <!-- Divine Tunic -->
+					<item id="473" min="1" max="1" chance="20" /> <!-- Divine Stockings -->
+					<item id="2463" min="1" max="1" chance="20" /> <!-- Divine Gloves -->
+					<item id="2468" min="1" max="3" chance="20" /> <!-- Blessed Gloves -->
+					<item id="603" min="1" max="3" chance="20" /> <!-- Divine Boots -->
+				</group>
+				<group chance="100">
+					<item id="119" min="1" max="1" chance="16.66" /> <!-- Necklace of Seal -->
+					<item id="855" min="1" max="3" chance="16.66" /> <!-- Nassen's Earring -->
+					<item id="857" min="1" max="3" chance="16.66" /> <!-- Holy Earring -->
+					<item id="886" min="1" max="3" chance="16.66" /> <!-- Ring of Seal -->
+					<item id="888" min="1" max="3" chance="16.66" /> <!-- Blessed Ring -->
+					<item id="919" min="1" max="1" chance="16.7" /> <!-- Blessed Necklace -->
+				</group>
+				<group chance="20">
+					<item id="6662" min="1" max="1" chance="100" /> <!-- Ring of Core -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
+				<group chance="100">
+					<item id="91529" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (C-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91536" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (C-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91543" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (C-grade) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -461,9 +523,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="75" /> <!-- Caliburs -->
 		<acquire exp="13947" sp="418" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="13817" hpRegen="166" mp="747" mpRegen="2.1" />
-			<attack physical="410" magical="69" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="13817" hpRegen="166" mp="747.8" mpRegen="2.1" />
+			<attack physical="410" magical="69" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="801" magical="293" />
 			<speed>
 				<walk ground="27" />
@@ -472,9 +534,9 @@
 			<hitTime>710</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -483,9 +545,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="2300" isAggressive="true">
@@ -497,40 +557,6 @@
 			<radius normal="12" grown="14.5" />
 			<height normal="31" grown="36" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="162" min="1" max="1" chance="0.003" /> <!-- War Axe -->
-				<item id="174" min="1" max="1" chance="0.003" /> <!-- Nirvana Axe -->
-				<item id="196" min="1" max="1" chance="0.003" /> <!-- Stick of Eternity -->
-				<item id="197" min="1" max="1" chance="0.003" /> <!-- Paradia Staff -->
-				<item id="199" min="1" max="1" chance="0.003" /> <!-- Pa'agrio Hammer -->
-				<item id="200" min="1" max="1" chance="0.003" /> <!-- Sage's Staff -->
-				<item id="201" min="1" max="1" chance="0.003" /> <!-- Club of Nature -->
-				<item id="202" min="1" max="1" chance="0.003" /> <!-- Mace of Underworld -->
-				<item id="57" min="1160" max="2714" chance="70" /> <!-- Adena -->
-				<item id="1872" min="1" max="3" chance="16.14" /> <!-- Animal Bone -->
-				<item id="1865" min="1" max="3" chance="8.492" /> <!-- Varnish -->
-				<item id="1882" min="1" max="1" chance="5.7" /> <!-- Leather -->
-				<item id="2508" min="2" max="6" chance="5.317" /> <!-- Cursed Bone -->
-				<item id="1876" min="1" max="1" chance="5.163" /> <!-- Mithril Ore -->
-				<item id="2952" min="1" max="1" chance="2.172" /> <!-- Demon's Boot Fabric -->
-				<item id="3005" min="1" max="1" chance="0.97" /> <!-- Recipe: Demon's Boots -->
-				<item id="2100" min="1" max="1" chance="0.3" /> <!-- Paradia Staff Head -->
-				<item id="2097" min="1" max="1" chance="0.3" /> <!-- War Axe Blade -->
-				<item id="2098" min="1" max="1" chance="0.3" /> <!-- Nirvana Axe Blade -->
-				<item id="2231" min="1" max="1" chance="0.3" /> <!-- Recipe: Full Plate Armor -->
-				<item id="2105" min="1" max="1" chance="0.3" /> <!-- Mace of Underworld Head -->
-				<item id="2104" min="1" max="1" chance="0.3" /> <!-- Club of Nature Head -->
-				<item id="2103" min="1" max="1" chance="0.3" /> <!-- Sage's Staff Head -->
-				<item id="2099" min="1" max="1" chance="0.3" /> <!-- Stick of Eternity Shaft -->
-				<item id="2102" min="1" max="1" chance="0.3" /> <!-- Pa'agrio Hammer Head -->
-				<item id="2360" min="1" max="1" chance="0.03" /> <!-- Recipe: Orcish Poleaxe -->
-			</drop>
-			<spoil>
-				<item id="1914" min="1" max="1" chance="46.21" /> <!-- Earring of Seal Gemstone -->
-				<item id="3011" min="1" max="1" chance="22.96" /> <!-- Recipe: Divine Boots -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29008" level="55" type="Monster" name="Doom Wraith">
 		<parameters>
@@ -543,9 +569,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="1472" /> <!-- Dreadbane -->
 		<acquire exp="15169" sp="501" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="16012" hpRegen="185" mp="889" mpRegen="2.4" />
-			<attack physical="470" magical="715" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="16012" hpRegen="185" mp="889.8" mpRegen="2.4" />
+			<attack physical="470" magical="715" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="895" magical="327" />
 			<speed>
 				<walk ground="100" />
@@ -554,21 +580,19 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="5" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="5" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="700" isAggressive="true">
@@ -591,9 +615,9 @@
 		<race>PLANT</race>
 		<sex>FEMALE</sex>
 		<acquire exp="11480" sp="344" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="12544" hpRegen="154" mp="665" mpRegen="2.1" />
-			<attack physical="354" magical="60" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<attack physical="354" magical="60" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="747" magical="273" />
 			<speed>
 				<walk ground="80" />
@@ -602,19 +626,19 @@
 			<hitTime>130</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4035" level="4" /> <!-- Poison -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4035" level="4" /> <!-- Poison -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="800" isAggressive="true">
@@ -626,34 +650,6 @@
 			<radius normal="12" />
 			<height normal="25.5" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="1126" min="1" max="1" chance="0.075" /> <!-- Crimson Boots -->
-				<item id="2434" min="1" max="1" chance="0.075" /> <!-- Rind Leather Boots -->
-				<item id="2455" min="1" max="1" chance="0.075" /> <!-- Plated Leather Gloves -->
-				<item id="2457" min="1" max="1" chance="0.075" /> <!-- Gloves of Seal -->
-				<item id="2458" min="1" max="1" chance="0.075" /> <!-- Rind Leather Gloves -->
-				<item id="57" min="996" max="2323" chance="70" /> <!-- Adena -->
-				<item id="1866" min="1" max="1" chance="13.34" /> <!-- Suede -->
-				<item id="1342" min="30" max="90" chance="12.95" /> <!-- Steel Arrow -->
-				<item id="1867" min="2" max="6" chance="6.416" /> <!-- Animal Skin -->
-				<item id="2951" min="1" max="1" chance="4.388" /> <!-- Rind Leather Glove Design -->
-				<item id="2950" min="1" max="1" chance="4.348" /> <!-- Gloves of Seal Pattern -->
-				<item id="2948" min="1" max="1" chance="4.342" /> <!-- Rind Leather Boot Lining -->
-				<item id="1882" min="1" max="1" chance="4.245" /> <!-- Leather -->
-				<item id="1868" min="5" max="15" chance="3.845" /> <!-- Thread -->
-				<item id="2946" min="1" max="1" chance="2.929" /> <!-- Plated Leather Glove Design -->
-				<item id="2508" min="3" max="9" chance="2.632" /> <!-- Cursed Bone -->
-				<item id="1974" min="1" max="3" chance="2.22" /> <!-- Crimson Boot Fabric -->
-				<item id="1885" min="1" max="1" chance="1.585" /> <!-- High-grade Suede -->
-				<item id="2350" min="1" max="1" chance="0.03" /> <!-- Recipe: Pa'agrio Axe -->
-				<item id="2339" min="1" max="1" chance="0.03" /> <!-- Recipe: Inferno Staff -->
-			</drop>
-			<spoil>
-				<item id="1895" min="1" max="5" chance="66.24" /> <!-- Metallic Fiber -->
-				<item id="2944" min="1" max="1" chance="62.28" /> <!-- Karmian Glove Fabric -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29010" level="46" type="Monster" name="Validus">
 		<parameters>
@@ -664,29 +660,29 @@
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<acquire exp="11032" sp="330" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="12130" hpRegen="150" mp="637" mpRegen="2.1" />
-			<attack physical="337" magical="58" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="12130" hpRegen="150" mp="637.8" mpRegen="2.1" />
+			<attack physical="337" magical="58" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="729" magical="267" />
 			<speed>
 				<walk ground="70" />
 				<run ground="110" />
 			</speed>
-			<hitTime>300</hitTime>
+			<hitTime>30</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="3" /> <!-- Beasts -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="3" /> <!-- Beasts -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="1200" isAggressive="true">
@@ -698,29 +694,6 @@
 			<radius normal="15" />
 			<height normal="29" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="354" min="1" max="1" chance="0.03" /> <!-- Chain Mail Shirt -->
-				<item id="232" min="1" max="1" chance="0.0075" /> <!-- Dark Elven Dagger -->
-				<item id="281" min="1" max="1" chance="0.0075" /> <!-- Crystallized Ice Bow -->
-				<item id="57" min="914" max="2141" chance="70" /> <!-- Adena -->
-				<item id="1866" min="1" max="1" chance="15.89" /> <!-- Suede -->
-				<item id="1878" min="1" max="1" chance="9.186" /> <!-- Durable Braid -->
-				<item id="1864" min="3" max="9" chance="7.663" /> <!-- Stem -->
-				<item id="1865" min="2" max="6" chance="5.755" /> <!-- Varnish -->
-				<item id="2508" min="2" max="6" chance="3.839" /> <!-- Cursed Bone -->
-				<item id="1959" min="1" max="1" chance="2.104" /> <!-- Chain Mail Shirt Material -->
-				<item id="2072" min="1" max="1" chance="0.75" /> <!-- Dark Elven Dagger Edge -->
-				<item id="2074" min="1" max="1" chance="0.75" /> <!-- Crystallized Ice Bow Shaft -->
-				<item id="2319" min="1" max="1" chance="0.075" /> <!-- Recipe: Raid Sword -->
-				<item id="951" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Weapon (C-grade) -->
-			</drop>
-			<spoil>
-				<item id="1873" min="1" max="3" chance="88.74" /> <!-- Silver Nugget -->
-				<item id="2060" min="1" max="1" chance="3.464" /> <!-- Stormbringer Blade -->
-				<item id="2067" min="1" max="1" chance="3.185" /> <!-- Crystal Staff Head -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29011" level="49" type="Monster" name="Susceptor">
 		<parameters>
@@ -731,10 +704,10 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="13389" hpRegen="162" mp="720" mpRegen="2.1" />
-			<attack physical="391" magical="66" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<attack physical="391" magical="66" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="783" magical="286" />
 			<speed>
 				<walk ground="27" />
@@ -743,10 +716,9 @@
 			<hitTime>430</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -755,7 +727,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="1500" isAggressive="true">
@@ -778,9 +751,9 @@
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<acquire exp="16035" sp="481" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="12964" hpRegen="158" mp="692" mpRegen="2.1" />
-			<attack physical="372" magical="63" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="12964" hpRegen="158" mp="692.4" mpRegen="2.1" />
+			<attack physical="372" magical="63" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="765" magical="280" />
 			<speed>
 				<walk ground="20" />
@@ -789,22 +762,22 @@
 			<hitTime>410</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4273" level="3" /> <!-- Resist Daggers/Rapier Weapon -->
-			<skill id="4274" level="1" /> <!-- Blunt Weapon Weak Point -->
-			<skill id="4408" level="12" /> <!-- HP Increase (4x) -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
-			<skill id="4444" level="2" /> <!-- Higher Resist Bow/Crossbow Weapons -->
+			<skill id="4444" level="2" /> <!-- Greater Bow Resistance -->
+			<skill id="4273" level="3" /> <!-- Dagger Resistance -->
+			<skill id="4274" level="1" /> <!-- Blunt Weapon Vulnerability -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="800" isAggressive="true">
@@ -816,35 +789,6 @@
 			<radius normal="18" />
 			<height normal="34" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="1126" min="1" max="1" chance="0.075" /> <!-- Crimson Boots -->
-				<item id="2434" min="1" max="1" chance="0.075" /> <!-- Rind Leather Boots -->
-				<item id="2455" min="1" max="1" chance="0.075" /> <!-- Plated Leather Gloves -->
-				<item id="2457" min="1" max="1" chance="0.075" /> <!-- Gloves of Seal -->
-				<item id="2458" min="1" max="1" chance="0.075" /> <!-- Rind Leather Gloves -->
-				<item id="57" min="1447" max="3374" chance="70" /> <!-- Adena -->
-				<item id="1873" min="1" max="1" chance="12.81" /> <!-- Silver Nugget -->
-				<item id="1865" min="1" max="3" chance="10.09" /> <!-- Varnish -->
-				<item id="2508" min="2" max="6" chance="6.579" /> <!-- Cursed Bone -->
-				<item id="1965" min="1" max="1" chance="4.208" /> <!-- Metal Plate Helmet Material -->
-				<item id="2946" min="1" max="1" chance="3.494" /> <!-- Plated Leather Glove Design -->
-				<item id="1880" min="1" max="1" chance="3.151" /> <!-- Steel -->
-				<item id="1869" min="5" max="15" chance="3.142" /> <!-- Iron Ore -->
-				<item id="1974" min="1" max="3" chance="2.735" /> <!-- Crimson Boot Fabric -->
-				<item id="1874" min="1" max="1" chance="2.061" /> <!-- Oriharukon Ore -->
-				<item id="2948" min="1" max="3" chance="1.772" /> <!-- Rind Leather Boot Lining -->
-				<item id="2950" min="2" max="6" chance="1.296" /> <!-- Gloves of Seal Pattern -->
-				<item id="2951" min="2" max="6" chance="1.067" /> <!-- Rind Leather Glove Design -->
-				<item id="1973" min="3" max="9" chance="0.75" /> <!-- Pa'agrio Hand Design -->
-				<item id="2344" min="1" max="1" chance="0.075" /> <!-- Recipe: Grace Dagger -->
-				<item id="951" min="1" max="1" chance="0.075" /> <!-- Scroll: Enchant Weapon (C-grade) -->
-			</drop>
-			<spoil>
-				<item id="2073" min="1" max="1" chance="7.894" /> <!-- Chakram Edge -->
-				<item id="2352" min="1" max="1" chance="2.107" /> <!-- Recipe: Widow Maker -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29013" level="45" type="Monster" name="Premo">
 		<parameters>
@@ -855,9 +799,9 @@
 		<race>GIANT</race>
 		<sex>MALE</sex>
 		<acquire exp="10351" sp="310" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="11721" hpRegen="146" mp="610" mpRegen="2.1" />
-			<attack physical="320" magical="55" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="11721" hpRegen="146" mp="610.8" mpRegen="2.1" />
+			<attack physical="320" magical="55" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="711" magical="260" />
 			<speed>
 				<walk ground="55" />
@@ -866,10 +810,10 @@
 			<hitTime>610</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="11" /> <!-- Giant -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
@@ -877,7 +821,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="11" /> <!-- Giants -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="1200" aggroRange="450">
@@ -889,30 +833,6 @@
 			<radius normal="21" grown="25" />
 			<height normal="35" grown="43" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="631" min="1" max="1" chance="0.3" /> <!-- Eldarake -->
-				<item id="2495" min="1" max="1" chance="0.3" /> <!-- Chain Shield -->
-				<item id="2413" min="1" max="1" chance="0.075" /> <!-- Chain Hood -->
-				<item id="57" min="859" max="2006" chance="70" /> <!-- Adena -->
-				<item id="1868" min="1" max="3" chance="17.95" /> <!-- Thread -->
-				<item id="1866" min="1" max="1" chance="12.31" /> <!-- Suede -->
-				<item id="1867" min="1" max="3" chance="8.405" /> <!-- Animal Skin -->
-				<item id="1964" min="1" max="1" chance="6.108" /> <!-- Eldarake Temper -->
-				<item id="2945" min="1" max="1" chance="6.014" /> <!-- Chain Shield Fragment -->
-				<item id="2936" min="1" max="1" chance="5.526" /> <!-- Chain Hood Pattern -->
-				<item id="1882" min="1" max="1" chance="4.181" /> <!-- Leather -->
-				<item id="1885" min="1" max="1" chance="1.519" /> <!-- High-grade Suede -->
-				<item id="2207" min="1" max="1" chance="0.3" /> <!-- Recipe: Karmian Tunic -->
-				<item id="2323" min="1" max="1" chance="0.075" /> <!-- Recipe: Elemental Bow -->
-				<item id="2326" min="1" max="1" chance="0.075" /> <!-- Recipe: Horn of Glory -->
-			</drop>
-			<spoil>
-				<item id="1876" min="1" max="1" chance="80.65" /> <!-- Mithril Ore -->
-				<item id="1962" min="1" max="1" chance="13.24" /> <!-- Karmian Tunic Pattern -->
-				<item id="2073" min="1" max="1" chance="3.192" /> <!-- Chakram Edge -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29014" level="50" type="GrandBoss" name="Orfen">
 		<parameters>
@@ -923,13 +843,13 @@
 				<npc id="29016" count="4" respawnTime="360" weightPoint="1" />
 			</minions>
 		</parameters>
-		<race>ELEMENTAL</race>
+		<race>FAIRY</race>
 		<sex>FEMALE</sex>
 		<acquire exp="8872500" sp="266175" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="289902.43642" hpRegen="145.2219912" mp="2901.03" mpRegen="2.1" />
-			<attack physical="722.31" magical="1398.68" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="1602" magical="293" />
+			<vitals hp="523103.852" hpRegen="441.65" mp="1708.8" mpRegen="20" />
+			<attack physical="3652" magical="1535" random="10" critical="4" accuracy="0" attackSpeed="253" type="SWORD" range="80" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -937,12 +857,9 @@
 			<hitTime>710</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4062" level="1" /> <!-- Orfen -->
-			<skill id="4063" level="1" /> <!-- Paralysis -->
-			<skill id="4064" level="1" /> <!-- Paralysis -->
+			<skill id="4416" level="13" /> <!-- Fairies -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -951,7 +868,10 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="13" /> <!-- Fairies -->
+			<skill id="4062" level="1" /> <!-- Orfen -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4063" level="1" /> <!-- Paralysis -->
+			<skill id="4064" level="1" /> <!-- Paralysis -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -966,59 +886,88 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="856" min="1" max="3" chance="34.93" /> <!-- Adamantite Earring -->
-				<item id="918" min="1" max="1" chance="33.56" /> <!-- Adamantite Necklace -->
-				<item id="887" min="1" max="3" chance="32.7" /> <!-- Adamantite Ring -->
-				<item id="2379" min="1" max="1" chance="25.04" /> <!-- Avadon Gaiters -->
-				<item id="2415" min="1" max="1" chance="24.89" /> <!-- Sealed Avadon Circlet -->
-				<item id="2376" min="1" max="1" chance="24.58" /> <!-- Avadon Breastplate -->
-				<item id="673" min="1" max="1" chance="23.9" /> <!-- Avadon Shield -->
-				<item id="499" min="1" max="3" chance="20.96" /> <!-- Mithril Helmet -->
-				<item id="2463" min="1" max="1" chance="20.59" /> <!-- Divine Gloves -->
-				<item id="401" min="1" max="1" chance="20.42" /> <!-- Drake Leather Armor -->
-				<item id="6661" min="1" max="1" chance="20.16" /> <!-- Orfen's Earring -->
-				<item id="356" min="1" max="1" chance="20.15" /> <!-- Full Plate Armor -->
-				<item id="2438" min="1" max="1" chance="20.12" /> <!-- Full Plate Boots -->
-				<item id="603" min="1" max="3" chance="19.69" /> <!-- Divine Boots -->
-				<item id="2462" min="1" max="1" chance="19.66" /> <!-- Full Plate Gauntlets -->
-				<item id="2414" min="1" max="1" chance="19.62" /> <!-- Full Plate Helmet -->
-				<item id="2461" min="1" max="1" chance="19.54" /> <!-- Drake Leather Gloves -->
-				<item id="2437" min="1" max="1" chance="19.3" /> <!-- Drake Leather Boots -->
-				<item id="2497" min="1" max="3" chance="19.29" /> <!-- Full Plate Shield -->
-				<item id="2468" min="1" max="3" chance="19.23" /> <!-- Blessed Gloves -->
-				<item id="473" min="1" max="1" chance="19.21" /> <!-- Divine Stockings -->
-				<item id="442" min="1" max="1" chance="19.06" /> <!-- Divine Tunic -->
-				<item id="1128" min="1" max="3" chance="19.02" /> <!-- Adamantite Boots -->
-				<item id="888" min="1" max="3" chance="17.23" /> <!-- Blessed Ring -->
-				<item id="919" min="1" max="1" chance="16.93" /> <!-- Blessed Necklace -->
-				<item id="855" min="1" max="3" chance="16.77" /> <!-- Nassen's Earring -->
-				<item id="119" min="1" max="1" chance="16.39" /> <!-- Necklace of Seal -->
-				<item id="886" min="1" max="3" chance="16.34" /> <!-- Ring of Seal -->
-				<item id="857" min="1" max="3" chance="16.24" /> <!-- Holy Earring -->
-				<item id="204" min="1" max="1" chance="11.65" /> <!-- Deadman's Staff -->
-				<item id="228" min="1" max="1" chance="11.64" /> <!-- Crystal Dagger -->
-				<item id="286" min="1" max="1" chance="11.54" /> <!-- Eminence Bow -->
-				<item id="2503" min="1" max="1" chance="11.53" /> <!-- Yaksa Mace -->
-				<item id="206" min="1" max="1" chance="11.41" /> <!-- Demon's Staff -->
-				<item id="299" min="1" max="1" chance="11.35" /> <!-- Orcish Poleaxe -->
-				<item id="205" min="1" max="1" chance="11.33" /> <!-- Ghoul's Staff -->
-				<item id="266" min="1" max="1" chance="11.22" /> <!-- Great Pata -->
-				<item id="135" min="1" max="1" chance="10.59" /> <!-- Samurai Long Sword -->
-				<item id="947" min="2" max="8" chance="100" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-				<item id="91536" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (C-grade) -->
-				<item id="91529" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (C-grade) -->
-				<item id="70000" min="198" max="593" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="91543" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (C-grade) -->
-				<item id="948" min="10" max="30" chance="100" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="8620" min="1" max="3" chance="49.83" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="4051" min="20" max="80" chance="12.9" /> <!-- Adamantite Necklace Chain -->
-				<item id="4065" min="20" max="80" chance="12.66" /> <!-- Avadon Gaiter Material -->
-				<item id="4049" min="20" max="80" chance="12.51" /> <!-- Adamantite Earring Gemstone -->
-				<item id="4050" min="20" max="80" chance="12.51" /> <!-- Adamantite Ring Wire -->
-				<item id="4071" min="20" max="80" chance="12.27" /> <!-- Avadon Robe Fabric -->
-				<item id="4072" min="20" max="80" chance="12.21" /> <!-- Sealed Avadon Circlet Pattern -->
-				<item id="4064" min="20" max="80" chance="12.2" /> <!-- Avadon Breastplate Part -->
-				<item id="4439" min="20" max="80" chance="12.11" /> <!-- Avadon Shield Fragment -->
+				<group chance="100">
+					<item id="135" min="1" max="1" chance="11.11" /> <!-- Samurai Long Sword -->
+					<item id="204" min="1" max="1" chance="11.11" /> <!-- Deadman's Staff -->
+					<item id="205" min="1" max="1" chance="11.11" /> <!-- Ghoul's Staff -->
+					<item id="206" min="1" max="1" chance="11.11" /> <!-- Demon's Staff -->
+					<item id="228" min="1" max="1" chance="11.11" /> <!-- Crystal Dagger -->
+					<item id="266" min="1" max="1" chance="11.11" /> <!-- Great Pata -->
+					<item id="286" min="1" max="1" chance="11.11" /> <!-- Eminence Bow -->
+					<item id="299" min="1" max="1" chance="11.11" /> <!-- Orcish Poleaxe -->
+					<item id="2503" min="1" max="1" chance="11.12" /> <!-- Yaksa Mace -->
+				</group>
+				<group chance="100">
+					<item id="356" min="1" max="1" chance="20" /> <!-- Full Plate Armor -->
+					<item id="2497" min="1" max="3" chance="20" /> <!-- Full Plate Shield -->
+					<item id="2414" min="1" max="1" chance="20" /> <!-- Full Plate Helmet -->
+					<item id="2438" min="1" max="1" chance="20" /> <!-- Full Plate Boots -->
+					<item id="2462" min="1" max="1" chance="20" /> <!-- Full Plate Gauntlets -->
+				</group>
+				<group chance="100">
+					<item id="2461" min="1" max="1" chance="20" /> <!-- Drake Leather Gloves -->
+					<item id="2437" min="1" max="1" chance="20" /> <!-- Drake Leather Boots -->
+					<item id="401" min="1" max="1" chance="20" /> <!-- Drake Leather Armor -->
+					<item id="603" min="1" max="3" chance="20" /> <!-- Divine Boots -->
+					<item id="1128" min="1" max="3" chance="20" /> <!-- Adamantite Boots -->
+				</group>
+				<group chance="100">
+					<item id="442" min="1" max="1" chance="20" /> <!-- Divine Tunic -->
+					<item id="473" min="1" max="1" chance="20" /> <!-- Divine Stockings -->
+					<item id="2463" min="1" max="1" chance="20" /> <!-- Divine Gloves -->
+					<item id="2468" min="1" max="3" chance="20" /> <!-- Blessed Gloves -->
+					<item id="499" min="1" max="3" chance="20" /> <!-- Mithril Helmet -->
+				</group>
+				<group chance="100">
+					<item id="119" min="1" max="1" chance="16.66" /> <!-- Necklace of Seal -->
+					<item id="855" min="1" max="3" chance="16.66" /> <!-- Nassen's Earring -->
+					<item id="857" min="1" max="3" chance="16.66" /> <!-- Holy Earring -->
+					<item id="886" min="1" max="3" chance="16.66" /> <!-- Ring of Seal -->
+					<item id="888" min="1" max="3" chance="16.66" /> <!-- Blessed Ring -->
+					<item id="919" min="1" max="1" chance="16.7" /> <!-- Blessed Necklace -->
+				</group>
+				<group chance="100">
+					<item id="2376" min="1" max="1" chance="25" /> <!-- Avadon Breastplate -->
+					<item id="2379" min="1" max="1" chance="25" /> <!-- Avadon Gaiters -->
+					<item id="2415" min="1" max="1" chance="25" /> <!-- Sealed Avadon Circlet -->
+					<item id="673" min="1" max="1" chance="25" /> <!-- Avadon Shield -->
+				</group>
+				<group chance="100">
+					<item id="856" min="1" max="3" chance="33.33" /> <!-- Adamantite Earring -->
+					<item id="887" min="1" max="3" chance="33.33" /> <!-- Adamantite Ring -->
+					<item id="918" min="1" max="1" chance="33.34" /> <!-- Adamantite Necklace -->
+				</group>
+				<group chance="100">
+					<item id="4049" min="20" max="80" chance="12.5" /> <!-- Adamantite Earring Gemstone -->
+					<item id="4050" min="20" max="80" chance="12.5" /> <!-- Adamantite Ring Wire -->
+					<item id="4051" min="20" max="80" chance="12.5" /> <!-- Adamantite Necklace Chain -->
+					<item id="4064" min="20" max="80" chance="12.5" /> <!-- Avadon Breastplate Part -->
+					<item id="4065" min="20" max="80" chance="12.5" /> <!-- Avadon Gaiter Material -->
+					<item id="4071" min="20" max="80" chance="12.5" /> <!-- Avadon Robe Fabric -->
+					<item id="4072" min="20" max="80" chance="12.5" /> <!-- Sealed Avadon Circlet Pattern -->
+					<item id="4439" min="20" max="80" chance="12.5" /> <!-- Avadon Shield Fragment -->
+				</group>
+				<group chance="20">
+					<item id="6661" min="1" max="1" chance="100" /> <!-- Orfen's Earring -->
+				</group>
+				<group chance="100">
+					<item id="947" min="2" max="8" chance="100" /> <!-- Scroll: Enchant Weapon (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="948" min="10" max="30" chance="100" /> <!-- Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
+				<group chance="100">
+					<item id="91529" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (C-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91536" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (C-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91543" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (C-grade) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -1028,13 +977,13 @@
 			<param name="MoveAroundSocial1" value="70" />
 			<param name="MoveAroundSocial2" value="70" />
 		</parameters>
-		<race>BEAST</race>
+		<race>BUG</race>
 		<sex>MALE</sex>
-		<acquire exp="16035" sp="481" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="16035" sp="481" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="158" mp="36936" mpRegen="2.1" />
-			<attack physical="298" magical="40" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="765" magical="280" />
+			<attack physical="298" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1042,9 +991,9 @@
 			<hitTime>540</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1053,7 +1002,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="2500" aggroRange="450">
@@ -1072,13 +1021,13 @@
 			<param name="MoveAroundSocial1" value="70" />
 			<param name="MoveAroundSocial2" value="70" />
 		</parameters>
-		<race>BEAST</race>
+		<race>BUG</race>
 		<sex>MALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="162" mp="36936" mpRegen="2.1" />
-			<attack physical="1058" magical="1563" random="30" critical="15" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="783" magical="286" />
+			<attack physical="1058" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1086,9 +1035,9 @@
 			<hitTime>540</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1097,7 +1046,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="2700" aggroRange="450">
@@ -1118,11 +1067,11 @@
 		</parameters>
 		<race>BUG</race>
 		<sex>FEMALE</sex>
-		<acquire exp="16035" sp="481" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="16035" sp="481" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="158" mp="36936" mpRegen="2.1" />
-			<attack physical="298" magical="40" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="765" magical="280" />
+			<attack physical="298" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1130,9 +1079,9 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1141,7 +1090,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="2700" aggroRange="450">
@@ -1157,11 +1106,11 @@
 	<npc id="29018" level="49" type="Monster" name="Riba Iren">
 		<race>BUG</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="162" mp="36936" mpRegen="2.1" />
-			<attack physical="1058" magical="1563" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="783" magical="286" />
+			<attack physical="1058" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1169,9 +1118,9 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1180,8 +1129,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
-			<skill id="4516" level="1" /> <!-- Orfen Heal -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="2900" isAggressive="true">
@@ -1199,27 +1147,19 @@
 		<sex>MALE</sex>
 		<acquire exp="262720917" sp="63053" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="7500000" hpRegen="1000" mp="18000" mpRegen="99" />
-			<attack physical="3260" magical="1700" random="30" critical="4" accuracy="40" attackSpeed="206" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="440" magical="440" />
+			<vitals hp="7000000" hpRegen="1000" mp="18000" mpRegen="99" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3840" magical="825" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4106" level="1" /> <!-- Antharas Stun -->
-			<skill id="4108" level="1" /> <!-- Antharas Terror -->
-			<skill id="4109" level="1" /> <!-- Curse of Antharas -->
-			<skill id="4110" level="2" /> <!-- Breath Attack -->
-			<skill id="4111" level="1" /> <!-- Antharas Fossilization -->
-			<skill id="4112" level="1" /> <!-- Ordinary Attack -->
-			<skill id="4113" level="1" /> <!-- Animal doing ordinary attack -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1228,9 +1168,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5092" level="1" /> <!-- Antharas Terror -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1239,92 +1179,36 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists> <!-- CT2.5 -->
-			<drop>
-				<item id="8620" min="10" max="30" chance="50" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="80" min="1" max="2" chance="25" /> <!-- Tallum Blade -->
-				<item id="98" min="1" max="2" chance="25" /> <!-- Halberd -->
-				<item id="269" min="1" max="2" chance="25" /> <!-- Blood Tornado -->
-				<item id="2504" min="1" max="2" chance="25" /> <!-- Meteor Shower -->
-				<item id="235" min="1" max="2" chance="25" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="2" chance="25" /> <!-- Carnage Bow -->
-				<item id="150" min="1" max="2" chance="25" /> <!-- Elemental Sword -->
-				<item id="212" min="1" max="2" chance="25" /> <!-- Dasparion's Staff -->
-				<item id="81" min="1" max="2" chance="25" /> <!-- Dragon Slayer -->
-				<item id="151" min="1" max="2" chance="25" /> <!-- Sword of Miracles -->
-				<item id="2500" min="1" max="2" chance="25" /> <!-- Dark Legion's Edge -->
-				<item id="164" min="1" max="2" chance="25" /> <!-- Elysian -->
-				<item id="236" min="1" max="2" chance="20" /> <!-- Soul Separator -->
-				<item id="270" min="1" max="2" chance="20" /> <!-- Dragon Grinder -->
-				<item id="289" min="1" max="2" chance="20" /> <!-- Soul Bow -->
-				<item id="213" min="1" max="2" chance="20" /> <!-- Branch of the Mother Tree -->
-				<item id="305" min="1" max="2" chance="20" /> <!-- Tallum Glaive -->
-				<item id="6326" min="1" max="5" chance="30" /> <!-- Sealed Majestic Necklace -->
-				<item id="6327" min="1" max="5" chance="35" /> <!-- Sealed Majestic Earring -->
-				<item id="6328" min="1" max="5" chance="35" /> <!-- Sealed Majestic Ring -->
-				<item id="6323" min="1" max="5" chance="30" /> <!-- Sealed Phoenix Necklace -->
-				<item id="6324" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Earring -->
-				<item id="6325" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Ring -->
-				<item id="5287" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5297" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5304" min="1" max="3" chance="25" /> <!-- Sealed Tallum Tunic -->
-				<item id="5311" min="1" max="3" chance="35" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5320" min="1" max="3" chance="35" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="30" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="3" chance="25" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5301" min="1" max="3" chance="25" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5308" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5316" min="1" max="3" chance="8" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5323" min="1" max="3" chance="8" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5329" min="1" max="3" chance="9" /> <!-- Sealed Majestic Robe -->
-				<item id="5288" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5298" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="30" /> <!-- Sealed Tallum Stockings -->
-				<item id="5289" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5294" min="1" max="3" chance="25" /> <!-- Sealed Tallum Helmet -->
-				<item id="5312" min="1" max="3" chance="25" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5317" min="1" max="3" chance="25" /> <!-- Sealed Majestic Circlet -->
-				<item id="5291" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5296" min="1" max="3" chance="25" /> <!-- Sealed Tallum Boots -->
-				<item id="5314" min="1" max="3" chance="25" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5319" min="1" max="3" chance="25" /> <!-- Sealed Majestic Boots -->
-				<item id="5290" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5295" min="1" max="3" chance="25" /> <!-- Sealed Tallum Gloves -->
-				<item id="5313" min="1" max="3" chance="25" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5318" min="1" max="3" chance="25" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5292" min="1" max="3" chance="40" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="40" /> <!-- Sealed Shield of Nightmare -->
-				<item id="729" min="1" max="19" chance="100" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="1538" min="1" max="59" chance="100" /> <!-- Blessed Scroll of Escape -->
-				<item id="3936" min="1" max="39" chance="100" /> <!-- Blessed Scroll of Resurrection -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="9000000" max="13000000" chance="100" /> <!-- Adena -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29020" level="80" type="GrandBoss" name="Baium">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<acquire exp="1024738848" sp="30742165" raidPoints="450" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="73892999.75369" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="3374.18" magical="2200" random="30" critical="4" accuracy="40" attackSpeed="206" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3300" magical="2200" />
+			<vitals hp="133333333" hpRegen="6666" mp="18000" mpRegen="99" />
+			<attack physical="25931" magical="8204" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3202" magical="2134" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4127" level="1" /> <!-- Baium: General Attack -->
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4256" level="1" /> <!-- Stun Resistance -->
+			<skill id="4127" level="1" /> <!-- Baium: General Attack -->
 		</skillList>
 		<corpseTime>13</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1337,83 +1221,104 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="6328" min="1" max="3" chance="51.37" /> <!-- Sealed Majestic Ring -->
-				<item id="49580" min="1" max="1" chance="29.92" /> <!-- Baium's Ring -->
-				<item id="6327" min="1" max="1" chance="20.85" /> <!-- Sealed Majestic Earring -->
-				<item id="7892" min="1" max="1" chance="17.48" /> <!-- Spell Breaker -->
-				<item id="7883" min="1" max="1" chance="17.02" /> <!-- Guardian's Sword -->
-				<item id="7900" min="1" max="1" chance="16.87" /> <!-- Ice Storm Hammer -->
-				<item id="7893" min="1" max="1" chance="16.47" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="16.35" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="16.02" /> <!-- Star Buster -->
-				<item id="6325" min="1" max="3" chance="14.26" /> <!-- Sealed Phoenix Ring -->
-				<item id="6326" min="1" max="1" chance="7.986" /> <!-- Sealed Majestic Necklace -->
-				<item id="5292" min="1" max="3" chance="6.982" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="1" chance="5.989" /> <!-- Sealed Shield of Nightmare -->
-				<item id="7894" min="1" max="1" chance="5.055" /> <!-- Spiritual Eye -->
-				<item id="98" min="1" max="1" chance="5.045" /> <!-- Halberd -->
-				<item id="5296" min="1" max="3" chance="5.041" /> <!-- Sealed Tallum Boots -->
-				<item id="5289" min="1" max="3" chance="5.025" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5295" min="1" max="3" chance="5.019" /> <!-- Sealed Tallum Gloves -->
-				<item id="288" min="1" max="1" chance="5.014" /> <!-- Carnage Bow -->
-				<item id="289" min="1" max="1" chance="5.011" /> <!-- Soul Bow -->
-				<item id="269" min="1" max="1" chance="5.006" /> <!-- Blood Tornado -->
-				<item id="151" min="1" max="1" chance="4.999" /> <!-- Sword of Miracles -->
-				<item id="5290" min="1" max="3" chance="4.982" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="7884" min="1" max="1" chance="4.976" /> <!-- Infernal Master -->
-				<item id="5294" min="1" max="3" chance="4.973" /> <!-- Sealed Tallum Helmet -->
-				<item id="150" min="1" max="1" chance="4.966" /> <!-- Elemental Sword -->
-				<item id="235" min="1" max="1" chance="4.959" /> <!-- Bloody Orchid -->
-				<item id="7899" min="1" max="1" chance="4.95" /> <!-- Destroyer Hammer -->
-				<item id="80" min="1" max="1" chance="4.948" /> <!-- Tallum Blade -->
-				<item id="2504" min="1" max="1" chance="4.941" /> <!-- Meteor Shower -->
-				<item id="5291" min="1" max="3" chance="4.93" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="270" min="1" max="1" chance="4.06" /> <!-- Dragon Grinder -->
-				<item id="212" min="1" max="1" chance="4.043" /> <!-- Dasparion's Staff -->
-				<item id="164" min="1" max="1" chance="4.031" /> <!-- Elysian -->
-				<item id="236" min="1" max="1" chance="4.028" /> <!-- Soul Separator -->
-				<item id="7902" min="1" max="1" chance="4.025" /> <!-- Doom Crusher -->
-				<item id="81" min="1" max="1" chance="4.021" /> <!-- Dragon Slayer -->
-				<item id="305" min="1" max="1" chance="4.021" /> <!-- Tallum Glaive -->
-				<item id="7895" min="1" max="1" chance="4.015" /> <!-- Flaming Dragon Skull -->
-				<item id="6324" min="1" max="1" chance="3.996" /> <!-- Sealed Phoenix Earring -->
-				<item id="213" min="1" max="1" chance="3.985" /> <!-- Branch of the Mother Tree -->
-				<item id="2500" min="1" max="1" chance="3.955" /> <!-- Dark Legion's Edge -->
-				<item id="5314" min="1" max="1" chance="3.065" /> <!-- Sealed Boots of Nightmare -->
-				<item id="49683" min="1" max="1" chance="3.042" /> <!-- Talisman of Baium -->
-				<item id="5319" min="1" max="1" chance="3.039" /> <!-- Sealed Majestic Boots -->
-				<item id="5293" min="1" max="1" chance="3.033" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5297" min="1" max="1" chance="3.031" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5318" min="1" max="1" chance="3.025" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5298" min="1" max="1" chance="3.01" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5312" min="1" max="1" chance="3.009" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5304" min="1" max="1" chance="3.006" /> <!-- Sealed Tallum Tunic -->
-				<item id="5287" min="1" max="1" chance="2.976" /> <!-- Sealed Dark Crystal Breastplate -->
-				<item id="5308" min="1" max="1" chance="2.972" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5313" min="1" max="1" chance="2.967" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5288" min="1" max="1" chance="2.962" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5317" min="1" max="1" chance="2.96" /> <!-- Sealed Majestic Circlet -->
-				<item id="5301" min="1" max="1" chance="2.953" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5305" min="1" max="1" chance="2.931" /> <!-- Sealed Tallum Stockings -->
-				<item id="5320" min="1" max="1" chance="2.055" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="1" chance="2.055" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5311" min="1" max="1" chance="2.014" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5316" min="1" max="1" chance="2.013" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5329" min="1" max="1" chance="1.985" /> <!-- Sealed Majestic Robe -->
-				<item id="5323" min="1" max="1" chance="1.962" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="6323" min="1" max="1" chance="0.75" /> <!-- Sealed Phoenix Necklace -->
-				<item id="91545" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (B-grade) -->
-				<item id="91538" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (B-grade) -->
-				<item id="8621" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Version) -->
-				<item id="91531" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (B-grade) -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="33814" min="2" max="4" chance="50.49" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="729" min="1" max="1" chance="50.46" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="730" min="1" max="1" chance="50.33" /> <!-- Scroll: Enchant Armor (A-grade) -->
-				<item id="49756" min="2" max="4" chance="49.81" /> <!-- Cloth Piece -->
-				<item id="33808" min="1" max="1" chance="49.36" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="49682" min="1" max="1" chance="27.45" /> <!-- Baium's Soul -->
-				<item id="90899" min="1" max="1" chance="2.979" /> <!-- Blessed Agathion's Soul -->
+				<group chance="100">
+					<item id="80" min="1" max="1" chance="5" /> <!-- Tallum Blade -->
+					<item id="81" min="1" max="1" chance="4" /> <!-- Dragon Slayer -->
+					<item id="98" min="1" max="1" chance="5" /> <!-- Halberd -->
+					<item id="150" min="1" max="1" chance="5" /> <!-- Elemental Sword -->
+					<item id="151" min="1" max="1" chance="5" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="1" chance="4" /> <!-- Elysian -->
+					<item id="212" min="1" max="1" chance="4" /> <!-- Dasparion's Staff -->
+					<item id="213" min="1" max="1" chance="4" /> <!-- Branch of the Mother Tree -->
+					<item id="235" min="1" max="1" chance="5" /> <!-- Bloody Orchid -->
+					<item id="236" min="1" max="1" chance="4" /> <!-- Soul Separator -->
+					<item id="269" min="1" max="1" chance="5" /> <!-- Blood Tornado -->
+					<item id="270" min="1" max="1" chance="4" /> <!-- Dragon Grinder -->
+					<item id="288" min="1" max="1" chance="5" /> <!-- Carnage Bow -->
+					<item id="289" min="1" max="1" chance="5" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="1" chance="4" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="1" chance="4" /> <!-- Dark Legion's Edge -->
+					<item id="2504" min="1" max="1" chance="5" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="1" chance="5" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="1" chance="5" /> <!-- Spiritual Eye -->
+					<item id="7895" min="1" max="1" chance="4" /> <!-- Flaming Dragon Skull -->
+					<item id="7899" min="1" max="1" chance="5" /> <!-- Destroyer Hammer -->
+					<item id="7902" min="1" max="1" chance="4" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="100">
+					<item id="7883" min="1" max="1" chance="17" /> <!-- Guardian's Sword -->
+					<item id="7889" min="1" max="1" chance="16" /> <!-- Wizard's Tear -->
+					<item id="7892" min="1" max="1" chance="17" /> <!-- Spell Breaker -->
+					<item id="7893" min="1" max="1" chance="17" /> <!-- Kaim Vanul's Bones -->
+					<item id="7900" min="1" max="1" chance="17" /> <!-- Ice Storm Hammer -->
+					<item id="7901" min="1" max="1" chance="16" /> <!-- Star Buster -->
+				</group>
+				<group chance="100">
+					<item id="5287" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5292" min="1" max="3" chance="7" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5293" min="1" max="1" chance="3" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="3" chance="5" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="3" chance="5" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="3" chance="5" /> <!-- Sealed Tallum Boots -->
+					<item id="5297" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5301" min="1" max="1" chance="3" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="1" chance="3" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="1" chance="3" /> <!-- Sealed Tallum Stockings -->
+					<item id="5308" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Robe -->
+					<item id="5311" min="1" max="1" chance="2" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="1" chance="3" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="1" chance="3" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="1" chance="3" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5315" min="1" max="1" chance="6" /> <!-- Sealed Shield of Nightmare -->
+					<item id="5316" min="1" max="1" chance="2" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="1" chance="3" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="1" chance="3" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="1" chance="3" /> <!-- Sealed Majestic Boots -->
+					<item id="5320" min="1" max="1" chance="2" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5323" min="1" max="1" chance="2" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5326" min="1" max="1" chance="2" /> <!-- Sealed Robe of Nightmare -->
+					<item id="5329" min="1" max="1" chance="2" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="100">
+					<item id="6323" min="1" max="1" chance="1" /> <!-- Sealed Phoenix Necklace -->
+					<item id="6324" min="1" max="1" chance="4" /> <!-- Sealed Phoenix Earring -->
+					<item id="6325" min="1" max="3" chance="15" /> <!-- Sealed Phoenix Ring -->
+					<item id="6326" min="1" max="1" chance="8" /> <!-- Sealed Majestic Necklace -->
+					<item id="6327" min="1" max="1" chance="20" /> <!-- Sealed Majestic Earring -->
+					<item id="6328" min="1" max="3" chance="52" /> <!-- Sealed Majestic Ring -->
+				</group>
+				<group chance="100">
+					<item id="33808" min="1" max="1" chance="50" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
+					<item id="33814" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="729" min="1" max="1" chance="50" /> <!-- Scroll: Enchant Weapon (A-grade) -->
+					<item id="730" min="1" max="1" chance="50" /> <!-- Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="30">
+					<item id="49580" min="1" max="1" chance="100" /> <!-- Baium's Ring -->
+				</group>
+				<group chance="30">
+					<item id="49683" min="1" max="1" chance="10" /> <!-- Talisman of Baium -->
+					<item id="49682" min="1" max="1" chance="90" /> <!-- Baium's Soul -->
+				</group>
+				<group chance="100">
+					<item id="8621" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Version) -->
+				</group>
+				<group chance="100">
+					<item id="91531" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91538" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91545" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (B-grade) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -1422,9 +1327,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="93" /> <!-- Winged Spear -->
 		<acquire exp="11520" sp="2" />
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="290966.74193" hpRegen="8.5" mp="1608.045" mpRegen="3" />
-			<attack physical="395" magical="371" random="30" critical="4" accuracy="40" attackSpeed="206" type="POLE" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="747660" hpRegen="158" mp="1475" mpRegen="3" />
+			<attack physical="4185" magical="371" random="10" critical="4" accuracy="0" attackSpeed="253" type="POLE" range="80" distance="80" width="120" />
 			<defence physical="5108" magical="1686" />
 			<speed>
 				<walk ground="50" />
@@ -1433,11 +1338,18 @@
 			<hitTime>760</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4132" level="1" /> <!-- Spear: Pound the Ground -->
-			<skill id="4133" level="1" /> <!-- Heal -->
 			<skill id="4416" level="8" /> <!-- Angel -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="11" /> <!-- Spear -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="300" isAggressive="true">
@@ -1455,9 +1367,9 @@
 		<sex>MALE</sex>
 		<acquire exp="102487500" sp="3074625" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="36946499.75369" hpRegen="310.756323" mp="20787.765" mpRegen="3" />
-			<attack physical="33864" magical="42273" random="30" critical="4" accuracy="40" attackSpeed="206" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3680" magical="4661" />
+			<vitals hp="66666666.6666667" hpRegen="2981.0298102981" mp="12240" mpRegen="10" />
+			<attack physical="15182.9268292683" magical="6600.03819341452" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2692.68292682927" magical="1794.92939666239" />
 			<speed>
 				<walk ground="42" />
 				<run ground="190" />
@@ -1465,13 +1377,19 @@
 			<hitTime>590</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4221" level="1" /> <!-- Range Dual Attack -->
-			<skill id="4220" level="1" /> <!-- Dual Attack -->
-			<skill id="4218" level="1" /> <!-- Drain -->
-			<skill id="4219" level="1" /> <!-- Hold -->
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1482,84 +1400,104 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="6328" min="1" max="3" chance="51.41" /> <!-- Sealed Majestic Ring -->
-				<item id="90763" min="1" max="1" chance="20.55" /> <!-- Zaken's Earring -->
-				<item id="6327" min="1" max="3" chance="19.7" /> <!-- Sealed Majestic Earring -->
-				<item id="7900" min="1" max="3" chance="17.47" /> <!-- Ice Storm Hammer -->
-				<item id="7883" min="1" max="3" chance="16.48" /> <!-- Guardian's Sword -->
-				<item id="7892" min="1" max="3" chance="16.46" /> <!-- Spell Breaker -->
-				<item id="7893" min="1" max="3" chance="16.42" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="3" chance="15.98" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="3" chance="15.2" /> <!-- Star Buster -->
-				<item id="6325" min="1" max="3" chance="14.87" /> <!-- Sealed Phoenix Ring -->
-				<item id="6326" min="1" max="3" chance="7.868" /> <!-- Sealed Majestic Necklace -->
-				<item id="5292" min="1" max="3" chance="6.818" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="5.831" /> <!-- Sealed Shield of Nightmare -->
-				<item id="80" min="1" max="3" chance="4.942" /> <!-- Tallum Blade -->
-				<item id="7899" min="1" max="3" chance="4.939" /> <!-- Destroyer Hammer -->
-				<item id="151" min="1" max="3" chance="4.918" /> <!-- Sword of Miracles -->
-				<item id="2504" min="1" max="3" chance="4.914" /> <!-- Meteor Shower -->
-				<item id="5291" min="1" max="3" chance="4.911" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5296" min="1" max="3" chance="4.91" /> <!-- Sealed Tallum Boots -->
-				<item id="98" min="1" max="3" chance="4.908" /> <!-- Halberd -->
-				<item id="5289" min="1" max="3" chance="4.907" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="7884" min="1" max="3" chance="4.906" /> <!-- Infernal Master -->
-				<item id="5290" min="1" max="3" chance="4.9" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5294" min="1" max="3" chance="4.889" /> <!-- Sealed Tallum Helmet -->
-				<item id="7894" min="1" max="3" chance="4.889" /> <!-- Spiritual Eye -->
-				<item id="150" min="1" max="3" chance="4.886" /> <!-- Elemental Sword -->
-				<item id="269" min="1" max="3" chance="4.871" /> <!-- Blood Tornado -->
-				<item id="235" min="1" max="3" chance="4.863" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="3" chance="4.859" /> <!-- Carnage Bow -->
-				<item id="5295" min="1" max="3" chance="4.857" /> <!-- Sealed Tallum Gloves -->
-				<item id="289" min="1" max="3" chance="4.836" /> <!-- Soul Bow -->
-				<item id="270" min="1" max="3" chance="3.99" /> <!-- Dragon Grinder -->
-				<item id="212" min="1" max="3" chance="3.987" /> <!-- Dasparion's Staff -->
-				<item id="2500" min="1" max="3" chance="3.974" /> <!-- Dark Legion's Edge -->
-				<item id="81" min="1" max="3" chance="3.954" /> <!-- Dragon Slayer -->
-				<item id="305" min="1" max="3" chance="3.952" /> <!-- Tallum Glaive -->
-				<item id="6324" min="1" max="3" chance="3.923" /> <!-- Sealed Phoenix Earring -->
-				<item id="236" min="1" max="3" chance="3.921" /> <!-- Soul Separator -->
-				<item id="7895" min="1" max="3" chance="3.893" /> <!-- Flaming Dragon Skull -->
-				<item id="7902" min="1" max="3" chance="3.891" /> <!-- Doom Crusher -->
-				<item id="164" min="1" max="3" chance="3.874" /> <!-- Elysian -->
-				<item id="213" min="1" max="3" chance="3.855" /> <!-- Branch of the Mother Tree -->
-				<item id="5314" min="1" max="3" chance="2.999" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5287" min="1" max="3" chance="2.954" /> <!-- Sealed Dark Crystal Breastplate -->
-				<item id="5319" min="1" max="3" chance="2.953" /> <!-- Sealed Majestic Boots -->
-				<item id="5288" min="1" max="3" chance="2.945" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5317" min="1" max="3" chance="2.937" /> <!-- Sealed Majestic Circlet -->
-				<item id="5293" min="1" max="3" chance="2.931" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5304" min="1" max="3" chance="2.925" /> <!-- Sealed Tallum Tunic -->
-				<item id="5301" min="1" max="3" chance="2.92" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5297" min="1" max="3" chance="2.919" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5305" min="1" max="3" chance="2.917" /> <!-- Sealed Tallum Stockings -->
-				<item id="5308" min="1" max="3" chance="2.914" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5312" min="1" max="3" chance="2.908" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5318" min="1" max="3" chance="2.901" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5313" min="1" max="3" chance="2.886" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5298" min="1" max="3" chance="2.877" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5320" min="1" max="3" chance="1.983" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="1.947" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5311" min="1" max="3" chance="1.936" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5323" min="1" max="3" chance="1.93" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5316" min="1" max="3" chance="1.906" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5329" min="1" max="3" chance="1.895" /> <!-- Sealed Majestic Robe -->
-				<item id="6323" min="1" max="3" chance="0.75" /> <!-- Sealed Phoenix Necklace -->
-				<item id="91545" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (B-grade) -->
-				<item id="91538" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (B-grade) -->
-				<item id="91531" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (B-grade) -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="1" max="3" chance="100" /> <!-- Cloth Piece -->
-				<item id="730" min="6" max="12" chance="50.95" /> <!-- Scroll: Enchant Armor (A-grade) -->
-				<item id="33814" min="5" max="15" chance="50.39" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33808" min="2" max="4" chance="49.76" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="729" min="2" max="4" chance="49.56" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="90899" min="1" max="1" chance="2.95" /> <!-- Blessed Agathion's Soul -->
+				<group chance="98">
+					<item id="80" min="1" max="3" chance="5" /> <!-- Tallum Blade -->
+					<item id="81" min="1" max="3" chance="4" /> <!-- Dragon Slayer -->
+					<item id="98" min="1" max="3" chance="5" /> <!-- Halberd -->
+					<item id="150" min="1" max="3" chance="5" /> <!-- Elemental Sword -->
+					<item id="151" min="1" max="3" chance="5" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="3" chance="4" /> <!-- Elysian -->
+					<item id="212" min="1" max="3" chance="4" /> <!-- Dasparion's Staff -->
+					<item id="213" min="1" max="3" chance="4" /> <!-- Branch of the Mother Tree -->
+					<item id="235" min="1" max="3" chance="5" /> <!-- Bloody Orchid -->
+					<item id="236" min="1" max="3" chance="4" /> <!-- Soul Separator -->
+					<item id="269" min="1" max="3" chance="5" /> <!-- Blood Tornado -->
+					<item id="270" min="1" max="3" chance="4" /> <!-- Dragon Grinder -->
+					<item id="288" min="1" max="3" chance="5" /> <!-- Carnage Bow -->
+					<item id="289" min="1" max="3" chance="5" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="3" chance="4" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="3" chance="4" /> <!-- Dark Legion's Edge -->
+					<item id="2504" min="1" max="3" chance="5" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="3" chance="5" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="3" chance="5" /> <!-- Spiritual Eye -->
+					<item id="7895" min="1" max="3" chance="4" /> <!-- Flaming Dragon Skull -->
+					<item id="7899" min="1" max="3" chance="5" /> <!-- Destroyer Hammer -->
+					<item id="7902" min="1" max="3" chance="4" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="98">
+					<item id="7883" min="1" max="3" chance="17" /> <!-- Guardian's Sword -->
+					<item id="7889" min="1" max="3" chance="16" /> <!-- Wizard's Tear -->
+					<item id="7892" min="1" max="3" chance="17" /> <!-- Spell Breaker -->
+					<item id="7893" min="1" max="3" chance="17" /> <!-- Kaim Vanul's Bones -->
+					<item id="7900" min="1" max="3" chance="17" /> <!-- Ice Storm Hammer -->
+					<item id="7901" min="1" max="3" chance="16" /> <!-- Star Buster -->
+				</group>
+				<group chance="98">
+					<item id="5287" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5292" min="1" max="3" chance="7" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5293" min="1" max="3" chance="3" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="3" chance="5" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="3" chance="5" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="3" chance="5" /> <!-- Sealed Tallum Boots -->
+					<item id="5297" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5301" min="1" max="3" chance="3" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="3" chance="3" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="3" chance="3" /> <!-- Sealed Tallum Stockings -->
+					<item id="5308" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Robe -->
+					<item id="5311" min="1" max="3" chance="2" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="3" chance="3" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="3" chance="3" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="3" chance="3" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5315" min="1" max="3" chance="6" /> <!-- Sealed Shield of Nightmare -->
+					<item id="5316" min="1" max="3" chance="2" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="3" chance="3" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="3" chance="3" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="3" chance="3" /> <!-- Sealed Majestic Boots -->
+					<item id="5320" min="1" max="3" chance="2" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5323" min="1" max="3" chance="2" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5326" min="1" max="3" chance="2" /> <!-- Sealed Robe of Nightmare -->
+					<item id="5329" min="1" max="3" chance="2" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="98">
+					<item id="6323" min="1" max="3" chance="1" /> <!-- Sealed Phoenix Necklace -->
+					<item id="6324" min="1" max="3" chance="4" /> <!-- Sealed Phoenix Earring -->
+					<item id="6325" min="1" max="3" chance="15" /> <!-- Sealed Phoenix Ring -->
+					<item id="6326" min="1" max="3" chance="8" /> <!-- Sealed Majestic Necklace -->
+					<item id="6327" min="1" max="3" chance="20" /> <!-- Sealed Majestic Earring -->
+					<item id="6328" min="1" max="3" chance="52" /> <!-- Sealed Majestic Ring -->
+				</group>
+				<group chance="100">
+					<item id="33808" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
+					<item id="33814" min="5" max="15" chance="50" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="729" min="2" max="4" chance="50" /> <!-- Scroll: Enchant Weapon (A-grade) -->
+					<item id="730" min="6" max="12" chance="50" /> <!-- Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="20">
+					<item id="90763" min="1" max="1" chance="100" /> <!-- Zaken's Earring -->
+				</group>
+				<group chance="100">
+					<item id="49756" min="1" max="3" chance="100" /> <!-- Cloth Piece -->
+				</group>
+				<group chance="100">
+					<item id="91531" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91538" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91545" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (B-grade) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29023" level="74" type="Monster" name="Doll Blader">
+	<npc id="29023" level="58" type="Monster" name="Doll Blader">
 		<parameters>
 			<param name="MoveAroundSocial" value="50" />
 			<param name="MoveAroundSocial1" value="50" />
@@ -1570,33 +1508,31 @@
 		<equipment rhand="5129" /> <!-- Doll Knife -->
 		<acquire exp="129198" sp="3875" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1828" hpRegen="6.5" mp="832" mpRegen="2.4" />
-			<attack physical="442" magical="302" random="30" critical="4" accuracy="40" attackSpeed="253" type="DUAL" range="40" distance="80" width="120" />
+			<vitals hp="1828" hpRegen="6.5" mp="832.4" mpRegen="2.4" />
+			<attack physical="442" magical="302" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="DUAL" range="40" distance="80" width="120" />
 			<defence physical="261" magical="191" />
 			<speed>
 				<walk ground="22" />
 				<run ground="150" />
 			</speed>
-			<hitTime>500</hitTime>
+			<hitTime>50</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="5" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4085" level="1" /> <!-- Critical Damage -->
-			<skill id="4086" level="1" /> <!-- Critical Chance -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="9" /> <!-- Average M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="19" /> <!-- Dual-Sword Weapons -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4333" level="5" /> <!-- Dark Attack Resistance -->
-			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4415" level="19" /> <!-- Dual Sword -->
+			<skill id="4071" level="5" /> <!-- Bow Resistance -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1604,22 +1540,8 @@
 			<radius normal="6" />
 			<height normal="12" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="97" min="1" max="1" chance="0.0075" /> <!-- Lance -->
-				<item id="268" min="1" max="1" chance="0.0075" /> <!-- Bellion Cestus -->
-				<item id="57" min="2433" max="5685" chance="70" /> <!-- Adena -->
-				<item id="1887" min="1" max="1" chance="10.68" /> <!-- Varnish of Purity -->
-				<item id="4120" min="1" max="1" chance="1.603" /> <!-- Bellion Cestus Edge -->
-				<item id="4115" min="1" max="1" chance="1.574" /> <!-- Lance Blade -->
-			</drop>
-			<spoil>
-				<item id="948" min="1" max="1" chance="4.296" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="947" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-			</spoil>
-		</dropLists>
 	</npc>
-	<npc id="29024" level="74" type="Monster" name="Veil Master">
+	<npc id="29024" level="59" type="Monster" name="Veil Master">
 		<parameters>
 			<param name="MoveAroundSocial" value="114" />
 			<param name="MoveAroundSocial1" value="114" />
@@ -1630,7 +1552,7 @@
 		<acquire exp="90904" sp="2727" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1880" hpRegen="6.5" mp="861" mpRegen="2.4" />
-			<attack physical="461" magical="315" random="30" critical="4" accuracy="40" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="461" magical="315" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="267" magical="195" />
 			<speed>
 				<walk ground="70" />
@@ -1639,66 +1561,9 @@
 			<hitTime>740</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="5" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4085" level="1" /> <!-- Critical Damage -->
-			<skill id="4086" level="1" /> <!-- Critical Chance -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4333" level="5" /> <!-- Dark Attack Resistance -->
 			<skill id="4416" level="9" /> <!-- Demons -->
-		</skillList>
-		<exCrtEffect>true</exCrtEffect>
-		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
-		<collision>
-			<radius normal="12" />
-			<height normal="40" />
-		</collision>
-		<dropLists>
-			<drop>
-				<item id="79" min="1" max="1" chance="0.003" /> <!-- Damascus -->
-				<item id="171" min="1" max="1" chance="0.003" /> <!-- Deadman's Glory -->
-				<item id="57" min="1372" max="3205" chance="70" /> <!-- Adena -->
-				<item id="1895" min="1" max="1" chance="11.11" /> <!-- Metallic Fiber -->
-				<item id="1876" min="1" max="1" chance="8.019" /> <!-- Mithril Ore -->
-				<item id="1866" min="2" max="6" chance="6.628" /> <!-- Suede -->
-				<item id="1879" min="1" max="1" chance="6.623" /> <!-- Cokes -->
-				<item id="1870" min="5" max="15" chance="3.946" /> <!-- Coal -->
-				<item id="1871" min="9" max="27" chance="2.235" /> <!-- Charcoal -->
-				<item id="4114" min="1" max="1" chance="0.75" /> <!-- Damascus Sword Blade -->
-				<item id="4116" min="1" max="1" chance="0.75" /> <!-- Deadman's Glory Stone -->
-			</drop>
-			<spoil>
-				<item id="948" min="1" max="1" chance="2.453" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="947" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-			</spoil>
-		</dropLists>
-	</npc>
-	<npc id="29025" level="75" type="Folk" name="Baium">
-		<race>HUMANOID</race>
-		<sex>MALE</sex>
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="1709400" hpRegen="8.5" mp="18000" mpRegen="3" />
-			<attack physical="874.18" magical="596.95" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="233.61" magical="233.61" />
-			<speed>
-				<walk ground="50" />
-				<run ground="120" />
-			</speed>
-			<abnormalResist physical="230" magical="230" />
-		</stats>
-		<status attackable="false" undying="true" />
-		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1707,7 +1572,44 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4071" level="5" /> <!-- Bow Resistance -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+		</skillList>
+		<exCrtEffect>true</exCrtEffect>
+		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="29025" level="75" type="Folk" name="Baium">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="1709400" hpRegen="718" mp="18000" mpRegen="99" />
+			<attack physical="1874.18" magical="1596.95" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3300" magical="2200" />
+			<speed>
+				<walk ground="50" />
+				<run ground="120" />
+			</speed>
+			<hitTime>60</hitTime>
+			<abnormalResist physical="230" magical="230" />
+		</stats>
+		<status attackable="false" undying="true" />
+		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="300" aggroRange="4296" />
@@ -1727,7 +1629,7 @@
 		<equipment rhand="232" /> <!-- Dark Elven Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1933" hpRegen="6.5" mp="804" mpRegen="2.4" />
-			<attack physical="420" magical="328" random="10" critical="8" accuracy="40" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
+			<attack physical="420" magical="328" random="5" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="272" magical="199" />
 			<speed>
 				<walk ground="14" />
@@ -1736,9 +1638,9 @@
 			<hitTime>760</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1746,10 +1648,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="7" /> <!-- Daggers -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4415" level="7" /> <!-- Dagger -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1769,7 +1669,7 @@
 		<equipment rhand="225" /> <!-- Mithril Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1776" hpRegen="6.5" mp="584" mpRegen="2.1" />
-			<attack physical="371" magical="289" random="10" critical="8" accuracy="40" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
+			<attack physical="371" magical="289" random="5" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="256" magical="187" />
 			<speed>
 				<walk ground="11" />
@@ -1778,9 +1678,9 @@
 			<hitTime>740</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1788,10 +1688,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="7" /> <!-- Daggers -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4415" level="7" /> <!-- Dagger -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1803,14 +1701,10 @@
 	<npc id="29045" level="85" type="Folk" name="Frintezza">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="428076" hpRegen="319.2293199" mp="23423" mpRegen="3" />
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="428076.229929773" hpRegen="2484.3" mp="23423.9034583234" mpRegen="3.15" />
 			<attack physical="2641.63342970569" magical="971.856593649426" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
 			<defence physical="4218.55484265502" magical="3093.6078479881" />
-			<attribute>
-				<attack type="WIND" value="350" />
-				<defence fire="300" water="300" wind="370" earth="250" holy="300" dark="300" default="300" />
-			</attribute>
 			<speed>
 				<walk ground="30" />
 				<run ground="31" />
@@ -1819,8 +1713,17 @@
 			<abnormalResist physical="230" magical="230" />
 		</stats>
 		<skillList>
-			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5464" level="1" /> <!-- Wind Attack -->
+			<skill id="4416" level="6" /> <!-- Humanoid -->
+			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="1" /> <!-- Bare Hands -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>15</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1839,14 +1742,10 @@
 		<sex>MALE</sex>
 		<equipment rhand="8204" /> <!-- Monster Only (Follower of Frintezza Calibur) -->
 		<acquire exp="130849003" sp="31403" />
-		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="19146585" hpRegen="248.43" mp="17588" mpRegen="109" />
-			<attack physical="3135.90530099925" magical="1442.51644402476" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="1342.97453242915" magical="2089.07149518896" />
-			<attribute>
-				<attack type="DARK" value="280" />
-				<defence fire="200" water="200" wind="200" earth="200" holy="150" dark="200" default="300" />
-			</attribute>
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="32000000" hpRegen="1" mp="2025740" mpRegen="1000" />
+			<attack physical="35810" magical="4375" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="2505" magical="1452" />
 			<speed>
 				<walk ground="240" />
 				<run ground="111" />
@@ -1855,8 +1754,8 @@
 			<abnormalResist physical="230" magical="230" />
 		</stats>
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="4" /> <!-- Resist Bow/Crossbow Weapons -->
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1865,13 +1764,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="5078" level="1" /> <!-- Frintezza Critical Power -->
-			<skill id="4494" level="1" /> <!-- Raid Boss -->
-			<skill id="14768" level="1" /> <!-- Raid Boss (Lv. 85) -->
-			<skill id="5467" level="1" /> <!-- Dark Attacks -->
-			<skill id="5017" level="1" /> <!-- Demon -->
-			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4071" level="4" /> <!-- Bow Resistance -->
+			<skill id="5078" level="1" /> <!-- Frintezza Critical Damage -->
 		</skillList>
 		<corpseTime>18</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1891,13 +1786,15 @@
 		<sex>MALE</sex>
 		<equipment rhand="8222" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="56970000" hpRegen="319.2293199" mp="3510317.685" mpRegen="3" />
-			<attack physical="8184.13934" magical="2579.001338" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3584.547554" magical="1748.708651" />
+			<vitals hp="40000000" hpRegen="1" mp="2025740" mpRegen="1000" />
+			<attack physical="35810" magical="4375" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="2505" magical="1452" />
 			<speed>
 				<walk ground="250" />
 				<run ground="155" />
 			</speed>
+			<hitTime>430</hitTime>
+			<abnormalResist physical="230" magical="230" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -1905,134 +1802,8 @@
 			<height normal="112.8" />
 		</collision>
 		<skillList>
-			<skill id="4494" level="1" /> <!-- Raid Boss -->
 			<skill id="4416" level="9" /> <!-- Demons -->
-		</skillList>
-		<dropLists>
-			<drop>
-				<item id="91550" min="1" max="1" chance="4.947" /> <!-- Frintezza's Necklace -->
-				<item id="5293" min="1" max="1" chance="1.138" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5313" min="1" max="1" chance="1.099" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5296" min="1" max="1" chance="1.09" /> <!-- Sealed Tallum Boots -->
-				<item id="5297" min="1" max="1" chance="1.087" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5312" min="1" max="1" chance="1.086" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5304" min="1" max="1" chance="1.08" /> <!-- Sealed Tallum Tunic -->
-				<item id="5308" min="1" max="1" chance="1.075" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5311" min="1" max="1" chance="1.068" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5316" min="1" max="1" chance="1.056" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5298" min="1" max="1" chance="1.051" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5329" min="1" max="1" chance="1.049" /> <!-- Sealed Majestic Robe -->
-				<item id="5288" min="1" max="1" chance="1.04" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5305" min="1" max="1" chance="1.037" /> <!-- Sealed Tallum Stockings -->
-				<item id="5314" min="1" max="1" chance="1.033" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5315" min="1" max="1" chance="1.033" /> <!-- Sealed Shield of Nightmare -->
-				<item id="5319" min="1" max="1" chance="1.023" /> <!-- Sealed Majestic Boots -->
-				<item id="5301" min="1" max="1" chance="1.021" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5291" min="1" max="1" chance="1.019" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5290" min="1" max="1" chance="1.018" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5294" min="1" max="1" chance="1.012" /> <!-- Sealed Tallum Helmet -->
-				<item id="5320" min="1" max="1" chance="1.007" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5287" min="1" max="1" chance="1.004" /> <!-- Sealed Dark Crystal Breastplate -->
-				<item id="5317" min="1" max="1" chance="0.997" /> <!-- Sealed Majestic Circlet -->
-				<item id="5295" min="1" max="1" chance="0.995" /> <!-- Sealed Tallum Gloves -->
-				<item id="5318" min="1" max="1" chance="0.992" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5323" min="1" max="1" chance="0.991" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5292" min="1" max="1" chance="0.987" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5326" min="1" max="1" chance="0.984" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5289" min="1" max="1" chance="0.978" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="7884" min="1" max="1" chance="0.75" /> <!-- Infernal Master -->
-				<item id="7894" min="1" max="1" chance="0.75" /> <!-- Spiritual Eye -->
-				<item id="7899" min="1" max="1" chance="0.75" /> <!-- Destroyer Hammer -->
-				<item id="7902" min="1" max="1" chance="0.75" /> <!-- Doom Crusher -->
-				<item id="7895" min="1" max="1" chance="0.75" /> <!-- Flaming Dragon Skull -->
-				<item id="213" min="1" max="1" chance="0.75" /> <!-- Branch of the Mother Tree -->
-				<item id="80" min="1" max="1" chance="0.75" /> <!-- Tallum Blade -->
-				<item id="81" min="1" max="1" chance="0.75" /> <!-- Dragon Slayer -->
-				<item id="98" min="1" max="1" chance="0.75" /> <!-- Halberd -->
-				<item id="150" min="1" max="1" chance="0.75" /> <!-- Elemental Sword -->
-				<item id="151" min="1" max="1" chance="0.75" /> <!-- Sword of Miracles -->
-				<item id="164" min="1" max="1" chance="0.75" /> <!-- Elysian -->
-				<item id="212" min="1" max="1" chance="0.75" /> <!-- Dasparion's Staff -->
-				<item id="235" min="1" max="1" chance="0.75" /> <!-- Bloody Orchid -->
-				<item id="236" min="1" max="1" chance="0.75" /> <!-- Soul Separator -->
-				<item id="2504" min="1" max="1" chance="0.75" /> <!-- Meteor Shower -->
-				<item id="2500" min="1" max="1" chance="0.75" /> <!-- Dark Legion's Edge -->
-				<item id="305" min="1" max="1" chance="0.75" /> <!-- Tallum Glaive -->
-				<item id="289" min="1" max="1" chance="0.75" /> <!-- Soul Bow -->
-				<item id="288" min="1" max="1" chance="0.75" /> <!-- Carnage Bow -->
-				<item id="270" min="1" max="1" chance="0.75" /> <!-- Dragon Grinder -->
-				<item id="269" min="1" max="1" chance="0.75" /> <!-- Blood Tornado -->
-				<item id="8688" min="1" max="1" chance="0.3" /> <!-- Daimon Crystal -->
-				<item id="8687" min="1" max="1" chance="0.3" /> <!-- Cabrio's Hand -->
-				<item id="8686" min="1" max="1" chance="0.3" /> <!-- Themis' Tongue -->
-				<item id="8685" min="1" max="1" chance="0.3" /> <!-- Sobekk's Hurricane -->
-				<item id="8684" min="1" max="1" chance="0.3" /> <!-- Shyeed's Bow -->
-				<item id="8683" min="1" max="1" chance="0.3" /> <!-- Tiphon's Spear -->
-				<item id="8681" min="1" max="1" chance="0.3" /> <!-- Behemoth' Tuning Fork -->
-				<item id="8680" min="1" max="1" chance="0.3" /> <!-- Barakiel's Axe -->
-				<item id="8679" min="1" max="1" chance="0.3" /> <!-- Sword of Ipos -->
-				<item id="8678" min="1" max="1" chance="0.3" /> <!-- Sirra's Blade -->
-				<item id="8682" min="1" max="1" chance="0.3" /> <!-- Naga Storm -->
-				<item id="8619" min="1" max="1" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Language Version) -->
-				<item id="70000" min="20" max="60" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="33815" min="1" max="1" chance="50.22" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
-				<item id="8620" min="1" max="1" chance="49.14" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="33809" min="1" max="1" chance="48.78" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
-				<item id="49756" min="1" max="1" chance="9.943" /> <!-- Cloth Piece -->
-				<item id="91548" min="1" max="1" chance="9.939" /> <!-- Special Armor Varnish (A-grade) -->
-				<item id="91549" min="1" max="1" chance="9.939" /> <!-- Special Accessory Varnish (A-grade) -->
-				<item id="91500" min="1" max="1" chance="0.75" /> <!-- Basalt Battlehammer Crafting Pack -->
-				<item id="91515" min="1" max="1" chance="0.75" /> <!-- Sealed Draconic Leather Armor Crafting Pack -->
-				<item id="91516" min="1" max="1" chance="0.75" /> <!-- Sealed Draconic Leather Gloves Crafting Pack -->
-				<item id="91517" min="1" max="1" chance="0.75" /> <!-- Sealed Draconic Leather Boots Crafting Pack -->
-				<item id="91518" min="1" max="1" chance="0.75" /> <!-- Sealed Draconic Leather Helmet Crafting Pack -->
-				<item id="91519" min="1" max="1" chance="0.75" /> <!-- Sealed Major Arcana Robe Crafting Pack -->
-				<item id="91520" min="1" max="1" chance="0.75" /> <!-- Sealed Major Arcana Gloves Crafting Pack -->
-				<item id="91521" min="1" max="1" chance="0.75" /> <!-- Sealed Major Arcana Boots Crafting Pack -->
-				<item id="91522" min="1" max="1" chance="0.75" /> <!-- Sealed Major Arcana Circlet Crafting Pack -->
-				<item id="91523" min="1" max="1" chance="0.75" /> <!-- Sealed Tateossian Earring Crafting Pack -->
-				<item id="91524" min="1" max="1" chance="0.75" /> <!-- Sealed Tateossian Ring Crafting Pack -->
-				<item id="91525" min="1" max="1" chance="0.75" /> <!-- Sealed Tateossian Necklace Crafting Pack -->
-				<item id="90898" min="1" max="1" chance="0.75" /> <!-- Agathion's Soul -->
-				<item id="91514" min="1" max="1" chance="0.75" /> <!-- Sealed Imperial Crusader Helmet Crafting Pack -->
-				<item id="91513" min="1" max="1" chance="0.75" /> <!-- Sealed Imperial Crusader Shield Crafting Pack -->
-				<item id="91501" min="1" max="1" chance="0.75" /> <!-- Imperial Staff Crafting Pack -->
-				<item id="91502" min="1" max="1" chance="0.75" /> <!-- Angel Slayer Crafting Pack -->
-				<item id="91503" min="1" max="1" chance="0.75" /> <!-- Dragon Hunter Axe Crafting Pack -->
-				<item id="91504" min="1" max="1" chance="0.75" /> <!-- Saint Spear Crafting Pack -->
-				<item id="91505" min="1" max="1" chance="0.75" /> <!-- Demon Splinter Crafting Pack -->
-				<item id="91506" min="1" max="1" chance="0.75" /> <!-- Heaven's Divider Crafting Pack -->
-				<item id="91507" min="1" max="1" chance="0.75" /> <!-- Arcana Mace Crafting Pack -->
-				<item id="91508" min="1" max="1" chance="0.75" /> <!-- Draconic Bow Crafting Pack -->
-				<item id="91509" min="1" max="1" chance="0.75" /> <!-- Sealed Imperial Crusader Breastplate Crafting Pack -->
-				<item id="91499" min="1" max="1" chance="0.75" /> <!-- Forgotten Blade Crafting Pack -->
-				<item id="91511" min="1" max="1" chance="0.75" /> <!-- Sealed Imperial Crusader Gauntlets Crafting Pack -->
-				<item id="91512" min="1" max="1" chance="0.75" /> <!-- Sealed Imperial Crusader Boots Crafting Pack -->
-				<item id="91510" min="1" max="1" chance="0.75" /> <!-- Sealed Imperial Crusader Gaiters Crafting Pack -->
-			</drop>
-		</dropLists>
-	</npc>
-	<npc id="29048" level="85" type="Monster" name="Evil Spirit">
-		<race>CONSTRUCT</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="82844" hpRegen="1.03" mp="2177" mpRegen="1.03" />
-			<attack physical="1637.21079615435" magical="1151.5428303933" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="1637.38608949103" magical="1091.59072648368" evasion="3" />
-			<attribute>
-				<attack type="WIND" value="280" />
-				<defence fire="200" water="200" wind="200" earth="150" holy="200" dark="200" default="220" />
-			</attribute>
-			<speed>
-				<walk ground="10" />
-				<run ground="1" />
-			</speed>
-			<hitTime>500</hitTime>
-			<abnormalResist physical="10" magical="10" />
-		</stats>
-		<status undying="false" />
-		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2041,8 +1812,157 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
-			<skill id="5464" level="1" /> <!-- Wind Attacks -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4071" level="4" /> <!-- Bow Resistance -->
+			<skill id="5078" level="1" /> <!-- Frintezza Critical Damage -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<group chance="20">
+					<item id="80" min="1" max="1" chance="4.54" /> <!-- Tallum Blade -->
+					<item id="81" min="1" max="1" chance="4.54" /> <!-- Dragon Slayer -->
+					<item id="98" min="1" max="1" chance="4.54" /> <!-- Halberd -->
+					<item id="150" min="1" max="1" chance="4.54" /> <!-- Elemental Sword -->
+					<item id="151" min="1" max="1" chance="4.54" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="1" chance="4.54" /> <!-- Elysian -->
+					<item id="212" min="1" max="1" chance="4.54" /> <!-- Dasparion's Staff -->
+					<item id="213" min="1" max="1" chance="4.54" /> <!-- Branch of the Mother Tree -->
+					<item id="235" min="1" max="1" chance="4.54" /> <!-- Bloody Orchid -->
+					<item id="236" min="1" max="1" chance="4.54" /> <!-- Soul Separator -->
+					<item id="269" min="1" max="1" chance="4.54" /> <!-- Blood Tornado -->
+					<item id="270" min="1" max="1" chance="4.54" /> <!-- Dragon Grinder -->
+					<item id="288" min="1" max="1" chance="4.54" /> <!-- Carnage Bow -->
+					<item id="289" min="1" max="1" chance="4.54" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="1" chance="4.54" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="1" chance="4.54" /> <!-- Dark Legion's Edge -->
+					<item id="2504" min="1" max="1" chance="4.54" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="1" chance="4.54" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="1" chance="4.54" /> <!-- Spiritual Eye -->
+					<item id="7895" min="1" max="1" chance="4.54" /> <!-- Flaming Dragon Skull -->
+					<item id="7899" min="1" max="1" chance="4.54" /> <!-- Destroyer Hammer -->
+					<item id="7902" min="1" max="1" chance="4.66" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="5">
+					<item id="8678" min="1" max="1" chance="9.09" /> <!-- Sirra's Blade -->
+					<item id="8679" min="1" max="1" chance="9.09" /> <!-- Sword of Ipos -->
+					<item id="8680" min="1" max="1" chance="9.09" /> <!-- Barakiel's Axe -->
+					<item id="8681" min="1" max="1" chance="9.09" /> <!-- Behemoth' Tuning Fork -->
+					<item id="8682" min="1" max="1" chance="9.09" /> <!-- Naga Storm -->
+					<item id="8683" min="1" max="1" chance="9.09" /> <!-- Tiphon's Spear -->
+					<item id="8684" min="1" max="1" chance="9.09" /> <!-- Shyeed's Bow -->
+					<item id="8685" min="1" max="1" chance="9.09" /> <!-- Sobekk's Hurricane -->
+					<item id="8686" min="1" max="1" chance="9.09" /> <!-- Themis' Tongue -->
+					<item id="8687" min="1" max="1" chance="9.09" /> <!-- Cabrio's Hand -->
+					<item id="8688" min="1" max="1" chance="9.1" /> <!-- Daimon Crystal -->
+				</group>
+				<group chance="30">
+					<item id="5287" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5292" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5293" min="1" max="1" chance="3.56" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="1" chance="3.44" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="1" chance="3.44" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="1" chance="3.44" /> <!-- Sealed Tallum Boots -->
+					<item id="5297" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5301" min="1" max="1" chance="3.44" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="1" chance="3.44" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="1" chance="3.44" /> <!-- Sealed Tallum Stockings -->
+					<item id="5308" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Robe -->
+					<item id="5311" min="1" max="1" chance="3.44" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="1" chance="3.44" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="1" chance="3.44" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="1" chance="3.44" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5315" min="1" max="1" chance="3.56" /> <!-- Sealed Shield of Nightmare -->
+					<item id="5316" min="1" max="1" chance="3.44" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="1" chance="3.44" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="1" chance="3.44" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="1" chance="3.44" /> <!-- Sealed Majestic Boots -->
+					<item id="5320" min="1" max="1" chance="3.44" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5323" min="1" max="1" chance="3.44" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5326" min="1" max="1" chance="3.44" /> <!-- Sealed Robe of Nightmare -->
+					<item id="5329" min="1" max="1" chance="3.44" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="100">
+					<item id="33809" min="1" max="1" chance="50" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
+					<item id="33815" min="1" max="1" chance="50" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="20">
+					<item id="91499" min="1" max="1" chance="3.7" /> <!-- Forgotten Blade Crafting Pack -->
+					<item id="91500" min="1" max="1" chance="3.7" /> <!-- Basalt Battlehammer Crafting Pack -->
+					<item id="91501" min="1" max="1" chance="3.7" /> <!-- Imperial Staff Crafting Pack -->
+					<item id="91502" min="1" max="1" chance="3.7" /> <!-- Angel Slayer Crafting Pack -->
+					<item id="91503" min="1" max="1" chance="3.7" /> <!-- Dragon Hunter Axe Crafting Pack -->
+					<item id="91504" min="1" max="1" chance="3.7" /> <!-- Saint Spear Crafting Pack -->
+					<item id="91505" min="1" max="1" chance="3.7" /> <!-- Demon Splinter Crafting Pack -->
+					<item id="91506" min="1" max="1" chance="3.7" /> <!-- Heaven's Divider Crafting Pack -->
+					<item id="91507" min="1" max="1" chance="3.7" /> <!-- Arcana Mace Crafting Pack -->
+					<item id="91508" min="1" max="1" chance="3.7" /> <!-- Draconic Bow Crafting Pack -->
+					<item id="91509" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Breastplate Crafting Pack -->
+					<item id="91510" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Gaiters Crafting Pack -->
+					<item id="91511" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Gauntlets Crafting Pack -->
+					<item id="91512" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Boots Crafting Pack -->
+					<item id="91513" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Shield Crafting Pack -->
+					<item id="91514" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Helmet Crafting Pack -->
+					<item id="91515" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Armor Crafting Pack -->
+					<item id="91516" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Gloves Crafting Pack -->
+					<item id="91517" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Boots Crafting Pack -->
+					<item id="91518" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Helmet Crafting Pack -->
+					<item id="91519" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Robe Crafting Pack -->
+					<item id="91520" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Gloves Crafting Pack -->
+					<item id="91521" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Boots Crafting Pack -->
+					<item id="91522" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Circlet Crafting Pack -->
+					<item id="91523" min="1" max="1" chance="3.7" /> <!-- Sealed Tateossian Earring Crafting Pack -->
+					<item id="91524" min="1" max="1" chance="3.7" /> <!-- Sealed Tateossian Ring Crafting Pack -->
+					<item id="91525" min="1" max="1" chance="3.8" /> <!-- Sealed Tateossian Necklace Crafting Pack -->
+				</group>
+				<group chance="10">
+					<item id="91548" min="1" max="1" chance="100" /> <!-- Special Armor Varnish (A-grade) -->
+				</group>
+				<group chance="10">
+					<item id="91549" min="1" max="1" chance="100" /> <!-- Special Accessory Varnish (A-grade) -->
+				</group>
+				<group chance="5">
+					<item id="91550" min="1" max="1" chance="100" /> <!-- Frintezza's Necklace -->
+				</group>
+				<group chance="100">
+					<item id="8619" min="1" max="1" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Language Version) -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="1" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
+			</drop>
+		</dropLists>
+	</npc>
+	<npc id="29048" level="85" type="Monster" name="Evil Spirit">
+		<race>CONSTRUCT</race>
+		<sex>FEMALE</sex>
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="126582.278481013" hpRegen="1" mp="2177.28986625269" mpRegen="1.03" />
+			<attack physical="35810" magical="4375" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="2505" magical="1452" />
+			<speed>
+				<walk ground="10" />
+				<run ground="1" />
+			</speed>
+			<hitTime>50</hitTime>
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="true" noSleepMode="true" />
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="1" /> <!-- Bare Hands -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="CORPSE" clanHelpRange="1000" isAggressive="true" aggroRange="6000">
@@ -2058,24 +1978,20 @@
 	<npc id="29049" level="85" type="Monster" name="Evil Spirit">
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="82844" hpRegen="1.03" mp="2177" mpRegen="1.03" />
-			<attack physical="1637.21079615435" magical="1151.5428303933" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="1637.38608949103" magical="1091.59072648368" evasion="3" />
-			<attribute>
-				<attack type="WIND" value="280" />
-				<defence fire="200" water="200" wind="200" earth="150" holy="200" dark="200" default="220" />
-			</attribute>
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="126582.278481013" hpRegen="1" mp="2177.28986625269" mpRegen="1.03" />
+			<attack physical="35810" magical="4375" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="2505" magical="1452" />
 			<speed>
 				<walk ground="10" />
 				<run ground="1" />
 			</speed>
-			<hitTime>500</hitTime>
+			<hitTime>50</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2084,8 +2000,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
-			<skill id="5464" level="1" /> <!-- Wind Attacks -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="CORPSE" clanHelpRange="1000" isAggressive="true" aggroRange="6000">
@@ -2101,14 +2016,10 @@
 	<npc id="29050" level="85" type="Monster" name="Halisha's Breath">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="12996" hpRegen="1.01" mp="20560" mpRegen="3.03" />
-			<attack physical="1556.78628597682" magical="1073.71405840992" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="642.236873936287" magical="428.157916018841" evasion="1" />
-			<attribute>
-				<attack type="DARK" value="280" />
-				<defence fire="200" water="200" wind="200" earth="200" holy="150" dark="200" default="220" />
-			</attribute>
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="44350.854" hpRegen="1" mp="20560.2695810843" mpRegen="3.03" />
+			<attack physical="47554.9" magical="12177.6875" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="1562.9247648" magical="857.7603864" />
 			<speed>
 				<walk ground="30" />
 				<run ground="200" />
@@ -2116,9 +2027,9 @@
 			<hitTime>430</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="9" /> <!-- Demons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2127,9 +2038,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="3" /> <!-- Light Armor Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="5467" level="1" /> <!-- Dark Attacks -->
-			<skill id="5009" level="1" /> <!-- Frintezza Ghost Fighter -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="2000" isAggressive="true">
@@ -2145,14 +2054,10 @@
 	<npc id="29051" level="85" type="Monster" name="Halisha's Breath">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="12996" hpRegen="1.01" mp="20560" mpRegen="3.03" />
-			<attack physical="1556.78628597682" magical="1073.71405840992" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="642.236873936287" magical="428.157916018841" evasion="1" />
-			<attribute>
-				<attack type="DARK" value="280" />
-				<defence fire="200" water="200" wind="200" earth="200" holy="150" dark="200" default="220" />
-			</attribute>
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="44350.854" hpRegen="1" mp="20560.2695810843" mpRegen="3.03" />
+			<attack physical="47554.9" magical="12177.6875" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="1562.9247648" magical="857.7603864" />
 			<speed>
 				<walk ground="30" />
 				<run ground="200" />
@@ -2160,9 +2065,9 @@
 			<hitTime>430</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="9" /> <!-- Demons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2171,9 +2076,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="3" /> <!-- Light Armor Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="5467" level="1" /> <!-- Dark Attacks -->
-			<skill id="5010" level="1" /> <!-- Frintezza Ghost Mage -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="2000" isAggressive="true">
@@ -2189,19 +2092,20 @@
 	<npc id="29052" level="85" type="Monster" name="">
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3960" hpRegen="8.585" mp="2056" mpRegen="3.03" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="3960.03406422627" hpRegen="8.585" mp="2056.8288406974" mpRegen="3.03" />
 			<attack physical="1216.23928591939" magical="838.839108132747" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="3864.96881246637" magical="2826.6352584085" evasion="1" />
+			<defence physical="3864.96881246637" magical="2826.6352584085" />
 			<speed>
 				<walk ground="10" />
 				<run ground="1" />
 			</speed>
-			<hitTime>500</hitTime>
+			<hitTime>50</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2210,7 +2114,6 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED">
@@ -2223,22 +2126,23 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="29053" level="84" type="Monster" name="">
+	<npc id="29053" level="85" type="Monster" name="">
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5448" hpRegen="8.5" mp="2036" mpRegen="3" />
-			<attack physical="1456.32495032888" magical="994.481156766258" random="10" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="5448.83722464782" hpRegen="8.5" mp="2036.46419871029" mpRegen="3" />
+			<attack physical="1456.32495032888" magical="994.481156766258" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
 			<defence physical="383.421920892449" magical="280.571522036227" />
 			<speed>
 				<walk ground="10" />
 				<run ground="1" />
 			</speed>
-			<hitTime>500</hitTime>
+			<hitTime>50</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2247,8 +2151,6 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
-			<skill id="5004" level="1" /> <!-- Dimensional Stun -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED">
@@ -2261,28 +2163,27 @@
 			<height normal="58" />
 		</collision>
 	</npc>
-	<npc id="29066" level="1" type="GrandBoss" name="Antharas">
+	<npc id="29066" level="75" type="GrandBoss" name="Antharas">
 		<parameters>
 			<param name="ultra_respawn_time" value="8" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<acquire exp="262720917" sp="63053" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="6100000" hpRegen="2" mp="1800000" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="6100000" hpRegen="1100" mp="1800000" mpRegen="1000" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3456" magical="862.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2291,8 +2192,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -2303,73 +2205,6 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists> <!-- CT2.5 -->
-			<drop>
-				<item id="8620" min="10" max="30" chance="50" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="80" min="1" max="2" chance="25" /> <!-- Tallum Blade -->
-				<item id="98" min="1" max="2" chance="25" /> <!-- Halberd -->
-				<item id="269" min="1" max="2" chance="25" /> <!-- Blood Tornado -->
-				<item id="2504" min="1" max="2" chance="25" /> <!-- Meteor Shower -->
-				<item id="235" min="1" max="2" chance="25" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="2" chance="25" /> <!-- Carnage Bow -->
-				<item id="150" min="1" max="2" chance="25" /> <!-- Elemental Sword -->
-				<item id="212" min="1" max="2" chance="25" /> <!-- Dasparion's Staff -->
-				<item id="81" min="1" max="2" chance="25" /> <!-- Dragon Slayer -->
-				<item id="151" min="1" max="2" chance="25" /> <!-- Sword of Miracles -->
-				<item id="2500" min="1" max="2" chance="25" /> <!-- Dark Legion's Edge -->
-				<item id="164" min="1" max="2" chance="25" /> <!-- Elysian -->
-				<item id="236" min="1" max="2" chance="20" /> <!-- Soul Separator -->
-				<item id="270" min="1" max="2" chance="20" /> <!-- Dragon Grinder -->
-				<item id="289" min="1" max="2" chance="20" /> <!-- Soul Bow -->
-				<item id="213" min="1" max="2" chance="20" /> <!-- Branch of the Mother Tree -->
-				<item id="305" min="1" max="2" chance="20" /> <!-- Tallum Glaive -->
-				<item id="6326" min="1" max="5" chance="30" /> <!-- Sealed Majestic Necklace -->
-				<item id="6327" min="1" max="5" chance="35" /> <!-- Sealed Majestic Earring -->
-				<item id="6328" min="1" max="5" chance="35" /> <!-- Sealed Majestic Ring -->
-				<item id="6323" min="1" max="5" chance="30" /> <!-- Sealed Phoenix Necklace -->
-				<item id="6324" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Earring -->
-				<item id="6325" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Ring -->
-				<item id="5287" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5297" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5304" min="1" max="3" chance="25" /> <!-- Sealed Tallum Tunic -->
-				<item id="5311" min="1" max="3" chance="35" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5320" min="1" max="3" chance="35" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="30" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="3" chance="25" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5301" min="1" max="3" chance="25" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5308" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5316" min="1" max="3" chance="8" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5323" min="1" max="3" chance="8" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5329" min="1" max="3" chance="9" /> <!-- Sealed Majestic Robe -->
-				<item id="5288" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5298" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="30" /> <!-- Sealed Tallum Stockings -->
-				<item id="5289" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5294" min="1" max="3" chance="25" /> <!-- Sealed Tallum Helmet -->
-				<item id="5312" min="1" max="3" chance="25" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5317" min="1" max="3" chance="25" /> <!-- Sealed Majestic Circlet -->
-				<item id="5291" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5296" min="1" max="3" chance="25" /> <!-- Sealed Tallum Boots -->
-				<item id="5314" min="1" max="3" chance="25" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5319" min="1" max="3" chance="25" /> <!-- Sealed Majestic Boots -->
-				<item id="5290" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5295" min="1" max="3" chance="25" /> <!-- Sealed Tallum Gloves -->
-				<item id="5313" min="1" max="3" chance="25" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5318" min="1" max="3" chance="25" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5292" min="1" max="3" chance="40" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="40" /> <!-- Sealed Shield of Nightmare -->
-				<item id="729" min="1" max="19" chance="100" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="1538" min="1" max="59" chance="100" /> <!-- Blessed Scroll of Escape -->
-				<item id="3936" min="1" max="39" chance="100" /> <!-- Blessed Scroll of Resurrection -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="9000000" max="13000000" chance="100" /> <!-- Adena -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29061" displayId="31842" level="70" type="Teleporter" name="Teleportation Cubic">
 		<race>ETC</race>
@@ -2385,28 +2220,6 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="false" />
-		<skillList>
-			<skill id="4045" level="1" />
-			<!-- Resist Full Magic Attack -->
-			<skill id="4408" level="1" />
-			<!-- HP Increase (1x) -->
-			<skill id="4409" level="1" />
-			<!-- MP Increase (1x) -->
-			<skill id="4410" level="11" />
-			<!-- Average P. Atk. -->
-			<skill id="4411" level="11" />
-			<!-- Average M. Atk. -->
-			<skill id="4412" level="11" />
-			<!-- Average P. Def. -->
-			<skill id="4413" level="11" />
-			<!-- Average M. Def. -->
-			<skill id="4414" level="2" />
-			<!-- Standard Type -->
-			<skill id="4415" level="3" />
-			<!-- One-handed Sword -->
-			<skill id="4416" level="19" />
-			<!-- Others -->
-		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="300" isAggressive="true" aggroRange="500" />
 		<collision>
@@ -2414,7 +2227,7 @@
 			<height normal="80" />
 		</collision>
 	</npc>
-	<npc id="29067" level="1" type="GrandBoss" name="Antharas">
+	<npc id="29067" level="75" type="GrandBoss" name="Antharas">
 		<parameters>
 			<param name="ultra_respawn_time" value="5" />
 		</parameters>
@@ -2423,19 +2236,18 @@
 		<acquire exp="262720918" sp="29116376" raidPoints="30780" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="6800000" hpRegen="1100" mp="1800000" mpRegen="1000" />
-			<attack physical="4900" magical="2550" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3456" magical="862.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2444,8 +2256,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -2456,91 +2269,6 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="5292" min="1" max="1" chance="51.25" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="1" chance="50.84" /> <!-- Sealed Shield of Nightmare -->
-				<item id="90992" min="1" max="1" chance="29.03" /> <!-- Antharas' Earring -->
-				<item id="5329" min="1" max="1" chance="20.5" /> <!-- Sealed Majestic Robe -->
-				<item id="5311" min="1" max="1" chance="20.37" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5323" min="1" max="1" chance="20.04" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5320" min="1" max="1" chance="19.68" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="1" chance="19.57" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="1" chance="19.15" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5316" min="1" max="1" chance="19.09" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="7900" min="1" max="1" chance="17.8" /> <!-- Ice Storm Hammer -->
-				<item id="5308" min="1" max="1" chance="17.77" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="7892" min="1" max="1" chance="17.72" /> <!-- Spell Breaker -->
-				<item id="5301" min="1" max="1" chance="17.33" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="7883" min="1" max="1" chance="16.92" /> <!-- Guardian's Sword -->
-				<item id="7893" min="1" max="1" chance="16.91" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="16.68" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="15.89" /> <!-- Star Buster -->
-				<item id="5319" min="1" max="1" chance="13.64" /> <!-- Sealed Majestic Boots -->
-				<item id="5313" min="1" max="1" chance="13.35" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5312" min="1" max="1" chance="13.17" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5288" min="1" max="1" chance="13.03" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5314" min="1" max="1" chance="12.9" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5318" min="1" max="1" chance="12.85" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5305" min="1" max="1" chance="12.76" /> <!-- Sealed Tallum Stockings -->
-				<item id="5295" min="1" max="1" chance="12.67" /> <!-- Sealed Tallum Gloves -->
-				<item id="5289" min="1" max="1" chance="12.66" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5317" min="1" max="1" chance="12.7" /> <!-- Sealed Majestic Circlet -->
-				<item id="5298" min="1" max="1" chance="12.59" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5296" min="1" max="1" chance="12.45" /> <!-- Sealed Tallum Boots -->
-				<item id="5304" min="1" max="1" chance="12.44" /> <!-- Sealed Tallum Tunic -->
-				<item id="5294" min="1" max="1" chance="12.34" /> <!-- Sealed Tallum Helmet -->
-				<item id="5297" min="1" max="1" chance="12.19" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5287" min="1" max="1" chance="11.92" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5291" min="1" max="1" chance="10.018" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5290" min="1" max="1" chance="9.982" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="2500" min="1" max="1" chance="9.154" /> <!-- Dark Legion's Edge -->
-				<item id="7902" min="1" max="1" chance="9.146" /> <!-- Doom Crusher -->
-				<item id="81" min="1" max="1" chance="9.146" /> <!-- Dragon Slayer -->
-				<item id="80" min="1" max="1" chance="9.144" /> <!-- Tallum Blade -->
-				<item id="7895" min="1" max="1" chance="9.136" /> <!-- Flaming Dragon Skull -->
-				<item id="213" min="1" max="1" chance="9.134" /> <!-- Branch of the Mother Tree -->
-				<item id="236" min="1" max="1" chance="9.13" /> <!-- Soul Separator -->
-				<item id="7899" min="1" max="1" chance="9.129" /> <!-- Destroyer Hammer -->
-				<item id="2504" min="1" max="1" chance="9.126" /> <!-- Meteor Shower -->
-				<item id="305" min="1" max="1" chance="9.124" /> <!-- Tallum Glaive -->
-				<item id="164" min="1" max="1" chance="9.124" /> <!-- Elysian -->
-				<item id="270" min="1" max="1" chance="9.122" /> <!-- Dragon Grinder -->
-				<item id="150" min="1" max="1" chance="9.103" /> <!-- Elemental Sword -->
-				<item id="235" min="1" max="1" chance="9.095" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="1" chance="9.08" /> <!-- Carnage Bow -->
-				<item id="269" min="1" max="1" chance="9.077" /> <!-- Blood Tornado -->
-				<item id="7884" min="1" max="1" chance="9.073" /> <!-- Infernal Master -->
-				<item id="98" min="1" max="1" chance="9.07" /> <!-- Halberd -->
-				<item id="7894" min="1" max="1" chance="9.067" /> <!-- Spiritual Eye -->
-				<item id="212" min="1" max="1" chance="9.029" /> <!-- Dasparion's Staff -->
-				<item id="289" min="1" max="1" chance="9.025" /> <!-- Soul Bow -->
-				<item id="151" min="1" max="1" chance="9.024" /> <!-- Sword of Miracles -->
-				<item id="8683" min="1" max="1" chance="8.378" /> <!-- Tiphon's Spear -->
-				<item id="8684" min="1" max="1" chance="8.378" /> <!-- Shyeed's Bow -->
-				<item id="8682" min="1" max="1" chance="8.368" /> <!-- Naga Storm -->
-				<item id="8688" min="1" max="1" chance="8.356" /> <!-- Daimon Crystal -->
-				<item id="8678" min="1" max="1" chance="8.356" /> <!-- Sirra's Blade -->
-				<item id="8680" min="1" max="1" chance="8.331" /> <!-- Barakiel's Axe -->
-				<item id="8681" min="1" max="1" chance="8.328" /> <!-- Behemoth' Tuning Fork -->
-				<item id="8686" min="1" max="1" chance="8.324" /> <!-- Themis' Tongue -->
-				<item id="8679" min="1" max="1" chance="8.317" /> <!-- Sword of Ipos -->
-				<item id="8687" min="1" max="1" chance="8.295" /> <!-- Cabrio's Hand -->
-				<item id="5706" min="1" max="1" chance="8.273" /> <!-- Damascus*Damascus -->
-				<item id="8685" min="1" max="1" chance="8.268" /> <!-- Sobekk's Hurricane -->
-				<item id="90998" min="1" max="3" chance="100" /> <!-- Balthus Knights' Glittering Varnish -->
-				<item id="90997" min="3" max="7" chance="100" /> <!-- Balthus Knights' Shining Varnish -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="3" max="7" chance="100" /> <!-- Cloth Piece -->
-				<item id="33815" min="2" max="4" chance="50.21" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
-				<item id="33814" min="2" max="4" chance="49.99" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33809" min="2" max="4" chance="49.83" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
-				<item id="33807" min="2" max="4" chance="49.36" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
-				<item id="33813" min="2" max="4" chance="48.95" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
-				<item id="33808" min="2" max="4" chance="48.94" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="90899" min="1" max="1" chance="2.932" /> <!-- Blessed Agathion's Soul -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29068" level="84" type="GrandBoss" name="Antharas" title="Land Dragon">
 		<parameters>
@@ -2550,21 +2278,31 @@
 		<sex>MALE</sex>
 		<acquire exp="40664236032" sp="9759416" raidPoints="1000" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="197047999.75369" hpRegen="319.2293199" mp="3440344.575" mpRegen="3" />
-			<attack physical="4799.20533" magical="263.60854" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3974.13793" magical="496.01325" />
+			<vitals hp="355555555" hpRegen="385356.45" mp="2025740" mpRegen="1000" />
+			<attack physical="35810" magical="3783.6" random="5" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2505.43352601156" magical="1452.04745968969" />
 			<speed>
 				<walk ground="50" />
 				<run ground="279" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
+		<status attackable="true" noSleepMode="true" isDeathPenalty="true" />
 		<skillList>
-			<skill id="4112" level="1" /> <!-- Ordinary Attack -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
 			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -2577,125 +2315,165 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="5315" min="1" max="3" chance="50.88" /> <!-- Sealed Shield of Nightmare -->
-				<item id="5292" min="1" max="3" chance="50.75" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="90992" min="1" max="1" chance="31.42" /> <!-- Antharas' Earring -->
-				<item id="5323" min="1" max="3" chance="20.73" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5316" min="1" max="3" chance="20.3" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5311" min="1" max="3" chance="20.19" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="19.87" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5320" min="1" max="3" chance="19.15" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5293" min="1" max="3" chance="19.11" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5329" min="1" max="3" chance="19.07" /> <!-- Sealed Majestic Robe -->
-				<item id="5308" min="1" max="3" chance="18.29" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="7883" min="1" max="3" chance="17.31" /> <!-- Guardian's Sword -->
-				<item id="7892" min="1" max="3" chance="17.29" /> <!-- Spell Breaker -->
-				<item id="7893" min="1" max="3" chance="17.02" /> <!-- Kaim Vanul's Bones -->
-				<item id="5301" min="1" max="3" chance="16.88" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="7900" min="1" max="3" chance="16.8" /> <!-- Ice Storm Hammer -->
-				<item id="7901" min="1" max="3" chance="15.63" /> <!-- Star Buster -->
-				<item id="7889" min="1" max="3" chance="15.21" /> <!-- Wizard's Tear -->
-				<item id="5317" min="1" max="3" chance="13.87" /> <!-- Sealed Majestic Circlet -->
-				<item id="5313" min="1" max="3" chance="13.67" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5314" min="1" max="3" chance="13.61" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5319" min="1" max="3" chance="13.6" /> <!-- Sealed Majestic Boots -->
-				<item id="5318" min="1" max="3" chance="13.13" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5298" min="1" max="3" chance="12.88" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="12.79" /> <!-- Sealed Tallum Stockings -->
-				<item id="5297" min="1" max="3" chance="12.77" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5312" min="1" max="3" chance="12.75" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5288" min="1" max="3" chance="12.53" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5289" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5295" min="1" max="3" chance="12.23" /> <!-- Sealed Tallum Gloves -->
-				<item id="5304" min="1" max="3" chance="12.09" /> <!-- Sealed Tallum Tunic -->
-				<item id="5294" min="1" max="3" chance="12.04" /> <!-- Sealed Tallum Helmet -->
-				<item id="5287" min="1" max="3" chance="11.98" /> <!-- Sealed Dark Crystal Breastplate -->
-				<item id="5296" min="1" max="3" chance="11.89" /> <!-- Sealed Tallum Boots -->
-				<item id="5291" min="1" max="3" chance="9.985" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5290" min="1" max="3" chance="9.93" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="7895" min="1" max="1" chance="9.156" /> <!-- Flaming Dragon Skull -->
-				<item id="2504" min="1" max="1" chance="9.146" /> <!-- Meteor Shower -->
-				<item id="213" min="1" max="1" chance="9.144" /> <!-- Branch of the Mother Tree -->
-				<item id="270" min="1" max="1" chance="9.13" /> <!-- Dragon Grinder -->
-				<item id="164" min="1" max="1" chance="9.114" /> <!-- Elysian -->
-				<item id="289" min="1" max="1" chance="9.102" /> <!-- Soul Bow -->
-				<item id="150" min="1" max="1" chance="9.096" /> <!-- Elemental Sword -->
-				<item id="151" min="1" max="1" chance="9.091" /> <!-- Sword of Miracles -->
-				<item id="236" min="1" max="1" chance="9.088" /> <!-- Soul Separator -->
-				<item id="80" min="1" max="1" chance="9.088" /> <!-- Tallum Blade -->
-				<item id="7894" min="1" max="1" chance="9.087" /> <!-- Spiritual Eye -->
-				<item id="288" min="1" max="1" chance="9.078" /> <!-- Carnage Bow -->
-				<item id="7884" min="1" max="1" chance="9.074" /> <!-- Infernal Master -->
-				<item id="235" min="1" max="1" chance="9.069" /> <!-- Bloody Orchid -->
-				<item id="81" min="1" max="1" chance="9.066" /> <!-- Dragon Slayer -->
-				<item id="212" min="1" max="1" chance="9.062" /> <!-- Dasparion's Staff -->
-				<item id="269" min="1" max="1" chance="9.054" /> <!-- Blood Tornado -->
-				<item id="305" min="1" max="1" chance="9.05" /> <!-- Tallum Glaive -->
-				<item id="7902" min="1" max="1" chance="9.049" /> <!-- Doom Crusher -->
-				<item id="7899" min="1" max="1" chance="9.046" /> <!-- Destroyer Hammer -->
-				<item id="98" min="1" max="1" chance="9.045" /> <!-- Halberd -->
-				<item id="2500" min="1" max="1" chance="9.035" /> <!-- Dark Legion's Edge -->
-				<item id="8686" min="1" max="1" chance="8.409" /> <!-- Themis' Tongue -->
-				<item id="8682" min="1" max="1" chance="8.401" /> <!-- Naga Storm -->
-				<item id="5706" min="1" max="1" chance="8.377" /> <!-- Damascus*Damascus -->
-				<item id="8688" min="1" max="1" chance="8.341" /> <!-- Daimon Crystal -->
-				<item id="8678" min="1" max="1" chance="8.323" /> <!-- Sirra's Blade -->
-				<item id="8687" min="1" max="1" chance="8.316" /> <!-- Cabrio's Hand -->
-				<item id="8684" min="1" max="1" chance="8.307" /> <!-- Shyeed's Bow -->
-				<item id="8680" min="1" max="1" chance="8.305" /> <!-- Barakiel's Axe -->
-				<item id="8683" min="1" max="1" chance="8.281" /> <!-- Tiphon's Spear -->
-				<item id="8685" min="1" max="1" chance="8.269" /> <!-- Sobekk's Hurricane -->
-				<item id="8679" min="1" max="1" chance="8.265" /> <!-- Sword of Ipos -->
-				<item id="8681" min="1" max="1" chance="8.265" /> <!-- Behemoth' Tuning Fork -->
-				<item id="959" min="1" max="1" chance="100" /> <!-- Scroll: Enchant Weapon (S-grade) -->
-				<item id="90998" min="1" max="3" chance="100" /> <!-- Balthus Knights' Glittering Varnish -->
-				<item id="90997" min="2" max="8" chance="100" /> <!-- Balthus Knights' Shining Varnish -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="3" max="7" chance="100" /> <!-- Cloth Piece -->
-				<item id="960" min="1" max="1" chance="100" /> <!-- Scroll: Enchant Armor (S-grade) -->
-				<item id="91548" min="1" max="1" chance="51.05" /> <!-- Special Armor Varnish (A-grade) -->
-				<item id="33815" min="2" max="4" chance="50.92" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
-				<item id="33808" min="2" max="8" chance="50.82" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="33813" min="2" max="8" chance="50.06" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
-				<item id="91549" min="1" max="1" chance="50.02" /> <!-- Special Accessory Varnish (A-grade) -->
-				<item id="33807" min="2" max="8" chance="49.81" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
-				<item id="33809" min="2" max="4" chance="49.15" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
-				<item id="33814" min="2" max="8" chance="48.99" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="91547" min="1" max="1" chance="29.16" /> <!-- Special Weapon Varnish (A-grade) -->
-				<item id="91497" min="1" max="1" chance="19.02" /> <!-- Dual Weapon Crafting Stamp (S-grade) -->
-				<item id="91516" min="1" max="1" chance="3.768" /> <!-- Sealed Draconic Leather Gloves Crafting Pack -->
-				<item id="91510" min="1" max="1" chance="3.762" /> <!-- Sealed Imperial Crusader Gaiters Crafting Pack -->
-				<item id="91518" min="1" max="1" chance="3.752" /> <!-- Sealed Draconic Leather Helmet Crafting Pack -->
-				<item id="91508" min="1" max="1" chance="3.75" /> <!-- Draconic Bow Crafting Pack -->
-				<item id="91502" min="1" max="1" chance="3.746" /> <!-- Angel Slayer Crafting Pack -->
-				<item id="91523" min="1" max="1" chance="3.745" /> <!-- Sealed Tateossian Earring Crafting Pack -->
-				<item id="91512" min="1" max="1" chance="3.742" /> <!-- Sealed Imperial Crusader Boots Crafting Pack -->
-				<item id="91504" min="1" max="1" chance="3.737" /> <!-- Saint Spear Crafting Pack -->
-				<item id="91505" min="1" max="1" chance="3.735" /> <!-- Demon Splinter Crafting Pack -->
-				<item id="91525" min="1" max="1" chance="3.737" /> <!-- Sealed Tateossian Necklace Crafting Pack -->
-				<item id="91514" min="1" max="1" chance="3.715" /> <!-- Sealed Imperial Crusader Helmet Crafting Pack -->
-				<item id="91513" min="1" max="1" chance="3.714" /> <!-- Sealed Imperial Crusader Shield Crafting Pack -->
-				<item id="91520" min="1" max="1" chance="3.709" /> <!-- Sealed Major Arcana Gloves Crafting Pack -->
-				<item id="91503" min="1" max="1" chance="3.709" /> <!-- Dragon Hunter Axe Crafting Pack -->
-				<item id="91515" min="1" max="1" chance="3.708" /> <!-- Sealed Draconic Leather Armor Crafting Pack -->
-				<item id="91517" min="1" max="1" chance="3.707" /> <!-- Sealed Draconic Leather Boots Crafting Pack -->
-				<item id="91524" min="1" max="1" chance="3.704" /> <!-- Sealed Tateossian Ring Crafting Pack -->
-				<item id="91501" min="1" max="1" chance="3.703" /> <!-- Imperial Staff Crafting Pack -->
-				<item id="91506" min="1" max="1" chance="3.683" /> <!-- Heaven's Divider Crafting Pack -->
-				<item id="91511" min="1" max="1" chance="3.677" /> <!-- Sealed Imperial Crusader Gauntlets Crafting Pack -->
-				<item id="91519" min="1" max="1" chance="3.675" /> <!-- Sealed Major Arcana Robe Crafting Pack -->
-				<item id="91507" min="1" max="1" chance="3.667" /> <!-- Arcana Mace Crafting Pack -->
-				<item id="91500" min="1" max="1" chance="3.663" /> <!-- Basalt Battlehammer Crafting Pack -->
-				<item id="91521" min="1" max="1" chance="3.645" /> <!-- Sealed Major Arcana Boots Crafting Pack -->
-				<item id="91522" min="1" max="1" chance="3.644" /> <!-- Sealed Major Arcana Circlet Crafting Pack -->
-				<item id="91499" min="1" max="1" chance="3.643" /> <!-- Forgotten Blade Crafting Pack -->
-				<item id="91509" min="1" max="1" chance="3.639" /> <!-- Sealed Imperial Crusader Breastplate Crafting Pack -->
-				<item id="90899" min="1" max="1" chance="2.942" /> <!-- Blessed Agathion's Soul -->
+				<group chance="100">
+					<item id="80" min="1" max="1" chance="9.1" /> <!-- Tallum Blade -->
+					<item id="98" min="1" max="1" chance="9.09" /> <!-- Halberd -->
+					<item id="150" min="1" max="1" chance="9.09" /> <!-- Elemental Sword -->
+					<item id="212" min="1" max="1" chance="9.09" /> <!-- Dasparion's Staff -->
+					<item id="235" min="1" max="1" chance="9.09" /> <!-- Bloody Orchid -->
+					<item id="269" min="1" max="1" chance="9.09" /> <!-- Blood Tornado -->
+					<item id="288" min="1" max="1" chance="9.09" /> <!-- Carnage Bow -->
+					<item id="2504" min="1" max="1" chance="9.09" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="1" chance="9.09" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="1" chance="9.09" /> <!-- Spiritual Eye -->
+					<item id="7899" min="1" max="1" chance="9.09" /> <!-- Destroyer Hammer -->
+				</group>
+				<group chance="100">
+					<item id="81" min="1" max="1" chance="9.1" /> <!-- Dragon Slayer -->
+					<item id="151" min="1" max="1" chance="9.09" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="1" chance="9.09" /> <!-- Elysian -->
+					<item id="213" min="1" max="1" chance="9.09" /> <!-- Branch of the Mother Tree -->
+					<item id="236" min="1" max="1" chance="9.09" /> <!-- Soul Separator -->
+					<item id="270" min="1" max="1" chance="9.09" /> <!-- Dragon Grinder -->
+					<item id="289" min="1" max="1" chance="9.09" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="1" chance="9.09" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="1" chance="9.09" /> <!-- Dark Legion's Edge -->
+					<item id="7895" min="1" max="1" chance="9.09" /> <!-- Flaming Dragon Skull -->
+					<item id="7902" min="1" max="1" chance="9.09" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="100">
+					<item id="7883" min="1" max="3" chance="17" /> <!-- Guardian's Sword -->
+					<item id="7889" min="1" max="3" chance="16" /> <!-- Wizard's Tear -->
+					<item id="7892" min="1" max="3" chance="17" /> <!-- Spell Breaker -->
+					<item id="7893" min="1" max="3" chance="17" /> <!-- Kaim Vanul's Bones -->
+					<item id="7900" min="1" max="3" chance="17" /> <!-- Ice Storm Hammer -->
+					<item id="7901" min="1" max="3" chance="16" /> <!-- Star Buster -->
+				</group>
+				<group chance="100">
+					<item id="8678" min="1" max="1" chance="8.34" /> <!-- Sirra's Blade -->
+					<item id="8679" min="1" max="1" chance="8.33" /> <!-- Sword of Ipos -->
+					<item id="8680" min="1" max="1" chance="8.33" /> <!-- Barakiel's Axe -->
+					<item id="8681" min="1" max="1" chance="8.33" /> <!-- Behemoth' Tuning Fork -->
+					<item id="8682" min="1" max="1" chance="8.34" /> <!-- Naga Storm -->
+					<item id="8683" min="1" max="1" chance="8.33" /> <!-- Tiphon's Spear -->
+					<item id="8684" min="1" max="1" chance="8.34" /> <!-- Shyeed's Bow -->
+					<item id="8685" min="1" max="1" chance="8.33" /> <!-- Sobekk's Hurricane -->
+					<item id="8686" min="1" max="1" chance="8.34" /> <!-- Themis' Tongue -->
+					<item id="8687" min="1" max="1" chance="8.33" /> <!-- Cabrio's Hand -->
+					<item id="8688" min="1" max="1" chance="8.33" /> <!-- Daimon Crystal -->
+					<item id="5706" min="1" max="1" chance="8.33" /> <!-- Damascus*Damascus -->
+				</group>
+				<group chance="100">
+					<item id="5287" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="3" chance="10" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="3" chance="10" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5297" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5308" min="1" max="3" chance="17.5" /> <!-- Sealed Dark Crystal Robe -->
+				</group>
+				<group chance="100">
+					<item id="5293" min="1" max="3" chance="20" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Boots -->
+					<item id="5301" min="1" max="3" chance="17.5" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Stockings -->
+				</group>
+				<group chance="100">
+					<item id="5311" min="1" max="3" chance="20" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="3" chance="13.34" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="3" chance="13.33" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="3" chance="13.33" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5320" min="1" max="3" chance="20" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5326" min="1" max="3" chance="20" /> <!-- Sealed Robe of Nightmare -->
+				</group>
+				<group chance="100">
+					<item id="5316" min="1" max="3" chance="20" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="3" chance="13.34" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="3" chance="13.33" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="3" chance="13.33" /> <!-- Sealed Majestic Boots -->
+					<item id="5323" min="1" max="3" chance="20" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5329" min="1" max="3" chance="20" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="100">
+					<item id="5292" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5315" min="1" max="3" chance="50" /> <!-- Sealed Shield of Nightmare -->
+				</group>
+				<group chance="100">
+					<item id="33809" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
+					<item id="33815" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="100">
+					<item id="33808" min="2" max="8" chance="50" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
+					<item id="33814" min="2" max="8" chance="50" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="33807" min="2" max="8" chance="50" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
+					<item id="33813" min="2" max="8" chance="50" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
+				</group>
+				<group chance="100">
+					<item id="90997" min="2" max="8" chance="100" /> <!-- Balthus Knights' Shining Varnish -->
+				</group>
+				<group chance="100">
+					<item id="90998" min="1" max="3" chance="100" /> <!-- Balthus Knights' Glittering Varnish -->
+				</group>
+				<group chance="30">
+					<item id="90992" min="1" max="1" chance="100" /> <!-- Antharas' Earring -->
+				</group>
+				<group chance="30">
+					<item id="91547" min="1" max="1" chance="100" /> <!-- Special Weapon Varnish (A-grade) -->
+				</group>
+				<group chance="50">
+					<item id="91548" min="1" max="1" chance="100" /> <!-- Special Armor Varnish (A-grade) -->
+				</group>
+				<group chance="50">
+					<item id="91549" min="1" max="1" chance="100" /> <!-- Special Accessory Varnish (A-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91499" min="1" max="1" chance="3.7" /> <!-- Forgotten Blade Crafting Pack -->
+					<item id="91500" min="1" max="1" chance="3.7" /> <!-- Basalt Battlehammer Crafting Pack -->
+					<item id="91501" min="1" max="1" chance="3.7" /> <!-- Imperial Staff Crafting Pack -->
+					<item id="91502" min="1" max="1" chance="3.7" /> <!-- Angel Slayer Crafting Pack -->
+					<item id="91503" min="1" max="1" chance="3.7" /> <!-- Dragon Hunter Axe Crafting Pack -->
+					<item id="91504" min="1" max="1" chance="3.7" /> <!-- Saint Spear Crafting Pack -->
+					<item id="91505" min="1" max="1" chance="3.7" /> <!-- Demon Splinter Crafting Pack -->
+					<item id="91506" min="1" max="1" chance="3.7" /> <!-- Heaven's Divider Crafting Pack -->
+					<item id="91507" min="1" max="1" chance="3.7" /> <!-- Arcana Mace Crafting Pack -->
+					<item id="91508" min="1" max="1" chance="3.7" /> <!-- Draconic Bow Crafting Pack -->
+					<item id="91509" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Breastplate Crafting Pack -->
+					<item id="91510" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Gaiters Crafting Pack -->
+					<item id="91511" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Gauntlets Crafting Pack -->
+					<item id="91512" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Boots Crafting Pack -->
+					<item id="91513" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Shield Crafting Pack -->
+					<item id="91514" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Helmet Crafting Pack -->
+					<item id="91515" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Armor Crafting Pack -->
+					<item id="91516" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Gloves Crafting Pack -->
+					<item id="91517" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Boots Crafting Pack -->
+					<item id="91518" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Helmet Crafting Pack -->
+					<item id="91519" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Robe Crafting Pack -->
+					<item id="91520" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Gloves Crafting Pack -->
+					<item id="91521" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Boots Crafting Pack -->
+					<item id="91522" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Circlet Crafting Pack -->
+					<item id="91523" min="1" max="1" chance="3.7" /> <!-- Sealed Tateossian Earring Crafting Pack -->
+					<item id="91524" min="1" max="1" chance="3.7" /> <!-- Sealed Tateossian Ring Crafting Pack -->
+					<item id="91525" min="1" max="1" chance="3.8" /> <!-- Sealed Tateossian Necklace Crafting Pack -->
+				</group>
+				<group chance="20">
+					<item id="91497" min="1" max="1" chance="100" /> <!-- Dual Weapon Crafting Stamp (S-grade) -->
+				</group>
+				<group chance="100">
+					<item id="959" min="1" max="1" chance="100" /> <!-- Scroll: Enchant Weapon (S-grade) -->
+				</group>
+				<group chance="100">
+					<item id="960" min="1" max="1" chance="100" /> <!-- Scroll: Enchant Armor (S-grade) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
 	<npc id="29069" level="84" type="Monster" name="Behemoth Dragon">
-		<!-- Todo: CT2.5 -->
 		<parameters>
 			<param name="RootingManage" value="0" />
 			<skill name="PhysicalSpecial" id="5095" level="1" />
@@ -2704,21 +2482,31 @@
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="369465" hpRegen="8.5" mp="24863.19" mpRegen="3" />
-			<attack physical="3584.56902102981" magical="1386.66000087809" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="1071.29474264312" magical="522.626863116263" evasion="-18" />
+			<vitals hp="949367" hpRegen="22" mp="22800" mpRegen="30" />
+			<attack physical="14519" magical="11667" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="1370" magical="851" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" isDeathPenalty="true" />
 		<skillList>
-			<skill id="5095" level="1" /> <!-- Antharas Subordinate Melee Attack -->
-			<skill id="5096" level="1" /> <!-- Antharas Subordinate Remote Attack -->
 			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="5095" level="1" /> <!-- Antharas Subordinate Melee Attack -->
+			<skill id="5096" level="1" /> <!-- Antharas Subordinate Remote Attack -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="300" isAggressive="true">
@@ -2729,26 +2517,27 @@
 			<height normal="54" />
 		</collision>
 	</npc>
-	<npc id="29070" level="79" type="Monster" name="Dragon Bomber">
-		<!-- Todo: CT2.5 -->
+	<npc id="29070" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1353" hpRegen="8.5" mp="1809" mpRegen="3" />
-			<attack physical="1094.11758465172" magical="4902.24" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<vitals hp="1353.6766" hpRegen="8.5" mp="1809" mpRegen="3" />
+			<attack physical="1094.11758465172" magical="4902.24" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.098247547707" magical="261.308998696584" />
 			<speed>
 				<walk ground="35" />
 				<run ground="250" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2757,10 +2546,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2769,25 +2556,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29071" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29071" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="245" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2796,9 +2584,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2807,25 +2594,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29072" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29072" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="255" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2834,9 +2622,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2845,25 +2632,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29073" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29073" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="247" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2872,9 +2660,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2883,25 +2670,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29074" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29074" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="252" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2910,9 +2698,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2921,25 +2708,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29075" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29075" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="243" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2948,9 +2736,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2959,25 +2746,27 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29076" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29076" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1353" hpRegen="2" mp="1809" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1353.6766" hpRegen="8.5" mp="1809" mpRegen="3" />
+			<attack physical="1094.11758465172" magical="4902.24" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="357.098247547707" magical="261.308998696584" />
 			<speed>
 				<walk ground="35" />
 				<run ground="250" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2986,9 +2775,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="200" clanHelpRange="300" isAggressive="true" />
@@ -2997,7 +2785,7 @@
 			<height normal="34.5" />
 		</collision>
 	</npc>
-	<npc id="29077" level="78" type="Monster" name="">
+	<npc id="29077" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="177456" />
 			<param name="suicide2_x" value="177120" />
@@ -3017,19 +2805,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3038,7 +2827,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3047,7 +2836,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29078" level="78" type="Monster" name="">
+	<npc id="29078" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175952" />
 			<param name="suicide2_x" value="175712" />
@@ -3067,19 +2856,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3088,7 +2878,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3097,7 +2887,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29079" level="78" type="Monster" name="">
+	<npc id="29079" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175120" />
 			<param name="suicide2_x" value="175024" />
@@ -3117,19 +2907,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3138,7 +2929,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3147,7 +2938,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29080" level="78" type="Monster" name="">
+	<npc id="29080" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="174640" />
 			<param name="suicide2_x" value="174576" />
@@ -3167,19 +2958,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3188,7 +2980,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3197,7 +2989,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29081" level="78" type="Monster" name="">
+	<npc id="29081" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="173968" />
 			<param name="suicide2_x" value="173856" />
@@ -3217,19 +3009,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3238,7 +3031,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3247,7 +3040,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29082" level="78" type="Monster" name="">
+	<npc id="29082" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="173920" />
 			<param name="suicide2_x" value="174064" />
@@ -3267,19 +3060,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3288,7 +3082,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3297,7 +3091,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29083" level="78" type="Monster" name="">
+	<npc id="29083" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="174704" />
 			<param name="suicide2_x" value="174800" />
@@ -3317,19 +3111,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3338,7 +3133,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3347,7 +3142,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29084" level="78" type="Monster" name="">
+	<npc id="29084" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175424" />
 			<param name="suicide2_x" value="175632" />
@@ -3367,19 +3162,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3388,7 +3184,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3397,7 +3193,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29085" level="78" type="Monster" name="">
+	<npc id="29085" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="176880" />
 			<param name="suicide2_x" value="177200" />
@@ -3417,19 +3213,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3438,7 +3235,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3447,7 +3244,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29086" level="78" type="Monster" name="">
+	<npc id="29086" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="178368" />
 			<param name="suicide2_x" value="178592" />
@@ -3467,19 +3264,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3488,7 +3286,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3497,7 +3295,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29087" level="78" type="Monster" name="">
+	<npc id="29087" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="179696" />
 			<param name="suicide2_x" value="179920" />
@@ -3517,19 +3315,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3538,7 +3337,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3547,7 +3346,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29088" level="78" type="Monster" name="">
+	<npc id="29088" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180592" />
 			<param name="suicide2_x" value="180752" />
@@ -3567,19 +3366,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3588,7 +3388,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3597,7 +3397,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29089" level="78" type="Monster" name="">
+	<npc id="29089" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180896" />
 			<param name="suicide2_x" value="180784" />
@@ -3617,19 +3417,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3638,7 +3439,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3647,7 +3448,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29090" level="78" type="Monster" name="">
+	<npc id="29090" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180496" />
 			<param name="suicide2_x" value="180512" />
@@ -3667,19 +3468,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3688,7 +3490,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3697,7 +3499,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29091" level="78" type="Monster" name="">
+	<npc id="29091" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180896" />
 			<param name="suicide2_x" value="181040" />
@@ -3717,19 +3519,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3738,7 +3541,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3747,7 +3550,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29092" level="78" type="Monster" name="">
+	<npc id="29092" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180720" />
 			<param name="suicide2_x" value="180640" />
@@ -3767,19 +3570,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3788,7 +3592,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3797,7 +3601,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29093" level="78" type="Monster" name="">
+	<npc id="29093" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180048" />
 			<param name="suicide2_x" value="179920" />
@@ -3817,19 +3621,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3838,7 +3643,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3847,7 +3652,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29094" level="78" type="Monster" name="">
+	<npc id="29094" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="178848" />
 			<param name="suicide2_x" value="178560" />
@@ -3867,19 +3672,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3888,7 +3694,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3897,20 +3703,34 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29099" level="80" type="Folk" name="Baium">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="53342293" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+	<npc id="29099" level="80" type="RaidBoss" name="Baium">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="35555555.2" hpRegen="2629" mp="18000" mpRegen="99" />
+			<attack physical="13829.6" magical="4375.2" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2048.8" magical="1365.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>60</hitTime>
+			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4256" level="1" /> <!-- Stun Resistance -->
+		</skillList>
 		<collision>
 			<radius normal="65" />
 			<height normal="174" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/29100-29199.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/29100-29199.xml
index 035d8fb974..5046f4e60d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/29100-29199.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/29100-29199.xml
@@ -6,7 +6,7 @@
 		<equipment rhand="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="290966.74193" hpRegen="8.5" mp="1608.045" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="50" />
@@ -47,7 +47,7 @@
 		<acquire exp="0" sp="0" raidPoints="1000" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="24630999.75369" hpRegen="319.2293199" mp="3440344.575" mpRegen="3" />
-			<attack physical="3152.927754" magical="1289.681983" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="3152.927754" magical="1289.681983" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3500.450389" magical="1707.68215" />
 			<speed>
 				<walk ground="50" />
@@ -69,7 +69,7 @@
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="197048" hpRegen="8.5" mp="24863.19" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="55" />
@@ -90,7 +90,7 @@
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="394096" hpRegen="8.5" mp="24863.19" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="55" />
@@ -112,7 +112,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="60" />
@@ -212,7 +212,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="80" />
@@ -310,7 +310,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="60" />
@@ -408,7 +408,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="40" />
@@ -701,7 +701,7 @@
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="11083949.50738" hpRegen="310.756323" mp="20787.765" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="42" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/36700-36799.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/36700-36799.xml
index da46a78f09..bfde4afe29 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/36700-36799.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/36700-36799.xml
@@ -466,7 +466,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -493,7 +493,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -520,7 +520,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -547,7 +547,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -597,7 +597,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -624,7 +624,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -651,7 +651,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -678,7 +678,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/02000-02099.xml
index e5e2d9337f..62d9b2a331 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/02000-02099.xml
@@ -231,10 +231,16 @@
 	</skill>
 	<skill id="2013" toLevel="2" name="Scroll of Escape">
 		<icon>icon.skill0000</icon>
-		<hitTime>20000</hitTime>
+		<hitTime>
+			<value level="1">20000</value>
+			<value level="2">1000</value>
+		</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>736</itemConsumeId> <!-- Scroll of Escape -->
+		<itemConsumeId>
+			<value level="1">736</value> <!-- Scroll of Escape -->
+			<value level="2">49087</value> <!-- Improved Scroll of Escape -->
+		</itemConsumeId>
 		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/39000-39099.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/39000-39099.xml
index 969a49ce78..cef30ef966 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/39000-39099.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/39000-39099.xml
@@ -1234,7 +1234,7 @@
 		<hitTime>1000</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>49087</itemConsumeId> <!-- Improved Scroll of Escape -->
+		<itemConsumeId>49500</itemConsumeId> <!-- Greater Scroll of Escape -->
 		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/39100-39199.xml
index 931fe4ea38..1ecad732e7 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/39100-39199.xml
@@ -57,7 +57,19 @@
 	</skill>
 	<skill id="39103" toLevel="1" name="Warrior's Instant Healing Potion">
 		<icon>icon.etc_reagent_white_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<amount>500</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39104" toLevel="1" name="Hero Cube - 7-day">
 		<icon>icon.sa_cube</icon>
@@ -91,7 +103,7 @@
 		<icon>icon.etc_scroll_of_resurrection_i01</icon>
 		<castRange>400</castRange>
 		<effectPoint>1</effectPoint>
-		<effectRange>600</effectRange>
+		<effectRange>900</effectRange>
 		<hitTime>1000</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
@@ -104,6 +116,9 @@
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpResurrection" />
+			<condition name="TargetMyParty">
+				<includeMe>false</includeMe>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="Resurrection">
@@ -2199,6 +2214,59 @@
 	</skill>
 	<skill id="39199" toLevel="1" name="Hero's Wondrous Cubic - 7-day">
 		<icon>icon.sa_cube</icon>
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<reuseDelay>-1</reuseDelay>
+		<hitTime>500</hitTime>
+		<coolTime>500</coolTime>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpEncumbered">
+				<weightPercent>20</weightPercent>
+				<slotsPercent>10</slotsPercent>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="RestorationRandom">
+				<items>
+					<item chance="16">
+						<item id="49487" count="2"/> <!-- Soulshot Ticket -->
+					</item>
+					<item chance="4">
+						<item id="49772" count="1"/> <!-- Scroll of Mood Melody -->
+					</item>
+					<item chance="16.49">
+						<item id="49488" count="5"/> <!-- Major Healing Potion -->
+					</item>
+					<item chance="20">
+						<item id="35669" count="1"/> <!-- Angel Cat's Blessing -->
+					</item>
+					<item chance="5">
+						<item id="49533" count="1"/> <!-- Quick Hero Healing Potion -->
+					</item>
+					<item chance="10">
+						<item id="49542" count="1"/> <!-- Improved Scroll of Resurrection -->
+					</item>
+					<item chance="14.5">
+						<item id="49536" count="1"/> <!-- Box of Scroll of Escape to the Base -->
+					</item>
+					<item chance="2">
+						<item id="49489" count="3"/> <!-- Parts of Enchantment Scrolls Chest -->
+					</item>
+					<item chance="10">
+						<item id="49416" count="1"/> <!-- Blade Spirit -->
+					</item>
+					<item chance="0.01">
+						<item id="49859" count="1"/> <!-- Weapon Exchange Coupon -->
+					</item>
+					<item chance="2">
+						<item id="49490" count="1"/> <!-- Fishing Kit -->
+					</item>
+				</items>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/55200-55299.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/55200-55299.xml
index f1ff20489e..6edbee0059 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/55200-55299.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/55200-55299.xml
@@ -500,7 +500,7 @@
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>ATTACK_TIME_DOWN</abnormalType>
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer’s Potion -->
+		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer's Potion -->
 		<mpConsume>75</mpConsume>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/documentation.txt
index 56b793ae01..ebd313e4b6 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/skills/documentation.txt
@@ -10,6 +10,8 @@ AddHate: Instant effect that increases target's hate towards you.
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -199,7 +201,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/Config.java
index 6983f2bc15..3268a05f35 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/Config.java
@@ -632,6 +632,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	
 	// --------------------------------------------------
 	// FloodProtector Settings
@@ -1279,6 +1280,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2135,6 +2137,7 @@ public class Config
 			ENABLE_AUTO_SKILL = generalConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = generalConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = generalConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = generalConfig.getBoolean("AssistLeader", false);
 			
 			// Load FloodProtector config file
 			final PropertiesParser floodProtectorConfig = new PropertiesParser(FLOOD_PROTECTOR_CONFIG_FILE);
@@ -3256,6 +3259,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index a50cbb8033..8378c362cb 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index 603e7d33be..dd968ed772 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -549,9 +549,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 2260001e17..380989e049 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
index 40b4ea1c3d..ae43e8d744 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
@@ -25,4 +25,9 @@ import org.l2jmobius.gameserver.model.actor.Player;
 public interface IPlayerActionHandler
 {
 	void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed);
+	
+	default boolean isPetAction()
+	{
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index 91a35da584..2a6169578d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -61,7 +61,7 @@ public class DailyTaskManager
 	private static final Set<Integer> RESET_SKILLS = new HashSet<>();
 	static
 	{
-		// No known skills.
+		RESET_SKILLS.add(39199); // Hero's Wondrous Cubic
 	}
 	public static final Set<Integer> RESET_ITEMS = new HashSet<>();
 	static
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
index 543c76f7c1..d936f9b1e6 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
@@ -100,6 +100,7 @@ public class IdManager
 				cleanCount += statement.executeUpdate("DELETE FROM character_shortcuts WHERE character_shortcuts.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_skills WHERE character_skills.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_skills_save WHERE character_skills_save.charId NOT IN (SELECT charId FROM characters);");
+				cleanCount += statement.executeUpdate("DELETE FROM character_spirits WHERE character_spirits.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_subclasses WHERE character_subclasses.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_instance_time WHERE character_instance_time.charId NOT IN (SELECT charId FROM characters);");
 				
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 0c2f5d59de..0b7ad4e019 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -215,7 +215,7 @@ public class ShortCuts implements IRestorable
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
 				newsc.setAutoUse(sc.isAutoUse());
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 6a829206f0..588ed23b84 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1289,7 +1289,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2817,7 +2817,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2830,190 +2830,152 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
-								case ELEMENTAL_SPIRIT_EARTH_ATTACK:
-								case ELEMENTAL_SPIRIT_EARTH_DEFENSE:
-								case ELEMENTAL_SPIRIT_FIRE_ATTACK:
-								case ELEMENTAL_SPIRIT_FIRE_DEFENSE:
-								case ELEMENTAL_SPIRIT_WATER_ATTACK:
-								case ELEMENTAL_SPIRIT_WATER_DEFENSE:
-								case ELEMENTAL_SPIRIT_WIND_ATTACK:
-								case ELEMENTAL_SPIRIT_WIND_DEFENSE:
-								{
-									info.addComponentType(UserInfoType.ATT_SPIRITS);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
+							}
+							case ELEMENTAL_SPIRIT_EARTH_ATTACK:
+							case ELEMENTAL_SPIRIT_EARTH_DEFENSE:
+							case ELEMENTAL_SPIRIT_FIRE_ATTACK:
+							case ELEMENTAL_SPIRIT_FIRE_DEFENSE:
+							case ELEMENTAL_SPIRIT_WATER_ATTACK:
+							case ELEMENTAL_SPIRIT_WATER_DEFENSE:
+							case ELEMENTAL_SPIRIT_WIND_ATTACK:
+							case ELEMENTAL_SPIRIT_WIND_DEFENSE:
+							{
+								info.addComponentType(UserInfoType.ATT_SPIRITS);
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						player.refreshExpertisePenalty();
-						sendPacket(info);
+					}
+					player.refreshExpertisePenalty();
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
index 3857b71225..215883d7da 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4558,7 +4558,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8306,9 +8306,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 8d7dc0eb54..11d18fc2eb 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -854,7 +855,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -875,7 +876,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -900,7 +908,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -908,7 +916,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -954,7 +969,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index ea1abbff9b..074a4ae995 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -863,15 +862,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -882,8 +879,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -892,7 +893,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -965,33 +966,6 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
@@ -1001,9 +975,17 @@ public class CreatureStat
 		// Notify recalculation to child classes.
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 150f95c365..73f94bfe57 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 3155a27f10..ec3d03a6f5 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
index 97397f753f..9d5faa0c61 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
@@ -57,7 +57,10 @@ public enum CommissionItemType
 	NECKLACE(31),
 	BELT(32),
 	BRACELET(33),
+	AGATHION(62),
 	HAIR_ACCESSORY(34),
+	BROOCH_JEWEL(63),
+	ARTIFACT(64),
 	// Supplies
 	POTION(35),
 	SCROLL_ENCHANT_WEAPON(36),
@@ -65,6 +68,7 @@ public enum CommissionItemType
 	SCROLL_OTHER(38),
 	SOULSHOT(39),
 	SPIRITSHOT(40),
+	OTHER_SUPPLIES(41),
 	// Pet Goods
 	PET_EQUIPMENT(42),
 	PET_SUPPLIES(43),
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
index eb10918430..3a194d1660 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
@@ -47,8 +47,8 @@ public enum CommissionTreeType
 		CommissionItemType.SPEAR,
 		CommissionItemType.OTHER_WEAPON),
 	ARMOR(1, CommissionItemType.HELMET, CommissionItemType.ARMOR_TOP, CommissionItemType.ARMOR_PANTS, CommissionItemType.FULL_BODY, CommissionItemType.GLOVES, CommissionItemType.FEET, CommissionItemType.SHIELD, CommissionItemType.SIGIL, CommissionItemType.UNDERWEAR, CommissionItemType.CLOAK),
-	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.HAIR_ACCESSORY),
-	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT),
+	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.AGATHION, CommissionItemType.HAIR_ACCESSORY, CommissionItemType.BROOCH_JEWEL, CommissionItemType.ARTIFACT),
+	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT, CommissionItemType.OTHER_SUPPLIES),
 	PET_GOODS(4, CommissionItemType.PET_EQUIPMENT, CommissionItemType.PET_SUPPLIES),
 	MISC(
 		5,
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0b6092b2d9..1e393ec4bf 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2216,6 +2216,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index 281d957b09..ba369c8c2e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -39,6 +39,7 @@ import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AgathionData;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -52,6 +53,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -71,12 +73,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPi
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
 import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -91,6 +95,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1637,7 +1642,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2557,6 +2564,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2581,6 +2593,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2606,6 +2620,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index c135128d72..22328e53d7 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -780,7 +780,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -932,7 +933,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 1bc24dc0d9..4ae0df5f3b 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -652,7 +652,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -675,7 +675,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -710,7 +710,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 550ec01da3..a1b86fb20b 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -143,7 +143,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index c305987ba6..c29c9ba398 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -93,6 +93,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index c5257ff589..1aff35bfd5 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 295da83257..6340a6f4d2 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -701,7 +701,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList();
 		player.updateShortCuts(_id, _level, 0);
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 14c84055da..63f5c4a527 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -87,7 +87,7 @@ public class RequestShortCutReg implements ClientPacket
 		else if (_page == 23)
 		{
 			final Item item = player.getInventory().getItemByObjectId(_id);
-			if ((item != null) && !item.isPotion())
+			if (((item != null) && !item.isPotion()) || (_type == ShortcutType.ACTION))
 			{
 				return;
 			}
@@ -148,7 +148,7 @@ public class RequestShortCutReg implements ClientPacket
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		sc.setAutoUse(_active);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 		player.sendPacket(new ExActivateAutoShortcut(sc, _active));
 		
 		// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index e5b1b8a192..07ed7641a9 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,128 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 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, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 92, 93,
-		94,	1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index dcc44cb9f3..2e152e2e29 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -207,7 +207,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		ServerPackets.EX_PET_INFO.writeId(this);
 		writeInt(_summon.getObjectId());
-		writeByte(_value); // // 0=teleported 1=default 2=summoned
+		writeByte(_value); // 0=teleported 1=default 2=summoned
 		writeShort(37); // mask_bits_37
 		writeBytes(_masks);
 		// Block 1
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
index a4539909c2..f7ac12028d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
@@ -167,7 +167,7 @@ public class FakePlayerInfo extends ServerPacket
 		writeByte(_npc.getTeam().getId());
 		writeInt(_clan != null ? _clan.getCrestLargeId() : 0);
 		writeByte(_fpcHolder.getNobleLevel());
-		writeByte(_fpcHolder.isHero());
+		writeByte(_fpcHolder.isHero() ? 2 : 0); // 152 - Value for enabled changed to 2
 		writeByte(_fpcHolder.isFishing());
 		writeInt(_fpcHolder.getBaitLocationX());
 		writeInt(_fpcHolder.getBaitLocationY());
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index f93c9e5e69..03909a2746 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
deleted file mode 100644
index 52a4032d14..0000000000
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
new file mode 100644
index 0000000000..62bb425a5a
--- /dev/null
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -0,0 +1,182 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeByte(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 427214cbc7..f1aa4c131d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,20 +19,21 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
+		player.restoreAutoShortcutVisual();
 	}
 	
 	@Override
@@ -54,8 +55,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index d19a1f00d4..6a83a8ae76 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -43,13 +49,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -60,8 +69,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 68ca369edf..37f3211b0a 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 0bee2f4e34..ec006a3d5c 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -42,6 +44,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	
@@ -96,6 +99,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking when in offline play.
+							if (player.isOfflinePlay() && player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -121,23 +135,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -145,6 +168,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -179,32 +205,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -303,6 +352,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 5899235fcb..66c93af753 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,7 +35,9 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.effects.EffectType;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemUse;
@@ -46,12 +48,12 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.EffectScope;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +383,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
@@ -394,7 +397,24 @@ public class AutoUseTaskManager
 							final IPlayerActionHandler actionHandler = PlayerActionHandler.getInstance().getHandler(actionHolder.getHandler());
 							if (actionHandler != null)
 							{
-								actionHandler.useAction(player, actionHolder, false, false);
+								if (!actionHandler.isPetAction())
+								{
+									actionHandler.useAction(player, actionHolder, false, false);
+								}
+								else
+								{
+									final Summon summon = player.getAnyServitor();
+									if ((summon != null) && !summon.isAlikeDead())
+									{
+										final Skill skill = summon.getKnownSkill(actionHolder.getOptionId());
+										if ((skill != null) && !canSummonCastSkill(player, summon, skill))
+										{
+											continue ACTIONS;
+										}
+										
+										actionHandler.useAction(player, actionHolder, false, false);
+									}
+								}
 							}
 						}
 					}
@@ -477,6 +497,59 @@ public class AutoUseTaskManager
 			
 			return !player.isSkillDisabled(skill) && skill.checkCondition(player, target, false);
 		}
+		
+		private boolean canSummonCastSkill(Player player, Summon summon, Skill skill)
+		{
+			if (skill.isBad() && (player.getTarget() == null))
+			{
+				return false;
+			}
+			
+			final int mpConsume = skill.getMpConsume() + skill.getMpInitialConsume();
+			if ((((mpConsume != 0) && (mpConsume > (int) Math.floor(summon.getCurrentMp()))) || ((skill.getHpConsume() != 0) && (skill.getHpConsume() > (int) Math.floor(summon.getCurrentHp())))))
+			{
+				return false;
+			}
+			
+			if (summon.isSkillDisabled(skill))
+			{
+				return false;
+			}
+			
+			if (((player.getTarget() != null) && !skill.checkCondition(summon, player.getTarget(), false)) || ((player.getTarget() == null) && !skill.checkCondition(summon, player, false)))
+			{
+				return false;
+			}
+			
+			if ((skill.getItemConsumeCount() > 0) && (summon.getInventory().getInventoryItemCount(skill.getItemConsumeId(), -1) < skill.getItemConsumeCount()))
+			{
+				return false;
+			}
+			
+			if (skill.getTargetType().equals(TargetType.SELF) || skill.getTargetType().equals(TargetType.SUMMON))
+			{
+				final BuffInfo summonInfo = summon.getEffectList().getBuffInfoBySkillId(skill.getId());
+				return (summonInfo != null) && (summonInfo.getTime() >= REUSE_MARGIN_TIME);
+			}
+			
+			if ((skill.getEffects(EffectScope.GENERAL) != null) && skill.getEffects(EffectScope.GENERAL).stream().anyMatch(a -> a.getEffectType().equals(EffectType.MANAHEAL_BY_LEVEL)) && (player.getCurrentMpPercent() > 80))
+			{
+				return false;
+			}
+			
+			final BuffInfo buffInfo = player.getEffectList().getBuffInfoBySkillId(skill.getId());
+			final BuffInfo abnormalBuffInfo = player.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
+			if (abnormalBuffInfo != null)
+			{
+				if (buffInfo != null)
+				{
+					return (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()));
+				}
+				return (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel()) || abnormalBuffInfo.isAbnormalType(AbnormalType.NONE);
+			}
+			
+			return true;
+		}
 	}
 	
 	public synchronized void startAutoUseTask(Player player)
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/buffer_schemes.sql
index 1784421092..bd964c8cc2 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/buffer_schemes.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL,
     PRIMARY KEY (`object_id`,`scheme_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle.sql
index 0109cb8ab4..082a199079 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_spirits.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_spirits.sql
index ac73d8dbe3..bb4044039f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_spirits.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_spirits.sql
@@ -11,6 +11,5 @@ CREATE TABLE `character_spirits`
     `crit_rate_points`   TINYINT      NOT NULL DEFAULT 0,
     `crit_damage_points` TINYINT      NOT NULL DEFAULT 0,
     `in_use`             BOOLEAN      NOT NULL DEFAULT FALSE,
-    PRIMARY KEY (`charId`, `type`),
-    FOREIGN KEY FK_CHARACTER_SPIRITS (`charId`) REFERENCES characters (`charId`) ON DELETE CASCADE
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+    PRIMARY KEY (`charId`, `type`)
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/characters.sql
index ea2aace011..60e1a786a2 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/characters.sql
@@ -60,4 +60,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort.sql
index 43de96f562..b4c76f8a7d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort_siege_guards.sql
index 19df57a3b9..43763210b4 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort_spawnlist.sql
index 22303a9b09..144979acd9 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,4 +11,4 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/grandboss_data.sql
index 9ad3ae33ce..bc319dc49e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/heroes.sql
index 2fc8753f90..49a371cbd5 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/heroes.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/items.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/olympiad_fights.sql
index ccd4ac94ec..f25cc4c1fa 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(4) NOT NULL DEFAULT 0,
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/Character.ini b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/Character.ini
index b5c7bc811a..733a5939ca 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/Character.ini
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/Character.ini
@@ -285,8 +285,8 @@ MaxMAtk = 999999
 MaxPCritRate = 500
 
 # Maximum character Magic Critical Rate. (10 = 1%)
-# Default: 200
-MaxMCritRate = 200
+# Classic Default: 320
+MaxMCritRate = 320
 
 # Maximum character Attack Speed.
 # Default: 1500
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/Custom/AutoPlay.ini b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/Custom/AutoPlay.ini
index 9a4fd4bf2e..6e9d9628be 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/Custom/AutoPlay.ini
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/Custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # Enable .play command only for premium players.
 # Premium System must be enabled.
 # Default: False
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/General.ini b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/General.ini
index 978c3fce97..659ece7db8 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/General.ini
@@ -430,8 +430,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/ActionData.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/ActionData.xml
index 677c57eb99..3c87d5be2d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/ActionData.xml
@@ -1,218 +1,251 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
-	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
-	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
-	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
-	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
-	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
-	<action id="70" handler="AirshipAction" option="4" /> <!-- Exit Airship -->
-	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
-	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
-	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
-	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
-	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="50094" /> <!-- Nightshade - Shadow's Despair -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
-	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="0" handler="SitStand" /> <!-- Toggle Sit/Stand. (Command: /sit, /stand) -->
+	<action id="1" handler="RunWalk" /> <!-- Toggle Walk/Run. (Command: /walk, /run) -->
+	<action id="2" handler="None" /> <!-- Attacks selected target(s), or takes a general action if the target cannot be attacked. Hold down the Ctrl key and click to attack by force. (Command: /attack, /attackforce) -->
+	<action id="3" handler="None" /> <!-- Request a trade from the selected target. (Command: /trade) -->
+	<action id="4" handler="None" /> <!-- Select the nearest available target. (Command: /targetnext) -->
+	<action id="5" handler="None" /> <!-- Pick up items that are scattered nearby. (Command: /pickup) -->
+	<action id="6" handler="None" /> <!-- Change to the target of the currently selected player. (Command: /assist) -->
+	<action id="7" handler="None" /> <!-- Invite the selected person to your party. (Command: /invite) -->
+	<action id="8" handler="None" /> <!-- Leave the party. (Command: /leave) -->
+	<action id="9" handler="None" /> <!-- If you are the leader of the party, dismiss selected members from your party. (Command: /dismiss) -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Sets up a private store to sell your items. (Command: /vendor) -->
+	<action id="11" handler="None" /> <!-- Display the party matching window to search for parties or to add members to your party. (Command: /partymatching) -->
+	<action id="12" handler="SocialAction" option="2" /> <!-- Emote: Greet others with a kind "hello." (Command: /socialhello) -->
+	<action id="13" handler="SocialAction" option="3" /> <!-- Emote: Let everyone know that you or someone else is victorious! (Command: /socialvictory) -->
+	<action id="14" handler="SocialAction" option="4" /> <!-- Emote: Rouse your allies and charge! (Command: /socialcharge) -->
+	<action id="15" handler="PetHold" /> <!-- Have your pet follow you or stay and hold its ground. -->
+	<action id="16" handler="PetAttack" /> <!-- Attack target. -->
+	<action id="17" handler="PetStop" /> <!-- Stop current action. -->
+	<action id="18" handler="None" /> <!-- Pick up nearby items. -->
+	<action id="19" handler="UnsummonPet" /> <!-- Returns your pet back to its home. -->
+	<action id="20" handler="None" /> <!-- Use special skill. -->
+	<action id="21" handler="ServitorHold" /> <!-- Have your summons follow you or stay and hold its ground. -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attack target. -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="24" handler="SocialAction" option="6" /> <!-- Emote: Respond positively. (Command: /socialyes) -->
+	<action id="25" handler="SocialAction" option="5" /> <!-- Emote: Respond negatively. (Command: /socialno) -->
+	<action id="26" handler="SocialAction" option="7" /> <!-- Emote: Show your respect and bow. (Command: /socialbow) -->
+	<action id="27" handler="None" /> <!-- Use special skill. -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Sets up a private store to purchase items. (Command: /buy) -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Emote: You have no idea what's going on. (Command: /socialunaware) -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Emote: I'm waiting... (Command: /socialwaiting) -->
+	<action id="31" handler="SocialAction" option="10" /> <!-- Emote: Have a good laugh. (Command: /sociallaugh) -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Toggle between Attack/Move modes. -->
+	<action id="33" handler="SocialAction" option="11" /> <!-- Emote: Applaud. (Command: /socialapplause) -->
+	<action id="34" handler="SocialAction" option="12" /> <!-- Emote: Serve them up your best dance moves. (Command: /socialdance) -->
+	<action id="35" handler="SocialAction" option="13" /> <!-- Emote: Show grief. (Command: /socialsad) -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Poison gas attack. -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Set up a private workshop that creates items by using Dwarven recipes in exchange for a fee. (Command: /dwarvenmanufacture) -->
+	<action id="38" handler="Ride" /> <!-- Toggle mount/dismount when near or on an NPC that can be ridden. (Commands: /mount, /dismount, /mountdismount) -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Exploding corpse attack. -->
+	<action id="40" handler="None" /> <!-- Enhances a target's evaluation score. (Command: /evaluate) -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Attacks castle gates, walls, or headquarters by shooting a cannon. -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Reflects damage back to the enemy. -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Attacks target and nearby enemies by creating a whirling surge of water. -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Attacks an enemy with a powerful explosion. -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Restores the summoner's MP. -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Attacks an enemy by summoning up a devastating storm. -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Damages an enemy and heals the servitor at the same time. -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Attacks the enemy by shooting a cannon. -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Attack with a fit of rage. -->
+	<action id="50" handler="None" /> <!-- The selected party member will become the new party leader. (Command: /changepartyleader) -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Removes shackles from the Servitor and sets him free. -->
+	<action id="53" handler="ServitorMove" /> <!-- Move to the target. -->
+	<action id="54" handler="PetMove" /> <!-- Move to the target. -->
+	<action id="55" handler="None" /> <!-- Toggle recording and stop recording of replay files. (Commands: /replayrecstart, /replayrecstop, /replayrecstartstop) -->
+	<action id="56" handler="None" /> <!-- Invite the selected target to a command channel. (Command: /channelinvite) -->
+	<action id="57" handler="None" /> <!-- Highlights private store and private workshop messages that contain the search word. (Command: /findprivatestore) -->
+	<action id="58" handler="None" /> <!-- Challenges another character to a duel. (Command: /duel) -->
+	<action id="59" handler="None" /> <!-- Withdrawing from a duel means losing it. (Command: /withdraw) -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Open a personal store for package sale. (Command: /packagesale) -->
+	<action id="62" handler="SocialAction" option="14" /> <!-- Charm Pose. (Command: /charm) -->
+	<action id="64" handler="TeleportBookmark" /> <!-- Displays My Teleports window you can use to save and manage teleport locations. (Command: /teleportbookmark) -->
+	<action id="65" handler="BotReport" /> <!-- Reports the targeted player as a suspected bot. (Command: /botreport) -->
+	<action id="66" handler="SocialAction" option="15" /> <!-- Allows character to strike shy pose. (Command: /socialshy) -->
+	<action id="67" handler="AirshipAction" option="1" /> <!-- Allows you to control the Airship. -->
+	<action id="68" handler="AirshipAction" option="2" /> <!-- Relinquishes control of the Airship. -->
+	<action id="69" handler="AirshipAction" option="3" /> <!-- Choose from pre-designated locations. -->
+	<action id="70" handler="AirshipAction" option="4" /> <!-- Disembarks from the Airship. -->
+	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange bows with another person. (Command: /couplebow) -->
+	<action id="72" handler="SocialAction" option="17" /> <!-- High Five another person. (Command: /couplehighfive) -->
+	<action id="73" handler="SocialAction" option="18" /> <!-- Dance with another player. (Command: /coupledance) -->
+	<action id="76" handler="None" /> <!-- Invite the selected target as friends. (Commands: /friendinvite, /friendadd, /friendreg) -->
+	<action id="77" handler="None" /> <!-- Start or end recording videos. (Commands: /recstart, /recstop, /recstartstop) -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Applies Token 1 to the target. Can be only used in a group. (Command: /tacticalsign1) -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Applies Token 2 to the target. Can be only used in a group. (Command: /tacticalsign2) -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Applies Token 3 to the target. Can be only used in a group. (Command: /tacticalsign3) -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Applies Token 4 to the target. Can be only used in a group. (Command: /tacticalsign4) -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Automatically focuses on the target marked with Token 1. Can be only used in a group. (Command: /targettacticalsign1) -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Automatically focuses on the target marked with Token 2. Can be only used in a group. (Command: /targettacticalsign2) -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Automatically focuses on the target marked with Token 3. Can be only used in a group. (Command: /targettacticalsign3) -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Automatically focuses on the target marked with Token 4. Can be only used in a group. (Command: /targettacticalsign4) -->
+	<action id="87" handler="SocialAction" option="28" /> <!-- Gesture of Proposal (Command: /socialpropose) -->
+	<action id="88" handler="SocialAction" option="29" /> <!-- Gesture of Provocation (Command: /socialprovocation) -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off (Command: /socialbeauty) -->
+	<action id="92" handler="None" /> <!-- Selects the previous target. (Command: /targetprev) -->
+	<action id="93" handler="None" /> <!-- Select the nearest attackable target in the range of 1400 m. (Command: /targetnext) -->
+	<action id="94" handler="None" /> <!-- Selects the previous target in the range of 1400 m. (Command: /targetprev) -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Attacks castle gates, walls, or headquarters with a powerful strike. -->
+	<action id="1001" handler="None" /> <!-- A reckless yet powerful attack that must be used with extreme caution. -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Provokes surrounding enemies to attack you. -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Instantly increases P. Def. and M. Def. significantly. Character is immovable while this skill is in effect. -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- A magical attack. -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Recovers the pet's HP. -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Increases party members' P. Critical Rate/ Damage. -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Temporarily increases party members' P. Atk. and P. Accuracy. -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Has a chance to remove curses from party members. -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Temporarily increases party members' MP Recovery Bonus. -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Temporarily reduces party members' M. Skill Cooldown. -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Has a certain chance to remove curses from party members. -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Provokes the enemy to attack and then casts a curse that decreases P./ M. Def. -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Provokes nearby enemies to attack and then casts a curse that decreases their P./ M. Def. -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Reduces Sleep/ Hold/ Stun/ Paralysis/ Mental / Knock Back/ Knock Down Attack Resistance of the nearby enemies. -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- A powerful blow on the enemy's vital points -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- A blow that inflicts damage and stuns an enemy. -->
+	
+	<!-- Actions 1018 to 1030 are present in the Client, but are not used in Classic. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Inflict a deadly curse on an enemy that absorbs their HP. -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kat the Cat -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mew the Cat -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kai the Cat -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Boxer the Unicorn -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mirage the Unicorn -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Merrow the Unicorn. -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Shadow. -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by Shadow. -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Silhouette -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by reanimated man -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by reanimated man -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by corrupted man -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- A powerful slashing attack. Over-hit is possible. -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Slashes at surrounding enemies while spinning in the air. Over-hit is possible. -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Immobilizes surrounding enemies. -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Powerful rear kicks that stuns the enemy and deals damage. Over-hit is possible. -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Pounds the target and surrounding enemies with a tremendous onrush of water. -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Detonates a corpse, inflicting damage to nearby enemies. -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Blades attached to each arm slash out in a devastating attack. Over-hit is possible. -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Curses nearby enemies, poisoning them and reducing their Atk. Spd. -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon: Fires a projectile a short distance. Consumes 4 Flash Gunpowder. -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon: Fires a projectile a long distance. Consumes 5 Flash Gunpowder. -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Viciously bite an enemy. -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Scratch an enemy with both paws. Causes bleeding. -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awaken hidden powers. -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Decrease a nearby enemy's P. Atk./M. Atk. with a wolf cry. -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Decrease a nearby enemy's attack speed/magic speed with a strider roar. -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Viciously bite an enemy. -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Causes both damage and shock at the same time. Instantly stuns the enemy. -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Breath fire in front of you. -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Increases maximum HP temporarily. -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Increases maximum MP temporarily. -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Increases Atk. Spd. temporarily. -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Increases Casting Spd. temporarily. -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Temporarily decreases the target's MP consumption of skills. Consumes Spirit Ore. -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Increases M. Atk. power temporarily. -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Temporarily increases M. Skill Critical Rate / Damage . -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Temporarily increases the critical attack power. -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Temporarily increases the probability of critical attack. -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Temporarily increases Accuracy. -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Rapidly attacks the enemy twice. -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Inflicts shock and damage to the enemy at the same time with a powerful spin attack. -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Attacks nearby enemies with a doll heap attack. -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakens a hidden ability. -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of thunder. -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack on nearby enemies when hit. -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Control put in place to prevent the use of a buff upon the master. 5-minute duration. -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Powerfully attacks the target. -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- A powerful attack that pierces through a target. -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies by spinning your own body like a whirlwind. -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Attacks a front-line enemy with a powerful lance thrust. -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Shouts a victory cry that increases your abilities. -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Powerfully attacks the target. -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Gathers energy into your body, then releases it in a destructive blast. -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Hits enemies with a powerful wave of force. -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Emits a loud roar that amplifies your abilities. -->
+	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Charges toward the enemy and inflicts damage. -->
+	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Cancels the target's de-buff. -->
+	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Emits a spread of ring-shaped flames. -->
+	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Attacks the enemy with a powerful flaming beak. -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Toggles you between Attack and Support modes. -->
+	<action id="1085" handler="ServitorSkillUse" option="4707" /> <!-- Sacrifice one's own HP to restore HP of party members. -->
+	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Removes one or several buffs from an enemy. -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- The enemy's Dark Resistance -25. -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Strike multiple enemies at the front with the tail. -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Viciously bite an enemy. -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Causes nearby enemies to flee in fear. -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Increases your speed. -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Greatly increases its master's speed. -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Increases the speed of its master and their party. -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Teleports its master to the Seed of Annihilation. -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Teleports its master and their party to the Seed of Annihilation. -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attack the target. -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move to a designated location. -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Make the servitor disappear by cancelling the summoning. -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Do not counter-attack. -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Counter-attack when the master or itself is attacked. -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Damages and provokes the target. -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Delivers a shock to the ground immobilizing surrounding enemies. -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Bites the target to inflict damage. -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Pounces on the target to inflict damage. Target's Speed -100. -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Damages the target and absorbs some of its HP. -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Attacks nearby enemies and blocks their P. Skills. -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Flourishes claws and frontally attacks enemies. -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Dashes toward enemies to inflict damage and to stun them. -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Inflicts damage onto the enemies with a flame. -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Flies straight into the enemy. -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Purifies the master. -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Attack the enemy by darting a feather. -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Hurt the enemy by attacking them with sharp claws. -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Recover the targets near the tree and clear any debuff. -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Attacks nearby targets with a powerful punch. -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Provokes nearby enemies. -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Bites the enemy. -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Pounces on the target to inflict damage. Target's Speed -100. -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Provokes nearby enemies. -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Bites the enemy. -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Pounces on the target to inflict damage. Target's Speed -100. -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Provokes nearby enemies. -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Bites the enemy. -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Pounces on the target to inflict damage. Target's Speed -100. -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Attacks nearby enemies and blocks their P. Skills. -->
+	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Rushes to the enemy to inflict damage and stun them. -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Can express affection to Rudolph. Affection Level rises by 25%. Warning: Can be used only when a Rudolph requests expression of affection, and cannot be used while transformed! -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Increases Max HP by 20%, Max MP by 20%, and the Speed by 20% for 5 minutes. Increases the Debuff Resistance by 10%. Reuse delay 10 minutes. Consumes 3 Rose Essence(s) during skill use. Doesn't overlap with other buffs except Critical Seduction. -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- For 30 min., party members' Max. HP +30%, Max. MP +30%, Max. CP +30%, P. Def. +30%, M. Def. +30%, Speed +20, P. Atk. +10%, and M. Atk. +20%. MP consumption for skill use -15%. Cooldown: 5 min. Consumes 10 Rose Essence(s) during skill use. -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of lightning. -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack upon contacted enemies nearby. -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Restricts to prevent the use of a buff upon the master. 5 minute duration. -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Inflicts a powerful attack that seems to pierce through the target. -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies. -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impales an enemy with a sword. -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Raises one's own abilities. -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Gathered energy within ones self can be focused and used to attack an enemy. -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Fires a shock wave to attack enemies at the front. -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Raises one's own abilities. -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switches between attack mode and support mode. -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Instantly restores the master's HP by 10%. For 1 min., master's Debuff Resistance +80%, Buff-canceling Attack Resistance +40%, Speed +10, P. Def. +20%, and M. Def. by 20%, and MP consumption for all skills -50%. Can be used if the master's HP is 30% or lower. Cooldown: 10 min. -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/AttendanceRewards.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/AttendanceRewards.xml
index a0e71cbdea..8af1ecd126 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/AttendanceRewards.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/AttendanceRewards.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/AttendanceRewards.xsd">
-	<item id="29564" count="50" /> <!-- Attendance Coin -->
-	<item id="29553" count="3" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29565" count="3" /> <!-- XP/SP Scroll -->
-	<item id="29584" count="2" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29585" count="1" /> <!-- Refined Romantic Chapeau -->
+	<item id="49490" count="1" /> <!-- Fishing Kit -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49488" count="5" /> <!-- Major Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49500" count="1" /> <!-- Greater Scroll of Escape -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="100" /> <!-- Attendance Coin -->
-	<item id="29553" count="3" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29519" count="3" /> <!-- XP/SP Scroll - Medium -->
-	<item id="29584" count="2" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="49512" count="1" /> <!-- Amulet: Prosperity -->
+	<item id="90007" count="1" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49533" count="5" /> <!-- Quick Hero Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49500" count="1" /> <!-- Greater Scroll of Escape -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="150" /> <!-- Attendance Coin -->
-	<item id="29553" count="6" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29519" count="3" /> <!-- XP/SP Scroll - Medium -->
-	<item id="29584" count="4" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29578" count="1" /> <!-- Rare Accessory Pack -->
+	<item id="90007" count="2" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49488" count="5" /> <!-- Major Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49542" count="1" /> <!-- Improved Scroll of Resurrection -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="300" /> <!-- Attendance Coin -->
-	<item id="29553" count="6" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29650" count="5" /> <!-- XP/SP Scroll - High -->
-	<item id="29584" count="4" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29587" count="1" /> <!-- Agathion - Singer & Dancer -->
+	<item id="90007" count="3" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49533" count="5" /> <!-- Quick Hero Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49542" count="1" /> <!-- Improved Scroll of Resurrection -->
+	<item id="49860" count="1" /> <!-- Hero's Wondrous Cubic (7-day) -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 5b501b1f1b..bcc74a8afe 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -254,6 +255,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 25f1799035..1dc5ebd6f1 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -41,6 +41,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AgathionSlot", AgathionSlot::new);
@@ -228,7 +230,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index cd446ab812..2775ff29a4 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -182,6 +182,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()))
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 43be5cfc4a..ae0fba5834 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,55 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..798a363468 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,46 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/skillTrees/fishingSkillTree.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/skillTrees/fishingSkillTree.xml
index 74aecc1262..37793d81b2 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/skillTrees/fishingSkillTree.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/skillTrees/fishingSkillTree.xml
@@ -64,5 +64,20 @@
 		<skill skillName="Expand Trade" skillId="1370" skillLevel="3" getLevel="65" learnedByNpc="true">
 			<item id="45481" count="2822" /> <!-- Fresh Blue Mackerel -->
 		</skill>
+		<skill skillName="Expand Inventory" skillId="1372" skillLevel="1" getLevel="10" learnedByNpc="true">
+			<item id="91113" count="1" /> <!-- Inventory Expansion Ticket - Lv. 1 -->
+		</skill>
+		<skill skillName="Expand Inventory" skillId="1372" skillLevel="2" getLevel="20" learnedByNpc="true">
+			<item id="91114" count="1" /> <!-- Inventory Expansion Ticket - Lv. 2 -->
+		</skill>
+		<skill skillName="Expand Inventory" skillId="1372" skillLevel="3" getLevel="30" learnedByNpc="true">
+			<item id="91115" count="1" /> <!-- Inventory Expansion Ticket - Lv. 3 -->
+		</skill>
+		<skill skillName="Expand Inventory" skillId="1372" skillLevel="4" getLevel="30" learnedByNpc="true">
+			<item id="91296" count="1" /> <!-- Inventory Expansion Ticket - Lv. 4 -->
+		</skill>
+		<skill skillName="Expand Inventory" skillId="1372" skillLevel="5" getLevel="30" learnedByNpc="true">
+			<item id="91297" count="1" /> <!-- Inventory Expansion Ticket - Lv. 5 -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/experience.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/experience.xml
index 52fe49f568..9ef9e70e83 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/experience.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/experience.xml
@@ -2,89 +2,89 @@
 <table maxLevel="107" maxPetLevel="99" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/experience.xsd">
 	<experience level="1" tolevel="0" trainingRate="0" />
 	<experience level="2" tolevel="68" trainingRate="0" />
-	<experience level="3" tolevel="363" trainingRate="0" />
-	<experience level="4" tolevel="1168" trainingRate="0" />
-	<experience level="5" tolevel="2884" trainingRate="0" />
-	<experience level="6" tolevel="6038" trainingRate="0" />
-	<experience level="7" tolevel="11287" trainingRate="0" />
-	<experience level="8" tolevel="19423" trainingRate="0" />
-	<experience level="9" tolevel="31378" trainingRate="0" />
-	<experience level="10" tolevel="48229" trainingRate="0" />
-	<experience level="11" tolevel="71202" trainingRate="0" />
-	<experience level="12" tolevel="101677" trainingRate="0" />
-	<experience level="13" tolevel="141193" trainingRate="0" />
-	<experience level="14" tolevel="191454" trainingRate="0" />
-	<experience level="15" tolevel="254330" trainingRate="0" />
-	<experience level="16" tolevel="331867" trainingRate="0" />
-	<experience level="17" tolevel="426288" trainingRate="0" />
-	<experience level="18" tolevel="540000" trainingRate="0" />
-	<experience level="19" tolevel="675596" trainingRate="0.4" />
-	<experience level="20" tolevel="835862" trainingRate="0.4" />
-	<experience level="21" tolevel="1023784" trainingRate="0.4" />
-	<experience level="22" tolevel="1439214" trainingRate="0.4" />
-	<experience level="23" tolevel="1948496" trainingRate="0.4" />
-	<experience level="24" tolevel="2568849" trainingRate="0.4" />
-	<experience level="25" tolevel="3320624" trainingRate="0.4" />
-	<experience level="26" tolevel="4227171" trainingRate="0.4" />
-	<experience level="27" tolevel="5315160" trainingRate="0.4" />
-	<experience level="28" tolevel="6614928" trainingRate="0.4" />
-	<experience level="29" tolevel="8161928" trainingRate="0.4" />
-	<experience level="30" tolevel="9995811" trainingRate="0.4" />
-	<experience level="31" tolevel="12162654" trainingRate="0.4" />
-	<experience level="32" tolevel="14713776" trainingRate="0.4" />
-	<experience level="33" tolevel="17708474" trainingRate="0.4" />
-	<experience level="34" tolevel="21213444" trainingRate="0.4" />
-	<experience level="35" tolevel="25304462" trainingRate="0.4" />
-	<experience level="36" tolevel="30067484" trainingRate="0.4" />
-	<experience level="37" tolevel="35599857" trainingRate="0.4" />
-	<experience level="38" tolevel="42010311" trainingRate="0.4" />
-	<experience level="39" tolevel="49421365" trainingRate="0.4" />
-	<experience level="40" tolevel="57972426" trainingRate="0.4" />
-	<experience level="41" tolevel="67818552" trainingRate="0.4" />
-	<experience level="42" tolevel="79135430" trainingRate="0.4" />
-	<experience level="43" tolevel="92117895" trainingRate="0.4" />
-	<experience level="44" tolevel="106985762" trainingRate="0.4" />
-	<experience level="45" tolevel="123986755" trainingRate="0.4" />
-	<experience level="46" tolevel="143394644" trainingRate="0.4" />
-	<experience level="47" tolevel="165516617" trainingRate="0.4" />
-	<experience level="48" tolevel="190696910" trainingRate="0.4" />
-	<experience level="49" tolevel="219317612" trainingRate="0.4" />
-	<experience level="50" tolevel="251805373" trainingRate="0.4" />
-	<experience level="51" tolevel="288635908" trainingRate="0.4" />
-	<experience level="52" tolevel="330338847" trainingRate="0.4" />
-	<experience level="53" tolevel="377507025" trainingRate="0.4" />
-	<experience level="54" tolevel="430790085" trainingRate="0.4" />
-	<experience level="55" tolevel="490916802" trainingRate="0.4" />
-	<experience level="56" tolevel="558693889" trainingRate="0.4" />
-	<experience level="57" tolevel="635018115" trainingRate="0.3" />
-	<experience level="58" tolevel="720879369" trainingRate="0.3" />
-	<experience level="59" tolevel="817380318" trainingRate="0.3" />
-	<experience level="60" tolevel="925741334" trainingRate="0.2" />
-	<experience level="61" tolevel="1047311008" trainingRate="0.2" />
-	<experience level="62" tolevel="1183577348" trainingRate="0.2" />
-	<experience level="63" tolevel="1336187066" trainingRate="0.2" />
-	<experience level="64" tolevel="1506967657" trainingRate="0.2" />
-	<experience level="65" tolevel="1697936135" trainingRate="0.2" />
-	<experience level="66" tolevel="1911306679" trainingRate="0.15" />
-	<experience level="67" tolevel="2149533464" trainingRate="0.15" />
-	<experience level="68" tolevel="2415323167" trainingRate="0.15" />
-	<experience level="69" tolevel="2711646439" trainingRate="0.1" />
-	<experience level="70" tolevel="3041801164" trainingRate="0.1" />
-	<experience level="71" tolevel="3409398454" trainingRate="0.1" />
-	<experience level="72" tolevel="3818421440" trainingRate="0.1" />
-	<experience level="73" tolevel="4273257147" trainingRate="0.1" />
-	<experience level="74" tolevel="4778730307" trainingRate="0.05" />
-	<experience level="75" tolevel="5340152663" trainingRate="0.05" />
-	<experience level="76" tolevel="5963335188" trainingRate="0.05" />
-	<experience level="77" tolevel="7138805249" trainingRate="0.05" />
-	<experience level="78" tolevel="9372198365" trainingRate="0.05" />
-	<experience level="79" tolevel="16072377712" trainingRate="0.05" />
-	<experience level="80" tolevel="38406308870" trainingRate="0.05" />
-	<experience level="81" tolevel="150075964660" trainingRate="0.025" />
-	<experience level="82" tolevel="279783329565" trainingRate="0.025" />
-	<experience level="83" tolevel="454748284484" trainingRate="0.025" />
-	<experience level="84" tolevel="673468617186" trainingRate="0.025" />
-	<experience level="85" tolevel="946585988577" trainingRate="0.025" />
-	<experience level="86" tolevel="959999999998" trainingRate="0.025" />
-	<experience level="87" tolevel="969999999998" trainingRate="0.025" />
+	<experience level="3" tolevel="364" trainingRate="0" />
+	<experience level="4" tolevel="1169" trainingRate="0" />
+	<experience level="5" tolevel="2885" trainingRate="0" />
+	<experience level="6" tolevel="6039" trainingRate="0" />
+	<experience level="7" tolevel="11288" trainingRate="0" />
+	<experience level="8" tolevel="19424" trainingRate="0" />
+	<experience level="9" tolevel="31379" trainingRate="0" />
+	<experience level="10" tolevel="48230" trainingRate="0" />
+	<experience level="11" tolevel="71203" trainingRate="0" />
+	<experience level="12" tolevel="101678" trainingRate="0" />
+	<experience level="13" tolevel="141194" trainingRate="0" />
+	<experience level="14" tolevel="191455" trainingRate="0" />
+	<experience level="15" tolevel="254331" trainingRate="0" />
+	<experience level="16" tolevel="331868" trainingRate="0" />
+	<experience level="17" tolevel="426289" trainingRate="0" />
+	<experience level="18" tolevel="540001" trainingRate="0" />
+	<experience level="19" tolevel="675597" trainingRate="0.4" />
+	<experience level="20" tolevel="835864" trainingRate="0.4" />
+	<experience level="21" tolevel="1023785" trainingRate="0.4" />
+	<experience level="22" tolevel="1439215" trainingRate="0.4" />
+	<experience level="23" tolevel="1948497" trainingRate="0.4" />
+	<experience level="24" tolevel="2568850" trainingRate="0.4" />
+	<experience level="25" tolevel="3320625" trainingRate="0.4" />
+	<experience level="26" tolevel="4227172" trainingRate="0.4" />
+	<experience level="27" tolevel="5315161" trainingRate="0.4" />
+	<experience level="28" tolevel="6614929" trainingRate="0.4" />
+	<experience level="29" tolevel="8161929" trainingRate="0.4" />
+	<experience level="30" tolevel="9995812" trainingRate="0.4" />
+	<experience level="31" tolevel="12162655" trainingRate="0.4" />
+	<experience level="32" tolevel="14713777" trainingRate="0.4" />
+	<experience level="33" tolevel="17708475" trainingRate="0.4" />
+	<experience level="34" tolevel="21213445" trainingRate="0.4" />
+	<experience level="35" tolevel="25304463" trainingRate="0.4" />
+	<experience level="36" tolevel="30067485" trainingRate="0.4" />
+	<experience level="37" tolevel="35599858" trainingRate="0.4" />
+	<experience level="38" tolevel="42010312" trainingRate="0.4" />
+	<experience level="39" tolevel="49421366" trainingRate="0.4" />
+	<experience level="40" tolevel="57972427" trainingRate="0.4" />
+	<experience level="41" tolevel="67818553" trainingRate="0.4" />
+	<experience level="42" tolevel="79135431" trainingRate="0.4" />
+	<experience level="43" tolevel="92117896" trainingRate="0.4" />
+	<experience level="44" tolevel="106985763" trainingRate="0.4" />
+	<experience level="45" tolevel="123986756" trainingRate="0.4" />
+	<experience level="46" tolevel="143394645" trainingRate="0.4" />
+	<experience level="47" tolevel="165516618" trainingRate="0.4" />
+	<experience level="48" tolevel="190696911" trainingRate="0.4" />
+	<experience level="49" tolevel="219317613" trainingRate="0.4" />
+	<experience level="50" tolevel="251805374" trainingRate="0.4" />
+	<experience level="51" tolevel="288635909" trainingRate="0.4" />
+	<experience level="52" tolevel="330338848" trainingRate="0.4" />
+	<experience level="53" tolevel="377507026" trainingRate="0.4" />
+	<experience level="54" tolevel="430790086" trainingRate="0.4" />
+	<experience level="55" tolevel="490916803" trainingRate="0.4" />
+	<experience level="56" tolevel="558693890" trainingRate="0.4" />
+	<experience level="57" tolevel="635018116" trainingRate="0.3" />
+	<experience level="58" tolevel="720879370" trainingRate="0.3" />
+	<experience level="59" tolevel="817380319" trainingRate="0.3" />
+	<experience level="60" tolevel="925741335" trainingRate="0.2" />
+	<experience level="61" tolevel="1047311009" trainingRate="0.2" />
+	<experience level="62" tolevel="1183577349" trainingRate="0.2" />
+	<experience level="63" tolevel="1336187067" trainingRate="0.2" />
+	<experience level="64" tolevel="1506967658" trainingRate="0.2" />
+	<experience level="65" tolevel="1697936136" trainingRate="0.2" />
+	<experience level="66" tolevel="1911306680" trainingRate="0.15" />
+	<experience level="67" tolevel="2149533465" trainingRate="0.15" />
+	<experience level="68" tolevel="2415323168" trainingRate="0.15" />
+	<experience level="69" tolevel="2711646440" trainingRate="0.1" />
+	<experience level="70" tolevel="3041801165" trainingRate="0.1" />
+	<experience level="71" tolevel="3409398455" trainingRate="0.1" />
+	<experience level="72" tolevel="3818421441" trainingRate="0.1" />
+	<experience level="73" tolevel="4273257148" trainingRate="0.1" />
+	<experience level="74" tolevel="4778730308" trainingRate="0.05" />
+	<experience level="75" tolevel="5340152664" trainingRate="0.05" />
+	<experience level="76" tolevel="5963335189" trainingRate="0.05" />
+	<experience level="77" tolevel="7138805250" trainingRate="0.05" />
+	<experience level="78" tolevel="9372198366" trainingRate="0.05" />
+	<experience level="79" tolevel="16072377713" trainingRate="0.05" />
+	<experience level="80" tolevel="38406308871" trainingRate="0.05" />
+	<experience level="81" tolevel="150075964661" trainingRate="0.025" />
+	<experience level="82" tolevel="279783329566" trainingRate="0.025" />
+	<experience level="83" tolevel="454748284485" trainingRate="0.025" />
+	<experience level="84" tolevel="673468617187" trainingRate="0.025" />
+	<experience level="85" tolevel="2020405851561" trainingRate="0.025" />
+	<experience level="86" tolevel="8755092023431" trainingRate="0.025" />
+	<experience level="87" tolevel="16836715429675" trainingRate="0.025" />
 </table>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/items/49000-49099.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/items/49000-49099.xml
index 029b141449..23af3d5b62 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/items/49000-49099.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/items/49000-49099.xml
@@ -1217,7 +1217,7 @@
 		<set name="handler" val="ItemSkills" />
 		<set name="commissionItemType" val="SCROLL_OTHER" />
 		<skills>
-			<skill id="39075" level="1" /> <!-- Improved Scroll of Escape -->
+			<skill id="2013" level="2" /> <!-- Improved Scroll of Escape -->
 		</skills>
 	</item>
 	<item id="49088" name="Gold Medal" type="EtcItem">
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/items/49400-49499.xml
index b2b95e76fb..770df7d5cc 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/items/49400-49499.xml
@@ -1433,13 +1433,23 @@
 	<item id="49489" name="Parts of Enchantment Scrolls Chest" type="EtcItem">
 		<!-- Double-click to obtain one Part of Enchantment Scrolls. Cannot be exchanged, dropped, or sold in a private store. Can be stored in a private warehouse. Can be shared within account through Dimensional Merchant. <Note>. Items received cannot be exchanged, dropped or sold. -->
 		<set name="icon" val="icon.etc_treasure_box_i08" />
-		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="default_action" val="PEEL" />
 		<set name="material" val="FISH" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="49474" min="1" max="1" chance="20" /> <!-- Scroll Part: Enchant Weapon -->
+			<item id="49475" min="1" max="1" chance="50" /> <!-- Scroll Part: Enchant Armor -->
+			<item id="49476" min="1" max="1" chance="2" /> <!-- Refined Scroll Part: Enchant Weapon -->
+			<item id="49478" min="1" max="1" chance="13" /> <!-- Refined Scroll Part: Enchant Armor -->
+			<item id="49479" min="1" max="1" chance="2" /> <!-- Solid Scroll Part: Enchant Weapon -->
+			<item id="49480" min="1" max="1" chance="13" /> <!-- Solid Scroll Part: Enchant Armor -->
+		</capsuled_items>
 	</item>
 	<item id="49490" name="Fishing kit" type="EtcItem">
 		<!-- Double-click to obtain 1 Fishing Rod (1-day), Bait (720 pcs), 1 Hero's Dual Swords, 1 Soulshot Ticket. Cannot be exchanged, dropped, or sold in a private store. Can be stored in a private warehouse. Can be shared within account through Dimensional Merchant. <Note>. Be careful before opening the items as their relocation is restricted. -->
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/items/49500-49599.xml
index 5a6343d52f..34fb4a1f4e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/items/49500-49599.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/items/49500-49599.xml
@@ -8,6 +8,13 @@
 		<set name="weight" val="120" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="commissionItemType" val="SCROLL_OTHER" />
+		<skills>
+			<skill id="39075" level="1" /> <!-- Improved Scroll of Escape -->
+		</skills>
 	</item>
 	<item id="49501" name="Fish Stew. The guild's gratitude." type="EtcItem">
 		<!-- For 20 min. XP/SP +10% while hunting. Cannot be dropped. -->
@@ -400,6 +407,8 @@
 		<!-- Magic potion that quickly restores HP. Instant cooldown. Cannot be used when HP is full. Cannot be exchanged, dropped, or sold. Can be stored in a private warehouse. Can be shared within account through Dimensional Merchant. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="LIQUID" />
 		<set name="weight" val="180" />
 		<set name="is_tradable" val="false" />
@@ -407,6 +416,12 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="is_event_restricted" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<skills>
+			<skill id="39103" level="1" /> <!-- Quick Hero Healing Potion -->
+		</skills>
 	</item>
 	<item id="49534" name="Hero Cube" additionalName="7-day" type="EtcItem">
 		<!-- 7-day item. Available at level 20 or higher. Double-click the Cube to receive Soulshot Ticket, Buff Scrolls Chest, Major Healing Potion, Warrior's Quick Healing Potion, Warrior's Quick Healing Potion, Angel Cat's Blessing, Improved Scroll of Resurrection, Parts of Enchantment Scrolls Chest, Fishing kit chest, My Teleport to the Base Package, Blade Spirit, Spellbook Box. (Can be used only once per day.) Cannot be exchanged, dropped, destroyed, or sold. Can be stored in a private warehouse. -->
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/items/49800-49899.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/items/49800-49899.xml
index 81cc28f4d6..d0dbd57499 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/items/49800-49899.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/items/49800-49899.xml
@@ -678,6 +678,10 @@
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="time" val="10080" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39199" level="1" /> <!-- Hero's Wondrous Cubic -->
+		</skills>
 	</item>
 	<item id="49861" name="Life Stone - Tester" additionalName="Tester" type="EtcItem">
 		<!-- Tester -->
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/18100-18199.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/18100-18199.xml
index 382309e159..20a6f078db 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/18100-18199.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/18100-18199.xml
@@ -417,7 +417,7 @@
 		<acquire exp="5695973" sp="85439" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -444,7 +444,7 @@
 		<acquire exp="5977531" sp="89662" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -472,7 +472,7 @@
 		<acquire exp="6185394" sp="92780" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20136.294068333" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -501,7 +501,7 @@
 		<acquire exp="6382637" sp="95739" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="19725.349291429" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -530,7 +530,7 @@
 		<acquire exp="2334831" sp="35022" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -556,7 +556,7 @@
 		<acquire exp="2345235" sp="35178" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -582,7 +582,7 @@
 		<acquire exp="2351087" sp="35266" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -608,7 +608,7 @@
 		<acquire exp="2345235" sp="35178" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -633,7 +633,7 @@
 		<acquire exp="2282377" sp="34235" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1328,7 +1328,7 @@
 		<acquire exp="2796075" sp="41941" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="22" />
@@ -1353,7 +1353,7 @@
 		<acquire exp="2796075" sp="41941" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="22" />
@@ -1556,7 +1556,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -1583,7 +1583,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -1610,7 +1610,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -1637,7 +1637,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/18200-18299.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/18200-18299.xml
index 96d0ef735d..08d34f1a21 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/18200-18299.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/18200-18299.xml
@@ -6,7 +6,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -33,7 +33,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -60,7 +60,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -87,7 +87,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -114,7 +114,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -141,7 +141,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -168,7 +168,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -195,7 +195,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -222,7 +222,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -249,7 +249,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -276,7 +276,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -303,7 +303,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -606,7 +606,7 @@
 		<acquire exp="2979228" sp="44688" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="70" />
@@ -631,7 +631,7 @@
 		<acquire exp="2979228" sp="44688" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="70" />
@@ -656,7 +656,7 @@
 		<acquire exp="2979228" sp="44688" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="70" />
@@ -681,7 +681,7 @@
 		<acquire exp="2979228" sp="44688" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="70" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20000-20099.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20000-20099.xml
index 63006e3b2f..51cd8c6ec4 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20000-20099.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20000-20099.xml
@@ -7,7 +7,7 @@
 		<acquire exp="30" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="20" />
@@ -84,7 +84,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -136,7 +136,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="60" />
@@ -188,7 +188,7 @@
 		<acquire exp="310" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="60" />
@@ -246,7 +246,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -5386,7 +5386,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -5442,7 +5442,7 @@
 		<acquire exp="441" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -5542,7 +5542,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20100-20199.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20100-20199.xml
index 18ac599ad5..ac592a769e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20100-20199.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20100-20199.xml
@@ -1135,7 +1135,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -1179,7 +1179,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="50" />
@@ -1229,7 +1229,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -1281,7 +1281,7 @@
 		<acquire exp="309" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -4346,7 +4346,7 @@
 		<acquire exp="1882" sp="57" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="636.798" hpRegen="3.5" mp="365.715" mpRegen="1.5" />
-			<attack physical="92.64226" magical="63.26266" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="92.64226" magical="63.26266" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.46427" magical="86.68702" />
 			<speed>
 				<walk ground="35" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20200-20299.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20200-20299.xml
index 7344709fa0..043dc1b0f7 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20200-20299.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20200-20299.xml
@@ -4066,7 +4066,7 @@
 		<acquire exp="2009" sp="61" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="670.347" hpRegen="4.5" mp="381.969" mpRegen="1.8" />
-			<attack physical="99.21986" magical="67.7543" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="99.21986" magical="67.7543" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="121.98819" magical="89.26566" />
 			<speed>
 				<walk ground="80" />
@@ -4133,7 +4133,7 @@
 		<acquire exp="2141" sp="65" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="705.162" hpRegen="4.5" mp="398.223" mpRegen="1.8" />
-			<attack physical="106.16525" magical="72.49711" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="106.16525" magical="72.49711" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="125.57727" magical="91.89199" />
 			<speed>
 				<walk ground="45" />
@@ -4201,7 +4201,7 @@
 		<acquire exp="2417" sp="73" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="777.324" hpRegen="4.5" mp="430.731" mpRegen="1.8" />
-			<attack physical="121.20802" magical="82.76936" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="121.20802" magical="82.76936" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="132.9486" magical="97.28601" />
 			<speed>
 				<walk ground="50" />
@@ -4267,7 +4267,7 @@
 		<acquire exp="2582" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="815.304" hpRegen="4.5" mp="446.985" mpRegen="1.8" />
-			<attack physical="129.32896" magical="88.31491" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="129.32896" magical="88.31491" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="136.72948" magical="100.0527" />
 			<speed>
 				<walk ground="80" />
@@ -4338,7 +4338,7 @@
 		<acquire exp="2295" sp="69" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="739.977" hpRegen="4.5" mp="413.574" mpRegen="1.8" />
-			<attack physical="113.49065" magical="77.49941" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="113.49065" magical="77.49941" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="129.23095" magical="94.5656" />
 			<speed>
 				<walk ground="80" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20300-20399.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20300-20399.xml
index a3d64dedb4..df6ebc20aa 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20300-20399.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20300-20399.xml
@@ -512,7 +512,7 @@
 		<acquire exp="266" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="60" />
@@ -569,7 +569,7 @@
 		<acquire exp="310" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="60" />
@@ -625,7 +625,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
@@ -808,7 +808,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="24" />
@@ -897,7 +897,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1002,7 +1002,7 @@
 		<acquire exp="441" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -1056,7 +1056,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -1158,7 +1158,7 @@
 		<acquire exp="441" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -1214,7 +1214,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1266,7 +1266,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -1316,7 +1316,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1527,7 +1527,7 @@
 		<acquire exp="454" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1733,7 +1733,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -2059,7 +2059,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="50" />
@@ -3004,7 +3004,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3225,7 +3225,7 @@
 		<acquire exp="354" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="70" />
@@ -3570,7 +3570,7 @@
 		<acquire exp="452" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3826,7 +3826,7 @@
 		<acquire exp="691" sp="21" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="86.088" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -3883,7 +3883,7 @@
 		<acquire exp="183" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="40" />
@@ -4103,7 +4103,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -4267,7 +4267,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -4317,7 +4317,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20400-20499.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20400-20499.xml
index 05f9fbee6e..3a04f0c0f8 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20400-20499.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20400-20499.xml
@@ -1286,7 +1286,7 @@
 		<acquire exp="439" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1350,7 +1350,7 @@
 		<acquire exp="292" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1579,7 +1579,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
@@ -2063,7 +2063,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="24" />
@@ -2230,7 +2230,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -2282,7 +2282,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -2333,7 +2333,7 @@
 		<acquire exp="309" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -2733,7 +2733,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -3324,7 +3324,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -3374,7 +3374,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -3426,7 +3426,7 @@
 		<acquire exp="309" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -3477,7 +3477,7 @@
 		<acquire exp="439" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3706,7 +3706,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -3810,7 +3810,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="24" />
@@ -3971,7 +3971,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
@@ -4029,7 +4029,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20500-20599.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20500-20599.xml
index 22fa4645b6..d012045b96 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20500-20599.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20500-20599.xml
@@ -1348,7 +1348,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -1555,7 +1555,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1602,7 +1602,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1647,7 +1647,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1874,7 +1874,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1919,7 +1919,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1964,7 +1964,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2009,7 +2009,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2276,7 +2276,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2326,7 +2326,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20700-20799.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20700-20799.xml
index ac4b14646e..b293a6a65a 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20700-20799.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20700-20799.xml
@@ -3575,7 +3575,7 @@
 		<acquire exp="46335" sp="1390" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1380.32124" hpRegen="8.5" mp="2629.335" mpRegen="3" />
-			<attack physical="469.5384" magical="416.6452173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="469.5384" magical="416.6452173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="958.284" magical="1597.14" />
 			<speed>
 				<walk ground="25" />
@@ -3624,7 +3624,7 @@
 		<acquire exp="50337" sp="1510" attributeExp="770" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.99191" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.131" magical="1641.885" />
 			<speed>
 				<walk ground="25" />
@@ -3672,7 +3672,7 @@
 		<acquire exp="88472" sp="2654" attributeExp="770" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.99191" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.131" magical="1641.885" />
 			<speed>
 				<walk ground="25" />
@@ -3725,7 +3725,7 @@
 		<acquire exp="91880" sp="2756" attributeExp="858" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.72623" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="488.6718" magical="433.67086956522" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="488.6718" magical="433.67086956522" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="997.443" magical="1662.405" />
 			<speed>
 				<walk ground="25" />
@@ -3777,7 +3777,7 @@
 		<acquire exp="93340" sp="2800" attributeExp="858" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.849385" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="488.7117" magical="433.70804347826" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="488.7117" magical="433.70804347826" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="997.5285" magical="1662.5475" />
 			<speed>
 				<walk ground="35" />
@@ -3827,7 +3827,7 @@
 		<acquire exp="96610" sp="2898" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1009.413" magical="1682.355" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20800-20899.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20800-20899.xml
index 293263d1a3..d4a1c92a6f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20800-20899.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20800-20899.xml
@@ -17,7 +17,7 @@
 		<acquire exp="131997" sp="3959" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2423.3825125" hpRegen="8.5" mp="3104.58" mpRegen="3" />
-			<attack physical="808.61705" magical="731.48967391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="808.61705" magical="731.48967391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1682.42625" magical="2804.04375" />
 			<speed>
 				<walk ground="70" />
@@ -65,7 +65,7 @@
 		<acquire exp="136896" sp="4106" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2827.269335" hpRegen="8.5" mp="3415.215" mpRegen="3" />
-			<attack physical="939.4691" magical="853.40152173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="939.4691" magical="853.40152173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1962.8235" magical="3271.3725" />
 			<speed>
 				<walk ground="60" />
@@ -117,7 +117,7 @@
 		<acquire exp="168844" sp="5065" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="4120.56" mpRegen="3" />
-			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2103.00075" magical="3505.00125" />
 			<speed>
 				<walk ground="45" />
@@ -169,7 +169,7 @@
 		<acquire exp="190141" sp="5704" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2940.744352" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2041.6032" magical="3402.672" />
 			<speed>
 				<walk ground="80" />
@@ -3393,7 +3393,7 @@
 		<acquire exp="141914" sp="4257" attributeExp="1134" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.5997675" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1701.32175" magical="2835.53625" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20900-20999.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20900-20999.xml
index 3f2c73ee05..ca001c8469 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20900-20999.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/20900-20999.xml
@@ -5167,7 +5167,7 @@
 		<acquire exp="187075" sp="5612" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="3104.58" mpRegen="3" />
-			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2041.6032" magical="3402.672" />
 			<speed>
 				<walk ground="45" />
@@ -5217,7 +5217,7 @@
 		<equipment rhand="94" /> <!-- Bec de Corbin -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="3104.58" mpRegen="3" />
-			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2103.00075" magical="3505.00125" />
 			<speed>
 				<walk ground="80" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/21300-21399.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/21300-21399.xml
index 660b8c9eec..93f74ab36f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/21300-21399.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/21300-21399.xml
@@ -6,7 +6,7 @@
 		<acquire exp="680551" sp="10208" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -51,7 +51,7 @@
 		<acquire exp="1355598" sp="20333" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -79,7 +79,7 @@
 		<acquire exp="680551" sp="20416" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -126,7 +126,7 @@
 		<acquire exp="1355598" sp="40667" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/21400-21499.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/21400-21499.xml
index 35ebfeb7d8..24ff8a606d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/21400-21499.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/21400-21499.xml
@@ -6,7 +6,7 @@
 		<acquire exp="993837" sp="14907" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -53,7 +53,7 @@
 		<acquire exp="1943222" sp="29148" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -78,7 +78,7 @@
 		<acquire exp="993837" sp="14907" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="37" />
@@ -125,7 +125,7 @@
 		<acquire exp="1980478" sp="29707" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="37" />
@@ -152,7 +152,7 @@
 		<acquire exp="993837" sp="14907" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -199,7 +199,7 @@
 		<acquire exp="1980478" sp="29707" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -227,7 +227,7 @@
 		<acquire exp="691558" sp="10373" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="40" />
@@ -268,7 +268,7 @@
 		<acquire exp="1375920" sp="20638" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="40" />
@@ -295,7 +295,7 @@
 		<acquire exp="708492" sp="10627" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="50" />
@@ -339,7 +339,7 @@
 		<acquire exp="1387139" sp="20807" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="50" />
@@ -367,7 +367,7 @@
 		<acquire exp="1010772" sp="15161" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -410,7 +410,7 @@
 		<acquire exp="1991697" sp="29875" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -439,7 +439,7 @@
 		<acquire exp="993837" sp="14907" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="37" />
@@ -480,7 +480,7 @@
 		<acquire exp="1980478" sp="29707" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="37" />
@@ -508,7 +508,7 @@
 		<acquire exp="758237" sp="11373" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="80" />
@@ -548,7 +548,7 @@
 		<acquire exp="1397934" sp="20969" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="80" />
@@ -575,7 +575,7 @@
 		<acquire exp="789989" sp="11849" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="39" />
@@ -617,7 +617,7 @@
 		<acquire exp="1442599" sp="21638" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="39" />
@@ -646,7 +646,7 @@
 		<acquire exp="705317" sp="10579" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="27" />
@@ -686,7 +686,7 @@
 		<acquire exp="1388620" sp="20829" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="27" />
@@ -713,7 +713,7 @@
 		<acquire exp="1330194" sp="19952" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="41" />
@@ -750,7 +750,7 @@
 		<acquire exp="2640882" sp="39613" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="41" />
@@ -776,7 +776,7 @@
 		<acquire exp="767945" sp="11519" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="80" />
@@ -816,7 +816,7 @@
 		<acquire exp="1430983" sp="21464" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="80" />
@@ -843,7 +843,7 @@
 		<acquire exp="1059474" sp="15892" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="41" />
@@ -881,7 +881,7 @@
 		<acquire exp="2076464" sp="31146" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="41" />
@@ -907,7 +907,7 @@
 		<acquire exp="1059474" sp="15892" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -945,7 +945,7 @@
 		<acquire exp="2076464" sp="31146" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -971,7 +971,7 @@
 		<acquire exp="1357938" sp="20369" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -1010,7 +1010,7 @@
 		<acquire exp="2673394" sp="40100" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -1038,7 +1038,7 @@
 		<acquire exp="1452658" sp="21789" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="35" />
@@ -1077,7 +1077,7 @@
 		<acquire exp="2697670" sp="40465" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="35" />
@@ -1103,7 +1103,7 @@
 		<acquire exp="2878656" sp="43179" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1146,7 +1146,7 @@
 		<acquire exp="2669276" sp="40039" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1188,7 +1188,7 @@
 		<acquire exp="3792041" sp="56880" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -1229,7 +1229,7 @@
 		<acquire exp="1701921" sp="25528" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="39" />
@@ -1272,7 +1272,7 @@
 		<acquire exp="1701921" sp="25528" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="39" />
@@ -1314,7 +1314,7 @@
 		<acquire exp="2056090" sp="30841" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1340,7 +1340,7 @@
 		<acquire exp="702678" sp="10540" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="16911.39829" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="40" />
@@ -1364,7 +1364,7 @@
 		<acquire exp="702678" sp="10540" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="16911.39829" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="40" />
@@ -1387,7 +1387,7 @@
 		<acquire exp="702678" sp="10540" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="16911.39829" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="15" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/21600-21699.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/21600-21699.xml
index f7b5096ea3..6d2f41db0f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/21600-21699.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/21600-21699.xml
@@ -2716,7 +2716,7 @@
 		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
-			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="22" />
@@ -2773,7 +2773,7 @@
 		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
-			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="60" />
@@ -2810,7 +2810,7 @@
 		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
-			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="80" />
@@ -2858,7 +2858,7 @@
 		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
-			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="80" />
@@ -2905,7 +2905,7 @@
 		<acquire exp="2711" sp="82" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1201.434" hpRegen="5.5" mp="650.16" mpRegen="2.1" />
-			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="173.43552" magical="126.91259" />
 			<speed>
 				<walk ground="100" />
@@ -2954,7 +2954,7 @@
 		<acquire exp="2835" sp="86" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1248.276" hpRegen="5.5" mp="679.056" mpRegen="2.1" />
-			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="177.78746" magical="130.09715" />
 			<speed>
 				<walk ground="45" />
@@ -3003,7 +3003,7 @@
 		<acquire exp="2963" sp="89" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1297.017" hpRegen="5.5" mp="708.855" mpRegen="2.1" />
-			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="182.18816" magical="133.31739" />
 			<speed>
 				<walk ground="80" />
@@ -3052,7 +3052,7 @@
 		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
-			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="27" />
@@ -3101,7 +3101,7 @@
 		<acquire exp="3226" sp="97" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1396.398" hpRegen="5.5" mp="770.259" mpRegen="2.1" />
-			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="191.12803" magical="139.8592" />
 			<speed>
 				<walk ground="60" />
@@ -3145,7 +3145,7 @@
 		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
-			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="80" />
@@ -3232,7 +3232,7 @@
 		<acquire exp="3362" sp="101" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1447.038" hpRegen="5.5" mp="800.961" mpRegen="2.1" />
-			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="195.66302" magical="143.17771" />
 			<speed>
 				<walk ground="70" />
@@ -3630,7 +3630,7 @@
 		<acquire exp="124807" sp="3744" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2423.3825125" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="808.61705" magical="731.48967391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="808.61705" magical="731.48967391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1682.42625" magical="2804.04375" />
 			<speed>
 				<walk ground="25" />
@@ -3679,7 +3679,7 @@
 		<acquire exp="127803" sp="3834" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2103.00075" magical="3505.00125" />
 			<attribute>
 				<attack type="FIRE" value="100" />
@@ -3727,7 +3727,7 @@
 		<acquire exp="163526" sp="4905" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="3104.58" mpRegen="3" />
-			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2103.00075" magical="3505.00125" />
 			<speed>
 				<walk ground="25" />
@@ -3768,7 +3768,7 @@
 		<acquire exp="168076" sp="5042" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2908.034384" hpRegen="8.5" mp="3415.215" mpRegen="3" />
-			<attack physical="965.63552" magical="877.78017391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="965.63552" magical="877.78017391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2018.8944" magical="3364.824" />
 			<speed>
 				<walk ground="37" />
@@ -3809,7 +3809,7 @@
 		<acquire exp="172838" sp="5185" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2908.034384" hpRegen="8.5" mp="3415.215" mpRegen="3" />
-			<attack physical="965.63552" magical="877.78017391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="965.63552" magical="877.78017391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2018.8944" magical="3364.824" />
 			<speed>
 				<walk ground="45" />
@@ -3851,7 +3851,7 @@
 		<acquire exp="206169" sp="6185" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2827.269335" hpRegen="8.5" mp="3753.285" mpRegen="3" />
-			<attack physical="939.4691" magical="853.40152173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="939.4691" magical="853.40152173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1962.8235" magical="3271.3725" />
 			<speed>
 				<walk ground="45" />
@@ -3894,7 +3894,7 @@
 		<acquire exp="178288" sp="5348" attributeExp="1134" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.5997675" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1701.32175" magical="2835.53625" />
 			<speed>
 				<walk ground="40" />
@@ -3936,7 +3936,7 @@
 		<acquire exp="181044" sp="5431" attributeExp="1134" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3063.234315" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1016.2039" magical="924.62673913043" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1016.2039" magical="924.62673913043" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2126.6415" magical="3544.4025" />
 			<speed>
 				<walk ground="80" />
@@ -3973,7 +3973,7 @@
 		<acquire exp="172383" sp="5171" attributeExp="1134" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.5997675" hpRegen="8.5" mp="3828.51" mpRegen="3" />
-			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1701.32175" magical="2835.53625" />
 			<speed>
 				<walk ground="70" />
@@ -4006,7 +4006,7 @@
 		<acquire exp="222900" sp="6687" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2940.744352" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2041.6032" magical="3402.672" />
 			<speed>
 				<walk ground="23" />
@@ -4048,7 +4048,7 @@
 		<acquire exp="227862" sp="6835" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2859.043325" hpRegen="8.5" mp="3166.53" mpRegen="3" />
-			<attack physical="950.0497" magical="862.99239130435" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="950.0497" magical="862.99239130435" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1984.8825" magical="3308.1375" />
 			<speed>
 				<walk ground="13" />
@@ -4090,7 +4090,7 @@
 		<acquire exp="222497" sp="6674" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2859.043325" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="950.0497" magical="862.99239130435" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="950.0497" magical="862.99239130435" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1984.8825" magical="3308.1375" />
 			<attribute>
 				<attack type="DARK" value="100" />
@@ -4134,7 +4134,7 @@
 		<acquire exp="40651" sp="1219" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1380.32124" hpRegen="8.5" mp="2629.335" mpRegen="3" />
-			<attack physical="469.5384" magical="416.6452173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="469.5384" magical="416.6452173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="958.284" magical="1597.14" />
 			<attribute>
 				<attack type="DARK" value="100" />
@@ -4174,7 +4174,7 @@
 		<acquire exp="79188" sp="2375" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1399.77973" hpRegen="8.5" mp="2683.32" mpRegen="3" />
-			<attack physical="476.129" magical="422.51869565217" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="476.129" magical="422.51869565217" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="971.793" magical="1619.655" />
 			<speed>
 				<walk ground="37" />
@@ -4201,7 +4201,7 @@
 		<acquire exp="82030" sp="2460" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.868755" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="482.5999" magical="428.28065217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.5999" magical="428.28065217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.0455" magical="1641.7425" />
 			<speed>
 				<walk ground="41" />
@@ -4229,7 +4229,7 @@
 		<acquire exp="52115" sp="1563" attributeExp="770" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.99191" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.131" magical="1641.885" />
 			<speed>
 				<walk ground="35" />
@@ -4275,7 +4275,7 @@
 		<acquire exp="50479" sp="1514" attributeExp="770" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.72623" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="488.6718" magical="433.67086956522" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="488.6718" magical="433.67086956522" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="997.443" magical="1662.405" />
 			<speed>
 				<walk ground="57" />
@@ -4439,7 +4439,7 @@
 		<acquire exp="94946" sp="2848" attributeExp="858" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.849385" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="482.5999" magical="428.28065217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.5999" magical="428.28065217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.0455" magical="1641.7425" />
 			<speed>
 				<walk ground="41" />
@@ -4467,7 +4467,7 @@
 		<acquire exp="95603" sp="2868" attributeExp="858" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1009.413" magical="1682.355" />
 			<speed>
 				<walk ground="57" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/21700-21799.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/21700-21799.xml
index 9ca5fe87cf..5d10dcf155 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/21700-21799.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/21700-21799.xml
@@ -1278,7 +1278,7 @@
 		<acquire exp="266169" sp="7186" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.9098066667" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="60" />
@@ -1381,7 +1381,7 @@
 		<acquire exp="1772332" sp="47852" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2758.7130516667" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="60" />
@@ -2511,7 +2511,7 @@
 		<acquire exp="240547" sp="7216" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1009.413" magical="1682.355" />
 			<speed>
 				<walk ground="39" />
@@ -2543,7 +2543,7 @@
 		<acquire exp="374272" sp="11228" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.6202933333" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="817.728" magical="739.71130434783" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="817.728" magical="739.71130434783" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1701.336" magical="2835.56" />
 			<speed>
 				<walk ground="13" />
@@ -2957,7 +2957,7 @@
 		<acquire exp="101142" sp="3034" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2423.44409" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="54" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/24000-24099.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/24000-24099.xml
index a6398ea53b..4af39f870f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/24000-24099.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/24000-24099.xml
@@ -441,7 +441,7 @@
 		<acquire exp="39238" sp="1177" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1360.493285" hpRegen="8.5" mp="2574.465" mpRegen="3" />
-			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="328.27073" magical="240.21427" />
 			<speed>
 				<walk ground="27" />
@@ -704,7 +704,7 @@
 		<acquire exp="129880" sp="3896" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1360.493285" hpRegen="8.5" mp="2574.465" mpRegen="3" />
-			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="328.27073" magical="240.21427" />
 			<speed>
 				<walk ground="27" />
@@ -1595,7 +1595,7 @@
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="314.65987" magical="230.25444" />
 			<hitTime>840</hitTime>
 		</stats>
@@ -1614,7 +1614,7 @@
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1620.4119125" hpRegen="8.5" mp="2412.51" mpRegen="3" />
-			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="314.65987" magical="230.25444" />
 			<speed>
 				<walk ground="30" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/25200-25299.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/25200-25299.xml
index f7b5d76a40..365716169f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/25200-25299.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/25200-25299.xml
@@ -4001,7 +4001,7 @@
 		<acquire exp="1008600000" sp="30258000" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="53409375" hpRegen="319.2293199" mp="31191.426" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="45" />
@@ -4215,7 +4215,7 @@
 		<acquire exp="1008600000" sp="30258000" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="53409375" hpRegen="319.2293199" mp="31191.426" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/25700-25799.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/25700-25799.xml
index 6e17ec8cd3..447f2ab9fc 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/25700-25799.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/25700-25799.xml
@@ -72,7 +72,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="45" />
@@ -137,7 +137,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="50" />
@@ -241,7 +241,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="30" />
@@ -305,7 +305,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="90" />
@@ -369,7 +369,7 @@
 		<acquire exp="52925400" sp="1587762" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="420467.42646" hpRegen="178.4276342" mp="515402.76" mpRegen="2.4" />
-			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1495.843372" magical="729.7418166" />
 			<speed>
 				<walk ground="60" />
@@ -416,7 +416,7 @@
 		<acquire exp="52925400" sp="1587762" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="420467.42646" hpRegen="178.4276342" mp="515402.76" mpRegen="2.4" />
-			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1495.843372" magical="729.7418166" />
 			<speed>
 				<walk ground="24" />
@@ -462,7 +462,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="50" />
@@ -529,7 +529,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="40" />
@@ -596,7 +596,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="50" />
@@ -663,7 +663,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="60" />
@@ -731,7 +731,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="60" />
@@ -799,7 +799,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="40" />
@@ -906,7 +906,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="13" />
@@ -952,7 +952,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="39" />
@@ -998,7 +998,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="80" />
@@ -1044,7 +1044,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="39" />
@@ -1090,7 +1090,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="50" />
@@ -1136,7 +1136,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="60" />
@@ -1182,7 +1182,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="25" />
@@ -1228,7 +1228,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="45" />
@@ -1275,7 +1275,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="79" />
@@ -1321,7 +1321,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="60" />
@@ -1407,7 +1407,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="45" />
@@ -1485,7 +1485,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="52" />
@@ -1563,7 +1563,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="38" />
@@ -1641,7 +1641,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="40" />
@@ -1720,7 +1720,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="30" />
@@ -1818,7 +1818,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -1896,7 +1896,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -1974,7 +1974,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -2052,7 +2052,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -2130,7 +2130,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="42" />
@@ -2209,7 +2209,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="48" />
@@ -2307,7 +2307,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="60" />
@@ -2370,7 +2370,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="50" />
@@ -2433,7 +2433,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="50" />
@@ -2496,7 +2496,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="55" />
@@ -2559,7 +2559,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="55" />
@@ -2622,7 +2622,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="55" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/29000-29099.xml
index 880d53b8e8..b955ee8326 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/29000-29099.xml
@@ -11,8 +11,8 @@
 		<sex>FEMALE</sex>
 		<acquire exp="2179535" sp="65386" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="214133.04684" hpRegen="85.09694484" mp="509.76" mpRegen="1.8" />
-			<attack physical="105" magical="8" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="386384" hpRegen="208" mp="300.8" mpRegen="2.1" />
+			<attack physical="105" magical="8" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1252" magical="229" />
 			<speed>
 				<walk ground="80" />
@@ -21,11 +21,9 @@
 			<hitTime>370</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4019" level="1" /> <!-- Decrease Speed -->
-			<skill id="4021" level="1" /> <!-- Queen Ant -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -34,8 +32,11 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4021" level="1" /> <!-- Queen Ant -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4017" level="1" /> <!-- Queen Ant's Blow -->
+			<skill id="4018" level="1" /> <!-- Decrease Speed -->
+			<skill id="4019" level="1" /> <!-- Decrease Speed -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -50,118 +51,147 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="915" min="1" max="1" chance="34.81" /> <!-- Aquastone Necklace -->
-				<item id="914" min="1" max="1" chance="34.49" /> <!-- Dark Necklace -->
-				<item id="851" min="1" max="3" chance="34.18" /> <!-- Onyx Beast's Eye Earring -->
-				<item id="882" min="1" max="3" chance="33.98" /> <!-- Mithril Ring -->
-				<item id="884" min="1" max="3" chance="33.82" /> <!-- Ring of Protection -->
-				<item id="916" min="1" max="1" chance="33.3" /> <!-- Necklace of Protection -->
-				<item id="853" min="1" max="3" chance="33.09" /> <!-- Earring of Protection -->
-				<item id="883" min="1" max="3" chance="32.76" /> <!-- Aquastone Ring -->
-				<item id="2496" min="1" max="1" chance="32.23" /> <!-- Dwarven Chain Shield -->
-				<item id="355" min="1" max="1" chance="32.2" /> <!-- Dwarven Chain Mail Shirt -->
-				<item id="852" min="1" max="3" chance="32.13" /> <!-- Moonstone Earring -->
-				<item id="382" min="1" max="1" chance="31.77" /> <!-- Dwarven Chain Gaiters -->
-				<item id="399" min="1" max="1" chance="26.09" /> <!-- Rind Leather Armor -->
-				<item id="419" min="1" max="1" chance="25.86" /> <!-- Rind Leather Gaiters -->
-				<item id="500" min="1" max="1" chance="25.01" /> <!-- Great Helmet -->
-				<item id="440" min="1" max="1" chance="24.69" /> <!-- Robe of Seal -->
-				<item id="6660" min="1" max="1" chance="20.99" /> <!-- Queen Ant's Ring -->
-				<item id="1126" min="1" max="3" chance="17.27" /> <!-- Crimson Boots -->
-				<item id="418" min="1" max="1" chance="17.23" /> <!-- Plated Leather Gaiters -->
-				<item id="398" min="1" max="1" chance="16.98" /> <!-- Plated Leather Armor -->
-				<item id="2455" min="1" max="3" chance="16.87" /> <!-- Plated Leather Gloves -->
-				<item id="632" min="1" max="3" chance="16.77" /> <!-- Knight's Shield -->
-				<item id="498" min="1" max="3" chance="16.02" /> <!-- Steel Plate Helmet -->
-				<item id="70" min="1" max="1" chance="7.207" /> <!-- Claymore -->
-				<item id="396" min="1" max="1" chance="7.2" /> <!-- Salamander Skin Mail -->
-				<item id="187" min="1" max="1" chance="7.2" /> <!-- Atuba Hammer -->
-				<item id="607" min="1" max="3" chance="7.198" /> <!-- Ogre Power Gauntlets -->
-				<item id="225" min="1" max="1" chance="7.189" /> <!-- Mithril Dagger -->
-				<item id="1125" min="1" max="3" chance="7.183" /> <!-- Assault Boots -->
-				<item id="2428" min="1" max="3" chance="7.183" /> <!-- Plate Boots -->
-				<item id="320" min="1" max="1" chance="7.174" /> <!-- Blue Crystal Skull -->
-				<item id="322" min="1" max="1" chance="7.174" /> <!-- Vajra Wand -->
-				<item id="630" min="1" max="3" chance="7.174" /> <!-- Square Shield -->
-				<item id="280" min="1" max="1" chance="7.17" /> <!-- Light Crossbow -->
-				<item id="438" min="1" max="3" chance="7.161" /> <!-- Sage's Rags -->
-				<item id="159" min="1" max="1" chance="7.137" /> <!-- Bonebreaker -->
-				<item id="321" min="1" max="1" chance="7.13" /> <!-- Demon's Fangs -->
-				<item id="497" min="1" max="3" chance="7.113" /> <!-- Chain Helmet -->
-				<item id="2451" min="1" max="3" chance="7.112" /> <!-- Sage's Worn Gloves -->
-				<item id="2427" min="1" max="3" chance="7.109" /> <!-- Salamander Skin Boots -->
-				<item id="353" min="1" max="1" chance="7.105" /> <!-- Half Plate Armor -->
-				<item id="380" min="1" max="1" chance="7.101" /> <!-- Plate Gaiters -->
-				<item id="297" min="1" max="1" chance="7.099" /> <!-- Glaive -->
-				<item id="188" min="1" max="1" chance="7.099" /> <!-- Ghost Staff -->
-				<item id="2412" min="1" max="3" chance="7.096" /> <!-- Plate Helmet -->
-				<item id="190" min="1" max="1" chance="7.094" /> <!-- Atuba Mace -->
-				<item id="61" min="1" max="3" chance="7.093" /> <!-- Mithril Gloves -->
-				<item id="262" min="1" max="1" chance="7.091" /> <!-- Scallop Jamadhr -->
-				<item id="189" min="1" max="1" chance="7.08" /> <!-- Staff of Life -->
-				<item id="2499" min="1" max="1" chance="7.068" /> <!-- Elven Long Sword -->
-				<item id="2494" min="1" max="3" chance="7.019" /> <!-- Plate Shield -->
-				<item id="94" min="1" max="1" chance="6.428" /> <!-- Bec de Corbin -->
-				<item id="242" min="1" max="1" chance="6.419" /> <!-- Soulfire Dirk -->
-				<item id="73" min="1" max="1" chance="6.405" /> <!-- Shamshir -->
-				<item id="227" min="1" max="1" chance="6.364" /> <!-- Stiletto -->
-				<item id="282" min="1" max="1" chance="6.35" /> <!-- Elemental Bow -->
-				<item id="131" min="1" max="1" chance="6.332" /> <!-- Spirit Sword -->
-				<item id="133" min="1" max="1" chance="6.315" /> <!-- Raid Sword -->
-				<item id="195" min="1" max="1" chance="6.312" /> <!-- Cursed Staff -->
-				<item id="285" min="1" max="1" chance="6.311" /> <!-- Noble Elven Bow -->
-				<item id="325" min="1" max="1" chance="6.31" /> <!-- Horn of Glory -->
-				<item id="74" min="1" max="1" chance="6.298" /> <!-- Katana -->
-				<item id="631" min="1" max="3" chance="5.655" /> <!-- Eldarake -->
-				<item id="302" min="1" max="1" chance="5.651" /> <!-- Body Slasher -->
-				<item id="191" min="1" max="1" chance="5.62" /> <!-- Heavy Doom Hammer -->
-				<item id="354" min="1" max="1" chance="5.616" /> <!-- Chain Mail Shirt -->
-				<item id="2431" min="1" max="3" chance="5.612" /> <!-- Plated Leather Boots -->
-				<item id="2433" min="1" max="3" chance="5.612" /> <!-- Boots of Seal -->
-				<item id="160" min="1" max="1" chance="5.607" /> <!-- Battle Axe -->
-				<item id="2452" min="1" max="3" chance="5.602" /> <!-- Reinforced Mithril Gloves -->
-				<item id="230" min="1" max="1" chance="5.598" /> <!-- Needle Wolverine -->
-				<item id="2413" min="1" max="3" chance="5.596" /> <!-- Chain Hood -->
-				<item id="89" min="1" max="1" chance="5.596" /> <!-- Big Hammer -->
-				<item id="161" min="1" max="1" chance="5.592" /> <!-- Silver Axe -->
-				<item id="263" min="1" max="1" chance="5.591" /> <!-- Chakram -->
-				<item id="2432" min="1" max="3" chance="5.587" /> <!-- Dwarven Chain Boots -->
-				<item id="2454" min="1" max="3" chance="5.575" /> <!-- Karmian Gloves -->
-				<item id="173" min="1" max="1" chance="5.574" /> <!-- Skull Graver -->
-				<item id="62" min="1" max="3" chance="5.573" /> <!-- Reinforced Mithril Boots -->
-				<item id="2495" min="1" max="3" chance="5.573" /> <!-- Chain Shield -->
-				<item id="281" min="1" max="1" chance="5.57" /> <!-- Crystallized Ice Bow -->
-				<item id="2453" min="1" max="3" chance="5.57" /> <!-- Chain Gloves -->
-				<item id="71" min="1" max="1" chance="5.561" /> <!-- Flamberge -->
-				<item id="439" min="1" max="1" chance="5.559" /> <!-- Karmian Tunic -->
-				<item id="72" min="1" max="1" chance="5.553" /> <!-- Stormbringer -->
-				<item id="226" min="1" max="1" chance="5.542" /> <!-- Cursed Dagger -->
-				<item id="298" min="1" max="1" chance="5.54" /> <!-- Orcish Glaive -->
-				<item id="471" min="1" max="1" chance="5.538" /> <!-- Karmian Stockings -->
-				<item id="397" min="1" max="1" chance="5.531" /> <!-- Reinforced Mithril Shirt -->
-				<item id="232" min="1" max="1" chance="5.525" /> <!-- Dark Elven Dagger -->
-				<item id="193" min="1" max="1" chance="5.525" /> <!-- Stick of Faith -->
-				<item id="192" min="1" max="1" chance="5.523" /> <!-- Crystal Staff -->
-				<item id="2429" min="1" max="3" chance="5.523" /> <!-- Chain Boots -->
-				<item id="2430" min="1" max="3" chance="5.523" /> <!-- Karmian Boots -->
-				<item id="2387" min="1" max="1" chance="5.519" /> <!-- Reinforced Mithril Gaiters -->
-				<item id="194" min="1" max="1" chance="5.518" /> <!-- Heavy Doom Axe -->
-				<item id="96" min="1" max="1" chance="5.504" /> <!-- Scythe -->
-				<item id="381" min="1" max="1" chance="5.48" /> <!-- Chain Gaiters -->
-				<item id="70000" min="76" max="228" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="91527" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (D-grade) -->
-				<item id="91534" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (D-grade) -->
-				<item id="91541" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (D-grade) -->
+				<group chance="100">
+					<item id="320" min="1" max="1" chance="7.15" /> <!-- Blue Crystal Skull -->
+					<item id="321" min="1" max="1" chance="7.15" /> <!-- Demon's Fangs -->
+					<item id="70" min="1" max="1" chance="7.15" /> <!-- Claymore -->
+					<item id="159" min="1" max="1" chance="7.15" /> <!-- Bonebreaker -->
+					<item id="187" min="1" max="1" chance="7.15" /> <!-- Atuba Hammer -->
+					<item id="188" min="1" max="1" chance="7.15" /> <!-- Ghost Staff -->
+					<item id="189" min="1" max="1" chance="7.15" /> <!-- Staff of Life -->
+					<item id="190" min="1" max="1" chance="7.15" /> <!-- Atuba Mace -->
+					<item id="225" min="1" max="1" chance="7.15" /> <!-- Mithril Dagger -->
+					<item id="262" min="1" max="1" chance="7.15" /> <!-- Scallop Jamadhr -->
+					<item id="280" min="1" max="1" chance="7.15" /> <!-- Light Crossbow -->
+					<item id="297" min="1" max="1" chance="7.15" /> <!-- Glaive -->
+					<item id="322" min="1" max="1" chance="7.15" /> <!-- Vajra Wand -->
+					<item id="2499" min="1" max="1" chance="7.05" /> <!-- Elven Long Sword -->
+				</group>
+				<group chance="100">
+					<item id="438" min="1" max="3" chance="7.15" /> <!-- Sage's Rags -->
+					<item id="61" min="1" max="3" chance="7.15" /> <!-- Mithril Gloves -->
+					<item id="353" min="1" max="1" chance="7.15" /> <!-- Half Plate Armor -->
+					<item id="380" min="1" max="1" chance="7.15" /> <!-- Plate Gaiters -->
+					<item id="396" min="1" max="1" chance="7.15" /> <!-- Salamander Skin Mail -->
+					<item id="497" min="1" max="3" chance="7.15" /> <!-- Chain Helmet -->
+					<item id="607" min="1" max="3" chance="7.15" /> <!-- Ogre Power Gauntlets -->
+					<item id="630" min="1" max="3" chance="7.15" /> <!-- Square Shield -->
+					<item id="1125" min="1" max="3" chance="7.15" /> <!-- Assault Boots -->
+					<item id="2412" min="1" max="3" chance="7.15" /> <!-- Plate Helmet -->
+					<item id="2427" min="1" max="3" chance="7.15" /> <!-- Salamander Skin Boots -->
+					<item id="2428" min="1" max="3" chance="7.15" /> <!-- Plate Boots -->
+					<item id="2451" min="1" max="3" chance="7.15" /> <!-- Sage's Worn Gloves -->
+					<item id="2494" min="1" max="3" chance="7.05" /> <!-- Plate Shield -->
+				</group>
+				<group chance="100">
+					<item id="851" min="1" max="3" chance="33.33" /> <!-- Onyx Beast's Eye Earring -->
+					<item id="882" min="1" max="3" chance="33.33" /> <!-- Mithril Ring -->
+					<item id="914" min="1" max="1" chance="33.34" /> <!-- Dark Necklace -->
+				</group>
+				<group chance="100">
+					<item id="71" min="1" max="1" chance="5.55" /> <!-- Flamberge -->
+					<item id="72" min="1" max="1" chance="5.55" /> <!-- Stormbringer -->
+					<item id="89" min="1" max="1" chance="5.55" /> <!-- Big Hammer -->
+					<item id="96" min="1" max="1" chance="5.55" /> <!-- Scythe -->
+					<item id="160" min="1" max="1" chance="5.55" /> <!-- Battle Axe -->
+					<item id="161" min="1" max="1" chance="5.55" /> <!-- Silver Axe -->
+					<item id="173" min="1" max="1" chance="5.55" /> <!-- Skull Graver -->
+					<item id="191" min="1" max="1" chance="5.55" /> <!-- Heavy Doom Hammer -->
+					<item id="192" min="1" max="1" chance="5.55" /> <!-- Crystal Staff -->
+					<item id="193" min="1" max="1" chance="5.55" /> <!-- Stick of Faith -->
+					<item id="194" min="1" max="1" chance="5.55" /> <!-- Heavy Doom Axe -->
+					<item id="226" min="1" max="1" chance="5.55" /> <!-- Cursed Dagger -->
+					<item id="230" min="1" max="1" chance="5.55" /> <!-- Needle Wolverine -->
+					<item id="232" min="1" max="1" chance="5.55" /> <!-- Dark Elven Dagger -->
+					<item id="263" min="1" max="1" chance="5.55" /> <!-- Chakram -->
+					<item id="281" min="1" max="1" chance="5.55" /> <!-- Crystallized Ice Bow -->
+					<item id="298" min="1" max="1" chance="5.55" /> <!-- Orcish Glaive -->
+					<item id="302" min="1" max="1" chance="5.65" /> <!-- Body Slasher -->
+				</group>
+				<group chance="100">
+					<item id="2387" min="1" max="1" chance="5.55" /> <!-- Reinforced Mithril Gaiters -->
+					<item id="2413" min="1" max="3" chance="5.55" /> <!-- Chain Hood -->
+					<item id="2429" min="1" max="3" chance="5.55" /> <!-- Chain Boots -->
+					<item id="2430" min="1" max="3" chance="5.55" /> <!-- Karmian Boots -->
+					<item id="2431" min="1" max="3" chance="5.55" /> <!-- Plated Leather Boots -->
+					<item id="2432" min="1" max="3" chance="5.55" /> <!-- Dwarven Chain Boots -->
+					<item id="2433" min="1" max="3" chance="5.55" /> <!-- Boots of Seal -->
+					<item id="2452" min="1" max="3" chance="5.55" /> <!-- Reinforced Mithril Gloves -->
+					<item id="2453" min="1" max="3" chance="5.55" /> <!-- Chain Gloves -->
+					<item id="2454" min="1" max="3" chance="5.55" /> <!-- Karmian Gloves -->
+					<item id="2495" min="1" max="3" chance="5.55" /> <!-- Chain Shield -->
+					<item id="62" min="1" max="3" chance="5.55" /> <!-- Reinforced Mithril Boots -->
+					<item id="354" min="1" max="1" chance="5.55" /> <!-- Chain Mail Shirt -->
+					<item id="381" min="1" max="1" chance="5.55" /> <!-- Chain Gaiters -->
+					<item id="397" min="1" max="1" chance="5.55" /> <!-- Reinforced Mithril Shirt -->
+					<item id="439" min="1" max="1" chance="5.55" /> <!-- Karmian Tunic -->
+					<item id="471" min="1" max="1" chance="5.55" /> <!-- Karmian Stockings -->
+					<item id="631" min="1" max="3" chance="5.65" /> <!-- Eldarake -->
+				</group>
+				<group chance="100">
+					<item id="852" min="1" max="3" chance="33.33" /> <!-- Moonstone Earring -->
+					<item id="883" min="1" max="3" chance="33.33" /> <!-- Aquastone Ring -->
+					<item id="915" min="1" max="1" chance="33.34" /> <!-- Aquastone Necklace -->
+				</group>
+				<group chance="70">
+					<item id="73" min="1" max="1" chance="9.09" /> <!-- Shamshir -->
+					<item id="74" min="1" max="1" chance="9.09" /> <!-- Katana -->
+					<item id="94" min="1" max="1" chance="9.09" /> <!-- Bec de Corbin -->
+					<item id="131" min="1" max="1" chance="9.09" /> <!-- Spirit Sword -->
+					<item id="133" min="1" max="1" chance="9.09" /> <!-- Raid Sword -->
+					<item id="195" min="1" max="1" chance="9.09" /> <!-- Cursed Staff -->
+					<item id="227" min="1" max="1" chance="9.09" /> <!-- Stiletto -->
+					<item id="242" min="1" max="1" chance="9.09" /> <!-- Soulfire Dirk -->
+					<item id="282" min="1" max="1" chance="9.09" /> <!-- Elemental Bow -->
+					<item id="285" min="1" max="1" chance="9.09" /> <!-- Noble Elven Bow -->
+					<item id="325" min="1" max="1" chance="9.1" /> <!-- Horn of Glory -->
+				</group>
+				<group chance="100">
+					<item id="355" min="1" max="1" chance="33.33" /> <!-- Dwarven Chain Mail Shirt -->
+					<item id="382" min="1" max="1" chance="33.33" /> <!-- Dwarven Chain Gaiters -->
+					<item id="2496" min="1" max="1" chance="33.34" /> <!-- Dwarven Chain Shield -->
+				</group>
+				<group chance="100">
+					<item id="399" min="1" max="1" chance="25" /> <!-- Rind Leather Armor -->
+					<item id="419" min="1" max="1" chance="25" /> <!-- Rind Leather Gaiters -->
+					<item id="440" min="1" max="1" chance="25" /> <!-- Robe of Seal -->
+					<item id="500" min="1" max="1" chance="25" /> <!-- Great Helmet -->
+				</group>
+				<group chance="100">
+					<item id="632" min="1" max="3" chance="16.66" /> <!-- Knight's Shield -->
+					<item id="1126" min="1" max="3" chance="16.66" /> <!-- Crimson Boots -->
+					<item id="498" min="1" max="3" chance="16.66" /> <!-- Steel Plate Helmet -->
+					<item id="398" min="1" max="1" chance="16.66" /> <!-- Plated Leather Armor -->
+					<item id="418" min="1" max="1" chance="16.66" /> <!-- Plated Leather Gaiters -->
+					<item id="2455" min="1" max="3" chance="16.7" /> <!-- Plated Leather Gloves -->
+				</group>
+				<group chance="100">
+					<item id="853" min="1" max="3" chance="33.33" /> <!-- Earring of Protection -->
+					<item id="884" min="1" max="3" chance="33.33" /> <!-- Ring of Protection -->
+					<item id="916" min="1" max="1" chance="33.34" /> <!-- Necklace of Protection -->
+				</group>
+				<group chance="20">
+					<item id="6660" min="1" max="1" chance="100" /> <!-- Queen Ant's Ring -->
+				</group>
+				<group chance="100">
+					<item id="91527" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (D-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91534" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (D-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91541" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (D-grade) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29002" level="29" type="Monster" name="Queen Ant Larva">
+	<npc id="29002" level="38" type="Monster" name="Queen Ant Larva">
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="591" hpRegen="3.5" mp="315" mpRegen="1.5" />
-			<attack physical="89.21" magical="59.01" random="30" critical="7" accuracy="40" attackSpeed="257" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="591.9" hpRegen="3.5" mp="315.1" mpRegen="1.5" />
+			<attack physical="89.21" magical="59.01" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.72" magical="84.16" />
 			<speed>
 				<walk ground="40" />
@@ -170,9 +200,9 @@
 			<hitTime>350</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="true" />
+		<status attackable="true" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -181,7 +211,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="4500" aggroRange="450">
@@ -198,9 +228,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4000" hpRegen="108" mp="402" mpRegen="1.8" />
-			<attack physical="637" magical="395" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="4000" hpRegen="108" mp="402.6" mpRegen="1.8" />
+			<attack physical="637" magical="395" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="547" magical="200" />
 			<speed>
 				<walk ground="40" />
@@ -209,9 +239,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -220,7 +250,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4020" level="1" /> <!-- Recovery -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
@@ -243,9 +273,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4343" hpRegen="115" mp="432" mpRegen="1.8" />
-			<attack physical="178" magical="27" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="4343" hpRegen="115" mp="432.7" mpRegen="1.8" />
+			<attack physical="178" magical="27" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="578" magical="211" />
 			<speed>
 				<walk ground="40" />
@@ -254,9 +284,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -265,7 +295,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="700" isAggressive="true">
@@ -287,9 +317,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="7051" hpRegen="122" mp="463" mpRegen="1.8" />
-			<attack physical="1190" magical="1074" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="7051" hpRegen="122" mp="463.3" mpRegen="1.8" />
+			<attack physical="1190" magical="1074" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="610" magical="223" />
 			<speed>
 				<walk ground="40" />
@@ -298,9 +328,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -309,7 +339,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="700" aggroRange="450">
@@ -334,18 +364,19 @@
 		<sex>MALE</sex>
 		<acquire exp="2041407" sp="61242" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="289902.43642" hpRegen="145.2219912" mp="2901.03" mpRegen="2.1" />
-			<attack physical="722.31" magical="1398.68" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="523103.852" hpRegen="441.65" mp="1708.8" mpRegen="20" />
+			<attack physical="722.31" magical="1398.68" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1602" magical="293" />
 			<speed>
 				<walk ground="50" />
 				<run ground="110" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -354,7 +385,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>10</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -369,85 +400,116 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="917" min="1" max="1" chance="33.35" /> <!-- Necklace of Mermaid -->
-				<item id="1149" min="1" max="3" chance="32.97" /> <!-- Shining Circlet -->
-				<item id="608" min="1" max="3" chance="32.46" /> <!-- Mithril Gauntlets -->
-				<item id="854" min="1" max="3" chance="32.43" /> <!-- Earring of Seal -->
-				<item id="885" min="1" max="3" chance="32.34" /> <!-- Ring of Ages -->
-				<item id="1127" min="1" max="3" chance="31.87" /> <!-- Forgotten Boots -->
-				<item id="2459" min="1" max="1" chance="25.94" /> <!-- Demon's Gloves -->
-				<item id="2460" min="1" max="1" chance="25.53" /> <!-- Theca Leather Gloves -->
-				<item id="472" min="1" max="1" chance="25.22" /> <!-- Demon's Stockings -->
-				<item id="2436" min="1" max="1" chance="25.13" /> <!-- Theca Leather Boots -->
-				<item id="441" min="1" max="1" chance="24.97" /> <!-- Demon's Tunic -->
-				<item id="420" min="1" max="1" chance="24.96" /> <!-- Theca Leather Gaiters -->
-				<item id="400" min="1" max="1" chance="24.4" /> <!-- Theca Leather Armor -->
-				<item id="2435" min="1" max="1" chance="24.39" /> <!-- Demon's Boots -->
-				<item id="107" min="1" max="3" chance="20.86" /> <!-- Compound Shield -->
-				<item id="499" min="1" max="3" chance="20.67" /> <!-- Mithril Helmet -->
-				<item id="2462" min="1" max="1" chance="20.56" /> <!-- Full Plate Gauntlets -->
-				<item id="356" min="1" max="1" chance="20.4" /> <!-- Full Plate Armor -->
-				<item id="1128" min="1" max="3" chance="20.31" /> <!-- Adamantite Boots -->
-				<item id="2438" min="1" max="1" chance="20.28" /> <!-- Full Plate Boots -->
-				<item id="2497" min="1" max="1" chance="20.24" /> <!-- Full Plate Shield -->
-				<item id="517" min="1" max="3" chance="20.03" /> <!-- Compound Helmet -->
-				<item id="2414" min="1" max="1" chance="19.98" /> <!-- Full Plate Helmet -->
-				<item id="64" min="1" max="1" chance="19.93" /> <!-- Compound Boots -->
-				<item id="6662" min="1" max="1" chance="19.92" /> <!-- Ring of Core -->
-				<item id="442" min="1" max="1" chance="19.84" /> <!-- Divine Tunic -->
-				<item id="603" min="1" max="3" chance="19.8" /> <!-- Divine Boots -->
-				<item id="103" min="1" max="3" chance="19.7" /> <!-- Tower Shield -->
-				<item id="2437" min="1" max="1" chance="19.62" /> <!-- Drake Leather Boots -->
-				<item id="60" min="1" max="1" chance="19.61" /> <!-- Compound Armor -->
-				<item id="401" min="1" max="1" chance="19.48" /> <!-- Drake Leather Armor -->
-				<item id="2461" min="1" max="1" chance="19.47" /> <!-- Drake Leather Gloves -->
-				<item id="2468" min="1" max="3" chance="19.27" /> <!-- Blessed Gloves -->
-				<item id="2463" min="1" max="1" chance="19.08" /> <!-- Divine Gloves -->
-				<item id="473" min="1" max="1" chance="19.05" /> <!-- Divine Stockings -->
-				<item id="888" min="1" max="3" chance="17.17" /> <!-- Blessed Ring -->
-				<item id="119" min="1" max="1" chance="17" /> <!-- Necklace of Seal -->
-				<item id="855" min="1" max="3" chance="16.98" /> <!-- Nassen's Earring -->
-				<item id="919" min="1" max="1" chance="16.94" /> <!-- Blessed Necklace -->
-				<item id="886" min="1" max="3" chance="16.11" /> <!-- Ring of Seal -->
-				<item id="857" min="1" max="3" chance="15.88" /> <!-- Holy Earring -->
-				<item id="206" min="1" max="1" chance="11.62" /> <!-- Demon's Staff -->
-				<item id="2503" min="1" max="1" chance="11.55" /> <!-- Yaksa Mace -->
-				<item id="286" min="1" max="1" chance="11.51" /> <!-- Eminence Bow -->
-				<item id="205" min="1" max="1" chance="11.44" /> <!-- Ghoul's Staff -->
-				<item id="266" min="1" max="1" chance="11.18" /> <!-- Great Pata -->
-				<item id="135" min="1" max="1" chance="11.05" /> <!-- Samurai Long Sword -->
-				<item id="228" min="1" max="1" chance="11.01" /> <!-- Crystal Dagger -->
-				<item id="299" min="1" max="1" chance="10.99" /> <!-- Orcish Poleaxe -->
-				<item id="204" min="1" max="1" chance="10.93" /> <!-- Deadman's Staff -->
-				<item id="303" min="1" max="1" chance="4.312" /> <!-- Widow Maker -->
-				<item id="95" min="1" max="1" chance="4.229" /> <!-- Poleaxe -->
-				<item id="203" min="1" max="1" chance="4.225" /> <!-- Pa'agrio Axe -->
-				<item id="162" min="1" max="1" chance="4.223" /> <!-- War Axe -->
-				<item id="283" min="1" max="1" chance="4.212" /> <!-- Akat Longbow -->
-				<item id="77" min="1" max="1" chance="4.211" /> <!-- Tsurugi -->
-				<item id="145" min="1" max="1" chance="4.208" /> <!-- Sword of Whispering Death -->
-				<item id="134" min="1" max="1" chance="4.201" /> <!-- Sword of Nightmare -->
-				<item id="197" min="1" max="1" chance="4.2" /> <!-- Paradia Staff -->
-				<item id="76" min="1" max="1" chance="4.195" /> <!-- Sword of Delusion -->
-				<item id="84" min="1" max="1" chance="4.185" /> <!-- Homunkulus' Sword -->
-				<item id="198" min="1" max="1" chance="4.183" /> <!-- Inferno Staff -->
-				<item id="174" min="1" max="1" chance="4.173" /> <!-- Nirvana Axe -->
-				<item id="132" min="1" max="1" chance="4.163" /> <!-- Ultimate Sword -->
-				<item id="196" min="1" max="1" chance="4.159" /> <!-- Stick of Eternity -->
-				<item id="233" min="1" max="1" chance="4.154" /> <!-- Dark Screamer -->
-				<item id="202" min="1" max="1" chance="4.151" /> <!-- Mace of Underworld -->
-				<item id="201" min="1" max="1" chance="4.146" /> <!-- Club of Nature -->
-				<item id="301" min="1" max="1" chance="4.143" /> <!-- Scorpion -->
-				<item id="200" min="1" max="1" chance="4.139" /> <!-- Sage's Staff -->
-				<item id="75" min="1" max="1" chance="4.127" /> <!-- Caliburs -->
-				<item id="199" min="1" max="1" chance="4.127" /> <!-- Pa'agrio Hammer -->
-				<item id="231" min="1" max="1" chance="4.111" /> <!-- Grace Dagger -->
-				<item id="265" min="1" max="1" chance="4.099" /> <!-- Fisted Blade -->
-				<item id="70000" min="297" max="891" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="91529" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (C-grade) -->
-				<item id="91536" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (C-grade) -->
-				<item id="91543" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (C-grade) -->
-				<item id="8620" min="1" max="3" chance="49.64" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				<group chance="100">
+					<item id="75" min="1" max="1" chance="4.16" /> <!-- Caliburs -->
+					<item id="76" min="1" max="1" chance="4.16" /> <!-- Sword of Delusion -->
+					<item id="77" min="1" max="1" chance="4.16" /> <!-- Tsurugi -->
+					<item id="84" min="1" max="1" chance="4.16" /> <!-- Homunkulus' Sword -->
+					<item id="95" min="1" max="1" chance="4.16" /> <!-- Poleaxe -->
+					<item id="132" min="1" max="1" chance="4.16" /> <!-- Ultimate Sword -->
+					<item id="134" min="1" max="1" chance="4.16" /> <!-- Sword of Nightmare -->
+					<item id="145" min="1" max="1" chance="4.16" /> <!-- Sword of Whispering Death -->
+					<item id="162" min="1" max="1" chance="4.16" /> <!-- War Axe -->
+					<item id="174" min="1" max="1" chance="4.16" /> <!-- Nirvana Axe -->
+					<item id="196" min="1" max="1" chance="4.16" /> <!-- Stick of Eternity -->
+					<item id="197" min="1" max="1" chance="4.16" /> <!-- Paradia Staff -->
+					<item id="198" min="1" max="1" chance="4.16" /> <!-- Inferno Staff -->
+					<item id="199" min="1" max="1" chance="4.16" /> <!-- Pa'agrio Hammer -->
+					<item id="200" min="1" max="1" chance="4.16" /> <!-- Sage's Staff -->
+					<item id="201" min="1" max="1" chance="4.16" /> <!-- Club of Nature -->
+					<item id="202" min="1" max="1" chance="4.16" /> <!-- Mace of Underworld -->
+					<item id="231" min="1" max="1" chance="4.16" /> <!-- Grace Dagger -->
+					<item id="233" min="1" max="1" chance="4.16" /> <!-- Dark Screamer -->
+					<item id="265" min="1" max="1" chance="4.16" /> <!-- Fisted Blade -->
+					<item id="283" min="1" max="1" chance="4.16" /> <!-- Akat Longbow -->
+					<item id="203" min="1" max="1" chance="4.16" /> <!-- Pa'agrio Axe -->
+					<item id="301" min="1" max="1" chance="4.16" /> <!-- scorpion -->
+					<item id="303" min="1" max="1" chance="4.32" /> <!-- Widow Maker -->
+				</group>
+				<group chance="100">
+					<item id="60" min="1" max="1" chance="20" /> <!-- Compound Armor -->
+					<item id="64" min="1" max="1" chance="20" /> <!-- Compound Boots -->
+					<item id="103" min="1" max="3" chance="20" /> <!-- Tower Shield -->
+					<item id="107" min="1" max="3" chance="20" /> <!-- Compound Shield -->
+					<item id="517" min="1" max="3" chance="20" /> <!-- Compound Helmet -->
+				</group>
+				<group chance="100">
+					<item id="608" min="1" max="3" chance="33.33" /> <!-- Mithril Gauntlets -->
+					<item id="1127" min="1" max="3" chance="33.33" /> <!-- Forgotten Boots -->
+					<item id="1149" min="1" max="3" chance="33.34" /> <!-- Shining Circlet -->
+				</group>
+				<group chance="100">
+					<item id="400" min="1" max="1" chance="25" /> <!-- Theca Leather Armor -->
+					<item id="420" min="1" max="1" chance="25" /> <!-- Theca Leather Gaiters -->
+					<item id="2436" min="1" max="1" chance="25" /> <!-- Theca Leather Boots -->
+					<item id="2460" min="1" max="1" chance="25" /> <!-- Theca Leather Gloves -->
+				</group>
+				<group chance="100">
+					<item id="441" min="1" max="1" chance="25" /> <!-- Demon's Tunic -->
+					<item id="472" min="1" max="1" chance="25" /> <!-- Demon's Stockings -->
+					<item id="2435" min="1" max="1" chance="25" /> <!-- Demon's Boots -->
+					<item id="2459" min="1" max="1" chance="25" /> <!-- Demon's Gloves -->
+				</group>
+				<group chance="100">
+					<item id="854" min="1" max="3" chance="33.33" /> <!-- Earring of Seal -->
+					<item id="885" min="1" max="3" chance="33.33" /> <!-- Ring of Ages -->
+					<item id="917" min="1" max="1" chance="33.34" /> <!-- Necklace of Mermaid -->
+				</group>
+				<group chance="100">
+					<item id="135" min="1" max="1" chance="11.11" /> <!-- Samurai Long Sword -->
+					<item id="204" min="1" max="1" chance="11.11" /> <!-- Deadman's Staff -->
+					<item id="205" min="1" max="1" chance="11.11" /> <!-- Ghoul's Staff -->
+					<item id="206" min="1" max="1" chance="11.11" /> <!-- Demon's Staff -->
+					<item id="228" min="1" max="1" chance="11.11" /> <!-- Crystal Dagger -->
+					<item id="266" min="1" max="1" chance="11.11" /> <!-- Great Pata -->
+					<item id="286" min="1" max="1" chance="11.11" /> <!-- Eminence Bow -->
+					<item id="299" min="1" max="1" chance="11.11" /> <!-- Orcish Poleaxe -->
+					<item id="2503" min="1" max="1" chance="11.12" /> <!-- Yaksa Mace -->
+				</group>
+				<group chance="100">
+					<item id="356" min="1" max="1" chance="20" /> <!-- Full Plate Armor -->
+					<item id="2414" min="1" max="1" chance="20" /> <!-- Full Plate Helmet -->
+					<item id="2438" min="1" max="1" chance="20" /> <!-- Full Plate Boots -->
+					<item id="2462" min="1" max="1" chance="20" /> <!-- Full Plate Gauntlets -->
+					<item id="2497" min="1" max="1" chance="20" /> <!-- Full Plate Shield -->
+				</group>
+				<group chance="100">
+					<item id="401" min="1" max="1" chance="20" /> <!-- Drake Leather Armor -->
+					<item id="2437" min="1" max="1" chance="20" /> <!-- Drake Leather Boots -->
+					<item id="2461" min="1" max="1" chance="20" /> <!-- Drake Leather Gloves -->
+					<item id="499" min="1" max="3" chance="20" /> <!-- Mithril Helmet -->
+					<item id="1128" min="1" max="3" chance="20" /> <!-- Adamantite Boots -->
+				</group>
+				<group chance="100">
+					<item id="442" min="1" max="1" chance="20" /> <!-- Divine Tunic -->
+					<item id="473" min="1" max="1" chance="20" /> <!-- Divine Stockings -->
+					<item id="2463" min="1" max="1" chance="20" /> <!-- Divine Gloves -->
+					<item id="2468" min="1" max="3" chance="20" /> <!-- Blessed Gloves -->
+					<item id="603" min="1" max="3" chance="20" /> <!-- Divine Boots -->
+				</group>
+				<group chance="100">
+					<item id="119" min="1" max="1" chance="16.66" /> <!-- Necklace of Seal -->
+					<item id="855" min="1" max="3" chance="16.66" /> <!-- Nassen's Earring -->
+					<item id="857" min="1" max="3" chance="16.66" /> <!-- Holy Earring -->
+					<item id="886" min="1" max="3" chance="16.66" /> <!-- Ring of Seal -->
+					<item id="888" min="1" max="3" chance="16.66" /> <!-- Blessed Ring -->
+					<item id="919" min="1" max="1" chance="16.7" /> <!-- Blessed Necklace -->
+				</group>
+				<group chance="20">
+					<item id="6662" min="1" max="1" chance="100" /> <!-- Ring of Core -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
+				<group chance="100">
+					<item id="91529" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (C-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91536" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (C-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91543" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (C-grade) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -461,9 +523,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="75" /> <!-- Caliburs -->
 		<acquire exp="13947" sp="418" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="13817" hpRegen="166" mp="747" mpRegen="2.1" />
-			<attack physical="410" magical="69" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="13817" hpRegen="166" mp="747.8" mpRegen="2.1" />
+			<attack physical="410" magical="69" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="801" magical="293" />
 			<speed>
 				<walk ground="27" />
@@ -472,9 +534,9 @@
 			<hitTime>710</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -483,9 +545,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="2300" isAggressive="true">
@@ -497,40 +557,6 @@
 			<radius normal="12" grown="14.5" />
 			<height normal="31" grown="36" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="162" min="1" max="1" chance="0.003" /> <!-- War Axe -->
-				<item id="174" min="1" max="1" chance="0.003" /> <!-- Nirvana Axe -->
-				<item id="196" min="1" max="1" chance="0.003" /> <!-- Stick of Eternity -->
-				<item id="197" min="1" max="1" chance="0.003" /> <!-- Paradia Staff -->
-				<item id="199" min="1" max="1" chance="0.003" /> <!-- Pa'agrio Hammer -->
-				<item id="200" min="1" max="1" chance="0.003" /> <!-- Sage's Staff -->
-				<item id="201" min="1" max="1" chance="0.003" /> <!-- Club of Nature -->
-				<item id="202" min="1" max="1" chance="0.003" /> <!-- Mace of Underworld -->
-				<item id="57" min="1160" max="2714" chance="70" /> <!-- Adena -->
-				<item id="1872" min="1" max="3" chance="16.14" /> <!-- Animal Bone -->
-				<item id="1865" min="1" max="3" chance="8.492" /> <!-- Varnish -->
-				<item id="1882" min="1" max="1" chance="5.7" /> <!-- Leather -->
-				<item id="2508" min="2" max="6" chance="5.317" /> <!-- Cursed Bone -->
-				<item id="1876" min="1" max="1" chance="5.163" /> <!-- Mithril Ore -->
-				<item id="2952" min="1" max="1" chance="2.172" /> <!-- Demon's Boot Fabric -->
-				<item id="3005" min="1" max="1" chance="0.97" /> <!-- Recipe: Demon's Boots -->
-				<item id="2100" min="1" max="1" chance="0.3" /> <!-- Paradia Staff Head -->
-				<item id="2097" min="1" max="1" chance="0.3" /> <!-- War Axe Blade -->
-				<item id="2098" min="1" max="1" chance="0.3" /> <!-- Nirvana Axe Blade -->
-				<item id="2231" min="1" max="1" chance="0.3" /> <!-- Recipe: Full Plate Armor -->
-				<item id="2105" min="1" max="1" chance="0.3" /> <!-- Mace of Underworld Head -->
-				<item id="2104" min="1" max="1" chance="0.3" /> <!-- Club of Nature Head -->
-				<item id="2103" min="1" max="1" chance="0.3" /> <!-- Sage's Staff Head -->
-				<item id="2099" min="1" max="1" chance="0.3" /> <!-- Stick of Eternity Shaft -->
-				<item id="2102" min="1" max="1" chance="0.3" /> <!-- Pa'agrio Hammer Head -->
-				<item id="2360" min="1" max="1" chance="0.03" /> <!-- Recipe: Orcish Poleaxe -->
-			</drop>
-			<spoil>
-				<item id="1914" min="1" max="1" chance="46.21" /> <!-- Earring of Seal Gemstone -->
-				<item id="3011" min="1" max="1" chance="22.96" /> <!-- Recipe: Divine Boots -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29008" level="55" type="Monster" name="Doom Wraith">
 		<parameters>
@@ -543,9 +569,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="1472" /> <!-- Dreadbane -->
 		<acquire exp="15169" sp="501" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="16012" hpRegen="185" mp="889" mpRegen="2.4" />
-			<attack physical="470" magical="715" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="16012" hpRegen="185" mp="889.8" mpRegen="2.4" />
+			<attack physical="470" magical="715" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="895" magical="327" />
 			<speed>
 				<walk ground="100" />
@@ -554,21 +580,19 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="5" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="5" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="700" isAggressive="true">
@@ -591,9 +615,9 @@
 		<race>PLANT</race>
 		<sex>FEMALE</sex>
 		<acquire exp="11480" sp="344" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="12544" hpRegen="154" mp="665" mpRegen="2.1" />
-			<attack physical="354" magical="60" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<attack physical="354" magical="60" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="747" magical="273" />
 			<speed>
 				<walk ground="80" />
@@ -602,19 +626,19 @@
 			<hitTime>130</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4035" level="4" /> <!-- Poison -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4035" level="4" /> <!-- Poison -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="800" isAggressive="true">
@@ -626,34 +650,6 @@
 			<radius normal="12" />
 			<height normal="25.5" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="1126" min="1" max="1" chance="0.075" /> <!-- Crimson Boots -->
-				<item id="2434" min="1" max="1" chance="0.075" /> <!-- Rind Leather Boots -->
-				<item id="2455" min="1" max="1" chance="0.075" /> <!-- Plated Leather Gloves -->
-				<item id="2457" min="1" max="1" chance="0.075" /> <!-- Gloves of Seal -->
-				<item id="2458" min="1" max="1" chance="0.075" /> <!-- Rind Leather Gloves -->
-				<item id="57" min="996" max="2323" chance="70" /> <!-- Adena -->
-				<item id="1866" min="1" max="1" chance="13.34" /> <!-- Suede -->
-				<item id="1342" min="30" max="90" chance="12.95" /> <!-- Steel Arrow -->
-				<item id="1867" min="2" max="6" chance="6.416" /> <!-- Animal Skin -->
-				<item id="2951" min="1" max="1" chance="4.388" /> <!-- Rind Leather Glove Design -->
-				<item id="2950" min="1" max="1" chance="4.348" /> <!-- Gloves of Seal Pattern -->
-				<item id="2948" min="1" max="1" chance="4.342" /> <!-- Rind Leather Boot Lining -->
-				<item id="1882" min="1" max="1" chance="4.245" /> <!-- Leather -->
-				<item id="1868" min="5" max="15" chance="3.845" /> <!-- Thread -->
-				<item id="2946" min="1" max="1" chance="2.929" /> <!-- Plated Leather Glove Design -->
-				<item id="2508" min="3" max="9" chance="2.632" /> <!-- Cursed Bone -->
-				<item id="1974" min="1" max="3" chance="2.22" /> <!-- Crimson Boot Fabric -->
-				<item id="1885" min="1" max="1" chance="1.585" /> <!-- High-grade Suede -->
-				<item id="2350" min="1" max="1" chance="0.03" /> <!-- Recipe: Pa'agrio Axe -->
-				<item id="2339" min="1" max="1" chance="0.03" /> <!-- Recipe: Inferno Staff -->
-			</drop>
-			<spoil>
-				<item id="1895" min="1" max="5" chance="66.24" /> <!-- Metallic Fiber -->
-				<item id="2944" min="1" max="1" chance="62.28" /> <!-- Karmian Glove Fabric -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29010" level="46" type="Monster" name="Validus">
 		<parameters>
@@ -664,29 +660,29 @@
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<acquire exp="11032" sp="330" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="12130" hpRegen="150" mp="637" mpRegen="2.1" />
-			<attack physical="337" magical="58" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="12130" hpRegen="150" mp="637.8" mpRegen="2.1" />
+			<attack physical="337" magical="58" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="729" magical="267" />
 			<speed>
 				<walk ground="70" />
 				<run ground="110" />
 			</speed>
-			<hitTime>300</hitTime>
+			<hitTime>30</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="3" /> <!-- Beasts -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="3" /> <!-- Beasts -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="1200" isAggressive="true">
@@ -698,29 +694,6 @@
 			<radius normal="15" />
 			<height normal="29" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="354" min="1" max="1" chance="0.03" /> <!-- Chain Mail Shirt -->
-				<item id="232" min="1" max="1" chance="0.0075" /> <!-- Dark Elven Dagger -->
-				<item id="281" min="1" max="1" chance="0.0075" /> <!-- Crystallized Ice Bow -->
-				<item id="57" min="914" max="2141" chance="70" /> <!-- Adena -->
-				<item id="1866" min="1" max="1" chance="15.89" /> <!-- Suede -->
-				<item id="1878" min="1" max="1" chance="9.186" /> <!-- Durable Braid -->
-				<item id="1864" min="3" max="9" chance="7.663" /> <!-- Stem -->
-				<item id="1865" min="2" max="6" chance="5.755" /> <!-- Varnish -->
-				<item id="2508" min="2" max="6" chance="3.839" /> <!-- Cursed Bone -->
-				<item id="1959" min="1" max="1" chance="2.104" /> <!-- Chain Mail Shirt Material -->
-				<item id="2072" min="1" max="1" chance="0.75" /> <!-- Dark Elven Dagger Edge -->
-				<item id="2074" min="1" max="1" chance="0.75" /> <!-- Crystallized Ice Bow Shaft -->
-				<item id="2319" min="1" max="1" chance="0.075" /> <!-- Recipe: Raid Sword -->
-				<item id="951" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Weapon (C-grade) -->
-			</drop>
-			<spoil>
-				<item id="1873" min="1" max="3" chance="88.74" /> <!-- Silver Nugget -->
-				<item id="2060" min="1" max="1" chance="3.464" /> <!-- Stormbringer Blade -->
-				<item id="2067" min="1" max="1" chance="3.185" /> <!-- Crystal Staff Head -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29011" level="49" type="Monster" name="Susceptor">
 		<parameters>
@@ -731,10 +704,10 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="13389" hpRegen="162" mp="720" mpRegen="2.1" />
-			<attack physical="391" magical="66" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<attack physical="391" magical="66" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="783" magical="286" />
 			<speed>
 				<walk ground="27" />
@@ -743,10 +716,9 @@
 			<hitTime>430</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -755,7 +727,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="1500" isAggressive="true">
@@ -778,9 +751,9 @@
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<acquire exp="16035" sp="481" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="12964" hpRegen="158" mp="692" mpRegen="2.1" />
-			<attack physical="372" magical="63" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="12964" hpRegen="158" mp="692.4" mpRegen="2.1" />
+			<attack physical="372" magical="63" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="765" magical="280" />
 			<speed>
 				<walk ground="20" />
@@ -789,22 +762,22 @@
 			<hitTime>410</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4273" level="3" /> <!-- Resist Daggers/Rapier Weapon -->
-			<skill id="4274" level="1" /> <!-- Blunt Weapon Weak Point -->
-			<skill id="4408" level="12" /> <!-- HP Increase (4x) -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
-			<skill id="4444" level="2" /> <!-- Higher Resist Bow/Crossbow Weapons -->
+			<skill id="4444" level="2" /> <!-- Greater Bow Resistance -->
+			<skill id="4273" level="3" /> <!-- Dagger Resistance -->
+			<skill id="4274" level="1" /> <!-- Blunt Weapon Vulnerability -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="800" isAggressive="true">
@@ -816,35 +789,6 @@
 			<radius normal="18" />
 			<height normal="34" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="1126" min="1" max="1" chance="0.075" /> <!-- Crimson Boots -->
-				<item id="2434" min="1" max="1" chance="0.075" /> <!-- Rind Leather Boots -->
-				<item id="2455" min="1" max="1" chance="0.075" /> <!-- Plated Leather Gloves -->
-				<item id="2457" min="1" max="1" chance="0.075" /> <!-- Gloves of Seal -->
-				<item id="2458" min="1" max="1" chance="0.075" /> <!-- Rind Leather Gloves -->
-				<item id="57" min="1447" max="3374" chance="70" /> <!-- Adena -->
-				<item id="1873" min="1" max="1" chance="12.81" /> <!-- Silver Nugget -->
-				<item id="1865" min="1" max="3" chance="10.09" /> <!-- Varnish -->
-				<item id="2508" min="2" max="6" chance="6.579" /> <!-- Cursed Bone -->
-				<item id="1965" min="1" max="1" chance="4.208" /> <!-- Metal Plate Helmet Material -->
-				<item id="2946" min="1" max="1" chance="3.494" /> <!-- Plated Leather Glove Design -->
-				<item id="1880" min="1" max="1" chance="3.151" /> <!-- Steel -->
-				<item id="1869" min="5" max="15" chance="3.142" /> <!-- Iron Ore -->
-				<item id="1974" min="1" max="3" chance="2.735" /> <!-- Crimson Boot Fabric -->
-				<item id="1874" min="1" max="1" chance="2.061" /> <!-- Oriharukon Ore -->
-				<item id="2948" min="1" max="3" chance="1.772" /> <!-- Rind Leather Boot Lining -->
-				<item id="2950" min="2" max="6" chance="1.296" /> <!-- Gloves of Seal Pattern -->
-				<item id="2951" min="2" max="6" chance="1.067" /> <!-- Rind Leather Glove Design -->
-				<item id="1973" min="3" max="9" chance="0.75" /> <!-- Pa'agrio Hand Design -->
-				<item id="2344" min="1" max="1" chance="0.075" /> <!-- Recipe: Grace Dagger -->
-				<item id="951" min="1" max="1" chance="0.075" /> <!-- Scroll: Enchant Weapon (C-grade) -->
-			</drop>
-			<spoil>
-				<item id="2073" min="1" max="1" chance="7.894" /> <!-- Chakram Edge -->
-				<item id="2352" min="1" max="1" chance="2.107" /> <!-- Recipe: Widow Maker -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29013" level="45" type="Monster" name="Premo">
 		<parameters>
@@ -855,9 +799,9 @@
 		<race>GIANT</race>
 		<sex>MALE</sex>
 		<acquire exp="10351" sp="310" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="11721" hpRegen="146" mp="610" mpRegen="2.1" />
-			<attack physical="320" magical="55" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="11721" hpRegen="146" mp="610.8" mpRegen="2.1" />
+			<attack physical="320" magical="55" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="711" magical="260" />
 			<speed>
 				<walk ground="55" />
@@ -866,10 +810,10 @@
 			<hitTime>610</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="11" /> <!-- Giant -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
@@ -877,7 +821,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="11" /> <!-- Giants -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="1200" aggroRange="450">
@@ -889,30 +833,6 @@
 			<radius normal="21" grown="25" />
 			<height normal="35" grown="43" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="631" min="1" max="1" chance="0.3" /> <!-- Eldarake -->
-				<item id="2495" min="1" max="1" chance="0.3" /> <!-- Chain Shield -->
-				<item id="2413" min="1" max="1" chance="0.075" /> <!-- Chain Hood -->
-				<item id="57" min="859" max="2006" chance="70" /> <!-- Adena -->
-				<item id="1868" min="1" max="3" chance="17.95" /> <!-- Thread -->
-				<item id="1866" min="1" max="1" chance="12.31" /> <!-- Suede -->
-				<item id="1867" min="1" max="3" chance="8.405" /> <!-- Animal Skin -->
-				<item id="1964" min="1" max="1" chance="6.108" /> <!-- Eldarake Temper -->
-				<item id="2945" min="1" max="1" chance="6.014" /> <!-- Chain Shield Fragment -->
-				<item id="2936" min="1" max="1" chance="5.526" /> <!-- Chain Hood Pattern -->
-				<item id="1882" min="1" max="1" chance="4.181" /> <!-- Leather -->
-				<item id="1885" min="1" max="1" chance="1.519" /> <!-- High-grade Suede -->
-				<item id="2207" min="1" max="1" chance="0.3" /> <!-- Recipe: Karmian Tunic -->
-				<item id="2323" min="1" max="1" chance="0.075" /> <!-- Recipe: Elemental Bow -->
-				<item id="2326" min="1" max="1" chance="0.075" /> <!-- Recipe: Horn of Glory -->
-			</drop>
-			<spoil>
-				<item id="1876" min="1" max="1" chance="80.65" /> <!-- Mithril Ore -->
-				<item id="1962" min="1" max="1" chance="13.24" /> <!-- Karmian Tunic Pattern -->
-				<item id="2073" min="1" max="1" chance="3.192" /> <!-- Chakram Edge -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29014" level="50" type="GrandBoss" name="Orfen">
 		<parameters>
@@ -923,13 +843,13 @@
 				<npc id="29016" count="4" respawnTime="360" weightPoint="1" />
 			</minions>
 		</parameters>
-		<race>ELEMENTAL</race>
+		<race>FAIRY</race>
 		<sex>FEMALE</sex>
 		<acquire exp="8872500" sp="266175" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="289902.43642" hpRegen="145.2219912" mp="2901.03" mpRegen="2.1" />
-			<attack physical="722.31" magical="1398.68" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="1602" magical="293" />
+			<vitals hp="523103.852" hpRegen="441.65" mp="1708.8" mpRegen="20" />
+			<attack physical="3652" magical="1535" random="10" critical="4" accuracy="0" attackSpeed="253" type="SWORD" range="80" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -937,12 +857,9 @@
 			<hitTime>710</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4062" level="1" /> <!-- Orfen -->
-			<skill id="4063" level="1" /> <!-- Paralysis -->
-			<skill id="4064" level="1" /> <!-- Paralysis -->
+			<skill id="4416" level="13" /> <!-- Fairies -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -951,7 +868,10 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="13" /> <!-- Fairies -->
+			<skill id="4062" level="1" /> <!-- Orfen -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4063" level="1" /> <!-- Paralysis -->
+			<skill id="4064" level="1" /> <!-- Paralysis -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -966,59 +886,88 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="856" min="1" max="3" chance="34.93" /> <!-- Adamantite Earring -->
-				<item id="918" min="1" max="1" chance="33.56" /> <!-- Adamantite Necklace -->
-				<item id="887" min="1" max="3" chance="32.7" /> <!-- Adamantite Ring -->
-				<item id="2379" min="1" max="1" chance="25.04" /> <!-- Avadon Gaiters -->
-				<item id="2415" min="1" max="1" chance="24.89" /> <!-- Sealed Avadon Circlet -->
-				<item id="2376" min="1" max="1" chance="24.58" /> <!-- Avadon Breastplate -->
-				<item id="673" min="1" max="1" chance="23.9" /> <!-- Avadon Shield -->
-				<item id="499" min="1" max="3" chance="20.96" /> <!-- Mithril Helmet -->
-				<item id="2463" min="1" max="1" chance="20.59" /> <!-- Divine Gloves -->
-				<item id="401" min="1" max="1" chance="20.42" /> <!-- Drake Leather Armor -->
-				<item id="6661" min="1" max="1" chance="20.16" /> <!-- Orfen's Earring -->
-				<item id="356" min="1" max="1" chance="20.15" /> <!-- Full Plate Armor -->
-				<item id="2438" min="1" max="1" chance="20.12" /> <!-- Full Plate Boots -->
-				<item id="603" min="1" max="3" chance="19.69" /> <!-- Divine Boots -->
-				<item id="2462" min="1" max="1" chance="19.66" /> <!-- Full Plate Gauntlets -->
-				<item id="2414" min="1" max="1" chance="19.62" /> <!-- Full Plate Helmet -->
-				<item id="2461" min="1" max="1" chance="19.54" /> <!-- Drake Leather Gloves -->
-				<item id="2437" min="1" max="1" chance="19.3" /> <!-- Drake Leather Boots -->
-				<item id="2497" min="1" max="3" chance="19.29" /> <!-- Full Plate Shield -->
-				<item id="2468" min="1" max="3" chance="19.23" /> <!-- Blessed Gloves -->
-				<item id="473" min="1" max="1" chance="19.21" /> <!-- Divine Stockings -->
-				<item id="442" min="1" max="1" chance="19.06" /> <!-- Divine Tunic -->
-				<item id="1128" min="1" max="3" chance="19.02" /> <!-- Adamantite Boots -->
-				<item id="888" min="1" max="3" chance="17.23" /> <!-- Blessed Ring -->
-				<item id="919" min="1" max="1" chance="16.93" /> <!-- Blessed Necklace -->
-				<item id="855" min="1" max="3" chance="16.77" /> <!-- Nassen's Earring -->
-				<item id="119" min="1" max="1" chance="16.39" /> <!-- Necklace of Seal -->
-				<item id="886" min="1" max="3" chance="16.34" /> <!-- Ring of Seal -->
-				<item id="857" min="1" max="3" chance="16.24" /> <!-- Holy Earring -->
-				<item id="204" min="1" max="1" chance="11.65" /> <!-- Deadman's Staff -->
-				<item id="228" min="1" max="1" chance="11.64" /> <!-- Crystal Dagger -->
-				<item id="286" min="1" max="1" chance="11.54" /> <!-- Eminence Bow -->
-				<item id="2503" min="1" max="1" chance="11.53" /> <!-- Yaksa Mace -->
-				<item id="206" min="1" max="1" chance="11.41" /> <!-- Demon's Staff -->
-				<item id="299" min="1" max="1" chance="11.35" /> <!-- Orcish Poleaxe -->
-				<item id="205" min="1" max="1" chance="11.33" /> <!-- Ghoul's Staff -->
-				<item id="266" min="1" max="1" chance="11.22" /> <!-- Great Pata -->
-				<item id="135" min="1" max="1" chance="10.59" /> <!-- Samurai Long Sword -->
-				<item id="947" min="2" max="8" chance="100" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-				<item id="91536" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (C-grade) -->
-				<item id="91529" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (C-grade) -->
-				<item id="70000" min="198" max="593" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="91543" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (C-grade) -->
-				<item id="948" min="10" max="30" chance="100" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="8620" min="1" max="3" chance="49.83" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="4051" min="20" max="80" chance="12.9" /> <!-- Adamantite Necklace Chain -->
-				<item id="4065" min="20" max="80" chance="12.66" /> <!-- Avadon Gaiter Material -->
-				<item id="4049" min="20" max="80" chance="12.51" /> <!-- Adamantite Earring Gemstone -->
-				<item id="4050" min="20" max="80" chance="12.51" /> <!-- Adamantite Ring Wire -->
-				<item id="4071" min="20" max="80" chance="12.27" /> <!-- Avadon Robe Fabric -->
-				<item id="4072" min="20" max="80" chance="12.21" /> <!-- Sealed Avadon Circlet Pattern -->
-				<item id="4064" min="20" max="80" chance="12.2" /> <!-- Avadon Breastplate Part -->
-				<item id="4439" min="20" max="80" chance="12.11" /> <!-- Avadon Shield Fragment -->
+				<group chance="100">
+					<item id="135" min="1" max="1" chance="11.11" /> <!-- Samurai Long Sword -->
+					<item id="204" min="1" max="1" chance="11.11" /> <!-- Deadman's Staff -->
+					<item id="205" min="1" max="1" chance="11.11" /> <!-- Ghoul's Staff -->
+					<item id="206" min="1" max="1" chance="11.11" /> <!-- Demon's Staff -->
+					<item id="228" min="1" max="1" chance="11.11" /> <!-- Crystal Dagger -->
+					<item id="266" min="1" max="1" chance="11.11" /> <!-- Great Pata -->
+					<item id="286" min="1" max="1" chance="11.11" /> <!-- Eminence Bow -->
+					<item id="299" min="1" max="1" chance="11.11" /> <!-- Orcish Poleaxe -->
+					<item id="2503" min="1" max="1" chance="11.12" /> <!-- Yaksa Mace -->
+				</group>
+				<group chance="100">
+					<item id="356" min="1" max="1" chance="20" /> <!-- Full Plate Armor -->
+					<item id="2497" min="1" max="3" chance="20" /> <!-- Full Plate Shield -->
+					<item id="2414" min="1" max="1" chance="20" /> <!-- Full Plate Helmet -->
+					<item id="2438" min="1" max="1" chance="20" /> <!-- Full Plate Boots -->
+					<item id="2462" min="1" max="1" chance="20" /> <!-- Full Plate Gauntlets -->
+				</group>
+				<group chance="100">
+					<item id="2461" min="1" max="1" chance="20" /> <!-- Drake Leather Gloves -->
+					<item id="2437" min="1" max="1" chance="20" /> <!-- Drake Leather Boots -->
+					<item id="401" min="1" max="1" chance="20" /> <!-- Drake Leather Armor -->
+					<item id="603" min="1" max="3" chance="20" /> <!-- Divine Boots -->
+					<item id="1128" min="1" max="3" chance="20" /> <!-- Adamantite Boots -->
+				</group>
+				<group chance="100">
+					<item id="442" min="1" max="1" chance="20" /> <!-- Divine Tunic -->
+					<item id="473" min="1" max="1" chance="20" /> <!-- Divine Stockings -->
+					<item id="2463" min="1" max="1" chance="20" /> <!-- Divine Gloves -->
+					<item id="2468" min="1" max="3" chance="20" /> <!-- Blessed Gloves -->
+					<item id="499" min="1" max="3" chance="20" /> <!-- Mithril Helmet -->
+				</group>
+				<group chance="100">
+					<item id="119" min="1" max="1" chance="16.66" /> <!-- Necklace of Seal -->
+					<item id="855" min="1" max="3" chance="16.66" /> <!-- Nassen's Earring -->
+					<item id="857" min="1" max="3" chance="16.66" /> <!-- Holy Earring -->
+					<item id="886" min="1" max="3" chance="16.66" /> <!-- Ring of Seal -->
+					<item id="888" min="1" max="3" chance="16.66" /> <!-- Blessed Ring -->
+					<item id="919" min="1" max="1" chance="16.7" /> <!-- Blessed Necklace -->
+				</group>
+				<group chance="100">
+					<item id="2376" min="1" max="1" chance="25" /> <!-- Avadon Breastplate -->
+					<item id="2379" min="1" max="1" chance="25" /> <!-- Avadon Gaiters -->
+					<item id="2415" min="1" max="1" chance="25" /> <!-- Sealed Avadon Circlet -->
+					<item id="673" min="1" max="1" chance="25" /> <!-- Avadon Shield -->
+				</group>
+				<group chance="100">
+					<item id="856" min="1" max="3" chance="33.33" /> <!-- Adamantite Earring -->
+					<item id="887" min="1" max="3" chance="33.33" /> <!-- Adamantite Ring -->
+					<item id="918" min="1" max="1" chance="33.34" /> <!-- Adamantite Necklace -->
+				</group>
+				<group chance="100">
+					<item id="4049" min="20" max="80" chance="12.5" /> <!-- Adamantite Earring Gemstone -->
+					<item id="4050" min="20" max="80" chance="12.5" /> <!-- Adamantite Ring Wire -->
+					<item id="4051" min="20" max="80" chance="12.5" /> <!-- Adamantite Necklace Chain -->
+					<item id="4064" min="20" max="80" chance="12.5" /> <!-- Avadon Breastplate Part -->
+					<item id="4065" min="20" max="80" chance="12.5" /> <!-- Avadon Gaiter Material -->
+					<item id="4071" min="20" max="80" chance="12.5" /> <!-- Avadon Robe Fabric -->
+					<item id="4072" min="20" max="80" chance="12.5" /> <!-- Sealed Avadon Circlet Pattern -->
+					<item id="4439" min="20" max="80" chance="12.5" /> <!-- Avadon Shield Fragment -->
+				</group>
+				<group chance="20">
+					<item id="6661" min="1" max="1" chance="100" /> <!-- Orfen's Earring -->
+				</group>
+				<group chance="100">
+					<item id="947" min="2" max="8" chance="100" /> <!-- Scroll: Enchant Weapon (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="948" min="10" max="30" chance="100" /> <!-- Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
+				<group chance="100">
+					<item id="91529" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (C-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91536" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (C-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91543" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (C-grade) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -1028,13 +977,13 @@
 			<param name="MoveAroundSocial1" value="70" />
 			<param name="MoveAroundSocial2" value="70" />
 		</parameters>
-		<race>BEAST</race>
+		<race>BUG</race>
 		<sex>MALE</sex>
-		<acquire exp="16035" sp="481" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="16035" sp="481" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="158" mp="36936" mpRegen="2.1" />
-			<attack physical="298" magical="40" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="765" magical="280" />
+			<attack physical="298" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1042,9 +991,9 @@
 			<hitTime>540</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1053,7 +1002,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="2500" aggroRange="450">
@@ -1072,13 +1021,13 @@
 			<param name="MoveAroundSocial1" value="70" />
 			<param name="MoveAroundSocial2" value="70" />
 		</parameters>
-		<race>BEAST</race>
+		<race>BUG</race>
 		<sex>MALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="162" mp="36936" mpRegen="2.1" />
-			<attack physical="1058" magical="1563" random="30" critical="15" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="783" magical="286" />
+			<attack physical="1058" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1086,9 +1035,9 @@
 			<hitTime>540</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1097,7 +1046,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="2700" aggroRange="450">
@@ -1118,11 +1067,11 @@
 		</parameters>
 		<race>BUG</race>
 		<sex>FEMALE</sex>
-		<acquire exp="16035" sp="481" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="16035" sp="481" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="158" mp="36936" mpRegen="2.1" />
-			<attack physical="298" magical="40" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="765" magical="280" />
+			<attack physical="298" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1130,9 +1079,9 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1141,7 +1090,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="2700" aggroRange="450">
@@ -1157,11 +1106,11 @@
 	<npc id="29018" level="49" type="Monster" name="Riba Iren">
 		<race>BUG</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="162" mp="36936" mpRegen="2.1" />
-			<attack physical="1058" magical="1563" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="783" magical="286" />
+			<attack physical="1058" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1169,9 +1118,9 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1180,8 +1129,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
-			<skill id="4516" level="1" /> <!-- Orfen Heal -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="2900" isAggressive="true">
@@ -1199,27 +1147,19 @@
 		<sex>MALE</sex>
 		<acquire exp="262720917" sp="63053" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="7500000" hpRegen="1000" mp="18000" mpRegen="99" />
-			<attack physical="3260" magical="1700" random="30" critical="4" accuracy="40" attackSpeed="206" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="440" magical="440" />
+			<vitals hp="7000000" hpRegen="1000" mp="18000" mpRegen="99" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3840" magical="825" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4106" level="1" /> <!-- Antharas Stun -->
-			<skill id="4108" level="1" /> <!-- Antharas Terror -->
-			<skill id="4109" level="1" /> <!-- Curse of Antharas -->
-			<skill id="4110" level="2" /> <!-- Breath Attack -->
-			<skill id="4111" level="1" /> <!-- Antharas Fossilization -->
-			<skill id="4112" level="1" /> <!-- Ordinary Attack -->
-			<skill id="4113" level="1" /> <!-- Animal doing ordinary attack -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1228,9 +1168,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5092" level="1" /> <!-- Antharas Terror -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1239,92 +1179,36 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists> <!-- CT2.5 -->
-			<drop>
-				<item id="8620" min="10" max="30" chance="50" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="80" min="1" max="2" chance="25" /> <!-- Tallum Blade -->
-				<item id="98" min="1" max="2" chance="25" /> <!-- Halberd -->
-				<item id="269" min="1" max="2" chance="25" /> <!-- Blood Tornado -->
-				<item id="2504" min="1" max="2" chance="25" /> <!-- Meteor Shower -->
-				<item id="235" min="1" max="2" chance="25" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="2" chance="25" /> <!-- Carnage Bow -->
-				<item id="150" min="1" max="2" chance="25" /> <!-- Elemental Sword -->
-				<item id="212" min="1" max="2" chance="25" /> <!-- Dasparion's Staff -->
-				<item id="81" min="1" max="2" chance="25" /> <!-- Dragon Slayer -->
-				<item id="151" min="1" max="2" chance="25" /> <!-- Sword of Miracles -->
-				<item id="2500" min="1" max="2" chance="25" /> <!-- Dark Legion's Edge -->
-				<item id="164" min="1" max="2" chance="25" /> <!-- Elysian -->
-				<item id="236" min="1" max="2" chance="20" /> <!-- Soul Separator -->
-				<item id="270" min="1" max="2" chance="20" /> <!-- Dragon Grinder -->
-				<item id="289" min="1" max="2" chance="20" /> <!-- Soul Bow -->
-				<item id="213" min="1" max="2" chance="20" /> <!-- Branch of the Mother Tree -->
-				<item id="305" min="1" max="2" chance="20" /> <!-- Tallum Glaive -->
-				<item id="6326" min="1" max="5" chance="30" /> <!-- Sealed Majestic Necklace -->
-				<item id="6327" min="1" max="5" chance="35" /> <!-- Sealed Majestic Earring -->
-				<item id="6328" min="1" max="5" chance="35" /> <!-- Sealed Majestic Ring -->
-				<item id="6323" min="1" max="5" chance="30" /> <!-- Sealed Phoenix Necklace -->
-				<item id="6324" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Earring -->
-				<item id="6325" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Ring -->
-				<item id="5287" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5297" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5304" min="1" max="3" chance="25" /> <!-- Sealed Tallum Tunic -->
-				<item id="5311" min="1" max="3" chance="35" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5320" min="1" max="3" chance="35" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="30" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="3" chance="25" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5301" min="1" max="3" chance="25" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5308" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5316" min="1" max="3" chance="8" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5323" min="1" max="3" chance="8" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5329" min="1" max="3" chance="9" /> <!-- Sealed Majestic Robe -->
-				<item id="5288" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5298" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="30" /> <!-- Sealed Tallum Stockings -->
-				<item id="5289" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5294" min="1" max="3" chance="25" /> <!-- Sealed Tallum Helmet -->
-				<item id="5312" min="1" max="3" chance="25" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5317" min="1" max="3" chance="25" /> <!-- Sealed Majestic Circlet -->
-				<item id="5291" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5296" min="1" max="3" chance="25" /> <!-- Sealed Tallum Boots -->
-				<item id="5314" min="1" max="3" chance="25" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5319" min="1" max="3" chance="25" /> <!-- Sealed Majestic Boots -->
-				<item id="5290" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5295" min="1" max="3" chance="25" /> <!-- Sealed Tallum Gloves -->
-				<item id="5313" min="1" max="3" chance="25" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5318" min="1" max="3" chance="25" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5292" min="1" max="3" chance="40" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="40" /> <!-- Sealed Shield of Nightmare -->
-				<item id="729" min="1" max="19" chance="100" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="1538" min="1" max="59" chance="100" /> <!-- Blessed Scroll of Escape -->
-				<item id="3936" min="1" max="39" chance="100" /> <!-- Blessed Scroll of Resurrection -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="9000000" max="13000000" chance="100" /> <!-- Adena -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29020" level="80" type="GrandBoss" name="Baium">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<acquire exp="1024738848" sp="30742165" raidPoints="450" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="73892999.75369" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="3374.18" magical="2200" random="30" critical="4" accuracy="40" attackSpeed="206" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3300" magical="2200" />
+			<vitals hp="133333333" hpRegen="6666" mp="18000" mpRegen="99" />
+			<attack physical="25931" magical="8204" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3202" magical="2134" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4127" level="1" /> <!-- Baium: General Attack -->
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4256" level="1" /> <!-- Stun Resistance -->
+			<skill id="4127" level="1" /> <!-- Baium: General Attack -->
 		</skillList>
 		<corpseTime>13</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1337,83 +1221,104 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="6328" min="1" max="3" chance="51.37" /> <!-- Sealed Majestic Ring -->
-				<item id="49580" min="1" max="1" chance="29.92" /> <!-- Baium's Ring -->
-				<item id="6327" min="1" max="1" chance="20.85" /> <!-- Sealed Majestic Earring -->
-				<item id="7892" min="1" max="1" chance="17.48" /> <!-- Spell Breaker -->
-				<item id="7883" min="1" max="1" chance="17.02" /> <!-- Guardian's Sword -->
-				<item id="7900" min="1" max="1" chance="16.87" /> <!-- Ice Storm Hammer -->
-				<item id="7893" min="1" max="1" chance="16.47" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="16.35" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="16.02" /> <!-- Star Buster -->
-				<item id="6325" min="1" max="3" chance="14.26" /> <!-- Sealed Phoenix Ring -->
-				<item id="6326" min="1" max="1" chance="7.986" /> <!-- Sealed Majestic Necklace -->
-				<item id="5292" min="1" max="3" chance="6.982" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="1" chance="5.989" /> <!-- Sealed Shield of Nightmare -->
-				<item id="7894" min="1" max="1" chance="5.055" /> <!-- Spiritual Eye -->
-				<item id="98" min="1" max="1" chance="5.045" /> <!-- Halberd -->
-				<item id="5296" min="1" max="3" chance="5.041" /> <!-- Sealed Tallum Boots -->
-				<item id="5289" min="1" max="3" chance="5.025" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5295" min="1" max="3" chance="5.019" /> <!-- Sealed Tallum Gloves -->
-				<item id="288" min="1" max="1" chance="5.014" /> <!-- Carnage Bow -->
-				<item id="289" min="1" max="1" chance="5.011" /> <!-- Soul Bow -->
-				<item id="269" min="1" max="1" chance="5.006" /> <!-- Blood Tornado -->
-				<item id="151" min="1" max="1" chance="4.999" /> <!-- Sword of Miracles -->
-				<item id="5290" min="1" max="3" chance="4.982" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="7884" min="1" max="1" chance="4.976" /> <!-- Infernal Master -->
-				<item id="5294" min="1" max="3" chance="4.973" /> <!-- Sealed Tallum Helmet -->
-				<item id="150" min="1" max="1" chance="4.966" /> <!-- Elemental Sword -->
-				<item id="235" min="1" max="1" chance="4.959" /> <!-- Bloody Orchid -->
-				<item id="7899" min="1" max="1" chance="4.95" /> <!-- Destroyer Hammer -->
-				<item id="80" min="1" max="1" chance="4.948" /> <!-- Tallum Blade -->
-				<item id="2504" min="1" max="1" chance="4.941" /> <!-- Meteor Shower -->
-				<item id="5291" min="1" max="3" chance="4.93" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="270" min="1" max="1" chance="4.06" /> <!-- Dragon Grinder -->
-				<item id="212" min="1" max="1" chance="4.043" /> <!-- Dasparion's Staff -->
-				<item id="164" min="1" max="1" chance="4.031" /> <!-- Elysian -->
-				<item id="236" min="1" max="1" chance="4.028" /> <!-- Soul Separator -->
-				<item id="7902" min="1" max="1" chance="4.025" /> <!-- Doom Crusher -->
-				<item id="81" min="1" max="1" chance="4.021" /> <!-- Dragon Slayer -->
-				<item id="305" min="1" max="1" chance="4.021" /> <!-- Tallum Glaive -->
-				<item id="7895" min="1" max="1" chance="4.015" /> <!-- Flaming Dragon Skull -->
-				<item id="6324" min="1" max="1" chance="3.996" /> <!-- Sealed Phoenix Earring -->
-				<item id="213" min="1" max="1" chance="3.985" /> <!-- Branch of the Mother Tree -->
-				<item id="2500" min="1" max="1" chance="3.955" /> <!-- Dark Legion's Edge -->
-				<item id="5314" min="1" max="1" chance="3.065" /> <!-- Sealed Boots of Nightmare -->
-				<item id="49683" min="1" max="1" chance="3.042" /> <!-- Talisman of Baium -->
-				<item id="5319" min="1" max="1" chance="3.039" /> <!-- Sealed Majestic Boots -->
-				<item id="5293" min="1" max="1" chance="3.033" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5297" min="1" max="1" chance="3.031" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5318" min="1" max="1" chance="3.025" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5298" min="1" max="1" chance="3.01" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5312" min="1" max="1" chance="3.009" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5304" min="1" max="1" chance="3.006" /> <!-- Sealed Tallum Tunic -->
-				<item id="5287" min="1" max="1" chance="2.976" /> <!-- Sealed Dark Crystal Breastplate -->
-				<item id="5308" min="1" max="1" chance="2.972" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5313" min="1" max="1" chance="2.967" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5288" min="1" max="1" chance="2.962" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5317" min="1" max="1" chance="2.96" /> <!-- Sealed Majestic Circlet -->
-				<item id="5301" min="1" max="1" chance="2.953" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5305" min="1" max="1" chance="2.931" /> <!-- Sealed Tallum Stockings -->
-				<item id="5320" min="1" max="1" chance="2.055" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="1" chance="2.055" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5311" min="1" max="1" chance="2.014" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5316" min="1" max="1" chance="2.013" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5329" min="1" max="1" chance="1.985" /> <!-- Sealed Majestic Robe -->
-				<item id="5323" min="1" max="1" chance="1.962" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="6323" min="1" max="1" chance="0.75" /> <!-- Sealed Phoenix Necklace -->
-				<item id="91545" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (B-grade) -->
-				<item id="91538" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (B-grade) -->
-				<item id="8621" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Version) -->
-				<item id="91531" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (B-grade) -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="33814" min="2" max="4" chance="50.49" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="729" min="1" max="1" chance="50.46" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="730" min="1" max="1" chance="50.33" /> <!-- Scroll: Enchant Armor (A-grade) -->
-				<item id="49756" min="2" max="4" chance="49.81" /> <!-- Cloth Piece -->
-				<item id="33808" min="1" max="1" chance="49.36" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="49682" min="1" max="1" chance="27.45" /> <!-- Baium's Soul -->
-				<item id="90899" min="1" max="1" chance="2.979" /> <!-- Blessed Agathion's Soul -->
+				<group chance="100">
+					<item id="80" min="1" max="1" chance="5" /> <!-- Tallum Blade -->
+					<item id="81" min="1" max="1" chance="4" /> <!-- Dragon Slayer -->
+					<item id="98" min="1" max="1" chance="5" /> <!-- Halberd -->
+					<item id="150" min="1" max="1" chance="5" /> <!-- Elemental Sword -->
+					<item id="151" min="1" max="1" chance="5" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="1" chance="4" /> <!-- Elysian -->
+					<item id="212" min="1" max="1" chance="4" /> <!-- Dasparion's Staff -->
+					<item id="213" min="1" max="1" chance="4" /> <!-- Branch of the Mother Tree -->
+					<item id="235" min="1" max="1" chance="5" /> <!-- Bloody Orchid -->
+					<item id="236" min="1" max="1" chance="4" /> <!-- Soul Separator -->
+					<item id="269" min="1" max="1" chance="5" /> <!-- Blood Tornado -->
+					<item id="270" min="1" max="1" chance="4" /> <!-- Dragon Grinder -->
+					<item id="288" min="1" max="1" chance="5" /> <!-- Carnage Bow -->
+					<item id="289" min="1" max="1" chance="5" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="1" chance="4" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="1" chance="4" /> <!-- Dark Legion's Edge -->
+					<item id="2504" min="1" max="1" chance="5" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="1" chance="5" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="1" chance="5" /> <!-- Spiritual Eye -->
+					<item id="7895" min="1" max="1" chance="4" /> <!-- Flaming Dragon Skull -->
+					<item id="7899" min="1" max="1" chance="5" /> <!-- Destroyer Hammer -->
+					<item id="7902" min="1" max="1" chance="4" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="100">
+					<item id="7883" min="1" max="1" chance="17" /> <!-- Guardian's Sword -->
+					<item id="7889" min="1" max="1" chance="16" /> <!-- Wizard's Tear -->
+					<item id="7892" min="1" max="1" chance="17" /> <!-- Spell Breaker -->
+					<item id="7893" min="1" max="1" chance="17" /> <!-- Kaim Vanul's Bones -->
+					<item id="7900" min="1" max="1" chance="17" /> <!-- Ice Storm Hammer -->
+					<item id="7901" min="1" max="1" chance="16" /> <!-- Star Buster -->
+				</group>
+				<group chance="100">
+					<item id="5287" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5292" min="1" max="3" chance="7" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5293" min="1" max="1" chance="3" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="3" chance="5" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="3" chance="5" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="3" chance="5" /> <!-- Sealed Tallum Boots -->
+					<item id="5297" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5301" min="1" max="1" chance="3" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="1" chance="3" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="1" chance="3" /> <!-- Sealed Tallum Stockings -->
+					<item id="5308" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Robe -->
+					<item id="5311" min="1" max="1" chance="2" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="1" chance="3" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="1" chance="3" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="1" chance="3" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5315" min="1" max="1" chance="6" /> <!-- Sealed Shield of Nightmare -->
+					<item id="5316" min="1" max="1" chance="2" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="1" chance="3" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="1" chance="3" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="1" chance="3" /> <!-- Sealed Majestic Boots -->
+					<item id="5320" min="1" max="1" chance="2" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5323" min="1" max="1" chance="2" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5326" min="1" max="1" chance="2" /> <!-- Sealed Robe of Nightmare -->
+					<item id="5329" min="1" max="1" chance="2" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="100">
+					<item id="6323" min="1" max="1" chance="1" /> <!-- Sealed Phoenix Necklace -->
+					<item id="6324" min="1" max="1" chance="4" /> <!-- Sealed Phoenix Earring -->
+					<item id="6325" min="1" max="3" chance="15" /> <!-- Sealed Phoenix Ring -->
+					<item id="6326" min="1" max="1" chance="8" /> <!-- Sealed Majestic Necklace -->
+					<item id="6327" min="1" max="1" chance="20" /> <!-- Sealed Majestic Earring -->
+					<item id="6328" min="1" max="3" chance="52" /> <!-- Sealed Majestic Ring -->
+				</group>
+				<group chance="100">
+					<item id="33808" min="1" max="1" chance="50" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
+					<item id="33814" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="729" min="1" max="1" chance="50" /> <!-- Scroll: Enchant Weapon (A-grade) -->
+					<item id="730" min="1" max="1" chance="50" /> <!-- Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="30">
+					<item id="49580" min="1" max="1" chance="100" /> <!-- Baium's Ring -->
+				</group>
+				<group chance="30">
+					<item id="49683" min="1" max="1" chance="10" /> <!-- Talisman of Baium -->
+					<item id="49682" min="1" max="1" chance="90" /> <!-- Baium's Soul -->
+				</group>
+				<group chance="100">
+					<item id="8621" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Version) -->
+				</group>
+				<group chance="100">
+					<item id="91531" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91538" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91545" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (B-grade) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -1422,9 +1327,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="93" /> <!-- Winged Spear -->
 		<acquire exp="11520" sp="2" />
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="290966.74193" hpRegen="8.5" mp="1608.045" mpRegen="3" />
-			<attack physical="395" magical="371" random="30" critical="4" accuracy="40" attackSpeed="206" type="POLE" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="747660" hpRegen="158" mp="1475" mpRegen="3" />
+			<attack physical="4185" magical="371" random="10" critical="4" accuracy="0" attackSpeed="253" type="POLE" range="80" distance="80" width="120" />
 			<defence physical="5108" magical="1686" />
 			<speed>
 				<walk ground="50" />
@@ -1433,11 +1338,18 @@
 			<hitTime>760</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4132" level="1" /> <!-- Spear: Pound the Ground -->
-			<skill id="4133" level="1" /> <!-- Heal -->
 			<skill id="4416" level="8" /> <!-- Angel -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="11" /> <!-- Spear -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="300" isAggressive="true">
@@ -1455,9 +1367,9 @@
 		<sex>MALE</sex>
 		<acquire exp="102487500" sp="3074625" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="36946499.75369" hpRegen="310.756323" mp="20787.765" mpRegen="3" />
-			<attack physical="33864" magical="42273" random="30" critical="4" accuracy="40" attackSpeed="206" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3680" magical="4661" />
+			<vitals hp="66666666.6666667" hpRegen="2981.0298102981" mp="12240" mpRegen="10" />
+			<attack physical="15182.9268292683" magical="6600.03819341452" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2692.68292682927" magical="1794.92939666239" />
 			<speed>
 				<walk ground="42" />
 				<run ground="190" />
@@ -1465,13 +1377,19 @@
 			<hitTime>590</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4221" level="1" /> <!-- Range Dual Attack -->
-			<skill id="4220" level="1" /> <!-- Dual Attack -->
-			<skill id="4218" level="1" /> <!-- Drain -->
-			<skill id="4219" level="1" /> <!-- Hold -->
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1482,84 +1400,104 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="6328" min="1" max="3" chance="51.41" /> <!-- Sealed Majestic Ring -->
-				<item id="90763" min="1" max="1" chance="20.55" /> <!-- Zaken's Earring -->
-				<item id="6327" min="1" max="3" chance="19.7" /> <!-- Sealed Majestic Earring -->
-				<item id="7900" min="1" max="3" chance="17.47" /> <!-- Ice Storm Hammer -->
-				<item id="7883" min="1" max="3" chance="16.48" /> <!-- Guardian's Sword -->
-				<item id="7892" min="1" max="3" chance="16.46" /> <!-- Spell Breaker -->
-				<item id="7893" min="1" max="3" chance="16.42" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="3" chance="15.98" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="3" chance="15.2" /> <!-- Star Buster -->
-				<item id="6325" min="1" max="3" chance="14.87" /> <!-- Sealed Phoenix Ring -->
-				<item id="6326" min="1" max="3" chance="7.868" /> <!-- Sealed Majestic Necklace -->
-				<item id="5292" min="1" max="3" chance="6.818" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="5.831" /> <!-- Sealed Shield of Nightmare -->
-				<item id="80" min="1" max="3" chance="4.942" /> <!-- Tallum Blade -->
-				<item id="7899" min="1" max="3" chance="4.939" /> <!-- Destroyer Hammer -->
-				<item id="151" min="1" max="3" chance="4.918" /> <!-- Sword of Miracles -->
-				<item id="2504" min="1" max="3" chance="4.914" /> <!-- Meteor Shower -->
-				<item id="5291" min="1" max="3" chance="4.911" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5296" min="1" max="3" chance="4.91" /> <!-- Sealed Tallum Boots -->
-				<item id="98" min="1" max="3" chance="4.908" /> <!-- Halberd -->
-				<item id="5289" min="1" max="3" chance="4.907" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="7884" min="1" max="3" chance="4.906" /> <!-- Infernal Master -->
-				<item id="5290" min="1" max="3" chance="4.9" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5294" min="1" max="3" chance="4.889" /> <!-- Sealed Tallum Helmet -->
-				<item id="7894" min="1" max="3" chance="4.889" /> <!-- Spiritual Eye -->
-				<item id="150" min="1" max="3" chance="4.886" /> <!-- Elemental Sword -->
-				<item id="269" min="1" max="3" chance="4.871" /> <!-- Blood Tornado -->
-				<item id="235" min="1" max="3" chance="4.863" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="3" chance="4.859" /> <!-- Carnage Bow -->
-				<item id="5295" min="1" max="3" chance="4.857" /> <!-- Sealed Tallum Gloves -->
-				<item id="289" min="1" max="3" chance="4.836" /> <!-- Soul Bow -->
-				<item id="270" min="1" max="3" chance="3.99" /> <!-- Dragon Grinder -->
-				<item id="212" min="1" max="3" chance="3.987" /> <!-- Dasparion's Staff -->
-				<item id="2500" min="1" max="3" chance="3.974" /> <!-- Dark Legion's Edge -->
-				<item id="81" min="1" max="3" chance="3.954" /> <!-- Dragon Slayer -->
-				<item id="305" min="1" max="3" chance="3.952" /> <!-- Tallum Glaive -->
-				<item id="6324" min="1" max="3" chance="3.923" /> <!-- Sealed Phoenix Earring -->
-				<item id="236" min="1" max="3" chance="3.921" /> <!-- Soul Separator -->
-				<item id="7895" min="1" max="3" chance="3.893" /> <!-- Flaming Dragon Skull -->
-				<item id="7902" min="1" max="3" chance="3.891" /> <!-- Doom Crusher -->
-				<item id="164" min="1" max="3" chance="3.874" /> <!-- Elysian -->
-				<item id="213" min="1" max="3" chance="3.855" /> <!-- Branch of the Mother Tree -->
-				<item id="5314" min="1" max="3" chance="2.999" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5287" min="1" max="3" chance="2.954" /> <!-- Sealed Dark Crystal Breastplate -->
-				<item id="5319" min="1" max="3" chance="2.953" /> <!-- Sealed Majestic Boots -->
-				<item id="5288" min="1" max="3" chance="2.945" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5317" min="1" max="3" chance="2.937" /> <!-- Sealed Majestic Circlet -->
-				<item id="5293" min="1" max="3" chance="2.931" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5304" min="1" max="3" chance="2.925" /> <!-- Sealed Tallum Tunic -->
-				<item id="5301" min="1" max="3" chance="2.92" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5297" min="1" max="3" chance="2.919" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5305" min="1" max="3" chance="2.917" /> <!-- Sealed Tallum Stockings -->
-				<item id="5308" min="1" max="3" chance="2.914" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5312" min="1" max="3" chance="2.908" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5318" min="1" max="3" chance="2.901" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5313" min="1" max="3" chance="2.886" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5298" min="1" max="3" chance="2.877" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5320" min="1" max="3" chance="1.983" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="1.947" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5311" min="1" max="3" chance="1.936" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5323" min="1" max="3" chance="1.93" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5316" min="1" max="3" chance="1.906" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5329" min="1" max="3" chance="1.895" /> <!-- Sealed Majestic Robe -->
-				<item id="6323" min="1" max="3" chance="0.75" /> <!-- Sealed Phoenix Necklace -->
-				<item id="91545" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (B-grade) -->
-				<item id="91538" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (B-grade) -->
-				<item id="91531" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (B-grade) -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="1" max="3" chance="100" /> <!-- Cloth Piece -->
-				<item id="730" min="6" max="12" chance="50.95" /> <!-- Scroll: Enchant Armor (A-grade) -->
-				<item id="33814" min="5" max="15" chance="50.39" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33808" min="2" max="4" chance="49.76" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="729" min="2" max="4" chance="49.56" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="90899" min="1" max="1" chance="2.95" /> <!-- Blessed Agathion's Soul -->
+				<group chance="98">
+					<item id="80" min="1" max="3" chance="5" /> <!-- Tallum Blade -->
+					<item id="81" min="1" max="3" chance="4" /> <!-- Dragon Slayer -->
+					<item id="98" min="1" max="3" chance="5" /> <!-- Halberd -->
+					<item id="150" min="1" max="3" chance="5" /> <!-- Elemental Sword -->
+					<item id="151" min="1" max="3" chance="5" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="3" chance="4" /> <!-- Elysian -->
+					<item id="212" min="1" max="3" chance="4" /> <!-- Dasparion's Staff -->
+					<item id="213" min="1" max="3" chance="4" /> <!-- Branch of the Mother Tree -->
+					<item id="235" min="1" max="3" chance="5" /> <!-- Bloody Orchid -->
+					<item id="236" min="1" max="3" chance="4" /> <!-- Soul Separator -->
+					<item id="269" min="1" max="3" chance="5" /> <!-- Blood Tornado -->
+					<item id="270" min="1" max="3" chance="4" /> <!-- Dragon Grinder -->
+					<item id="288" min="1" max="3" chance="5" /> <!-- Carnage Bow -->
+					<item id="289" min="1" max="3" chance="5" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="3" chance="4" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="3" chance="4" /> <!-- Dark Legion's Edge -->
+					<item id="2504" min="1" max="3" chance="5" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="3" chance="5" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="3" chance="5" /> <!-- Spiritual Eye -->
+					<item id="7895" min="1" max="3" chance="4" /> <!-- Flaming Dragon Skull -->
+					<item id="7899" min="1" max="3" chance="5" /> <!-- Destroyer Hammer -->
+					<item id="7902" min="1" max="3" chance="4" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="98">
+					<item id="7883" min="1" max="3" chance="17" /> <!-- Guardian's Sword -->
+					<item id="7889" min="1" max="3" chance="16" /> <!-- Wizard's Tear -->
+					<item id="7892" min="1" max="3" chance="17" /> <!-- Spell Breaker -->
+					<item id="7893" min="1" max="3" chance="17" /> <!-- Kaim Vanul's Bones -->
+					<item id="7900" min="1" max="3" chance="17" /> <!-- Ice Storm Hammer -->
+					<item id="7901" min="1" max="3" chance="16" /> <!-- Star Buster -->
+				</group>
+				<group chance="98">
+					<item id="5287" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5292" min="1" max="3" chance="7" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5293" min="1" max="3" chance="3" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="3" chance="5" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="3" chance="5" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="3" chance="5" /> <!-- Sealed Tallum Boots -->
+					<item id="5297" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5301" min="1" max="3" chance="3" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="3" chance="3" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="3" chance="3" /> <!-- Sealed Tallum Stockings -->
+					<item id="5308" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Robe -->
+					<item id="5311" min="1" max="3" chance="2" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="3" chance="3" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="3" chance="3" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="3" chance="3" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5315" min="1" max="3" chance="6" /> <!-- Sealed Shield of Nightmare -->
+					<item id="5316" min="1" max="3" chance="2" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="3" chance="3" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="3" chance="3" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="3" chance="3" /> <!-- Sealed Majestic Boots -->
+					<item id="5320" min="1" max="3" chance="2" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5323" min="1" max="3" chance="2" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5326" min="1" max="3" chance="2" /> <!-- Sealed Robe of Nightmare -->
+					<item id="5329" min="1" max="3" chance="2" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="98">
+					<item id="6323" min="1" max="3" chance="1" /> <!-- Sealed Phoenix Necklace -->
+					<item id="6324" min="1" max="3" chance="4" /> <!-- Sealed Phoenix Earring -->
+					<item id="6325" min="1" max="3" chance="15" /> <!-- Sealed Phoenix Ring -->
+					<item id="6326" min="1" max="3" chance="8" /> <!-- Sealed Majestic Necklace -->
+					<item id="6327" min="1" max="3" chance="20" /> <!-- Sealed Majestic Earring -->
+					<item id="6328" min="1" max="3" chance="52" /> <!-- Sealed Majestic Ring -->
+				</group>
+				<group chance="100">
+					<item id="33808" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
+					<item id="33814" min="5" max="15" chance="50" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="729" min="2" max="4" chance="50" /> <!-- Scroll: Enchant Weapon (A-grade) -->
+					<item id="730" min="6" max="12" chance="50" /> <!-- Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="20">
+					<item id="90763" min="1" max="1" chance="100" /> <!-- Zaken's Earring -->
+				</group>
+				<group chance="100">
+					<item id="49756" min="1" max="3" chance="100" /> <!-- Cloth Piece -->
+				</group>
+				<group chance="100">
+					<item id="91531" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91538" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91545" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (B-grade) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29023" level="74" type="Monster" name="Maiden Doll">
+	<npc id="29023" level="58" type="Monster" name="Maiden Doll">
 		<parameters>
 			<param name="MoveAroundSocial" value="50" />
 			<param name="MoveAroundSocial1" value="50" />
@@ -1570,33 +1508,31 @@
 		<equipment rhand="5129" /> <!-- Doll Knife -->
 		<acquire exp="129198" sp="3875" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1828" hpRegen="6.5" mp="832" mpRegen="2.4" />
-			<attack physical="442" magical="302" random="30" critical="4" accuracy="40" attackSpeed="253" type="DUAL" range="40" distance="80" width="120" />
+			<vitals hp="1828" hpRegen="6.5" mp="832.4" mpRegen="2.4" />
+			<attack physical="442" magical="302" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="DUAL" range="40" distance="80" width="120" />
 			<defence physical="261" magical="191" />
 			<speed>
 				<walk ground="22" />
 				<run ground="150" />
 			</speed>
-			<hitTime>500</hitTime>
+			<hitTime>50</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="5" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4085" level="1" /> <!-- Critical Damage -->
-			<skill id="4086" level="1" /> <!-- Critical Chance -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="9" /> <!-- Average M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="19" /> <!-- Dual-Sword Weapons -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4333" level="5" /> <!-- Dark Attack Resistance -->
-			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4415" level="19" /> <!-- Dual Sword -->
+			<skill id="4071" level="5" /> <!-- Bow Resistance -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1604,22 +1540,8 @@
 			<radius normal="6" />
 			<height normal="12" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="97" min="1" max="1" chance="0.0075" /> <!-- Lance -->
-				<item id="268" min="1" max="1" chance="0.0075" /> <!-- Bellion Cestus -->
-				<item id="57" min="2433" max="5685" chance="70" /> <!-- Adena -->
-				<item id="1887" min="1" max="1" chance="10.68" /> <!-- Varnish of Purity -->
-				<item id="4120" min="1" max="1" chance="1.603" /> <!-- Bellion Cestus Edge -->
-				<item id="4115" min="1" max="1" chance="1.574" /> <!-- Lance Blade -->
-			</drop>
-			<spoil>
-				<item id="948" min="1" max="1" chance="4.296" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="947" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-			</spoil>
-		</dropLists>
 	</npc>
-	<npc id="29024" level="74" type="Monster" name="Veil Master">
+	<npc id="29024" level="59" type="Monster" name="Veil Master">
 		<parameters>
 			<param name="MoveAroundSocial" value="114" />
 			<param name="MoveAroundSocial1" value="114" />
@@ -1630,7 +1552,7 @@
 		<acquire exp="90904" sp="2727" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1880" hpRegen="6.5" mp="861" mpRegen="2.4" />
-			<attack physical="461" magical="315" random="30" critical="4" accuracy="40" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="461" magical="315" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="267" magical="195" />
 			<speed>
 				<walk ground="70" />
@@ -1639,66 +1561,9 @@
 			<hitTime>740</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="5" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4085" level="1" /> <!-- Critical Damage -->
-			<skill id="4086" level="1" /> <!-- Critical Chance -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4333" level="5" /> <!-- Dark Attack Resistance -->
 			<skill id="4416" level="9" /> <!-- Demons -->
-		</skillList>
-		<exCrtEffect>true</exCrtEffect>
-		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
-		<collision>
-			<radius normal="12" />
-			<height normal="40" />
-		</collision>
-		<dropLists>
-			<drop>
-				<item id="79" min="1" max="1" chance="0.003" /> <!-- Damascus -->
-				<item id="171" min="1" max="1" chance="0.003" /> <!-- Deadman's Glory -->
-				<item id="57" min="1372" max="3205" chance="70" /> <!-- Adena -->
-				<item id="1895" min="1" max="1" chance="11.11" /> <!-- Metallic Fiber -->
-				<item id="1876" min="1" max="1" chance="8.019" /> <!-- Mithril Ore -->
-				<item id="1866" min="2" max="6" chance="6.628" /> <!-- Suede -->
-				<item id="1879" min="1" max="1" chance="6.623" /> <!-- Cokes -->
-				<item id="1870" min="5" max="15" chance="3.946" /> <!-- Coal -->
-				<item id="1871" min="9" max="27" chance="2.235" /> <!-- Charcoal -->
-				<item id="4114" min="1" max="1" chance="0.75" /> <!-- Damascus Sword Blade -->
-				<item id="4116" min="1" max="1" chance="0.75" /> <!-- Deadman's Glory Stone -->
-			</drop>
-			<spoil>
-				<item id="948" min="1" max="1" chance="2.453" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="947" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-			</spoil>
-		</dropLists>
-	</npc>
-	<npc id="29025" level="75" type="Folk" name="Baium">
-		<race>HUMANOID</race>
-		<sex>MALE</sex>
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="1709400" hpRegen="8.5" mp="18000" mpRegen="3" />
-			<attack physical="874.18" magical="596.95" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="233.61" magical="233.61" />
-			<speed>
-				<walk ground="50" />
-				<run ground="120" />
-			</speed>
-			<abnormalResist physical="230" magical="230" />
-		</stats>
-		<status attackable="false" undying="true" />
-		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1707,7 +1572,44 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4071" level="5" /> <!-- Bow Resistance -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+		</skillList>
+		<exCrtEffect>true</exCrtEffect>
+		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="29025" level="75" type="Folk" name="Baium">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="1709400" hpRegen="718" mp="18000" mpRegen="99" />
+			<attack physical="1874.18" magical="1596.95" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3300" magical="2200" />
+			<speed>
+				<walk ground="50" />
+				<run ground="120" />
+			</speed>
+			<hitTime>60</hitTime>
+			<abnormalResist physical="230" magical="230" />
+		</stats>
+		<status attackable="false" undying="true" />
+		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="300" aggroRange="4296" />
@@ -1727,7 +1629,7 @@
 		<equipment rhand="232" /> <!-- Dark Elven Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1933" hpRegen="6.5" mp="804" mpRegen="2.4" />
-			<attack physical="420" magical="328" random="10" critical="8" accuracy="40" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
+			<attack physical="420" magical="328" random="5" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="272" magical="199" />
 			<speed>
 				<walk ground="14" />
@@ -1736,9 +1638,9 @@
 			<hitTime>760</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1746,10 +1648,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="7" /> <!-- Daggers -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4415" level="7" /> <!-- Dagger -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1769,7 +1669,7 @@
 		<equipment rhand="225" /> <!-- Mithril Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1776" hpRegen="6.5" mp="584" mpRegen="2.1" />
-			<attack physical="371" magical="289" random="10" critical="8" accuracy="40" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
+			<attack physical="371" magical="289" random="5" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="256" magical="187" />
 			<speed>
 				<walk ground="11" />
@@ -1778,9 +1678,9 @@
 			<hitTime>740</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1788,10 +1688,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="7" /> <!-- Daggers -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4415" level="7" /> <!-- Dagger -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1803,14 +1701,10 @@
 	<npc id="29045" level="85" type="Folk" name="Frintezza">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="643059.482835" hpRegen="319.2293199" mp="38410.582" mpRegen="3" />
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="428076.229929773" hpRegen="2484.3" mp="23423.9034583234" mpRegen="3.15" />
 			<attack physical="2641.63342970569" magical="971.856593649426" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
 			<defence physical="4218.55484265502" magical="3093.6078479881" />
-			<attribute>
-				<attack type="WIND" value="350" />
-				<defence fire="300" water="300" wind="370" earth="250" holy="300" dark="300" default="300" />
-			</attribute>
 			<speed>
 				<walk ground="30" />
 				<run ground="31" />
@@ -1819,8 +1713,17 @@
 			<abnormalResist physical="230" magical="230" />
 		</stats>
 		<skillList>
-			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5464" level="1" /> <!-- Wind Attack -->
+			<skill id="4416" level="6" /> <!-- Humanoid -->
+			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="1" /> <!-- Bare Hands -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>15</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1839,14 +1742,10 @@
 		<sex>MALE</sex>
 		<equipment rhand="8204" /> <!-- Monster Only (Follower of Frintezza Calibur) -->
 		<acquire exp="130849003" sp="31403" />
-		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="19146585" hpRegen="248.43" mp="17588" mpRegen="109" />
-			<attack physical="3135.90530099925" magical="1442.51644402476" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="1342.97453242915" magical="2089.07149518896" />
-			<attribute>
-				<attack type="DARK" value="280" />
-				<defence fire="200" water="200" wind="200" earth="200" holy="150" dark="200" default="300" />
-			</attribute>
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="32000000" hpRegen="1" mp="2025740" mpRegen="1000" />
+			<attack physical="35810" magical="4375" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="2505" magical="1452" />
 			<speed>
 				<walk ground="240" />
 				<run ground="111" />
@@ -1855,8 +1754,8 @@
 			<abnormalResist physical="230" magical="230" />
 		</stats>
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="4" /> <!-- Resist Bow/Crossbow Weapons -->
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1865,13 +1764,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="5078" level="1" /> <!-- Frintezza Critical Power -->
-			<skill id="4494" level="1" /> <!-- Raid Boss -->
-			<skill id="14768" level="1" /> <!-- Raid Boss (Lv. 85) -->
-			<skill id="5467" level="1" /> <!-- Dark Attacks -->
-			<skill id="5017" level="1" /> <!-- Demon -->
-			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4071" level="4" /> <!-- Bow Resistance -->
+			<skill id="5078" level="1" /> <!-- Frintezza Critical Damage -->
 		</skillList>
 		<corpseTime>18</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1891,13 +1786,15 @@
 		<sex>MALE</sex>
 		<equipment rhand="8222" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="56970000" hpRegen="319.2293199" mp="3510317.685" mpRegen="3" />
-			<attack physical="8184.13934" magical="2579.001338" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3584.547554" magical="1748.708651" />
+			<vitals hp="40000000" hpRegen="1" mp="2025740" mpRegen="1000" />
+			<attack physical="35810" magical="4375" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="2505" magical="1452" />
 			<speed>
 				<walk ground="250" />
 				<run ground="155" />
 			</speed>
+			<hitTime>430</hitTime>
+			<abnormalResist physical="230" magical="230" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -1905,134 +1802,8 @@
 			<height normal="112.8" />
 		</collision>
 		<skillList>
-			<skill id="4494" level="1" /> <!-- Raid Boss -->
 			<skill id="4416" level="9" /> <!-- Demons -->
-		</skillList>
-		<dropLists>
-			<drop>
-				<item id="91550" min="1" max="1" chance="4.947" /> <!-- Frintezza's Necklace -->
-				<item id="5293" min="1" max="1" chance="1.138" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5313" min="1" max="1" chance="1.099" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5296" min="1" max="1" chance="1.09" /> <!-- Sealed Tallum Boots -->
-				<item id="5297" min="1" max="1" chance="1.087" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5312" min="1" max="1" chance="1.086" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5304" min="1" max="1" chance="1.08" /> <!-- Sealed Tallum Tunic -->
-				<item id="5308" min="1" max="1" chance="1.075" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5311" min="1" max="1" chance="1.068" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5316" min="1" max="1" chance="1.056" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5298" min="1" max="1" chance="1.051" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5329" min="1" max="1" chance="1.049" /> <!-- Sealed Majestic Robe -->
-				<item id="5288" min="1" max="1" chance="1.04" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5305" min="1" max="1" chance="1.037" /> <!-- Sealed Tallum Stockings -->
-				<item id="5314" min="1" max="1" chance="1.033" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5315" min="1" max="1" chance="1.033" /> <!-- Sealed Shield of Nightmare -->
-				<item id="5319" min="1" max="1" chance="1.023" /> <!-- Sealed Majestic Boots -->
-				<item id="5301" min="1" max="1" chance="1.021" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5291" min="1" max="1" chance="1.019" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5290" min="1" max="1" chance="1.018" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5294" min="1" max="1" chance="1.012" /> <!-- Sealed Tallum Helmet -->
-				<item id="5320" min="1" max="1" chance="1.007" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5287" min="1" max="1" chance="1.004" /> <!-- Sealed Dark Crystal Breastplate -->
-				<item id="5317" min="1" max="1" chance="0.997" /> <!-- Sealed Majestic Circlet -->
-				<item id="5295" min="1" max="1" chance="0.995" /> <!-- Sealed Tallum Gloves -->
-				<item id="5318" min="1" max="1" chance="0.992" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5323" min="1" max="1" chance="0.991" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5292" min="1" max="1" chance="0.987" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5326" min="1" max="1" chance="0.984" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5289" min="1" max="1" chance="0.978" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="7884" min="1" max="1" chance="0.75" /> <!-- Infernal Master -->
-				<item id="7894" min="1" max="1" chance="0.75" /> <!-- Spiritual Eye -->
-				<item id="7899" min="1" max="1" chance="0.75" /> <!-- Destroyer Hammer -->
-				<item id="7902" min="1" max="1" chance="0.75" /> <!-- Doom Crusher -->
-				<item id="7895" min="1" max="1" chance="0.75" /> <!-- Flaming Dragon Skull -->
-				<item id="213" min="1" max="1" chance="0.75" /> <!-- Branch of the Mother Tree -->
-				<item id="80" min="1" max="1" chance="0.75" /> <!-- Tallum Blade -->
-				<item id="81" min="1" max="1" chance="0.75" /> <!-- Dragon Slayer -->
-				<item id="98" min="1" max="1" chance="0.75" /> <!-- Halberd -->
-				<item id="150" min="1" max="1" chance="0.75" /> <!-- Elemental Sword -->
-				<item id="151" min="1" max="1" chance="0.75" /> <!-- Sword of Miracles -->
-				<item id="164" min="1" max="1" chance="0.75" /> <!-- Elysian -->
-				<item id="212" min="1" max="1" chance="0.75" /> <!-- Dasparion's Staff -->
-				<item id="235" min="1" max="1" chance="0.75" /> <!-- Bloody Orchid -->
-				<item id="236" min="1" max="1" chance="0.75" /> <!-- Soul Separator -->
-				<item id="2504" min="1" max="1" chance="0.75" /> <!-- Meteor Shower -->
-				<item id="2500" min="1" max="1" chance="0.75" /> <!-- Dark Legion's Edge -->
-				<item id="305" min="1" max="1" chance="0.75" /> <!-- Tallum Glaive -->
-				<item id="289" min="1" max="1" chance="0.75" /> <!-- Soul Bow -->
-				<item id="288" min="1" max="1" chance="0.75" /> <!-- Carnage Bow -->
-				<item id="270" min="1" max="1" chance="0.75" /> <!-- Dragon Grinder -->
-				<item id="269" min="1" max="1" chance="0.75" /> <!-- Blood Tornado -->
-				<item id="8688" min="1" max="1" chance="0.3" /> <!-- Daimon Crystal -->
-				<item id="8687" min="1" max="1" chance="0.3" /> <!-- Cabrio's Hand -->
-				<item id="8686" min="1" max="1" chance="0.3" /> <!-- Themis' Tongue -->
-				<item id="8685" min="1" max="1" chance="0.3" /> <!-- Sobekk's Hurricane -->
-				<item id="8684" min="1" max="1" chance="0.3" /> <!-- Shyeed's Bow -->
-				<item id="8683" min="1" max="1" chance="0.3" /> <!-- Tiphon's Spear -->
-				<item id="8681" min="1" max="1" chance="0.3" /> <!-- Behemoth' Tuning Fork -->
-				<item id="8680" min="1" max="1" chance="0.3" /> <!-- Barakiel's Axe -->
-				<item id="8679" min="1" max="1" chance="0.3" /> <!-- Sword of Ipos -->
-				<item id="8678" min="1" max="1" chance="0.3" /> <!-- Sirra's Blade -->
-				<item id="8682" min="1" max="1" chance="0.3" /> <!-- Naga Storm -->
-				<item id="8619" min="1" max="1" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Language Version) -->
-				<item id="70000" min="20" max="60" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="33815" min="1" max="1" chance="50.22" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
-				<item id="8620" min="1" max="1" chance="49.14" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="33809" min="1" max="1" chance="48.78" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
-				<item id="49756" min="1" max="1" chance="9.943" /> <!-- Cloth Piece -->
-				<item id="91548" min="1" max="1" chance="9.939" /> <!-- Special Armor Varnish (A-grade) -->
-				<item id="91549" min="1" max="1" chance="9.939" /> <!-- Special Accessory Varnish (A-grade) -->
-				<item id="91500" min="1" max="1" chance="0.75" /> <!-- Basalt Battlehammer Crafting Pack -->
-				<item id="91515" min="1" max="1" chance="0.75" /> <!-- Sealed Draconic Leather Armor Crafting Pack -->
-				<item id="91516" min="1" max="1" chance="0.75" /> <!-- Sealed Draconic Leather Gloves Crafting Pack -->
-				<item id="91517" min="1" max="1" chance="0.75" /> <!-- Sealed Draconic Leather Boots Crafting Pack -->
-				<item id="91518" min="1" max="1" chance="0.75" /> <!-- Sealed Draconic Leather Helmet Crafting Pack -->
-				<item id="91519" min="1" max="1" chance="0.75" /> <!-- Sealed Major Arcana Robe Crafting Pack -->
-				<item id="91520" min="1" max="1" chance="0.75" /> <!-- Sealed Major Arcana Gloves Crafting Pack -->
-				<item id="91521" min="1" max="1" chance="0.75" /> <!-- Sealed Major Arcana Boots Crafting Pack -->
-				<item id="91522" min="1" max="1" chance="0.75" /> <!-- Sealed Major Arcana Circlet Crafting Pack -->
-				<item id="91523" min="1" max="1" chance="0.75" /> <!-- Sealed Tateossian Earring Crafting Pack -->
-				<item id="91524" min="1" max="1" chance="0.75" /> <!-- Sealed Tateossian Ring Crafting Pack -->
-				<item id="91525" min="1" max="1" chance="0.75" /> <!-- Sealed Tateossian Necklace Crafting Pack -->
-				<item id="90898" min="1" max="1" chance="0.75" /> <!-- Agathion's Soul -->
-				<item id="91514" min="1" max="1" chance="0.75" /> <!-- Sealed Imperial Crusader Helmet Crafting Pack -->
-				<item id="91513" min="1" max="1" chance="0.75" /> <!-- Sealed Imperial Crusader Shield Crafting Pack -->
-				<item id="91501" min="1" max="1" chance="0.75" /> <!-- Imperial Staff Crafting Pack -->
-				<item id="91502" min="1" max="1" chance="0.75" /> <!-- Angel Slayer Crafting Pack -->
-				<item id="91503" min="1" max="1" chance="0.75" /> <!-- Dragon Hunter Axe Crafting Pack -->
-				<item id="91504" min="1" max="1" chance="0.75" /> <!-- Saint Spear Crafting Pack -->
-				<item id="91505" min="1" max="1" chance="0.75" /> <!-- Demon Splinter Crafting Pack -->
-				<item id="91506" min="1" max="1" chance="0.75" /> <!-- Heaven's Divider Crafting Pack -->
-				<item id="91507" min="1" max="1" chance="0.75" /> <!-- Arcana Mace Crafting Pack -->
-				<item id="91508" min="1" max="1" chance="0.75" /> <!-- Draconic Bow Crafting Pack -->
-				<item id="91509" min="1" max="1" chance="0.75" /> <!-- Sealed Imperial Crusader Breastplate Crafting Pack -->
-				<item id="91499" min="1" max="1" chance="0.75" /> <!-- Forgotten Blade Crafting Pack -->
-				<item id="91511" min="1" max="1" chance="0.75" /> <!-- Sealed Imperial Crusader Gauntlets Crafting Pack -->
-				<item id="91512" min="1" max="1" chance="0.75" /> <!-- Sealed Imperial Crusader Boots Crafting Pack -->
-				<item id="91510" min="1" max="1" chance="0.75" /> <!-- Sealed Imperial Crusader Gaiters Crafting Pack -->
-			</drop>
-		</dropLists>
-	</npc>
-	<npc id="29048" level="85" type="Monster" name="Evil Spirit">
-		<race>CONSTRUCT</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="82844" hpRegen="1.03" mp="2177" mpRegen="1.03" />
-			<attack physical="1637.21079615435" magical="1151.5428303933" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="1637.38608949103" magical="1091.59072648368" evasion="3" />
-			<attribute>
-				<attack type="WIND" value="280" />
-				<defence fire="200" water="200" wind="200" earth="150" holy="200" dark="200" default="220" />
-			</attribute>
-			<speed>
-				<walk ground="10" />
-				<run ground="1" />
-			</speed>
-			<hitTime>500</hitTime>
-			<abnormalResist physical="10" magical="10" />
-		</stats>
-		<status undying="false" />
-		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2041,8 +1812,157 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
-			<skill id="5464" level="1" /> <!-- Wind Attacks -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4071" level="4" /> <!-- Bow Resistance -->
+			<skill id="5078" level="1" /> <!-- Frintezza Critical Damage -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<group chance="20">
+					<item id="80" min="1" max="1" chance="4.54" /> <!-- Tallum Blade -->
+					<item id="81" min="1" max="1" chance="4.54" /> <!-- Dragon Slayer -->
+					<item id="98" min="1" max="1" chance="4.54" /> <!-- Halberd -->
+					<item id="150" min="1" max="1" chance="4.54" /> <!-- Elemental Sword -->
+					<item id="151" min="1" max="1" chance="4.54" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="1" chance="4.54" /> <!-- Elysian -->
+					<item id="212" min="1" max="1" chance="4.54" /> <!-- Dasparion's Staff -->
+					<item id="213" min="1" max="1" chance="4.54" /> <!-- Branch of the Mother Tree -->
+					<item id="235" min="1" max="1" chance="4.54" /> <!-- Bloody Orchid -->
+					<item id="236" min="1" max="1" chance="4.54" /> <!-- Soul Separator -->
+					<item id="269" min="1" max="1" chance="4.54" /> <!-- Blood Tornado -->
+					<item id="270" min="1" max="1" chance="4.54" /> <!-- Dragon Grinder -->
+					<item id="288" min="1" max="1" chance="4.54" /> <!-- Carnage Bow -->
+					<item id="289" min="1" max="1" chance="4.54" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="1" chance="4.54" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="1" chance="4.54" /> <!-- Dark Legion's Edge -->
+					<item id="2504" min="1" max="1" chance="4.54" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="1" chance="4.54" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="1" chance="4.54" /> <!-- Spiritual Eye -->
+					<item id="7895" min="1" max="1" chance="4.54" /> <!-- Flaming Dragon Skull -->
+					<item id="7899" min="1" max="1" chance="4.54" /> <!-- Destroyer Hammer -->
+					<item id="7902" min="1" max="1" chance="4.66" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="5">
+					<item id="8678" min="1" max="1" chance="9.09" /> <!-- Sirra's Blade -->
+					<item id="8679" min="1" max="1" chance="9.09" /> <!-- Sword of Ipos -->
+					<item id="8680" min="1" max="1" chance="9.09" /> <!-- Barakiel's Axe -->
+					<item id="8681" min="1" max="1" chance="9.09" /> <!-- Behemoth' Tuning Fork -->
+					<item id="8682" min="1" max="1" chance="9.09" /> <!-- Naga Storm -->
+					<item id="8683" min="1" max="1" chance="9.09" /> <!-- Tiphon's Spear -->
+					<item id="8684" min="1" max="1" chance="9.09" /> <!-- Shyeed's Bow -->
+					<item id="8685" min="1" max="1" chance="9.09" /> <!-- Sobekk's Hurricane -->
+					<item id="8686" min="1" max="1" chance="9.09" /> <!-- Themis' Tongue -->
+					<item id="8687" min="1" max="1" chance="9.09" /> <!-- Cabrio's Hand -->
+					<item id="8688" min="1" max="1" chance="9.1" /> <!-- Daimon Crystal -->
+				</group>
+				<group chance="30">
+					<item id="5287" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5292" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5293" min="1" max="1" chance="3.56" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="1" chance="3.44" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="1" chance="3.44" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="1" chance="3.44" /> <!-- Sealed Tallum Boots -->
+					<item id="5297" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5301" min="1" max="1" chance="3.44" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="1" chance="3.44" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="1" chance="3.44" /> <!-- Sealed Tallum Stockings -->
+					<item id="5308" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Robe -->
+					<item id="5311" min="1" max="1" chance="3.44" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="1" chance="3.44" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="1" chance="3.44" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="1" chance="3.44" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5315" min="1" max="1" chance="3.56" /> <!-- Sealed Shield of Nightmare -->
+					<item id="5316" min="1" max="1" chance="3.44" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="1" chance="3.44" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="1" chance="3.44" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="1" chance="3.44" /> <!-- Sealed Majestic Boots -->
+					<item id="5320" min="1" max="1" chance="3.44" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5323" min="1" max="1" chance="3.44" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5326" min="1" max="1" chance="3.44" /> <!-- Sealed Robe of Nightmare -->
+					<item id="5329" min="1" max="1" chance="3.44" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="100">
+					<item id="33809" min="1" max="1" chance="50" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
+					<item id="33815" min="1" max="1" chance="50" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="20">
+					<item id="91499" min="1" max="1" chance="3.7" /> <!-- Forgotten Blade Crafting Pack -->
+					<item id="91500" min="1" max="1" chance="3.7" /> <!-- Basalt Battlehammer Crafting Pack -->
+					<item id="91501" min="1" max="1" chance="3.7" /> <!-- Imperial Staff Crafting Pack -->
+					<item id="91502" min="1" max="1" chance="3.7" /> <!-- Angel Slayer Crafting Pack -->
+					<item id="91503" min="1" max="1" chance="3.7" /> <!-- Dragon Hunter Axe Crafting Pack -->
+					<item id="91504" min="1" max="1" chance="3.7" /> <!-- Saint Spear Crafting Pack -->
+					<item id="91505" min="1" max="1" chance="3.7" /> <!-- Demon Splinter Crafting Pack -->
+					<item id="91506" min="1" max="1" chance="3.7" /> <!-- Heaven's Divider Crafting Pack -->
+					<item id="91507" min="1" max="1" chance="3.7" /> <!-- Arcana Mace Crafting Pack -->
+					<item id="91508" min="1" max="1" chance="3.7" /> <!-- Draconic Bow Crafting Pack -->
+					<item id="91509" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Breastplate Crafting Pack -->
+					<item id="91510" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Gaiters Crafting Pack -->
+					<item id="91511" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Gauntlets Crafting Pack -->
+					<item id="91512" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Boots Crafting Pack -->
+					<item id="91513" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Shield Crafting Pack -->
+					<item id="91514" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Helmet Crafting Pack -->
+					<item id="91515" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Armor Crafting Pack -->
+					<item id="91516" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Gloves Crafting Pack -->
+					<item id="91517" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Boots Crafting Pack -->
+					<item id="91518" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Helmet Crafting Pack -->
+					<item id="91519" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Robe Crafting Pack -->
+					<item id="91520" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Gloves Crafting Pack -->
+					<item id="91521" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Boots Crafting Pack -->
+					<item id="91522" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Circlet Crafting Pack -->
+					<item id="91523" min="1" max="1" chance="3.7" /> <!-- Sealed Tateossian Earring Crafting Pack -->
+					<item id="91524" min="1" max="1" chance="3.7" /> <!-- Sealed Tateossian Ring Crafting Pack -->
+					<item id="91525" min="1" max="1" chance="3.8" /> <!-- Sealed Tateossian Necklace Crafting Pack -->
+				</group>
+				<group chance="10">
+					<item id="91548" min="1" max="1" chance="100" /> <!-- Special Armor Varnish (A-grade) -->
+				</group>
+				<group chance="10">
+					<item id="91549" min="1" max="1" chance="100" /> <!-- Special Accessory Varnish (A-grade) -->
+				</group>
+				<group chance="5">
+					<item id="91550" min="1" max="1" chance="100" /> <!-- Frintezza's Necklace -->
+				</group>
+				<group chance="100">
+					<item id="8619" min="1" max="1" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Language Version) -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="1" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
+			</drop>
+		</dropLists>
+	</npc>
+	<npc id="29048" level="85" type="Monster" name="Evil Spirit">
+		<race>CONSTRUCT</race>
+		<sex>FEMALE</sex>
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="126582.278481013" hpRegen="1" mp="2177.28986625269" mpRegen="1.03" />
+			<attack physical="35810" magical="4375" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="2505" magical="1452" />
+			<speed>
+				<walk ground="10" />
+				<run ground="1" />
+			</speed>
+			<hitTime>50</hitTime>
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="true" noSleepMode="true" />
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="1" /> <!-- Bare Hands -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="CORPSE" clanHelpRange="1000" isAggressive="true" aggroRange="6000">
@@ -2058,24 +1978,20 @@
 	<npc id="29049" level="85" type="Monster" name="Evil Spirit">
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="82844" hpRegen="1.03" mp="2177" mpRegen="1.03" />
-			<attack physical="1637.21079615435" magical="1151.5428303933" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="1637.38608949103" magical="1091.59072648368" evasion="3" />
-			<attribute>
-				<attack type="WIND" value="280" />
-				<defence fire="200" water="200" wind="200" earth="150" holy="200" dark="200" default="220" />
-			</attribute>
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="126582.278481013" hpRegen="1" mp="2177.28986625269" mpRegen="1.03" />
+			<attack physical="35810" magical="4375" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="2505" magical="1452" />
 			<speed>
 				<walk ground="10" />
 				<run ground="1" />
 			</speed>
-			<hitTime>500</hitTime>
+			<hitTime>50</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2084,8 +2000,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
-			<skill id="5464" level="1" /> <!-- Wind Attacks -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="CORPSE" clanHelpRange="1000" isAggressive="true" aggroRange="6000">
@@ -2101,14 +2016,10 @@
 	<npc id="29050" level="85" type="Monster" name="Halisha's Breath">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="12996" hpRegen="1.01" mp="20560" mpRegen="3.03" />
-			<attack physical="1556.78628597682" magical="1073.71405840992" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="642.236873936287" magical="428.157916018841" evasion="1" />
-			<attribute>
-				<attack type="DARK" value="280" />
-				<defence fire="200" water="200" wind="200" earth="200" holy="150" dark="200" default="220" />
-			</attribute>
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="44350.854" hpRegen="1" mp="20560.2695810843" mpRegen="3.03" />
+			<attack physical="47554.9" magical="12177.6875" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="1562.9247648" magical="857.7603864" />
 			<speed>
 				<walk ground="30" />
 				<run ground="200" />
@@ -2116,9 +2027,9 @@
 			<hitTime>430</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="9" /> <!-- Demons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2127,9 +2038,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="3" /> <!-- Light Armor Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="5467" level="1" /> <!-- Dark Attacks -->
-			<skill id="5009" level="1" /> <!-- Frintezza Ghost Fighter -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="2000" isAggressive="true">
@@ -2145,14 +2054,10 @@
 	<npc id="29051" level="85" type="Monster" name="Halisha's Breath">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="12996" hpRegen="1.01" mp="20560" mpRegen="3.03" />
-			<attack physical="1556.78628597682" magical="1073.71405840992" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="642.236873936287" magical="428.157916018841" evasion="1" />
-			<attribute>
-				<attack type="DARK" value="280" />
-				<defence fire="200" water="200" wind="200" earth="200" holy="150" dark="200" default="220" />
-			</attribute>
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="44350.854" hpRegen="1" mp="20560.2695810843" mpRegen="3.03" />
+			<attack physical="47554.9" magical="12177.6875" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="1562.9247648" magical="857.7603864" />
 			<speed>
 				<walk ground="30" />
 				<run ground="200" />
@@ -2160,9 +2065,9 @@
 			<hitTime>430</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="9" /> <!-- Demons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2171,9 +2076,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="3" /> <!-- Light Armor Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="5467" level="1" /> <!-- Dark Attacks -->
-			<skill id="5010" level="1" /> <!-- Frintezza Ghost Mage -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="2000" isAggressive="true">
@@ -2189,19 +2092,20 @@
 	<npc id="29052" level="85" type="Monster" name="">
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3960" hpRegen="8.585" mp="2056" mpRegen="3.03" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="3960.03406422627" hpRegen="8.585" mp="2056.8288406974" mpRegen="3.03" />
 			<attack physical="1216.23928591939" magical="838.839108132747" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="3864.96881246637" magical="2826.6352584085" evasion="1" />
+			<defence physical="3864.96881246637" magical="2826.6352584085" />
 			<speed>
 				<walk ground="10" />
 				<run ground="1" />
 			</speed>
-			<hitTime>500</hitTime>
+			<hitTime>50</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2210,7 +2114,6 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED">
@@ -2223,22 +2126,23 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="29053" level="84" type="Monster" name="">
+	<npc id="29053" level="85" type="Monster" name="">
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5448" hpRegen="8.5" mp="2036" mpRegen="3" />
-			<attack physical="1456.32495032888" magical="994.481156766258" random="10" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="5448.83722464782" hpRegen="8.5" mp="2036.46419871029" mpRegen="3" />
+			<attack physical="1456.32495032888" magical="994.481156766258" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
 			<defence physical="383.421920892449" magical="280.571522036227" />
 			<speed>
 				<walk ground="10" />
 				<run ground="1" />
 			</speed>
-			<hitTime>500</hitTime>
+			<hitTime>50</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2247,8 +2151,6 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
-			<skill id="5004" level="1" /> <!-- Dimensional Stun -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED">
@@ -2261,28 +2163,27 @@
 			<height normal="58" />
 		</collision>
 	</npc>
-	<npc id="29066" level="1" type="GrandBoss" name="Antharas">
+	<npc id="29066" level="75" type="GrandBoss" name="Antharas">
 		<parameters>
 			<param name="ultra_respawn_time" value="8" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<acquire exp="262720917" sp="63053" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="6100000" hpRegen="2" mp="1800000" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="6100000" hpRegen="1100" mp="1800000" mpRegen="1000" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3456" magical="862.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2291,8 +2192,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -2303,73 +2205,6 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists> <!-- CT2.5 -->
-			<drop>
-				<item id="8620" min="10" max="30" chance="50" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="80" min="1" max="2" chance="25" /> <!-- Tallum Blade -->
-				<item id="98" min="1" max="2" chance="25" /> <!-- Halberd -->
-				<item id="269" min="1" max="2" chance="25" /> <!-- Blood Tornado -->
-				<item id="2504" min="1" max="2" chance="25" /> <!-- Meteor Shower -->
-				<item id="235" min="1" max="2" chance="25" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="2" chance="25" /> <!-- Carnage Bow -->
-				<item id="150" min="1" max="2" chance="25" /> <!-- Elemental Sword -->
-				<item id="212" min="1" max="2" chance="25" /> <!-- Dasparion's Staff -->
-				<item id="81" min="1" max="2" chance="25" /> <!-- Dragon Slayer -->
-				<item id="151" min="1" max="2" chance="25" /> <!-- Sword of Miracles -->
-				<item id="2500" min="1" max="2" chance="25" /> <!-- Dark Legion's Edge -->
-				<item id="164" min="1" max="2" chance="25" /> <!-- Elysian -->
-				<item id="236" min="1" max="2" chance="20" /> <!-- Soul Separator -->
-				<item id="270" min="1" max="2" chance="20" /> <!-- Dragon Grinder -->
-				<item id="289" min="1" max="2" chance="20" /> <!-- Soul Bow -->
-				<item id="213" min="1" max="2" chance="20" /> <!-- Branch of the Mother Tree -->
-				<item id="305" min="1" max="2" chance="20" /> <!-- Tallum Glaive -->
-				<item id="6326" min="1" max="5" chance="30" /> <!-- Sealed Majestic Necklace -->
-				<item id="6327" min="1" max="5" chance="35" /> <!-- Sealed Majestic Earring -->
-				<item id="6328" min="1" max="5" chance="35" /> <!-- Sealed Majestic Ring -->
-				<item id="6323" min="1" max="5" chance="30" /> <!-- Sealed Phoenix Necklace -->
-				<item id="6324" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Earring -->
-				<item id="6325" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Ring -->
-				<item id="5287" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5297" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5304" min="1" max="3" chance="25" /> <!-- Sealed Tallum Tunic -->
-				<item id="5311" min="1" max="3" chance="35" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5320" min="1" max="3" chance="35" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="30" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="3" chance="25" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5301" min="1" max="3" chance="25" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5308" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5316" min="1" max="3" chance="8" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5323" min="1" max="3" chance="8" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5329" min="1" max="3" chance="9" /> <!-- Sealed Majestic Robe -->
-				<item id="5288" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5298" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="30" /> <!-- Sealed Tallum Stockings -->
-				<item id="5289" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5294" min="1" max="3" chance="25" /> <!-- Sealed Tallum Helmet -->
-				<item id="5312" min="1" max="3" chance="25" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5317" min="1" max="3" chance="25" /> <!-- Sealed Majestic Circlet -->
-				<item id="5291" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5296" min="1" max="3" chance="25" /> <!-- Sealed Tallum Boots -->
-				<item id="5314" min="1" max="3" chance="25" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5319" min="1" max="3" chance="25" /> <!-- Sealed Majestic Boots -->
-				<item id="5290" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5295" min="1" max="3" chance="25" /> <!-- Sealed Tallum Gloves -->
-				<item id="5313" min="1" max="3" chance="25" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5318" min="1" max="3" chance="25" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5292" min="1" max="3" chance="40" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="40" /> <!-- Sealed Shield of Nightmare -->
-				<item id="729" min="1" max="19" chance="100" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="1538" min="1" max="59" chance="100" /> <!-- Blessed Scroll of Escape -->
-				<item id="3936" min="1" max="39" chance="100" /> <!-- Blessed Scroll of Resurrection -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="9000000" max="13000000" chance="100" /> <!-- Adena -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29061" displayId="31842" level="70" type="Teleporter" name="Teleportation Cubic">
 		<race>ETC</race>
@@ -2385,28 +2220,6 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="false" />
-		<skillList>
-			<skill id="4045" level="1" />
-			<!-- Resist Full Magic Attack -->
-			<skill id="4408" level="1" />
-			<!-- HP Increase (1x) -->
-			<skill id="4409" level="1" />
-			<!-- MP Increase (1x) -->
-			<skill id="4410" level="11" />
-			<!-- Average P. Atk. -->
-			<skill id="4411" level="11" />
-			<!-- Average M. Atk. -->
-			<skill id="4412" level="11" />
-			<!-- Average P. Def. -->
-			<skill id="4413" level="11" />
-			<!-- Average M. Def. -->
-			<skill id="4414" level="2" />
-			<!-- Standard Type -->
-			<skill id="4415" level="3" />
-			<!-- One-handed Sword -->
-			<skill id="4416" level="19" />
-			<!-- Others -->
-		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="300" isAggressive="true" aggroRange="500" />
 		<collision>
@@ -2414,7 +2227,7 @@
 			<height normal="80" />
 		</collision>
 	</npc>
-	<npc id="29067" level="1" type="GrandBoss" name="Antharas">
+	<npc id="29067" level="75" type="GrandBoss" name="Antharas">
 		<parameters>
 			<param name="ultra_respawn_time" value="5" />
 		</parameters>
@@ -2423,19 +2236,18 @@
 		<acquire exp="262720918" sp="29116376" raidPoints="30780" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="6800000" hpRegen="1100" mp="1800000" mpRegen="1000" />
-			<attack physical="4900" magical="2550" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3456" magical="862.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2444,8 +2256,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -2456,91 +2269,6 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="5292" min="1" max="1" chance="51.25" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="1" chance="50.84" /> <!-- Sealed Shield of Nightmare -->
-				<item id="90992" min="1" max="1" chance="29.03" /> <!-- Antharas' Earring -->
-				<item id="5329" min="1" max="1" chance="20.5" /> <!-- Sealed Majestic Robe -->
-				<item id="5311" min="1" max="1" chance="20.37" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5323" min="1" max="1" chance="20.04" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5320" min="1" max="1" chance="19.68" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="1" chance="19.57" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="1" chance="19.15" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5316" min="1" max="1" chance="19.09" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="7900" min="1" max="1" chance="17.8" /> <!-- Ice Storm Hammer -->
-				<item id="5308" min="1" max="1" chance="17.77" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="7892" min="1" max="1" chance="17.72" /> <!-- Spell Breaker -->
-				<item id="5301" min="1" max="1" chance="17.33" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="7883" min="1" max="1" chance="16.92" /> <!-- Guardian's Sword -->
-				<item id="7893" min="1" max="1" chance="16.91" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="16.68" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="15.89" /> <!-- Star Buster -->
-				<item id="5319" min="1" max="1" chance="13.64" /> <!-- Sealed Majestic Boots -->
-				<item id="5313" min="1" max="1" chance="13.35" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5312" min="1" max="1" chance="13.17" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5288" min="1" max="1" chance="13.03" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5314" min="1" max="1" chance="12.9" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5318" min="1" max="1" chance="12.85" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5305" min="1" max="1" chance="12.76" /> <!-- Sealed Tallum Stockings -->
-				<item id="5295" min="1" max="1" chance="12.67" /> <!-- Sealed Tallum Gloves -->
-				<item id="5289" min="1" max="1" chance="12.66" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5317" min="1" max="1" chance="12.7" /> <!-- Sealed Majestic Circlet -->
-				<item id="5298" min="1" max="1" chance="12.59" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5296" min="1" max="1" chance="12.45" /> <!-- Sealed Tallum Boots -->
-				<item id="5304" min="1" max="1" chance="12.44" /> <!-- Sealed Tallum Tunic -->
-				<item id="5294" min="1" max="1" chance="12.34" /> <!-- Sealed Tallum Helmet -->
-				<item id="5297" min="1" max="1" chance="12.19" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5287" min="1" max="1" chance="11.92" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5291" min="1" max="1" chance="10.018" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5290" min="1" max="1" chance="9.982" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="2500" min="1" max="1" chance="9.154" /> <!-- Dark Legion's Edge -->
-				<item id="7902" min="1" max="1" chance="9.146" /> <!-- Doom Crusher -->
-				<item id="81" min="1" max="1" chance="9.146" /> <!-- Dragon Slayer -->
-				<item id="80" min="1" max="1" chance="9.144" /> <!-- Tallum Blade -->
-				<item id="7895" min="1" max="1" chance="9.136" /> <!-- Flaming Dragon Skull -->
-				<item id="213" min="1" max="1" chance="9.134" /> <!-- Branch of the Mother Tree -->
-				<item id="236" min="1" max="1" chance="9.13" /> <!-- Soul Separator -->
-				<item id="7899" min="1" max="1" chance="9.129" /> <!-- Destroyer Hammer -->
-				<item id="2504" min="1" max="1" chance="9.126" /> <!-- Meteor Shower -->
-				<item id="305" min="1" max="1" chance="9.124" /> <!-- Tallum Glaive -->
-				<item id="164" min="1" max="1" chance="9.124" /> <!-- Elysian -->
-				<item id="270" min="1" max="1" chance="9.122" /> <!-- Dragon Grinder -->
-				<item id="150" min="1" max="1" chance="9.103" /> <!-- Elemental Sword -->
-				<item id="235" min="1" max="1" chance="9.095" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="1" chance="9.08" /> <!-- Carnage Bow -->
-				<item id="269" min="1" max="1" chance="9.077" /> <!-- Blood Tornado -->
-				<item id="7884" min="1" max="1" chance="9.073" /> <!-- Infernal Master -->
-				<item id="98" min="1" max="1" chance="9.07" /> <!-- Halberd -->
-				<item id="7894" min="1" max="1" chance="9.067" /> <!-- Spiritual Eye -->
-				<item id="212" min="1" max="1" chance="9.029" /> <!-- Dasparion's Staff -->
-				<item id="289" min="1" max="1" chance="9.025" /> <!-- Soul Bow -->
-				<item id="151" min="1" max="1" chance="9.024" /> <!-- Sword of Miracles -->
-				<item id="8683" min="1" max="1" chance="8.378" /> <!-- Tiphon's Spear -->
-				<item id="8684" min="1" max="1" chance="8.378" /> <!-- Shyeed's Bow -->
-				<item id="8682" min="1" max="1" chance="8.368" /> <!-- Naga Storm -->
-				<item id="8688" min="1" max="1" chance="8.356" /> <!-- Daimon Crystal -->
-				<item id="8678" min="1" max="1" chance="8.356" /> <!-- Sirra's Blade -->
-				<item id="8680" min="1" max="1" chance="8.331" /> <!-- Barakiel's Axe -->
-				<item id="8681" min="1" max="1" chance="8.328" /> <!-- Behemoth' Tuning Fork -->
-				<item id="8686" min="1" max="1" chance="8.324" /> <!-- Themis' Tongue -->
-				<item id="8679" min="1" max="1" chance="8.317" /> <!-- Sword of Ipos -->
-				<item id="8687" min="1" max="1" chance="8.295" /> <!-- Cabrio's Hand -->
-				<item id="5706" min="1" max="1" chance="8.273" /> <!-- Damascus*Damascus -->
-				<item id="8685" min="1" max="1" chance="8.268" /> <!-- Sobekk's Hurricane -->
-				<item id="90998" min="1" max="3" chance="100" /> <!-- Balthus Knights' Glittering Varnish -->
-				<item id="90997" min="3" max="7" chance="100" /> <!-- Balthus Knights' Shining Varnish -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="3" max="7" chance="100" /> <!-- Cloth Piece -->
-				<item id="33815" min="2" max="4" chance="50.21" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
-				<item id="33814" min="2" max="4" chance="49.99" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33809" min="2" max="4" chance="49.83" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
-				<item id="33807" min="2" max="4" chance="49.36" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
-				<item id="33813" min="2" max="4" chance="48.95" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
-				<item id="33808" min="2" max="4" chance="48.94" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="90899" min="1" max="1" chance="2.932" /> <!-- Blessed Agathion's Soul -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29068" level="84" type="GrandBoss" name="Antharas" title="Land Dragon">
 		<parameters>
@@ -2550,21 +2278,31 @@
 		<sex>MALE</sex>
 		<acquire exp="40664236032" sp="9759416" raidPoints="1000" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="197047999.75369" hpRegen="319.2293199" mp="3440344.575" mpRegen="3" />
-			<attack physical="4799.20533" magical="263.60854" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3974.13793" magical="496.01325" />
+			<vitals hp="355555555" hpRegen="385356.45" mp="2025740" mpRegen="1000" />
+			<attack physical="35810" magical="3783.6" random="5" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2505.43352601156" magical="1452.04745968969" />
 			<speed>
 				<walk ground="50" />
 				<run ground="279" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
+		<status attackable="true" noSleepMode="true" isDeathPenalty="true" />
 		<skillList>
-			<skill id="4112" level="1" /> <!-- Ordinary Attack -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
 			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -2577,125 +2315,165 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="5315" min="1" max="3" chance="50.88" /> <!-- Sealed Shield of Nightmare -->
-				<item id="5292" min="1" max="3" chance="50.75" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="90992" min="1" max="1" chance="31.42" /> <!-- Antharas' Earring -->
-				<item id="5323" min="1" max="3" chance="20.73" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5316" min="1" max="3" chance="20.3" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5311" min="1" max="3" chance="20.19" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="19.87" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5320" min="1" max="3" chance="19.15" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5293" min="1" max="3" chance="19.11" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5329" min="1" max="3" chance="19.07" /> <!-- Sealed Majestic Robe -->
-				<item id="5308" min="1" max="3" chance="18.29" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="7883" min="1" max="3" chance="17.31" /> <!-- Guardian's Sword -->
-				<item id="7892" min="1" max="3" chance="17.29" /> <!-- Spell Breaker -->
-				<item id="7893" min="1" max="3" chance="17.02" /> <!-- Kaim Vanul's Bones -->
-				<item id="5301" min="1" max="3" chance="16.88" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="7900" min="1" max="3" chance="16.8" /> <!-- Ice Storm Hammer -->
-				<item id="7901" min="1" max="3" chance="15.63" /> <!-- Star Buster -->
-				<item id="7889" min="1" max="3" chance="15.21" /> <!-- Wizard's Tear -->
-				<item id="5317" min="1" max="3" chance="13.87" /> <!-- Sealed Majestic Circlet -->
-				<item id="5313" min="1" max="3" chance="13.67" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5314" min="1" max="3" chance="13.61" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5319" min="1" max="3" chance="13.6" /> <!-- Sealed Majestic Boots -->
-				<item id="5318" min="1" max="3" chance="13.13" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5298" min="1" max="3" chance="12.88" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="12.79" /> <!-- Sealed Tallum Stockings -->
-				<item id="5297" min="1" max="3" chance="12.77" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5312" min="1" max="3" chance="12.75" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5288" min="1" max="3" chance="12.53" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5289" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5295" min="1" max="3" chance="12.23" /> <!-- Sealed Tallum Gloves -->
-				<item id="5304" min="1" max="3" chance="12.09" /> <!-- Sealed Tallum Tunic -->
-				<item id="5294" min="1" max="3" chance="12.04" /> <!-- Sealed Tallum Helmet -->
-				<item id="5287" min="1" max="3" chance="11.98" /> <!-- Sealed Dark Crystal Breastplate -->
-				<item id="5296" min="1" max="3" chance="11.89" /> <!-- Sealed Tallum Boots -->
-				<item id="5291" min="1" max="3" chance="9.985" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5290" min="1" max="3" chance="9.93" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="7895" min="1" max="1" chance="9.156" /> <!-- Flaming Dragon Skull -->
-				<item id="2504" min="1" max="1" chance="9.146" /> <!-- Meteor Shower -->
-				<item id="213" min="1" max="1" chance="9.144" /> <!-- Branch of the Mother Tree -->
-				<item id="270" min="1" max="1" chance="9.13" /> <!-- Dragon Grinder -->
-				<item id="164" min="1" max="1" chance="9.114" /> <!-- Elysian -->
-				<item id="289" min="1" max="1" chance="9.102" /> <!-- Soul Bow -->
-				<item id="150" min="1" max="1" chance="9.096" /> <!-- Elemental Sword -->
-				<item id="151" min="1" max="1" chance="9.091" /> <!-- Sword of Miracles -->
-				<item id="236" min="1" max="1" chance="9.088" /> <!-- Soul Separator -->
-				<item id="80" min="1" max="1" chance="9.088" /> <!-- Tallum Blade -->
-				<item id="7894" min="1" max="1" chance="9.087" /> <!-- Spiritual Eye -->
-				<item id="288" min="1" max="1" chance="9.078" /> <!-- Carnage Bow -->
-				<item id="7884" min="1" max="1" chance="9.074" /> <!-- Infernal Master -->
-				<item id="235" min="1" max="1" chance="9.069" /> <!-- Bloody Orchid -->
-				<item id="81" min="1" max="1" chance="9.066" /> <!-- Dragon Slayer -->
-				<item id="212" min="1" max="1" chance="9.062" /> <!-- Dasparion's Staff -->
-				<item id="269" min="1" max="1" chance="9.054" /> <!-- Blood Tornado -->
-				<item id="305" min="1" max="1" chance="9.05" /> <!-- Tallum Glaive -->
-				<item id="7902" min="1" max="1" chance="9.049" /> <!-- Doom Crusher -->
-				<item id="7899" min="1" max="1" chance="9.046" /> <!-- Destroyer Hammer -->
-				<item id="98" min="1" max="1" chance="9.045" /> <!-- Halberd -->
-				<item id="2500" min="1" max="1" chance="9.035" /> <!-- Dark Legion's Edge -->
-				<item id="8686" min="1" max="1" chance="8.409" /> <!-- Themis' Tongue -->
-				<item id="8682" min="1" max="1" chance="8.401" /> <!-- Naga Storm -->
-				<item id="5706" min="1" max="1" chance="8.377" /> <!-- Damascus*Damascus -->
-				<item id="8688" min="1" max="1" chance="8.341" /> <!-- Daimon Crystal -->
-				<item id="8678" min="1" max="1" chance="8.323" /> <!-- Sirra's Blade -->
-				<item id="8687" min="1" max="1" chance="8.316" /> <!-- Cabrio's Hand -->
-				<item id="8684" min="1" max="1" chance="8.307" /> <!-- Shyeed's Bow -->
-				<item id="8680" min="1" max="1" chance="8.305" /> <!-- Barakiel's Axe -->
-				<item id="8683" min="1" max="1" chance="8.281" /> <!-- Tiphon's Spear -->
-				<item id="8685" min="1" max="1" chance="8.269" /> <!-- Sobekk's Hurricane -->
-				<item id="8679" min="1" max="1" chance="8.265" /> <!-- Sword of Ipos -->
-				<item id="8681" min="1" max="1" chance="8.265" /> <!-- Behemoth' Tuning Fork -->
-				<item id="959" min="1" max="1" chance="100" /> <!-- Scroll: Enchant Weapon (S-grade) -->
-				<item id="90998" min="1" max="3" chance="100" /> <!-- Balthus Knights' Glittering Varnish -->
-				<item id="90997" min="2" max="8" chance="100" /> <!-- Balthus Knights' Shining Varnish -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="3" max="7" chance="100" /> <!-- Cloth Piece -->
-				<item id="960" min="1" max="1" chance="100" /> <!-- Scroll: Enchant Armor (S-grade) -->
-				<item id="91548" min="1" max="1" chance="51.05" /> <!-- Special Armor Varnish (A-grade) -->
-				<item id="33815" min="2" max="4" chance="50.92" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
-				<item id="33808" min="2" max="8" chance="50.82" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="33813" min="2" max="8" chance="50.06" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
-				<item id="91549" min="1" max="1" chance="50.02" /> <!-- Special Accessory Varnish (A-grade) -->
-				<item id="33807" min="2" max="8" chance="49.81" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
-				<item id="33809" min="2" max="4" chance="49.15" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
-				<item id="33814" min="2" max="8" chance="48.99" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="91547" min="1" max="1" chance="29.16" /> <!-- Special Weapon Varnish (A-grade) -->
-				<item id="91497" min="1" max="1" chance="19.02" /> <!-- Dual Weapon Crafting Stamp (S-grade) -->
-				<item id="91516" min="1" max="1" chance="3.768" /> <!-- Sealed Draconic Leather Gloves Crafting Pack -->
-				<item id="91510" min="1" max="1" chance="3.762" /> <!-- Sealed Imperial Crusader Gaiters Crafting Pack -->
-				<item id="91518" min="1" max="1" chance="3.752" /> <!-- Sealed Draconic Leather Helmet Crafting Pack -->
-				<item id="91508" min="1" max="1" chance="3.75" /> <!-- Draconic Bow Crafting Pack -->
-				<item id="91502" min="1" max="1" chance="3.746" /> <!-- Angel Slayer Crafting Pack -->
-				<item id="91523" min="1" max="1" chance="3.745" /> <!-- Sealed Tateossian Earring Crafting Pack -->
-				<item id="91512" min="1" max="1" chance="3.742" /> <!-- Sealed Imperial Crusader Boots Crafting Pack -->
-				<item id="91504" min="1" max="1" chance="3.737" /> <!-- Saint Spear Crafting Pack -->
-				<item id="91505" min="1" max="1" chance="3.735" /> <!-- Demon Splinter Crafting Pack -->
-				<item id="91525" min="1" max="1" chance="3.737" /> <!-- Sealed Tateossian Necklace Crafting Pack -->
-				<item id="91514" min="1" max="1" chance="3.715" /> <!-- Sealed Imperial Crusader Helmet Crafting Pack -->
-				<item id="91513" min="1" max="1" chance="3.714" /> <!-- Sealed Imperial Crusader Shield Crafting Pack -->
-				<item id="91520" min="1" max="1" chance="3.709" /> <!-- Sealed Major Arcana Gloves Crafting Pack -->
-				<item id="91503" min="1" max="1" chance="3.709" /> <!-- Dragon Hunter Axe Crafting Pack -->
-				<item id="91515" min="1" max="1" chance="3.708" /> <!-- Sealed Draconic Leather Armor Crafting Pack -->
-				<item id="91517" min="1" max="1" chance="3.707" /> <!-- Sealed Draconic Leather Boots Crafting Pack -->
-				<item id="91524" min="1" max="1" chance="3.704" /> <!-- Sealed Tateossian Ring Crafting Pack -->
-				<item id="91501" min="1" max="1" chance="3.703" /> <!-- Imperial Staff Crafting Pack -->
-				<item id="91506" min="1" max="1" chance="3.683" /> <!-- Heaven's Divider Crafting Pack -->
-				<item id="91511" min="1" max="1" chance="3.677" /> <!-- Sealed Imperial Crusader Gauntlets Crafting Pack -->
-				<item id="91519" min="1" max="1" chance="3.675" /> <!-- Sealed Major Arcana Robe Crafting Pack -->
-				<item id="91507" min="1" max="1" chance="3.667" /> <!-- Arcana Mace Crafting Pack -->
-				<item id="91500" min="1" max="1" chance="3.663" /> <!-- Basalt Battlehammer Crafting Pack -->
-				<item id="91521" min="1" max="1" chance="3.645" /> <!-- Sealed Major Arcana Boots Crafting Pack -->
-				<item id="91522" min="1" max="1" chance="3.644" /> <!-- Sealed Major Arcana Circlet Crafting Pack -->
-				<item id="91499" min="1" max="1" chance="3.643" /> <!-- Forgotten Blade Crafting Pack -->
-				<item id="91509" min="1" max="1" chance="3.639" /> <!-- Sealed Imperial Crusader Breastplate Crafting Pack -->
-				<item id="90899" min="1" max="1" chance="2.942" /> <!-- Blessed Agathion's Soul -->
+				<group chance="100">
+					<item id="80" min="1" max="1" chance="9.1" /> <!-- Tallum Blade -->
+					<item id="98" min="1" max="1" chance="9.09" /> <!-- Halberd -->
+					<item id="150" min="1" max="1" chance="9.09" /> <!-- Elemental Sword -->
+					<item id="212" min="1" max="1" chance="9.09" /> <!-- Dasparion's Staff -->
+					<item id="235" min="1" max="1" chance="9.09" /> <!-- Bloody Orchid -->
+					<item id="269" min="1" max="1" chance="9.09" /> <!-- Blood Tornado -->
+					<item id="288" min="1" max="1" chance="9.09" /> <!-- Carnage Bow -->
+					<item id="2504" min="1" max="1" chance="9.09" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="1" chance="9.09" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="1" chance="9.09" /> <!-- Spiritual Eye -->
+					<item id="7899" min="1" max="1" chance="9.09" /> <!-- Destroyer Hammer -->
+				</group>
+				<group chance="100">
+					<item id="81" min="1" max="1" chance="9.1" /> <!-- Dragon Slayer -->
+					<item id="151" min="1" max="1" chance="9.09" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="1" chance="9.09" /> <!-- Elysian -->
+					<item id="213" min="1" max="1" chance="9.09" /> <!-- Branch of the Mother Tree -->
+					<item id="236" min="1" max="1" chance="9.09" /> <!-- Soul Separator -->
+					<item id="270" min="1" max="1" chance="9.09" /> <!-- Dragon Grinder -->
+					<item id="289" min="1" max="1" chance="9.09" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="1" chance="9.09" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="1" chance="9.09" /> <!-- Dark Legion's Edge -->
+					<item id="7895" min="1" max="1" chance="9.09" /> <!-- Flaming Dragon Skull -->
+					<item id="7902" min="1" max="1" chance="9.09" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="100">
+					<item id="7883" min="1" max="3" chance="17" /> <!-- Guardian's Sword -->
+					<item id="7889" min="1" max="3" chance="16" /> <!-- Wizard's Tear -->
+					<item id="7892" min="1" max="3" chance="17" /> <!-- Spell Breaker -->
+					<item id="7893" min="1" max="3" chance="17" /> <!-- Kaim Vanul's Bones -->
+					<item id="7900" min="1" max="3" chance="17" /> <!-- Ice Storm Hammer -->
+					<item id="7901" min="1" max="3" chance="16" /> <!-- Star Buster -->
+				</group>
+				<group chance="100">
+					<item id="8678" min="1" max="1" chance="8.34" /> <!-- Sirra's Blade -->
+					<item id="8679" min="1" max="1" chance="8.33" /> <!-- Sword of Ipos -->
+					<item id="8680" min="1" max="1" chance="8.33" /> <!-- Barakiel's Axe -->
+					<item id="8681" min="1" max="1" chance="8.33" /> <!-- Behemoth' Tuning Fork -->
+					<item id="8682" min="1" max="1" chance="8.34" /> <!-- Naga Storm -->
+					<item id="8683" min="1" max="1" chance="8.33" /> <!-- Tiphon's Spear -->
+					<item id="8684" min="1" max="1" chance="8.34" /> <!-- Shyeed's Bow -->
+					<item id="8685" min="1" max="1" chance="8.33" /> <!-- Sobekk's Hurricane -->
+					<item id="8686" min="1" max="1" chance="8.34" /> <!-- Themis' Tongue -->
+					<item id="8687" min="1" max="1" chance="8.33" /> <!-- Cabrio's Hand -->
+					<item id="8688" min="1" max="1" chance="8.33" /> <!-- Daimon Crystal -->
+					<item id="5706" min="1" max="1" chance="8.33" /> <!-- Damascus*Damascus -->
+				</group>
+				<group chance="100">
+					<item id="5287" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="3" chance="10" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="3" chance="10" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5297" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5308" min="1" max="3" chance="17.5" /> <!-- Sealed Dark Crystal Robe -->
+				</group>
+				<group chance="100">
+					<item id="5293" min="1" max="3" chance="20" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Boots -->
+					<item id="5301" min="1" max="3" chance="17.5" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Stockings -->
+				</group>
+				<group chance="100">
+					<item id="5311" min="1" max="3" chance="20" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="3" chance="13.34" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="3" chance="13.33" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="3" chance="13.33" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5320" min="1" max="3" chance="20" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5326" min="1" max="3" chance="20" /> <!-- Sealed Robe of Nightmare -->
+				</group>
+				<group chance="100">
+					<item id="5316" min="1" max="3" chance="20" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="3" chance="13.34" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="3" chance="13.33" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="3" chance="13.33" /> <!-- Sealed Majestic Boots -->
+					<item id="5323" min="1" max="3" chance="20" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5329" min="1" max="3" chance="20" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="100">
+					<item id="5292" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5315" min="1" max="3" chance="50" /> <!-- Sealed Shield of Nightmare -->
+				</group>
+				<group chance="100">
+					<item id="33809" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
+					<item id="33815" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="100">
+					<item id="33808" min="2" max="8" chance="50" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
+					<item id="33814" min="2" max="8" chance="50" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="33807" min="2" max="8" chance="50" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
+					<item id="33813" min="2" max="8" chance="50" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
+				</group>
+				<group chance="100">
+					<item id="90997" min="2" max="8" chance="100" /> <!-- Balthus Knights' Shining Varnish -->
+				</group>
+				<group chance="100">
+					<item id="90998" min="1" max="3" chance="100" /> <!-- Balthus Knights' Glittering Varnish -->
+				</group>
+				<group chance="30">
+					<item id="90992" min="1" max="1" chance="100" /> <!-- Antharas' Earring -->
+				</group>
+				<group chance="30">
+					<item id="91547" min="1" max="1" chance="100" /> <!-- Special Weapon Varnish (A-grade) -->
+				</group>
+				<group chance="50">
+					<item id="91548" min="1" max="1" chance="100" /> <!-- Special Armor Varnish (A-grade) -->
+				</group>
+				<group chance="50">
+					<item id="91549" min="1" max="1" chance="100" /> <!-- Special Accessory Varnish (A-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91499" min="1" max="1" chance="3.7" /> <!-- Forgotten Blade Crafting Pack -->
+					<item id="91500" min="1" max="1" chance="3.7" /> <!-- Basalt Battlehammer Crafting Pack -->
+					<item id="91501" min="1" max="1" chance="3.7" /> <!-- Imperial Staff Crafting Pack -->
+					<item id="91502" min="1" max="1" chance="3.7" /> <!-- Angel Slayer Crafting Pack -->
+					<item id="91503" min="1" max="1" chance="3.7" /> <!-- Dragon Hunter Axe Crafting Pack -->
+					<item id="91504" min="1" max="1" chance="3.7" /> <!-- Saint Spear Crafting Pack -->
+					<item id="91505" min="1" max="1" chance="3.7" /> <!-- Demon Splinter Crafting Pack -->
+					<item id="91506" min="1" max="1" chance="3.7" /> <!-- Heaven's Divider Crafting Pack -->
+					<item id="91507" min="1" max="1" chance="3.7" /> <!-- Arcana Mace Crafting Pack -->
+					<item id="91508" min="1" max="1" chance="3.7" /> <!-- Draconic Bow Crafting Pack -->
+					<item id="91509" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Breastplate Crafting Pack -->
+					<item id="91510" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Gaiters Crafting Pack -->
+					<item id="91511" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Gauntlets Crafting Pack -->
+					<item id="91512" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Boots Crafting Pack -->
+					<item id="91513" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Shield Crafting Pack -->
+					<item id="91514" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Helmet Crafting Pack -->
+					<item id="91515" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Armor Crafting Pack -->
+					<item id="91516" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Gloves Crafting Pack -->
+					<item id="91517" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Boots Crafting Pack -->
+					<item id="91518" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Helmet Crafting Pack -->
+					<item id="91519" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Robe Crafting Pack -->
+					<item id="91520" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Gloves Crafting Pack -->
+					<item id="91521" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Boots Crafting Pack -->
+					<item id="91522" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Circlet Crafting Pack -->
+					<item id="91523" min="1" max="1" chance="3.7" /> <!-- Sealed Tateossian Earring Crafting Pack -->
+					<item id="91524" min="1" max="1" chance="3.7" /> <!-- Sealed Tateossian Ring Crafting Pack -->
+					<item id="91525" min="1" max="1" chance="3.8" /> <!-- Sealed Tateossian Necklace Crafting Pack -->
+				</group>
+				<group chance="20">
+					<item id="91497" min="1" max="1" chance="100" /> <!-- Dual Weapon Crafting Stamp (S-grade) -->
+				</group>
+				<group chance="100">
+					<item id="959" min="1" max="1" chance="100" /> <!-- Scroll: Enchant Weapon (S-grade) -->
+				</group>
+				<group chance="100">
+					<item id="960" min="1" max="1" chance="100" /> <!-- Scroll: Enchant Armor (S-grade) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
 	<npc id="29069" level="84" type="Monster" name="Behemoth Dragon">
-		<!-- Todo: CT2.5 -->
 		<parameters>
 			<param name="RootingManage" value="0" />
 			<skill name="PhysicalSpecial" id="5095" level="1" />
@@ -2704,21 +2482,31 @@
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="369465" hpRegen="8.5" mp="24863.19" mpRegen="3" />
-			<attack physical="3584.56902102981" magical="1386.66000087809" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="1071.29474264312" magical="522.626863116263" evasion="-18" />
+			<vitals hp="949367" hpRegen="22" mp="22800" mpRegen="30" />
+			<attack physical="14519" magical="11667" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="1370" magical="851" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" isDeathPenalty="true" />
 		<skillList>
-			<skill id="5095" level="1" /> <!-- Antharas Subordinate Melee Attack -->
-			<skill id="5096" level="1" /> <!-- Antharas Subordinate Remote Attack -->
 			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="5095" level="1" /> <!-- Antharas Subordinate Melee Attack -->
+			<skill id="5096" level="1" /> <!-- Antharas Subordinate Remote Attack -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="300" isAggressive="true">
@@ -2729,26 +2517,27 @@
 			<height normal="54" />
 		</collision>
 	</npc>
-	<npc id="29070" level="79" type="Monster" name="Dragon Bomber">
-		<!-- Todo: CT2.5 -->
+	<npc id="29070" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1353" hpRegen="8.5" mp="1809" mpRegen="3" />
-			<attack physical="1094.11758465172" magical="4902.24" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<vitals hp="1353.6766" hpRegen="8.5" mp="1809" mpRegen="3" />
+			<attack physical="1094.11758465172" magical="4902.24" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.098247547707" magical="261.308998696584" />
 			<speed>
 				<walk ground="35" />
 				<run ground="250" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2757,10 +2546,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2769,25 +2556,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29071" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29071" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="245" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2796,9 +2584,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2807,25 +2594,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29072" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29072" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="255" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2834,9 +2622,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2845,25 +2632,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29073" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29073" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="247" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2872,9 +2660,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2883,25 +2670,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29074" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29074" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="252" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2910,9 +2698,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2921,25 +2708,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29075" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29075" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="243" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2948,9 +2736,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2959,25 +2746,27 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29076" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29076" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1353" hpRegen="2" mp="1809" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1353.6766" hpRegen="8.5" mp="1809" mpRegen="3" />
+			<attack physical="1094.11758465172" magical="4902.24" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="357.098247547707" magical="261.308998696584" />
 			<speed>
 				<walk ground="35" />
 				<run ground="250" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2986,9 +2775,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="200" clanHelpRange="300" isAggressive="true" />
@@ -2997,7 +2785,7 @@
 			<height normal="34.5" />
 		</collision>
 	</npc>
-	<npc id="29077" level="78" type="Monster" name="">
+	<npc id="29077" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="177456" />
 			<param name="suicide2_x" value="177120" />
@@ -3017,19 +2805,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3038,7 +2827,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3047,7 +2836,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29078" level="78" type="Monster" name="">
+	<npc id="29078" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175952" />
 			<param name="suicide2_x" value="175712" />
@@ -3067,19 +2856,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3088,7 +2878,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3097,7 +2887,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29079" level="78" type="Monster" name="">
+	<npc id="29079" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175120" />
 			<param name="suicide2_x" value="175024" />
@@ -3117,19 +2907,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3138,7 +2929,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3147,7 +2938,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29080" level="78" type="Monster" name="">
+	<npc id="29080" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="174640" />
 			<param name="suicide2_x" value="174576" />
@@ -3167,19 +2958,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3188,7 +2980,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3197,7 +2989,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29081" level="78" type="Monster" name="">
+	<npc id="29081" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="173968" />
 			<param name="suicide2_x" value="173856" />
@@ -3217,19 +3009,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3238,7 +3031,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3247,7 +3040,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29082" level="78" type="Monster" name="">
+	<npc id="29082" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="173920" />
 			<param name="suicide2_x" value="174064" />
@@ -3267,19 +3060,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3288,7 +3082,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3297,7 +3091,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29083" level="78" type="Monster" name="">
+	<npc id="29083" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="174704" />
 			<param name="suicide2_x" value="174800" />
@@ -3317,19 +3111,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3338,7 +3133,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3347,7 +3142,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29084" level="78" type="Monster" name="">
+	<npc id="29084" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175424" />
 			<param name="suicide2_x" value="175632" />
@@ -3367,19 +3162,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3388,7 +3184,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3397,7 +3193,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29085" level="78" type="Monster" name="">
+	<npc id="29085" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="176880" />
 			<param name="suicide2_x" value="177200" />
@@ -3417,19 +3213,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3438,7 +3235,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3447,7 +3244,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29086" level="78" type="Monster" name="">
+	<npc id="29086" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="178368" />
 			<param name="suicide2_x" value="178592" />
@@ -3467,19 +3264,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3488,7 +3286,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3497,7 +3295,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29087" level="78" type="Monster" name="">
+	<npc id="29087" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="179696" />
 			<param name="suicide2_x" value="179920" />
@@ -3517,19 +3315,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3538,7 +3337,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3547,7 +3346,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29088" level="78" type="Monster" name="">
+	<npc id="29088" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180592" />
 			<param name="suicide2_x" value="180752" />
@@ -3567,19 +3366,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3588,7 +3388,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3597,7 +3397,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29089" level="78" type="Monster" name="">
+	<npc id="29089" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180896" />
 			<param name="suicide2_x" value="180784" />
@@ -3617,19 +3417,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3638,7 +3439,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3647,7 +3448,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29090" level="78" type="Monster" name="">
+	<npc id="29090" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180496" />
 			<param name="suicide2_x" value="180512" />
@@ -3667,19 +3468,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3688,7 +3490,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3697,7 +3499,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29091" level="78" type="Monster" name="">
+	<npc id="29091" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180896" />
 			<param name="suicide2_x" value="181040" />
@@ -3717,19 +3519,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3738,7 +3541,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3747,7 +3550,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29092" level="78" type="Monster" name="">
+	<npc id="29092" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180720" />
 			<param name="suicide2_x" value="180640" />
@@ -3767,19 +3570,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3788,7 +3592,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3797,7 +3601,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29093" level="78" type="Monster" name="">
+	<npc id="29093" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180048" />
 			<param name="suicide2_x" value="179920" />
@@ -3817,19 +3621,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3838,7 +3643,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3847,7 +3652,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29094" level="78" type="Monster" name="">
+	<npc id="29094" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="178848" />
 			<param name="suicide2_x" value="178560" />
@@ -3867,19 +3672,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3888,7 +3694,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3897,20 +3703,34 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29099" level="80" type="Folk" name="Baium">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="53342293" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+	<npc id="29099" level="80" type="RaidBoss" name="Baium">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="35555555.2" hpRegen="2629" mp="18000" mpRegen="99" />
+			<attack physical="13829.6" magical="4375.2" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2048.8" magical="1365.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>60</hitTime>
+			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4256" level="1" /> <!-- Stun Resistance -->
+		</skillList>
 		<collision>
 			<radius normal="65" />
 			<height normal="174" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/29100-29199.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/29100-29199.xml
index 4259f076af..05e695eca0 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/29100-29199.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/29100-29199.xml
@@ -6,7 +6,7 @@
 		<equipment rhand="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="290966.74193" hpRegen="8.5" mp="1608.045" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="50" />
@@ -47,7 +47,7 @@
 		<acquire exp="0" sp="0" raidPoints="1000" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="24630999.75369" hpRegen="319.2293199" mp="3440344.575" mpRegen="3" />
-			<attack physical="3152.927754" magical="1289.681983" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="3152.927754" magical="1289.681983" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3500.450389" magical="1707.68215" />
 			<speed>
 				<walk ground="50" />
@@ -69,7 +69,7 @@
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="197048" hpRegen="8.5" mp="24863.19" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="55" />
@@ -90,7 +90,7 @@
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="394096" hpRegen="8.5" mp="24863.19" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="55" />
@@ -112,7 +112,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="60" />
@@ -212,7 +212,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="80" />
@@ -310,7 +310,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="60" />
@@ -408,7 +408,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="40" />
@@ -701,7 +701,7 @@
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="11083949.50738" hpRegen="310.756323" mp="20787.765" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="42" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/36700-36799.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/36700-36799.xml
index 12151829f8..6942dd0a84 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/36700-36799.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/npcs/36700-36799.xml
@@ -466,7 +466,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -493,7 +493,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -520,7 +520,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -547,7 +547,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -597,7 +597,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -624,7 +624,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -651,7 +651,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -678,7 +678,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/02000-02099.xml
index 15873370f4..816b486ebe 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/02000-02099.xml
@@ -231,10 +231,16 @@
 	</skill>
 	<skill id="2013" toLevel="2" name="Scroll of Escape">
 		<icon>icon.skill0000</icon>
-		<hitTime>20000</hitTime>
+		<hitTime>
+			<value level="1">20000</value>
+			<value level="2">1000</value>
+		</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>736</itemConsumeId> <!-- Scroll of Escape -->
+		<itemConsumeId>
+			<value level="1">736</value> <!-- Scroll of Escape -->
+			<value level="2">49087</value> <!-- Improved Scroll of Escape -->
+		</itemConsumeId>
 		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/39000-39099.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/39000-39099.xml
index 262a2b80a6..b66f81aed2 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/39000-39099.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/39000-39099.xml
@@ -1234,7 +1234,7 @@
 		<hitTime>1000</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>49087</itemConsumeId> <!-- Improved Scroll of Escape -->
+		<itemConsumeId>49500</itemConsumeId> <!-- Greater Scroll of Escape -->
 		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/39100-39199.xml
index 14088624b9..88eaed097c 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/39100-39199.xml
@@ -57,7 +57,19 @@
 	</skill>
 	<skill id="39103" toLevel="1" name="Warrior's Quick Healing Potion">
 		<icon>icon.etc_reagent_white_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<amount>500</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39104" toLevel="1" name="Hero Cube - 7-day">
 		<icon>icon.sa_cube</icon>
@@ -91,7 +103,7 @@
 		<icon>icon.etc_scroll_of_resurrection_i01</icon>
 		<castRange>400</castRange>
 		<effectPoint>1</effectPoint>
-		<effectRange>600</effectRange>
+		<effectRange>900</effectRange>
 		<hitTime>1000</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
@@ -104,6 +116,9 @@
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpResurrection" />
+			<condition name="TargetMyParty">
+				<includeMe>false</includeMe>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="Resurrection">
@@ -2199,6 +2214,59 @@
 	</skill>
 	<skill id="39199" toLevel="1" name="Hero's Wondrous Cubic - 7-day">
 		<icon>icon.sa_cube</icon>
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<reuseDelay>-1</reuseDelay>
+		<hitTime>500</hitTime>
+		<coolTime>500</coolTime>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpEncumbered">
+				<weightPercent>20</weightPercent>
+				<slotsPercent>10</slotsPercent>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="RestorationRandom">
+				<items>
+					<item chance="16">
+						<item id="49487" count="2"/> <!-- Soulshot Ticket -->
+					</item>
+					<item chance="4">
+						<item id="49772" count="1"/> <!-- Scroll of Mood Melody -->
+					</item>
+					<item chance="16.49">
+						<item id="49488" count="5"/> <!-- Major Healing Potion -->
+					</item>
+					<item chance="20">
+						<item id="35669" count="1"/> <!-- Angel Cat's Blessing -->
+					</item>
+					<item chance="5">
+						<item id="49533" count="1"/> <!-- Quick Hero Healing Potion -->
+					</item>
+					<item chance="10">
+						<item id="49542" count="1"/> <!-- Improved Scroll of Resurrection -->
+					</item>
+					<item chance="14.5">
+						<item id="49536" count="1"/> <!-- Box of Scroll of Escape to the Base -->
+					</item>
+					<item chance="2">
+						<item id="49489" count="3"/> <!-- Parts of Enchantment Scrolls Chest -->
+					</item>
+					<item chance="10">
+						<item id="49416" count="1"/> <!-- Blade Spirit -->
+					</item>
+					<item chance="0.01">
+						<item id="49859" count="1"/> <!-- Weapon Exchange Coupon -->
+					</item>
+					<item chance="2">
+						<item id="49490" count="1"/> <!-- Fishing Kit -->
+					</item>
+				</items>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/55200-55299.xml b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/55200-55299.xml
index e91d7eb63c..6682c5ce76 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/55200-55299.xml
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/55200-55299.xml
@@ -500,7 +500,7 @@
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>ATTACK_TIME_DOWN</abnormalType>
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer’s Potion -->
+		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer's Potion -->
 		<mpConsume>75</mpConsume>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/documentation.txt
index 56b793ae01..ebd313e4b6 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/stats/skills/documentation.txt
@@ -10,6 +10,8 @@ AddHate: Instant effect that increases target's hate towards you.
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -199,7 +201,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/Config.java
index 52efa170dd..082e9d8dc7 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/Config.java
@@ -1206,6 +1206,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static boolean AUTO_PLAY_PREMIUM;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
@@ -1281,6 +1282,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2520,6 +2522,7 @@ public class Config
 			ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 			AUTO_PLAY_PREMIUM = autoPlayConfig.getBoolean("AutoPlayPremium", false);
 			DISABLED_AUTO_SKILLS.clear();
 			final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
@@ -3276,6 +3279,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index a50cbb8033..8378c362cb 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index 603e7d33be..dd968ed772 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -549,9 +549,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 2260001e17..380989e049 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index 91a35da584..2a6169578d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -61,7 +61,7 @@ public class DailyTaskManager
 	private static final Set<Integer> RESET_SKILLS = new HashSet<>();
 	static
 	{
-		// No known skills.
+		RESET_SKILLS.add(39199); // Hero's Wondrous Cubic
 	}
 	public static final Set<Integer> RESET_ITEMS = new HashSet<>();
 	static
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
index 543c76f7c1..d936f9b1e6 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
@@ -100,6 +100,7 @@ public class IdManager
 				cleanCount += statement.executeUpdate("DELETE FROM character_shortcuts WHERE character_shortcuts.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_skills WHERE character_skills.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_skills_save WHERE character_skills_save.charId NOT IN (SELECT charId FROM characters);");
+				cleanCount += statement.executeUpdate("DELETE FROM character_spirits WHERE character_spirits.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_subclasses WHERE character_subclasses.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_instance_time WHERE character_instance_time.charId NOT IN (SELECT charId FROM characters);");
 				
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 36f3461010..efc07efb38 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -230,7 +230,7 @@ public class ShortCuts implements IRestorable
 			if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL))
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 4dc627e30b..6165d65376 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1289,7 +1289,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2817,7 +2817,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2830,190 +2830,152 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
-								case ELEMENTAL_SPIRIT_EARTH_ATTACK:
-								case ELEMENTAL_SPIRIT_EARTH_DEFENSE:
-								case ELEMENTAL_SPIRIT_FIRE_ATTACK:
-								case ELEMENTAL_SPIRIT_FIRE_DEFENSE:
-								case ELEMENTAL_SPIRIT_WATER_ATTACK:
-								case ELEMENTAL_SPIRIT_WATER_DEFENSE:
-								case ELEMENTAL_SPIRIT_WIND_ATTACK:
-								case ELEMENTAL_SPIRIT_WIND_DEFENSE:
-								{
-									info.addComponentType(UserInfoType.ATT_SPIRITS);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
+							}
+							case ELEMENTAL_SPIRIT_EARTH_ATTACK:
+							case ELEMENTAL_SPIRIT_EARTH_DEFENSE:
+							case ELEMENTAL_SPIRIT_FIRE_ATTACK:
+							case ELEMENTAL_SPIRIT_FIRE_DEFENSE:
+							case ELEMENTAL_SPIRIT_WATER_ATTACK:
+							case ELEMENTAL_SPIRIT_WATER_DEFENSE:
+							case ELEMENTAL_SPIRIT_WIND_ATTACK:
+							case ELEMENTAL_SPIRIT_WIND_DEFENSE:
+							{
+								info.addComponentType(UserInfoType.ATT_SPIRITS);
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						player.refreshExpertisePenalty();
-						sendPacket(info);
+					}
+					player.refreshExpertisePenalty();
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java
index bd0d2be677..9868035574 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4544,7 +4544,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8258,9 +8258,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 532bbe1e9d..adc6bca76d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -846,7 +847,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -867,7 +868,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -892,7 +900,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -900,7 +908,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -946,7 +961,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index ea1abbff9b..074a4ae995 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -863,15 +862,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -882,8 +879,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -892,7 +893,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -965,33 +966,6 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
@@ -1001,9 +975,17 @@ public class CreatureStat
 		// Notify recalculation to child classes.
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 150f95c365..73f94bfe57 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 3155a27f10..ec3d03a6f5 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
index 97397f753f..9d5faa0c61 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
@@ -57,7 +57,10 @@ public enum CommissionItemType
 	NECKLACE(31),
 	BELT(32),
 	BRACELET(33),
+	AGATHION(62),
 	HAIR_ACCESSORY(34),
+	BROOCH_JEWEL(63),
+	ARTIFACT(64),
 	// Supplies
 	POTION(35),
 	SCROLL_ENCHANT_WEAPON(36),
@@ -65,6 +68,7 @@ public enum CommissionItemType
 	SCROLL_OTHER(38),
 	SOULSHOT(39),
 	SPIRITSHOT(40),
+	OTHER_SUPPLIES(41),
 	// Pet Goods
 	PET_EQUIPMENT(42),
 	PET_SUPPLIES(43),
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
index eb10918430..3a194d1660 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
@@ -47,8 +47,8 @@ public enum CommissionTreeType
 		CommissionItemType.SPEAR,
 		CommissionItemType.OTHER_WEAPON),
 	ARMOR(1, CommissionItemType.HELMET, CommissionItemType.ARMOR_TOP, CommissionItemType.ARMOR_PANTS, CommissionItemType.FULL_BODY, CommissionItemType.GLOVES, CommissionItemType.FEET, CommissionItemType.SHIELD, CommissionItemType.SIGIL, CommissionItemType.UNDERWEAR, CommissionItemType.CLOAK),
-	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.HAIR_ACCESSORY),
-	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT),
+	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.AGATHION, CommissionItemType.HAIR_ACCESSORY, CommissionItemType.BROOCH_JEWEL, CommissionItemType.ARTIFACT),
+	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT, CommissionItemType.OTHER_SUPPLIES),
 	PET_GOODS(4, CommissionItemType.PET_EQUIPMENT, CommissionItemType.PET_SUPPLIES),
 	MISC(
 		5,
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0b6092b2d9..1e393ec4bf 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2216,6 +2216,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index 281d957b09..ba369c8c2e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -39,6 +39,7 @@ import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AgathionData;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -52,6 +53,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -71,12 +73,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPi
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
 import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -91,6 +95,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1637,7 +1642,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2557,6 +2564,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2581,6 +2593,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2606,6 +2620,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index c135128d72..22328e53d7 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -780,7 +780,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -932,7 +933,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 1692c9fcd7..ec97ae1f75 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -652,7 +652,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -675,7 +675,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -710,7 +710,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 550ec01da3..a1b86fb20b 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -143,7 +143,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index c305987ba6..c29c9ba398 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -93,6 +93,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index c5257ff589..1aff35bfd5 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 71ba0f75aa..e0df9bcce3 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -701,7 +701,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList();
 		player.updateShortCuts(_id, _level, 0);
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index c16d3301f0..7c284015a5 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -63,6 +63,6 @@ public class RequestShortCutReg implements ClientPacket
 		
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 	}
 }
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index e5b1b8a192..07ed7641a9 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,128 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 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, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 92, 93,
-		94,	1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index dcc44cb9f3..2e152e2e29 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -207,7 +207,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		ServerPackets.EX_PET_INFO.writeId(this);
 		writeInt(_summon.getObjectId());
-		writeByte(_value); // // 0=teleported 1=default 2=summoned
+		writeByte(_value); // 0=teleported 1=default 2=summoned
 		writeShort(37); // mask_bits_37
 		writeBytes(_masks);
 		// Block 1
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
index a4539909c2..f7ac12028d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
@@ -167,7 +167,7 @@ public class FakePlayerInfo extends ServerPacket
 		writeByte(_npc.getTeam().getId());
 		writeInt(_clan != null ? _clan.getCrestLargeId() : 0);
 		writeByte(_fpcHolder.getNobleLevel());
-		writeByte(_fpcHolder.isHero());
+		writeByte(_fpcHolder.isHero() ? 2 : 0); // 152 - Value for enabled changed to 2
 		writeByte(_fpcHolder.isFishing());
 		writeInt(_fpcHolder.getBaitLocationX());
 		writeInt(_fpcHolder.getBaitLocationY());
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index f93c9e5e69..03909a2746 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
deleted file mode 100644
index 52a4032d14..0000000000
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
new file mode 100644
index 0000000000..62bb425a5a
--- /dev/null
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -0,0 +1,182 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeByte(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 83e29f7bed..3ee2b1ef96 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,19 +19,19 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
 	}
 	
@@ -53,8 +53,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 8872c0cf63..c2b8c8f51a 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -42,13 +48,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -59,8 +68,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 68ca369edf..37f3211b0a 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1f54b5040f..0d5d066d25 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,6 +25,7 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -95,6 +98,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							if (player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -120,23 +134,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -144,6 +167,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -178,32 +204,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -302,6 +351,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 7cd7dd9696..c56221841f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
@@ -51,7 +52,6 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +381,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/buffer_schemes.sql
index 1784421092..bd964c8cc2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/buffer_schemes.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL,
     PRIMARY KEY (`object_id`,`scheme_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle.sql
index 0109cb8ab4..082a199079 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_ranking_history.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_ranking_history.sql
index 3f938ba850..d2da345dec 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_ranking_history.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_ranking_history.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_ranking_history` (
   `ranking` int(20) NOT NULL,
   `exp` bigint(20) NOT NULL,
   PRIMARY KEY (`charId`,`day`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_spirits.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_spirits.sql
index ac73d8dbe3..bb4044039f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_spirits.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_spirits.sql
@@ -11,6 +11,5 @@ CREATE TABLE `character_spirits`
     `crit_rate_points`   TINYINT      NOT NULL DEFAULT 0,
     `crit_damage_points` TINYINT      NOT NULL DEFAULT 0,
     `in_use`             BOOLEAN      NOT NULL DEFAULT FALSE,
-    PRIMARY KEY (`charId`, `type`),
-    FOREIGN KEY FK_CHARACTER_SPIRITS (`charId`) REFERENCES characters (`charId`) ON DELETE CASCADE
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+    PRIMARY KEY (`charId`, `type`)
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/characters.sql
index ea2aace011..60e1a786a2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/characters.sql
@@ -60,4 +60,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort.sql
index a8a87876f8..673d6bb510 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort_siege_guards.sql
index 19df57a3b9..43763210b4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort_spawnlist.sql
index 22303a9b09..144979acd9 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,4 +11,4 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/grandboss_data.sql
index 9ad3ae33ce..bc319dc49e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/heroes.sql
index ae59eb8ba1..f2ee5692a8 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/heroes.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/items.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/olympiad_fights.sql
index ccd4ac94ec..f25cc4c1fa 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(4) NOT NULL DEFAULT 0,
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Character.ini b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Character.ini
index c720c9a4ed..691da97315 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Character.ini
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Character.ini
@@ -285,8 +285,8 @@ MaxMAtk = 999999
 MaxPCritRate = 500
 
 # Maximum character Magic Critical Rate. (10 = 1%)
-# Default: 200
-MaxMCritRate = 200
+# Classic Default: 320
+MaxMCritRate = 320
 
 # Maximum character Attack Speed.
 # Default: 1500
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini
index 477e6d2fc4..8770e08477 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini
@@ -430,8 +430,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
@@ -633,6 +633,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 
 # ---------------------------------------------------------------------------
 # Developer Settings
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/ActionData.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/ActionData.xml
index 677c57eb99..3db7ba6e4a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/ActionData.xml
@@ -1,218 +1,253 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
-	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
-	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
-	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
-	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
-	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
-	<action id="70" handler="AirshipAction" option="4" /> <!-- Exit Airship -->
-	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
-	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
-	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
-	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
-	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="50094" /> <!-- Nightshade - Shadow's Despair -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
-	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="0" handler="SitStand" /> <!-- Toggle Sit/Stand. (Command: /sit, /stand) -->
+	<action id="1" handler="RunWalk" /> <!-- Toggle Walk/Run. (Command: /walk, /run) -->
+	<action id="2" handler="None" /> <!-- Attacks selected target(s), or takes a general action if the target cannot be attacked. Hold down the Ctrl key and click to attack by force. (Command: /attack, /attackforce) -->
+	<action id="3" handler="None" /> <!-- Request a trade from the selected target. (Command: /trade) -->
+	<action id="4" handler="None" /> <!-- Select the nearest available target. (Command: /targetnext) -->
+	<action id="5" handler="None" /> <!-- Pick up items that are scattered nearby. (Command: /pickup) -->
+	<action id="6" handler="None" /> <!-- Change to the target of the currently selected player. (Command: /assist) -->
+	<action id="7" handler="None" /> <!-- Invite the selected person to your party. (Command: /invite) -->
+	<action id="8" handler="None" /> <!-- Leave the party. (Command: /leave) -->
+	<action id="9" handler="None" /> <!-- If you are the leader of the party, dismiss selected members from your party. (Command: /dismiss) -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Sets up a private store to sell your items. (Command: /vendor) -->
+	<action id="11" handler="None" /> <!-- Display the party matching window to search for parties or to add members to your party. (Command: /partymatching) -->
+	<action id="12" handler="SocialAction" option="2" /> <!-- Emote: Greet others with a kind "hello." (Command: /socialhello) -->
+	<action id="13" handler="SocialAction" option="3" /> <!-- Emote: Let everyone know that you or someone else is victorious! (Command: /socialvictory) -->
+	<action id="14" handler="SocialAction" option="4" /> <!-- Emote: Rouse your allies and charge! (Command: /socialcharge) -->
+	<action id="15" handler="PetHold" /> <!-- Have your pet follow you or stay and hold its ground. -->
+	<action id="16" handler="PetAttack" /> <!-- Attack target. -->
+	<action id="17" handler="PetStop" /> <!-- Stop current action. -->
+	<action id="18" handler="None" /> <!-- Pick up nearby items. -->
+	<action id="19" handler="UnsummonPet" /> <!-- Returns your pet back to its home. -->
+	<action id="20" handler="None" /> <!-- Use special skill. -->
+	<action id="21" handler="ServitorHold" /> <!-- Have your summons follow you or stay and hold its ground. -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attack target. -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="24" handler="SocialAction" option="6" /> <!-- Emote: Respond positively. (Command: /socialyes) -->
+	<action id="25" handler="SocialAction" option="5" /> <!-- Emote: Respond negatively. (Command: /socialno) -->
+	<action id="26" handler="SocialAction" option="7" /> <!-- Emote: Show your respect and bow. (Command: /socialbow) -->
+	<action id="27" handler="None" /> <!-- Use special skill. -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Sets up a private store to purchase items. (Command: /buy) -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Emote: You have no idea what's going on. (Command: /socialunaware) -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Emote: I'm waiting... (Command: /socialwaiting) -->
+	<action id="31" handler="SocialAction" option="10" /> <!-- Emote: Have a good laugh. (Command: /sociallaugh) -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Toggle between Attack/Move modes. -->
+	<action id="33" handler="SocialAction" option="11" /> <!-- Emote: Applaud. (Command: /socialapplause) -->
+	<action id="34" handler="SocialAction" option="12" /> <!-- Emote: Serve them up your best dance moves. (Command: /socialdance) -->
+	<action id="35" handler="SocialAction" option="13" /> <!-- Emote: Show grief. (Command: /socialsad) -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Poison gas attack. -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Set up a private workshop that creates items by using Dwarven recipes in exchange for a fee. (Command: /dwarvenmanufacture) -->
+	<action id="38" handler="Ride" /> <!-- Toggle mount/dismount when near or on an NPC that can be ridden. (Commands: /mount, /dismount, /mountdismount) -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- The corpse explodes damaging all nearby enemies. -->
+	<action id="40" handler="None" /> <!-- Leave the recommendation to raise the target's aggregate figure. (Command: /evaluate) -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Attacks castle gates, walls, or headquarters by shooting a cannon. -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Reflects damage back to the enemy. -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Attacks target and nearby enemies by creating a whirling surge of water. -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Attacks an enemy with a powerful explosion. -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Restores the summoner's MP. -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Attacks an enemy by summoning up a devastating storm. -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Damages an enemy and heals the servitor at the same time. -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Attacks the enemy by shooting a cannon. -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Attack with a fit of rage. -->
+	<action id="50" handler="None" /> <!-- The selected party member will become the new party leader. (Command: /changepartyleader) -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Removes shackles from the Servitor and sets him free. -->
+	<action id="53" handler="ServitorMove" /> <!-- Move to the target. -->
+	<action id="54" handler="PetMove" /> <!-- Move to the target. -->
+	<action id="55" handler="None" /> <!-- Toggle recording and stop recording of replay files. (Commands: /replayrecstart, /replayrecstop, /replayrecstartstop) -->
+	<action id="56" handler="None" /> <!-- Invite the selected target to a command channel. (Command: /channelinvite) -->
+	<action id="57" handler="None" /> <!-- Highlights private store and private workshop messages that contain the search word. (Command: /findprivatestore) -->
+	<action id="58" handler="None" /> <!-- Challenges another character to a duel. (Command: /duel) -->
+	<action id="59" handler="None" /> <!-- Withdrawing from a duel means losing it. (Command: /withdraw) -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Open a personal store for package sale. (Command: /packagesale) -->
+	<action id="62" handler="SocialAction" option="14" /> <!-- Charm Pose. (Command: /charm) -->
+	<action id="64" handler="TeleportBookmark" /> <!-- Displays My Teleports window you can use to save and manage teleport locations. (Command: /teleportbookmark) -->
+	<action id="66" handler="SocialAction" option="15" /> <!-- Allows character to strike shy pose. (Command: /socialshy) -->
+	<action id="67" handler="AirshipAction" option="1" /> <!-- Allows you to control the Airship. -->
+	<action id="68" handler="AirshipAction" option="2" /> <!-- Relinquishes control of the Airship. -->
+	<action id="69" handler="AirshipAction" option="3" /> <!-- Choose from pre-designated locations. -->
+	<action id="70" handler="AirshipAction" option="4" /> <!-- Disembarks from the Airship. -->
+	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange bows with another person. (Command: /couplebow) -->
+	<action id="72" handler="SocialAction" option="17" /> <!-- High Five another person. (Command: /couplehighfive) -->
+	<action id="73" handler="SocialAction" option="18" /> <!-- Dance with another player. (Command: /coupledance) -->
+	<action id="76" handler="None" /> <!-- Invite the selected target as friends. (Commands: /friendinvite, /friendadd, /friendreg) -->
+	<action id="77" handler="None" /> <!-- Start or end recording videos. (Commands: /recstart, /recstop, /recstartstop) -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Applies Token 1 to the target. Can be only used in a group. (Command: /tacticalsign1) -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Applies Token 2 to the target. Can be only used in a group. (Command: /tacticalsign2) -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Applies Token 3 to the target. Can be only used in a group. (Command: /tacticalsign3) -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Applies Token 4 to the target. Can be only used in a group. (Command: /tacticalsign4) -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Automatically focuses on the target marked with Token 1. Can be only used in a group. (Command: /targettacticalsign1) -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Automatically focuses on the target marked with Token 2. Can be only used in a group. (Command: /targettacticalsign2) -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Automatically focuses on the target marked with Token 3. Can be only used in a group. (Command: /targettacticalsign3) -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Automatically focuses on the target marked with Token 4. Can be only used in a group. (Command: /targettacticalsign4) -->
+	<action id="87" handler="SocialAction" option="28" /> <!-- Gesture of Proposal (Command: /socialpropose) -->
+	<action id="88" handler="SocialAction" option="29" /> <!-- Gesture of Provocation (Command: /socialprovocation) -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off (Command: /socialbeauty) -->
+	<action id="92" handler="None" /> <!-- Selects the previous target. (Command: /targetprev) -->
+	<action id="93" handler="None" /> <!-- Select the nearest attackable target in the range of 1400 m. (Command: /targetnext) -->
+	<action id="94" handler="None" /> <!-- Selects the previous target in the range of 1400 m. (Command: /targetprev) -->
+	<action id="96" handler="None" /> <!-- Activates when attacked by an enemy. (Command: /strikeback) -->
+	<action id="97" handler="None" /> <!-- You've turn on the mode where you can attack and use skills without holding Ctrl. -->
+	<action id="98" handler="None" /> <!-- To raise the reputation level of the character who has no recommendation. (Command: /noevaluate) -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Attacks castle gates, walls, or headquarters with a powerful strike. -->
+	<action id="1001" handler="None" /> <!-- A reckless yet powerful attack that must be used with extreme caution. -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Provokes surrounding enemies to attack you. -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Instantly increases P. Def. and M. Def. significantly. Character is immovable while this skill is in effect. -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- A magical attack. -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Recovers the pet's HP. -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Increases party members' P. Critical Rate/ Damage. -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Temporarily increases party members' P. Atk. and P. Accuracy. -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Has a chance to remove curses from party members. -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Temporarily increases party members' MP Recovery Bonus and M. Critical Rate. -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Temporarily reduces party members' M. Skill Cooldown. -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Has a certain chance to remove curses from party members. -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Provokes the enemy to attack and then casts a curse that decreases P./ M. Def. -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Provokes nearby enemies to attack and then casts a curse that decreases their P./ M. Def. -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Reduces Sleep/ Hold/ Stun/ Paralysis/ Mental / Knock Back/ Knock Down Attack Resistance of the nearby enemies. -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- A powerful blow on the enemy's vital points -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- A blow that inflicts damage and stuns an enemy. -->
+	
+	<!-- Actions 1018 to 1030 are present in the Client, but are not used in Classic. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Inflict a deadly curse on an enemy that absorbs their HP. -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kat the Cat -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mew the Cat -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kai the Cat -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Boxer the Unicorn -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mirage the Unicorn -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Merrow the Unicorn. -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Shadow. -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by Shadow. -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Silhouette -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by reanimated man -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by reanimated man -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by corrupted man -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Inflicts a powerful cutting blow on the enemy. -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King: Attacks nearby enemies with whirlwind. -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King: Holds nearby enemies. -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Powerful rear kicks that stuns the enemy and deals damage. Over-hit is possible. -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Pounds the target and surrounding enemies with a tremendous onrush of water. -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord: Detonates a corpse, inflicting damage to nearby enemies. -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Blades attached to each arm slash out in a devastating attack. Over-hit is possible. -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Curses nearby enemies, poisoning them and reducing their Atk. Spd. -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon: Fires a projectile a short distance. Consumes 4 Flash Gunpowder. -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon: Fires a projectile a long distance. Consumes 5 Flash Gunpowder. -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Viciously bite an enemy. -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Scratch an enemy with both paws. Causes bleeding. -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awaken hidden powers. -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Decrease a nearby enemy's P. Atk./M. Atk. with a wolf cry. -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Decrease a nearby enemy's attack speed/magic speed with a strider roar. -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Viciously bite an enemy. -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Causes both damage and shock at the same time. Instantly stuns the enemy. -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Breath fire in front of you. -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Increases maximum HP temporarily. -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Increases maximum MP temporarily. -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Increases Atk. Spd. temporarily. -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Increases Casting Spd. temporarily. -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Temporarily decreases the target's MP consumption of skills. Consumes Spirit Ore. -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Increases M. Atk. power temporarily. -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Temporarily increases M. Skill Critical Rate / Damage . -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Temporarily increases the critical attack power. -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Temporarily increases the probability of critical attack. -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Temporarily increases Accuracy. -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Rapidly attacks the enemy twice. -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Inflicts shock and damage to the enemy at the same time with a powerful spin attack. -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Attacks nearby enemies with a doll heap attack. -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakens a hidden ability. -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of thunder. -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack on nearby enemies when hit. -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Control put in place to prevent the use of a buff upon the master. 5-minute duration. -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Powerfully attacks the target. -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- A powerful attack that pierces through a target. -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies by spinning your own body like a whirlwind. -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Attacks a front-line enemy with a powerful lance thrust. -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Shouts a victory cry that increases your abilities. -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Powerfully attacks the target. -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Gathers energy into your body, then releases it in a destructive blast. -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Hits enemies with a powerful wave of force. -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Emits a loud roar that amplifies your abilities. -->
+	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Charges toward the enemy and inflicts damage. -->
+	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Cancels the target's de-buff. -->
+	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Emits a spread of ring-shaped flames. -->
+	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Attacks the enemy with a powerful flaming beak. -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Toggles you between Attack and Support modes. -->
+	<action id="1085" handler="ServitorSkillUse" option="4707" /> <!-- Sacrifice one's own HP to restore HP of party members. -->
+	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Removes one or several buffs from an enemy. -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- The enemy's Dark Resistance -25. -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Strike multiple enemies at the front with the tail. -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Viciously bite an enemy. -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Causes nearby enemies to flee in fear. -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Increases your speed. -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Greatly increases its master's speed. -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Increases the speed of its master and their party. -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Teleports its master to the Seed of Annihilation. -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Teleports its master and their party to the Seed of Annihilation. -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attack the target. -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move to a designated location. -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Make the servitor disappear by cancelling the summoning. -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Do not counter-attack. -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Counter-attack when the master or itself is attacked. -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Damages and provokes the target. -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Delivers a shock to the ground immobilizing surrounding enemies. -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Bites the target to inflict damage. -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Pounces on the target to inflict damage. Target's Speed -100. -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Damages the target and absorbs some of its HP. -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Attacks nearby enemies and blocks their P. Skills. -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Flourishes claws and frontally attacks enemies. -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Dashes toward enemies to inflict damage and to stun them. -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Inflicts damage onto the enemies with a flame. -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Flies straight into the enemy. -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Purifies the master. -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Attack the enemy by darting a feather. -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Hurt the enemy by attacking them with sharp claws. -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Recover the targets near the tree and clear any debuff. -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Attacks nearby targets with a powerful punch. -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Provokes nearby enemies. -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Bites the enemy. -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Pounces on the target to inflict damage. Target's Speed -100. -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Provokes nearby enemies. -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Bites the enemy. -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Pounces on the target to inflict damage. Target's Speed -100. -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Provokes nearby enemies. -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Bites the enemy. -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Pounces on the target to inflict damage. Target's Speed -100. -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Attacks nearby enemies and blocks their P. Skills. -->
+	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Rushes to the enemy to inflict damage and stun them. -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Can express affection to Rudolph. Affection Level rises by 25%. Warning: Can be used only when a Rudolph requests expression of affection, and cannot be used while transformed! -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Increases Max HP by 20%, Max MP by 20%, and the Speed by 20% for 5 minutes. Increases the Debuff Resistance by 10%. Reuse delay 10 minutes. Consumes 3 Rose Essence(s) during skill use. Doesn't overlap with other buffs except Critical Seduction. -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- For 30 min., party members' Max. HP +30%, Max. MP +30%, Max. CP +30%, P. Def. +30%, M. Def. +30%, Speed +20, P. Atk. +10%, and M. Atk. +20%. MP consumption for skill use -15%. Cooldown: 5 min. Consumes 10 Rose Essence(s) during skill use. -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of lightning. -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack upon contacted enemies nearby. -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Restricts to prevent the use of a buff upon the master. 5 minute duration. -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Inflicts a powerful attack that seems to pierce through the target. -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies. -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impales an enemy with a sword. -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Raises one's own abilities. -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Gathered energy within ones self can be focused and used to attack an enemy. -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Fires a shock wave to attack enemies at the front. -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Raises one's own abilities. -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switches between attack mode and support mode. -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Instantly restores the master's HP by 10%. For 1 min., master's Debuff Resistance +80%, Buff-canceling Attack Resistance +40%, Speed +10, P. Def. +20%, and M. Def. by 20%, and MP consumption for all skills -50%. Can be used if the master's HP is 30% or lower. Cooldown: 10 min. -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/AttendanceRewards.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/AttendanceRewards.xml
index a0e71cbdea..8af1ecd126 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/AttendanceRewards.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/AttendanceRewards.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/AttendanceRewards.xsd">
-	<item id="29564" count="50" /> <!-- Attendance Coin -->
-	<item id="29553" count="3" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29565" count="3" /> <!-- XP/SP Scroll -->
-	<item id="29584" count="2" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29585" count="1" /> <!-- Refined Romantic Chapeau -->
+	<item id="49490" count="1" /> <!-- Fishing Kit -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49488" count="5" /> <!-- Major Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49500" count="1" /> <!-- Greater Scroll of Escape -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="100" /> <!-- Attendance Coin -->
-	<item id="29553" count="3" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29519" count="3" /> <!-- XP/SP Scroll - Medium -->
-	<item id="29584" count="2" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="49512" count="1" /> <!-- Amulet: Prosperity -->
+	<item id="90007" count="1" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49533" count="5" /> <!-- Quick Hero Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49500" count="1" /> <!-- Greater Scroll of Escape -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="150" /> <!-- Attendance Coin -->
-	<item id="29553" count="6" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29519" count="3" /> <!-- XP/SP Scroll - Medium -->
-	<item id="29584" count="4" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29578" count="1" /> <!-- Rare Accessory Pack -->
+	<item id="90007" count="2" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49488" count="5" /> <!-- Major Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49542" count="1" /> <!-- Improved Scroll of Resurrection -->
+	<item id="49489" count="3" /> <!-- Parts of Enchantment Scrolls Chest -->
 	
-	<item id="29564" count="300" /> <!-- Attendance Coin -->
-	<item id="29553" count="6" /> <!-- 2nd Class Buff Scroll -->
-	<item id="29554" count="10" /> <!-- Quick Healing Potion -->
-	<item id="29650" count="5" /> <!-- XP/SP Scroll - High -->
-	<item id="29584" count="4" /> <!-- Angel Cat's Blessing Chest -->
-	<item id="29566" count="1" /> <!-- Attendance XP Rune -->
-	<item id="29587" count="1" /> <!-- Agathion - Singer & Dancer -->
+	<item id="90007" count="3" /> <!-- Plain Life Stone -->
+	<item id="49772" count="1" /> <!-- Scroll of Mood Melody -->
+	<item id="49533" count="5" /> <!-- Quick Hero Healing Potion -->
+	<item id="49487" count="2" /> <!-- Soulshot Ticket -->
+	<item id="35669" count="1" /> <!-- Angel Cat's Blessing (30-day) -->
+	<item id="49542" count="1" /> <!-- Improved Scroll of Resurrection -->
+	<item id="49860" count="1" /> <!-- Hero's Wondrous Cubic (7-day) -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/DailyMission.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/DailyMission.xml
index 217d7cbe6c..693f70ac17 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/DailyMission.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/DailyMission.xml
@@ -736,7 +736,7 @@
 		<items>
 			<item id="49778" count="1" />
 			<item id="49495" count="1" />
-			<item id="90907" count="5" />
+			<item id="49487" count="5" />
 		</items>
 	</reward>
 	<reward id="4001" reward_id="1078" name="Reaching Level 20" requiredCompletion="20">
@@ -747,7 +747,7 @@
 		<items>
 			<item id="49488" count="10" />
 			<item id="49778" count="8" />
-			<item id="90907" count="5" />
+			<item id="49487" count="5" />
 		</items>
 	</reward>
 	<reward id="4002" reward_id="1079" name="Reaching Level 30" requiredCompletion="30">
@@ -758,7 +758,7 @@
 		<items>
 			<item id="49488" count="20" />
 			<item id="49779" count="9" />
-			<item id="90907" count="15" />
+			<item id="49487" count="15" />
 		</items>
 	</reward>
 	<reward id="4003" reward_id="1080" name="Reaching Level 40" requiredCompletion="40">
@@ -768,7 +768,7 @@
 		</handler>
 		<items>
 			<item id="49488" count="30" />
-			<item id="90907" count="20" />
+			<item id="49487" count="20" />
 		</items>
 	</reward>
 	<reward id="4004" reward_id="1081" name="Reaching Level 45" requiredCompletion="45">
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/merchant/30936.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/merchant/30936.htm
index 0e7e248e7d..2e577ccb9a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/merchant/30936.htm
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/merchant/30936.htm
@@ -6,6 +6,7 @@ I'm only interested in rare items; however, you've worked hard to find me. That'
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Multisell 3093607">"I want to exchange Jewels for Jewel Coins"</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Multisell 3093601">"I want to remove seal from Zaken's Cloak"</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Multisell 3093602">"I want to buy an Elemental Stone"</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Multisell 3093608">"I want to exchange Blade Spirits"</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Multisell 3093603">"I want to buy some Grocery items"</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Multisell 3093604">"I want to buy a Bracelet"</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Multisell 3093605">"I want to buy a Talisman"</Button>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/multisell/3001203.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/multisell/3001203.xml
index 86a1fc5289..403f9f7d99 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/multisell/3001203.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/multisell/3001203.xml
@@ -3,22 +3,6 @@
 	<npcs>
 		<npc>30012</npc> <!-- Fishing Guildsman -->
 	</npcs>
-	<item>
-		<!-- Blue Mackerel -->
-		<ingredient count="41538" id="45473" />
-		<!-- Fresh Blue Mackerel -->
-		<ingredient count="27000" id="45481" />
-		<!-- Agathion - Pisces (15-day) -->
-		<production count="1" id="49458" />
-	</item>
-	<item>
-		<!-- Blue Mackerel -->
-		<ingredient count="41538" id="45473" />
-		<!-- Fresh Blue Mackerel -->
-		<ingredient count="27000" id="45481" />
-		<!-- Agathion - Cancer (15-day) -->
-		<production count="1" id="49459" />
-	</item>
 	<item>
 		<!-- Blue Mackerel -->
 		<ingredient count="50" id="45473" />
@@ -127,4 +111,34 @@
 		<!-- Platonic Tempest Scroll - Lv 5 -->
 		<production count="1" id="70091" />
 	</item>
+	<item>
+		<!-- Old Inventory Expansion Ticket - Lv 1 -->
+		<ingredient count="1" id="91113" />
+		<!-- Inventory Expansion Ticket - Lv 1 -->
+		<production count="1" id="92004" />
+	</item>
+	<item>
+		<!-- Old Inventory Expansion Ticket - Lv 2 -->
+		<ingredient count="1" id="91114" />
+		<!-- Inventory Expansion Ticket - Lv 2 -->
+		<production count="1" id="92005" />
+	</item>
+	<item>
+		<!-- Old Inventory Expansion Ticket - Lv 3 -->
+		<ingredient count="1" id="91115" />
+		<!-- Inventory Expansion Ticket - Lv 3 -->
+		<production count="1" id="92006" />
+	</item>
+	<item>
+		<!-- Old Inventory Expansion Ticket - Lv 4 -->
+		<ingredient count="1" id="91296" />
+		<!-- Inventory Expansion Ticket - Lv 4 -->
+		<production count="1" id="92007" />
+	</item>
+	<item>
+		<!-- Old Inventory Expansion Ticket - Lv 5 -->
+		<ingredient count="1" id="91297" />
+		<!-- Inventory Expansion Ticket - Lv 5 -->
+		<production count="1" id="92008" />
+	</item>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/multisell/3093608.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/multisell/3093608.xml
new file mode 100644
index 0000000000..41cae4bcf6
--- /dev/null
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/multisell/3093608.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list applyTaxes="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
+	<npcs>
+		<npc>30936</npc> <!-- Pona -->
+	</npcs>
+	<item>
+		<ingredient count="1" id="49416" /> <!-- Blade Spirit -->
+		<ingredient count="1000" id="57" /> <!-- Adena -->
+		<production count="2" id="49543" /> <!-- Elemental Stone -->
+	</item>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/multisell/3247801.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/multisell/3247801.xml
index 62bafdb996..62b532fa52 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/multisell/3247801.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/multisell/3247801.xml
@@ -5,25 +5,25 @@
 	</npcs>
 	<item>
 		<!-- Soulshot Ticket -->
-		<ingredient count="1" id="90907" />
+		<ingredient count="1" id="49487" />
 		<!-- Soulshots -->
 		<production count="500" id="91927" />
 	</item>
 	<item>
 		<!-- Soulshot Ticket -->
-		<ingredient count="1" id="90907" />
+		<ingredient count="1" id="49487" />
 		<!-- Spiritshot -->
 		<production count="334" id="91928" />
 	</item>
 	<item>
 		<!-- Soulshot Ticket -->
-		<ingredient count="1" id="90907" />
+		<ingredient count="1" id="49487" />
 		<!-- Blessed SoulShots -->
 		<production count="200" id="91929" />
 	</item>
 	<item>
 		<!-- Soulshot Ticket -->
-		<ingredient count="1" id="90907" />
+		<ingredient count="1" id="49487" />
 		<!-- Blessed Spiritshot -->
 		<production count="134" id="91930" />
 	</item>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 5b501b1f1b..bcc74a8afe 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -254,6 +255,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/EffectMasterHandler.java
index ddc0af33f9..c833679bbb 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -42,6 +42,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AgathionSlot", AgathionSlot::new);
@@ -190,6 +192,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("HpRegen", HpRegen::new);
 		EffectHandler.getInstance().registerHandler("HpToOwner", HpToOwner::new);
 		EffectHandler.getInstance().registerHandler("IgnoreDeath", IgnoreDeath::new);
+		EffectHandler.getInstance().registerHandler("IgnoreReduceDamage", IgnoreReduceDamage::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageBonus", ImmobileDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageResist", ImmobileDamageResist::new);
 		EffectHandler.getInstance().registerHandler("ImmobilePetBuff", ImmobilePetBuff::new);
@@ -230,7 +233,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtkByPAtk", MAtkByPAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
new file mode 100644
index 0000000000..5405ccd4be
--- /dev/null
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class IgnoreReduceDamage extends AbstractStatEffect
+{
+	public IgnoreReduceDamage(StatSet params)
+	{
+		super(params, Stat.IGNORE_REDUCE_DAMAGE);
+	}
+}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
index 951002a2c2..35bfbcb6bc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.enums.StatModifierType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener;
 import org.l2jmobius.gameserver.model.events.returns.DamageReturn;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author Sdw
@@ -32,10 +34,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 public class ReduceDamage extends AbstractEffect
 {
 	private final double _amount;
+	private final StatModifierType _mode;
 	
 	public ReduceDamage(StatSet params)
 	{
 		_amount = params.getDouble("amount");
+		_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
 	}
 	
 	private DamageReturn onDamageReceivedEvent(OnCreatureDamageReceived event)
@@ -46,7 +50,15 @@ public class ReduceDamage extends AbstractEffect
 			return null;
 		}
 		
-		final double newDamage = event.getDamage() * (_amount / 100);
+		final double newDamage;
+		if (_mode == StatModifierType.PER)
+		{
+			newDamage = event.getDamage() - (event.getDamage() * (_amount / 100));
+		}
+		else // DIFF
+		{
+			newDamage = event.getDamage() - Math.max((_amount - event.getAttacker().getStat().getAdd(Stat.IGNORE_REDUCE_DAMAGE)), 0.0);
+		}
 		
 		return new DamageReturn(false, true, false, newDamage);
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index cd446ab812..2775ff29a4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -182,6 +182,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()))
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 43be5cfc4a..b7f22c792b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,61 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetHold.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetHold.java
index b018436dfe..9108d23a43 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetHold.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetHold.java
@@ -52,4 +52,10 @@ public class PetHold implements IPlayerActionHandler
 			((SummonAI) pet.getAI()).notifyFollowStatusChange();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetMove.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetMove.java
index c97c69a261..0ced5aadcf 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetMove.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetMove.java
@@ -53,4 +53,10 @@ public class PetMove implements IPlayerActionHandler
 			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, player.getTarget().getLocation());
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
index 29d38cbd67..3d23492682 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
@@ -77,4 +77,10 @@ public class PetSkillUse implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetStop.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetStop.java
index 495daf88a0..2e0cfd90fe 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetStop.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetStop.java
@@ -51,4 +51,10 @@ public class PetStop implements IPlayerActionHandler
 			pet.cancelAction();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..b681353b73 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,52 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorHold.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
index bc32c24750..83b8f824d5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
@@ -48,4 +48,10 @@ public class ServitorHold implements IPlayerActionHandler
 			((SummonAI) s.getAI()).notifyFollowStatusChange();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorMode.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
index 285d766a50..6dc9476247 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
@@ -68,4 +68,10 @@ public class ServitorMode implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorMove.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
index d9277b758e..80f59f231c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
@@ -56,4 +56,10 @@ public class ServitorMove implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
index acd342bad9..60fa7d6066 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
@@ -62,4 +62,10 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			}
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorStop.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
index a42bae7d82..d5288cd129 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
@@ -47,4 +47,10 @@ public class ServitorStop implements IPlayerActionHandler
 			s.cancelAction();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
index 390822a7b1..eaace592ee 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
@@ -62,4 +62,10 @@ public class UnsummonPet implements IPlayerActionHandler
 			pet.unSummon(player);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
index 30fc6eb54c..c5d2782f22 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
@@ -69,4 +69,10 @@ public class UnsummonServitor implements IPlayerActionHandler
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/skillTrees/StartingClass/KamaelSoldier.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/skillTrees/StartingClass/KamaelSoldier.xml
index 94a55fc0e9..7dd615d85f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/skillTrees/StartingClass/KamaelSoldier.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/skillTrees/StartingClass/KamaelSoldier.xml
@@ -7,19 +7,15 @@
 			<item id="92004" count="1" /> <!-- Inventory Expansion Ticket Lv. 1 -->
 		</skill>
 		<skill skillName="Extra Inventory" skillId="1372" skillLevel="2" getLevel="1" levelUpSp="0">
-			<preRequisiteSkill id="1372" lvl="1" /> <!-- Extra Inventory lv 1 -->
 			<item id="92005" count="1" /> <!-- Inventory Expansion Ticket Lv. 2 -->
 		</skill>
 		<skill skillName="Extra Inventory" skillId="1372" skillLevel="3" getLevel="1" levelUpSp="0">
-			<preRequisiteSkill id="1372" lvl="2" /> <!-- Extra Inventory lv 2 -->
 			<item id="92006" count="1" /> <!-- Inventory Expansion Ticket Lv. 3 -->
 		</skill>
 		<skill skillName="Extra Inventory" skillId="1372" skillLevel="4" getLevel="1" levelUpSp="0">
-			<preRequisiteSkill id="1372" lvl="3" /> <!-- Extra Inventory lv 3 -->
 			<item id="92007" count="1" /> <!-- Inventory Expansion Ticket Lv. 4 -->
 		</skill>
 		<skill skillName="Extra Inventory" skillId="1372" skillLevel="5" getLevel="1" levelUpSp="0">
-			<preRequisiteSkill id="1372" lvl="4" /> <!-- Extra Inventory lv 4 -->
 			<item id="92008" count="1" /> <!-- Inventory Expansion Ticket Lv. 5 -->
 		</skill>
 		
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/experience.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/experience.xml
index 3750b37746..364a9fc3f2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/experience.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/experience.xml
@@ -85,8 +85,8 @@
 	<experience level="83" tolevel="454748284485" trainingRate="0.025" />
 	<experience level="84" tolevel="673468617187" trainingRate="0.025" />
 	<experience level="85" tolevel="2020405851561" trainingRate="0.025" />
-	<experience level="86" tolevel="8755092023431" trainingRate="0.02" />
-	<experience level="87" tolevel="16836715429675" trainingRate="0.01" />
+	<experience level="86" tolevel="8755092023431" trainingRate="0.025" />
+	<experience level="87" tolevel="16836715429675" trainingRate="0.025" />
 	<experience level="88" tolevel="26534663517168" trainingRate="0.01" />
 	<experience level="89" tolevel="38172201222159" trainingRate="0.01" />
 	<experience level="90" tolevel="52137246468149" trainingRate="0.01" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49000-49099.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49000-49099.xml
index 91cda9cf4f..5087a9807c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49000-49099.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49000-49099.xml
@@ -1218,7 +1218,7 @@
 		<set name="handler" val="ItemSkills" />
 		<set name="commissionItemType" val="SCROLL_OTHER" />
 		<skills>
-			<skill id="39075" level="1" /> <!-- Improved Scroll of Escape -->
+			<skill id="2013" level="2" /> <!-- Improved Scroll of Escape -->
 		</skills>
 	</item>
 	<item id="49088" name="Gold Medal" type="EtcItem">
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49400-49499.xml
index 907398db8b..0d646d9dbe 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49400-49499.xml
@@ -1445,13 +1445,23 @@
 	<item id="49489" name="Parts of Enchantment Scrolls Chest" type="EtcItem">
 		<!-- Double-click to obtain 1 Enchantment Scroll Part. <Note>. The scroll part cannot be exchanged, dropped or sold. -->
 		<set name="icon" val="icon.etc_treasure_box_i08" />
-		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="default_action" val="PEEL" />
 		<set name="material" val="FISH" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="49474" min="1" max="1" chance="20" /> <!-- Scroll Part: Enchant Weapon -->
+			<item id="49475" min="1" max="1" chance="50" /> <!-- Scroll Part: Enchant Armor -->
+			<item id="49476" min="1" max="1" chance="2" /> <!-- Refined Scroll Part: Enchant Weapon -->
+			<item id="49478" min="1" max="1" chance="13" /> <!-- Refined Scroll Part: Enchant Armor -->
+			<item id="49479" min="1" max="1" chance="2" /> <!-- Solid Scroll Part: Enchant Weapon -->
+			<item id="49480" min="1" max="1" chance="13" /> <!-- Solid Scroll Part: Enchant Armor -->
+		</capsuled_items>
 	</item>
 	<item id="49490" name="Fishing kit" type="EtcItem">
 		<!-- Double-click to obtain Fishing Rod (1-day), 720 Normal Baits (event), and 1 Soulshot Ticket. <Note>. The received items cannot be transferred. -->
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49500-49599.xml
index 62c4e8b259..d0eee5e7c0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49500-49599.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49500-49599.xml
@@ -8,6 +8,13 @@
 		<set name="weight" val="120" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<set name="commissionItemType" val="SCROLL_OTHER" />
+		<skills>
+			<skill id="39075" level="1" /> <!-- Improved Scroll of Escape -->
+		</skills>
 	</item>
 	<item id="49501" name="Fish Stew. The guild's gratitude." type="EtcItem">
 		<!-- For 20 min. Acquired XP/ SP (hunting) +10%. -->
@@ -401,6 +408,8 @@
 		<!-- Instantly recovers 500 HP. The remaining points are used to recover CP. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="LIQUID" />
 		<set name="weight" val="1" />
 		<set name="is_tradable" val="false" />
@@ -408,6 +417,12 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="is_event_restricted" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<skills>
+			<skill id="39103" level="1" /> <!-- Quick Hero Healing Potion -->
+		</skills>
 	</item>
 	<item id="49534" name="Hero Cube" additionalName="7-day" type="EtcItem">
 		<!-- Available for 7 days. Required level: 20. Double-click to obtain Soulshot Ticket, Buff Scroll Chest, Hero's Top-grade HP Replenishing Potion, Hero's HP Recovery Potion, Angel Cat's Blessing, Improved Scroll of Resurrection, Chest of Enchant Scroll's Parts, Fishing Kit, Box of Scroll of Escape to Base, Blade Spirit, Spellbook Chest. Can be used only once a day. -->
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49800-49899.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49800-49899.xml
index 948b57109f..2824be5513 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49800-49899.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49800-49899.xml
@@ -669,7 +669,7 @@
 		<set name="is_freightable" val="true" />
 	</item>
 	<item id="49860" name="Hero's Wondrous Cubic" additionalName="7-day" type="EtcItem">
-		<!-- Available for 7 days. Required level: 20. Double-click to obtain Soulshot Ticket, Scroll of Mood Melody, Hero's Top-grade HP Replenishing Potion, Hero's HP Recovery Potion, Angel Cat's Blessing, Improved Scroll of Resurrection, Chest of Enchant Scroll's Parts, Fishing Kit, Box of Scroll of Escape to Base, Blade Spirit, Weapon Exchange Coupon. Can be used only once a day. -->
+		<!-- Available for 7 days. Required level: 20. Double-click to obtain Soulshot Tickets, Scroll of Mood Melody, Hero's Top-grade HP Replenishing Potion, Hero's HP Recovery Potion, Angel Cat's Blessing, Improved Scroll of Resurrection, Chest of Enchant Scroll's Parts, Fishing Kit, Box of Scroll of Escape to Base, Blade Spirit, Weapon Exchange Coupon. Can be used only once a day. -->
 		<set name="icon" val="icon.etc_pink_crystal_cube_pc_i00" />
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="material" val="PAPER" />
@@ -678,6 +678,10 @@
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="time" val="10080" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39199" level="1" /> <!-- Hero's Wondrous Cubic -->
+		</skills>
 	</item>
 	<item id="49861" name="Life Stone - Tester" additionalName="Tester" type="EtcItem">
 		<!-- Tester -->
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/91100-91199.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/91100-91199.xml
index 82477cf655..338eeedc94 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/91100-91199.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/91100-91199.xml
@@ -150,7 +150,7 @@
 			<skill id="3267" level="1" type="ON_UNEQUIP" /> <!-- Seal Agathion -->
 		</skills>
 	</item>
-	<item id="91113" name="Inventory Expansion Ticket - Lv. 1" type="EtcItem">
+	<item id="91113" name="Old Inventory Expansion Ticket - Lv. 1" type="EtcItem">
 		<!-- Old coupon for the inventory expansion. Expired long time ago and completely useless right now. Can be exchanged for Inventory Expansion Ticket Lv. 1 by the Fishing Guildsmen. -->
 		<set name="icon" val="icon.etc_ticket_i00" />
 		<set name="is_dropable" val="false" />
@@ -158,7 +158,7 @@
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
 	</item>
-	<item id="91114" name="Inventory Expansion Ticket - Lv. 2" type="EtcItem">
+	<item id="91114" name="Old Inventory Expansion Ticket - Lv. 2" type="EtcItem">
 		<!-- Old coupon for the inventory expansion. Expired long time ago and completely useless right now. Can be exchanged for Inventory Expansion Ticket Lv. 2 by the Fishing Guildsmen. -->
 		<set name="icon" val="icon.etc_ticket_i00" />
 		<set name="is_dropable" val="false" />
@@ -166,7 +166,7 @@
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
 	</item>
-	<item id="91115" name="Inventory Expansion Ticket - Lv. 3" type="EtcItem">
+	<item id="91115" name="Old Inventory Expansion Ticket - Lv. 3" type="EtcItem">
 		<!-- Old coupon for the inventory expansion. Expired long time ago and completely useless right now. Can be exchanged for Inventory Expansion Ticket Lv. 3 by the Fishing Guildsmen. -->
 		<set name="icon" val="icon.etc_ticket_i00" />
 		<set name="is_dropable" val="false" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/91200-91299.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/91200-91299.xml
index 8b89d37d82..b1d5df86dc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/91200-91299.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/91200-91299.xml
@@ -939,7 +939,7 @@
 		<set name="is_stackable" val="true" />
 		<set name="is_sellable" val="false" />
 	</item>
-	<item id="91296" name="Inventory Expansion Ticket - Lv. 4" type="EtcItem">
+	<item id="91296" name="Old Inventory Expansion Ticket - Lv. 4" type="EtcItem">
 		<!-- Old coupon for the inventory expansion. Expired long time ago and completely useless right now. Can be exchanged for Inventory Expansion Ticket Lv. 4 by the Fishing Guildsmen. -->
 		<set name="icon" val="icon.etc_ticket_i00" />
 		<set name="material" val="PAPER" />
@@ -947,7 +947,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 	</item>
-	<item id="91297" name="Inventory Expansion Ticket - Lv. 5" type="EtcItem">
+	<item id="91297" name="Old Inventory Expansion Ticket - Lv. 5" type="EtcItem">
 		<!-- Old coupon for the inventory expansion. Expired long time ago and completely useless right now. Can be exchanged for Inventory Expansion Ticket Lv. 5 by the Fishing Guildsmen. -->
 		<set name="icon" val="icon.etc_ticket_i00" />
 		<set name="material" val="PAPER" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/91800-91899.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/91800-91899.xml
index 5886e36862..d97ce55632 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/91800-91899.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/91800-91899.xml
@@ -873,7 +873,7 @@
 			<item id="91870" min="1" max="1" chance="100" /> <!-- Jewel Box (Siege Event) -->
 			<item id="91871" min="1" max="1" chance="100" /> <!-- Rare Accessory Pack (Siege Event) -->
 			<item id="91874" min="1" max="1" chance="100" /> <!-- Accessory Pack (Siege Event) -->
-			<item id="90907" min="2000" max="2000" chance="100" /> <!-- Soulshot Ticket - Event -->
+			<item id="49487" min="2000" max="2000" chance="100" /> <!-- Soulshot Ticket -->
 			<item id="90861" min="1" max="1" chance="100" /> <!-- Fire Dragon Belt - 30 days -->
 			<item id="90985" min="1" max="1" chance="100" /> <!-- Land Dragon Belt - 30 days -->
 			<item id="91436" min="1" max="1" chance="100" /> <!-- Blessed Dragon Pendant - 30 days -->
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/18100-18199.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/18100-18199.xml
index 382309e159..20a6f078db 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/18100-18199.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/18100-18199.xml
@@ -417,7 +417,7 @@
 		<acquire exp="5695973" sp="85439" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -444,7 +444,7 @@
 		<acquire exp="5977531" sp="89662" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -472,7 +472,7 @@
 		<acquire exp="6185394" sp="92780" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20136.294068333" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -501,7 +501,7 @@
 		<acquire exp="6382637" sp="95739" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="19725.349291429" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -530,7 +530,7 @@
 		<acquire exp="2334831" sp="35022" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -556,7 +556,7 @@
 		<acquire exp="2345235" sp="35178" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -582,7 +582,7 @@
 		<acquire exp="2351087" sp="35266" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -608,7 +608,7 @@
 		<acquire exp="2345235" sp="35178" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -633,7 +633,7 @@
 		<acquire exp="2282377" sp="34235" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1328,7 +1328,7 @@
 		<acquire exp="2796075" sp="41941" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="22" />
@@ -1353,7 +1353,7 @@
 		<acquire exp="2796075" sp="41941" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="22" />
@@ -1556,7 +1556,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -1583,7 +1583,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -1610,7 +1610,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -1637,7 +1637,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/18200-18299.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/18200-18299.xml
index 96d0ef735d..08d34f1a21 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/18200-18299.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/18200-18299.xml
@@ -6,7 +6,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -33,7 +33,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -60,7 +60,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -87,7 +87,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -114,7 +114,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -141,7 +141,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -168,7 +168,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -195,7 +195,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -222,7 +222,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -249,7 +249,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -276,7 +276,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -303,7 +303,7 @@
 		<acquire exp="4019412" sp="60291" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="20711.616756" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="1" />
@@ -606,7 +606,7 @@
 		<acquire exp="2979228" sp="44688" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="70" />
@@ -631,7 +631,7 @@
 		<acquire exp="2979228" sp="44688" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="70" />
@@ -656,7 +656,7 @@
 		<acquire exp="2979228" sp="44688" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="70" />
@@ -681,7 +681,7 @@
 		<acquire exp="2979228" sp="44688" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="70" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20000-20099.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20000-20099.xml
index b15cf884ff..131ca35b9e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20000-20099.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20000-20099.xml
@@ -6,7 +6,7 @@
 		<acquire exp="30" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="20" />
@@ -83,7 +83,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -135,7 +135,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="60" />
@@ -187,7 +187,7 @@
 		<acquire exp="310" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="60" />
@@ -245,7 +245,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -3546,7 +3546,7 @@
 		<acquire exp="1390" sp="42" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="458.925" hpRegen="3.5" mp="272.706" mpRegen="1.5" />
-			<attack physical="60.19687" magical="41.10666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="60.19687" magical="41.10666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="98.70919" magical="72.2311" />
 			<speed>
 				<walk ground="50" />
@@ -3730,7 +3730,7 @@
 		<acquire exp="1479" sp="45" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="486.144" hpRegen="3.5" mp="288.057" mpRegen="1.5" />
-			<attack physical="64.83203" magical="44.27187" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="64.83203" magical="44.27187" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="101.83533" magical="74.51868" />
 			<speed>
 				<walk ground="50" />
@@ -4321,7 +4321,7 @@
 		<acquire exp="3442" sp="104" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="302.09925" hpRegen="3.5" mp="350.364" mpRegen="1.5" />
-			<attack physical="86.42002" magical="59.01367" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="86.42002" magical="59.01367" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="115.00598" magical="84.15638" />
 			<speed>
 				<walk ground="50" />
@@ -5374,7 +5374,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -5430,7 +5430,7 @@
 		<acquire exp="441" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -5530,7 +5530,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20100-20199.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20100-20199.xml
index 1b601bffcf..6ede6d8868 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20100-20199.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20100-20199.xml
@@ -1132,7 +1132,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -1176,7 +1176,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="50" />
@@ -1226,7 +1226,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -1278,7 +1278,7 @@
 		<acquire exp="309" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -1433,7 +1433,7 @@
 		<acquire exp="1394760" sp="41843" attributeExp="1428" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="87829.82" hpRegen="6.5" mp="3017.43" mpRegen="2.4" />
-			<attack physical="2305.94387" magical="1575.44778" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2305.94387" magical="1575.44778" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="363.81593" magical="265.68216" /> <!-- physical="242.81593" magical="177.68216" physical="461.94387" magical="315.44778" -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -1623,7 +1623,7 @@
 		<acquire exp="1435319" sp="43060" attributeExp="1530" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="88700.27" hpRegen="6.5" mp="3075.12" mpRegen="2.4" />
-			<attack physical="2120.23295" magical="1445.69611" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2120.23295" magical="1445.69611" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.18839" magical="255.63714" /> <!-- physical="233.18839" magical="170.63714" -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -2102,7 +2102,7 @@
 		<acquire exp="1449841" sp="43496" attributeExp="1530" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="88700.27" hpRegen="5.5" mp="3075.12" mpRegen="2.1" />
-			<attack physical="1525.54906" magical="1040.6504" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1525.54906" magical="1040.6504" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="300.23844" magical="219.5258" /> <!-- physical="200.23844" magical="146.5258" -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -4313,7 +4313,7 @@
 		<acquire exp="1882" sp="57" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="636.798" hpRegen="3.5" mp="365.715" mpRegen="1.5" />
-			<attack physical="92.64226" magical="63.26266" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="92.64226" magical="63.26266" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.46427" magical="86.68702" />
 			<speed>
 				<walk ground="35" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20200-20299.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20200-20299.xml
index 770fe9d84b..e02b24c98a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20200-20299.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20200-20299.xml
@@ -2305,7 +2305,7 @@
 		<acquire exp="1374149" sp="41225" attributeExp="1328" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="86910.30" hpRegen="5.5" mp="2959.74" mpRegen="2.1" />
-			<attack physical="1240.0526" magical="845.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1240.0526" magical="845.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="360.18816" magical="266.31739" /> <!-- physical="182.18816" magical="133.31739" -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -2366,7 +2366,7 @@
 		<acquire exp="1316282" sp="39489" attributeExp="1328" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="86910.30" hpRegen="5.5" mp="2959.74" mpRegen="2.1" />
-			<attack physical="1305.69549" magical="890.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1305.69549" magical="890.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="372.63569" magical="272.5719" /> <!-- <defence physical="186.63569" magical="136.5719" /> -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -2428,7 +2428,7 @@
 		<acquire exp="1480702" sp="44422" attributeExp="1428" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="43915.54" hpRegen="5.5" mp="3017.43" mpRegen="2.1" />
-			<attack physical="1375.82705" magical="940.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1375.82705" magical="940.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="286.12803" magical="208.8592" /> <!-- physical="191.12803" magical="139.8592" -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -2481,7 +2481,7 @@
 		<acquire exp="1404286" sp="42129" attributeExp="1428" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="87829.82" hpRegen="5.5" mp="3017.43" mpRegen="2.1" />
-			<attack physical="1450.44588" magical="990.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1450.44588" magical="990.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="292.66302" magical="214.17771" />
 			<attribute>
 				<attack type="earth" value="20" />
@@ -2552,7 +2552,7 @@
 		<acquire exp="1471516" sp="44146" attributeExp="1530" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="88700.27" hpRegen="6.5" mp="3075.12" mpRegen="2.4" />
-			<attack physical="1605.13207" magical="1095.29157" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1605.13207" magical="1095.29157" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="306.85194" magical="223.90176" /> <!-- physical="204.85194" magical="149.90176" -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -2619,7 +2619,7 @@
 		<acquire exp="1396911" sp="41908" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="42970.63" hpRegen="6.5" mp="2902.05" mpRegen="2.4" />
-			<attack physical="1685.18867" magical="1150.25615" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1685.18867" magical="1150.25615" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="418.50106" magical="306.30378" /> <!-- p atack 209 m atack 153 -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -2668,7 +2668,7 @@
 		<acquire exp="1332159" sp="39965" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="85939.99" hpRegen="6.5" mp="2902.05" mpRegen="2.4" />
-			<attack physical="1765.71092" magical="1205.5387" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1765.71092" magical="1205.5387" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="456.18326" magical="312.73001" />
 			<attribute>
 				<attack type="earth" value="20" />
@@ -2724,7 +2724,7 @@
 		<acquire exp="1365883" sp="40977" attributeExp="1328" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="86910.30" hpRegen="6.5" mp="2959.74" mpRegen="2.4" />
-			<attack physical="1850.68904" magical="1265.13256" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1850.68904" magical="1265.13256" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="414.89589" magical="320.17851" />
 			<attribute>
 				<attack type="earth" value="20" />
@@ -2780,7 +2780,7 @@
 		<acquire exp="1472524" sp="44176" attributeExp="1328" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="43455.15" hpRegen="6.5" mp="2959.74" mpRegen="2.4" />
-			<attack physical="1940.11142" magical="1325.02979" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1940.11142" magical="1325.02979" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="446.6362" magical="326.64727" /> <!-- <defence physical="223.6362" magical="163.64727" /> -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -2840,7 +2840,7 @@
 		<acquire exp="1374149" sp="41225" attributeExp="1328" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="86910.30" hpRegen="6.5" mp="2959.74" mpRegen="2.4" />
-			<attack physical="2025.96455" magical="1385.22116" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2025.96455" magical="1385.22116" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="456.40135" magical="334.1342" /> <!-- <defence physical="228.40135" magical="167.1342" /> -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -2902,7 +2902,7 @@
 		<acquire exp="1508220" sp="45247" attributeExp="1428" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="43915.54" hpRegen="6.5" mp="3017.43" mpRegen="2.4" />
-			<attack physical="2210.8992" magical="1510.44274" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2210.8992" magical="1510.44274" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="355.99429" magical="261.1539" /> <!-- physical="237.99429" magical="174.1539" -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -3886,7 +3886,7 @@
 		<acquire exp="2009" sp="61" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="670.347" hpRegen="4.5" mp="381.969" mpRegen="1.8" />
-			<attack physical="99.21986" magical="67.7543" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="99.21986" magical="67.7543" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="121.98819" magical="89.26566" />
 			<speed>
 				<walk ground="80" />
@@ -3953,7 +3953,7 @@
 		<acquire exp="2141" sp="65" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="705.162" hpRegen="4.5" mp="398.223" mpRegen="1.8" />
-			<attack physical="106.16525" magical="72.49711" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="106.16525" magical="72.49711" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="125.57727" magical="91.89199" />
 			<speed>
 				<walk ground="45" />
@@ -4021,7 +4021,7 @@
 		<acquire exp="2417" sp="73" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="777.324" hpRegen="4.5" mp="430.731" mpRegen="1.8" />
-			<attack physical="121.20802" magical="82.76936" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="121.20802" magical="82.76936" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="132.9486" magical="97.28601" />
 			<speed>
 				<walk ground="50" />
@@ -4087,7 +4087,7 @@
 		<acquire exp="2582" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="815.304" hpRegen="4.5" mp="446.985" mpRegen="1.8" />
-			<attack physical="129.32896" magical="88.31491" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="129.32896" magical="88.31491" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="136.72948" magical="100.0527" />
 			<speed>
 				<walk ground="80" />
@@ -4158,7 +4158,7 @@
 		<acquire exp="2295" sp="69" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="739.977" hpRegen="4.5" mp="413.574" mpRegen="1.8" />
-			<attack physical="113.49065" magical="77.49941" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="113.49065" magical="77.49941" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="129.23095" magical="94.5656" />
 			<speed>
 				<walk ground="80" />
@@ -4222,7 +4222,7 @@
 		<acquire exp="1374149" sp="41225" attributeExp="1328" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="86910.30" hpRegen="5.5" mp="2959.74" mpRegen="2.1" />
-			<attack physical="1240.0526" magical="845.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1240.0526" magical="845.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="360.18816" magical="266.31739" /> <!-- physical="182.18816" magical="133.31739" -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -4282,7 +4282,7 @@
 		<acquire exp="1316282" sp="39489" attributeExp="1328" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="86910.30" hpRegen="5.5" mp="2959.74" mpRegen="2.1" />
-			<attack physical="1305.69549" magical="890.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1305.69549" magical="890.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="372.63569" magical="272.5719" /> <!-- <defence physical="186.63569" magical="136.5719" /> -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -4339,7 +4339,7 @@
 		<acquire exp="1480702" sp="44422" attributeExp="1428" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="43915.54" hpRegen="5.5" mp="3017.43" mpRegen="2.1" />
-			<attack physical="1375.82705" magical="940.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1375.82705" magical="940.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="286.12803" magical="208.8592" /> <!-- physical="191.12803" magical="139.8592" -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -4390,7 +4390,7 @@
 		<acquire exp="1404286" sp="42129" attributeExp="1428" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="87829.82" hpRegen="5.5" mp="3017.43" mpRegen="2.1" />
-			<attack physical="1450.44588" magical="990.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1450.44588" magical="990.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="292.66302" magical="214.17771" />
 			<attribute>
 				<attack type="earth" value="20" />
@@ -4455,7 +4455,7 @@
 		<acquire exp="1471516" sp="44146" attributeExp="1530" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="88700.27" hpRegen="6.5" mp="3075.12" mpRegen="2.4" />
-			<attack physical="1605.13207" magical="1095.29157" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1605.13207" magical="1095.29157" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="306.85194" magical="223.90176" /> <!-- physical="204.85194" magical="149.90176" -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -4523,7 +4523,7 @@
 		<acquire exp="1493403" sp="44803" attributeExp="1428" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="43915.54" hpRegen="6.5" mp="3017.43" mpRegen="2.4" />
-			<attack physical="2210.8992" magical="1510.44274" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2210.8992" magical="1510.44274" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="355.99429" magical="261.1539" /> <!-- physical="237.99429" magical="174.1539" -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -4652,7 +4652,7 @@
 		<acquire exp="1475851" sp="44276" attributeExp="1530" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="88700.27" hpRegen="5.5" mp="3075.12" mpRegen="2.1" />
-			<attack physical="1525.54906" magical="1040.6504" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1525.54906" magical="1040.6504" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="300.23844" magical="219.5258" /> <!-- physical="200.23844" magical="146.5258" -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -4711,7 +4711,7 @@
 		<acquire exp="1326108" sp="39784" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="85939.99" hpRegen="6.5" mp="2902.05" mpRegen="2.4" />
-			<attack physical="1765.71092" magical="1205.5387" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1765.71092" magical="1205.5387" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="456.18326" magical="312.73001" />
 			<attribute>
 				<attack type="earth" value="20" />
@@ -4765,7 +4765,7 @@
 		<acquire exp="1351416" sp="40543" attributeExp="1328" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="86910.30" hpRegen="6.5" mp="2959.74" mpRegen="2.4" />
-			<attack physical="1850.68904" magical="1265.13256" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1850.68904" magical="1265.13256" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="414.89589" magical="320.17851" />
 			<attribute>
 				<attack type="earth" value="20" />
@@ -4820,7 +4820,7 @@
 		<acquire exp="1472524" sp="44176" attributeExp="1328" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="43455.15" hpRegen="6.5" mp="2959.74" mpRegen="2.4" />
-			<attack physical="1940.11142" magical="1325.02979" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1940.11142" magical="1325.02979" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="446.6362" magical="326.64727" /> <!-- <defence physical="223.6362" magical="163.64727" /> -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -4871,7 +4871,7 @@
 		<acquire exp="1374149" sp="41225" attributeExp="1328" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="86910.30" hpRegen="6.5" mp="2959.74" mpRegen="2.4" />
-			<attack physical="2025.96455" magical="1385.22116" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2025.96455" magical="1385.22116" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="456.40135" magical="334.1342" /> <!-- <defence physical="228.40135" magical="167.1342" /> -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -4930,7 +4930,7 @@
 		<acquire exp="1462846" sp="43886" attributeExp="1530" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="88700.27" hpRegen="6.5" mp="3075.12" mpRegen="2.4" />
-			<attack physical="2120.23295" magical="1445.69611" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2120.23295" magical="1445.69611" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.18839" magical="255.63714" /> <!-- physical="233.18839" magical="170.63714" -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -4988,7 +4988,7 @@
 		<acquire exp="1396911" sp="41908" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="42970.63" hpRegen="6.5" mp="2902.05" mpRegen="2.4" />
-			<attack physical="1685.18867" magical="1150.25615" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1685.18867" magical="1150.25615" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="418.50106" magical="306.30378" /> <!-- p atack 209 m atack 153 -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -5034,7 +5034,7 @@
 		<acquire exp="1394760" sp="41843" attributeExp="1428" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="87829.82" hpRegen="6.5" mp="3017.43" mpRegen="2.4" />
-			<attack physical="2305.94387" magical="1575.44778" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2305.94387" magical="1575.44778" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="363.81593" magical="265.68216" /> <!-- physical="242.81593" magical="177.68216" physical="461.94387" magical="315.44778" -->
 			<attribute>
 				<attack type="earth" value="20" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20300-20399.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20300-20399.xml
index ef32527085..275df8e981 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20300-20399.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20300-20399.xml
@@ -512,7 +512,7 @@
 		<acquire exp="266" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="60" />
@@ -569,7 +569,7 @@
 		<acquire exp="310" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="60" />
@@ -625,7 +625,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
@@ -808,7 +808,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="24" />
@@ -897,7 +897,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1002,7 +1002,7 @@
 		<acquire exp="441" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -1056,7 +1056,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -1158,7 +1158,7 @@
 		<acquire exp="441" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -1214,7 +1214,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1266,7 +1266,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -1316,7 +1316,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="40" />
@@ -1526,7 +1526,7 @@
 		<acquire exp="454" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1732,7 +1732,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="40" />
@@ -2056,7 +2056,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="50" />
@@ -2999,7 +2999,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3220,7 +3220,7 @@
 		<acquire exp="354" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="70" />
@@ -3565,7 +3565,7 @@
 		<acquire exp="452" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3821,7 +3821,7 @@
 		<acquire exp="691" sp="21" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="86.088" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="40" />
@@ -3878,7 +3878,7 @@
 		<acquire exp="183" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="40" />
@@ -4098,7 +4098,7 @@
 		<acquire exp="450" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -4262,7 +4262,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -4312,7 +4312,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20400-20499.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20400-20499.xml
index 0dddd981a4..57a9b6fa36 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20400-20499.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20400-20499.xml
@@ -336,7 +336,7 @@
 		<acquire exp="7426723" sp="222802" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="44350.16" hpRegen="8.5" mp="3075.63" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="60" />
@@ -385,7 +385,7 @@
 		<acquire exp="1014371" sp="30432" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="43915.64" hpRegen="8.5" mp="3017.84" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="80" />
@@ -434,7 +434,7 @@
 		<acquire exp="1045169" sp="31356" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="44356.209" hpRegen="8.5" mp="3081.939" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1265,7 +1265,7 @@
 		<acquire exp="439" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1329,7 +1329,7 @@
 		<acquire exp="292" sp="9" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="90" />
@@ -1558,7 +1558,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="50" />
@@ -1842,7 +1842,7 @@
 		<acquire exp="2925" sp="88" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="256.998" hpRegen="3.5" mp="303.408" mpRegen="1.5" />
-			<attack physical="69.75926" magical="47.63653" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="69.75926" magical="47.63653" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="105.02818" magical="76.85506" shield="53" shieldRate="20" />
 			<speed>
 				<walk ground="50" />
@@ -1904,7 +1904,7 @@
 		<acquire exp="2578" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="229.4625" hpRegen="3.5" mp="272.706" mpRegen="1.5" />
-			<attack physical="60.19687" magical="41.10666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="60.19687" magical="41.10666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="98.70919" magical="72.2311" />
 			<speed>
 				<walk ground="50" />
@@ -2040,7 +2040,7 @@
 		<acquire exp="221" sp="7" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="24" />
@@ -2207,7 +2207,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -2259,7 +2259,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -2310,7 +2310,7 @@
 		<acquire exp="309" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -2710,7 +2710,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -3301,7 +3301,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="45" />
@@ -3351,7 +3351,7 @@
 		<acquire exp="353" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="45" />
@@ -3403,7 +3403,7 @@
 		<acquire exp="309" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="113.94" hpRegen="2" mp="93.912" mpRegen="0.9" />
-			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="14.80956" magical="10.11301" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="55.51894" magical="40.62635" />
 			<speed>
 				<walk ground="45" />
@@ -3454,7 +3454,7 @@
 		<acquire exp="439" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="45" />
@@ -3683,7 +3683,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -3787,7 +3787,7 @@
 		<acquire exp="265" sp="8" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="98.115" hpRegen="2" mp="85.785" mpRegen="0.9" />
-			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="13.52471" magical="9.23562" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="53.53373" magical="39.17366" />
 			<speed>
 				<walk ground="24" />
@@ -3948,7 +3948,7 @@
 		<acquire exp="443" sp="14" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="172.176" hpRegen="2" mp="120.099" mpRegen="0.9" />
-			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="19.33758" magical="13.20506" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="61.82527" magical="45.24105" />
 			<speed>
 				<walk ground="60" />
@@ -4006,7 +4006,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20500-20599.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20500-20599.xml
index b173c66765..dae0eb897a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20500-20599.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20500-20599.xml
@@ -1347,7 +1347,7 @@
 		<acquire exp="177" sp="6" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="70.896" hpRegen="2" mp="68.628" mpRegen="0.9" />
-			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="11.24892" magical="7.68155" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="49.73343" magical="36.39277" />
 			<speed>
 				<walk ground="24" />
@@ -1554,7 +1554,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1601,7 +1601,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1646,7 +1646,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
@@ -1873,7 +1873,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1918,7 +1918,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -1963,7 +1963,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2008,7 +2008,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2275,7 +2275,7 @@
 		<acquire exp="133" sp="4" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="23" />
@@ -2325,7 +2325,7 @@
 		<acquire exp="45" sp="2" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="23" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20600-20699.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20600-20699.xml
index a9df952b3d..52cc1abda0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20600-20699.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20600-20699.xml
@@ -1323,7 +1323,7 @@
 		<acquire exp="1984500" sp="59535" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21960.51075" hpRegen="8.5" mp="3024.147" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="55" />
@@ -1370,7 +1370,7 @@
 		<acquire exp="1986617" sp="59599" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21960.51075" hpRegen="8.5" mp="3024.147" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="25" />
@@ -1422,7 +1422,7 @@
 		<acquire exp="969283" sp="29079" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21960.51075" hpRegen="8.5" mp="3024.147" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="80" />
@@ -1487,7 +1487,7 @@
 		<acquire exp="1955500" sp="58665" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21960.51075" hpRegen="8.5" mp="3024.147" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="43" />
@@ -1537,7 +1537,7 @@
 		<acquire exp="2997653" sp="89930" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="14785.403" hpRegen="8.5" mp="3081.939" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1582,7 +1582,7 @@
 		<acquire exp="1033634" sp="31010" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21960.51075" hpRegen="8.5" mp="3024.147" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="40" />
@@ -1646,7 +1646,7 @@
 		<acquire exp="1494461" sp="44834" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="14640.375666667" hpRegen="8.5" mp="3024.147" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="27" />
@@ -1712,7 +1712,7 @@
 		<acquire exp="1073563" sp="32207" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="22178.1045" hpRegen="8.5" mp="3081.939" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="100" />
@@ -1777,7 +1777,7 @@
 		<acquire exp="3029949" sp="90899" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="14785.403" hpRegen="8.5" mp="3081.939" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1832,7 +1832,7 @@
 		<acquire exp="2971426" sp="89143" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="14785.403" hpRegen="8.5" mp="3081.939" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="37" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20700-20799.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20700-20799.xml
index ef501ed8da..a8c877e730 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20700-20799.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20700-20799.xml
@@ -1129,7 +1129,7 @@
 		<acquire exp="4188044" sp="125642" attributeExp="1530" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="88700.27" hpRegen="5.5" mp="3705.12" mpRegen="2.1" />
-			<attack physical="1450.44588" magical="990.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1450.44588" magical="990.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="390.66302" magical="286.17771" /> <!-- <defence physical="195.66302" magical="143.17771" /> -->
 			<attribute>
 				<attack type="earth" value="20" />
@@ -1315,7 +1315,7 @@
 		<acquire exp="1978928" sp="59368" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="44350.51" hpRegen="8.5" mp="3075.63" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="80" />
@@ -1379,7 +1379,7 @@
 		<acquire exp="2024296" sp="60729" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="43915.01" hpRegen="8.5" mp="3017.84" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="100" />
@@ -3536,7 +3536,7 @@
 		<acquire exp="46335" sp="1390" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1380.32124" hpRegen="8.5" mp="2629.335" mpRegen="3" />
-			<attack physical="469.5384" magical="416.6452173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="469.5384" magical="416.6452173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="958.284" magical="1597.14" />
 			<speed>
 				<walk ground="25" />
@@ -3585,7 +3585,7 @@
 		<acquire exp="50337" sp="1510" attributeExp="770" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.99191" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.131" magical="1641.885" />
 			<speed>
 				<walk ground="25" />
@@ -3633,7 +3633,7 @@
 		<acquire exp="88472" sp="2654" attributeExp="770" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.99191" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.131" magical="1641.885" />
 			<speed>
 				<walk ground="25" />
@@ -3686,7 +3686,7 @@
 		<acquire exp="91880" sp="2756" attributeExp="858" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.72623" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="488.6718" magical="433.67086956522" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="488.6718" magical="433.67086956522" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="997.443" magical="1662.405" />
 			<speed>
 				<walk ground="25" />
@@ -3738,7 +3738,7 @@
 		<acquire exp="93340" sp="2800" attributeExp="858" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.849385" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="488.7117" magical="433.70804347826" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="488.7117" magical="433.70804347826" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="997.5285" magical="1662.5475" />
 			<speed>
 				<walk ground="35" />
@@ -3788,7 +3788,7 @@
 		<acquire exp="96610" sp="2898" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1009.413" magical="1682.355" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20800-20899.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20800-20899.xml
index 3eead884a8..8e7209ad2c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20800-20899.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20800-20899.xml
@@ -17,7 +17,7 @@
 		<acquire exp="131997" sp="3959" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2423.3825125" hpRegen="8.5" mp="3104.58" mpRegen="3" />
-			<attack physical="808.61705" magical="731.48967391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="808.61705" magical="731.48967391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1682.42625" magical="2804.04375" />
 			<speed>
 				<walk ground="70" />
@@ -65,7 +65,7 @@
 		<acquire exp="136896" sp="4106" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2827.269335" hpRegen="8.5" mp="3415.215" mpRegen="3" />
-			<attack physical="939.4691" magical="853.40152173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="939.4691" magical="853.40152173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1962.8235" magical="3271.3725" />
 			<speed>
 				<walk ground="60" />
@@ -117,7 +117,7 @@
 		<acquire exp="168844" sp="5065" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="4120.56" mpRegen="3" />
-			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2103.00075" magical="3505.00125" />
 			<speed>
 				<walk ground="45" />
@@ -169,7 +169,7 @@
 		<acquire exp="190141" sp="5704" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2940.744352" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2041.6032" magical="3402.672" />
 			<speed>
 				<walk ground="80" />
@@ -3386,7 +3386,7 @@
 		<acquire exp="141914" sp="4257" attributeExp="1134" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.5997675" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1701.32175" magical="2835.53625" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20900-20999.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20900-20999.xml
index 5437ba3579..9901874929 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20900-20999.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/20900-20999.xml
@@ -5149,7 +5149,7 @@
 		<acquire exp="187075" sp="5612" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="3104.58" mpRegen="3" />
-			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2041.6032" magical="3402.672" />
 			<speed>
 				<walk ground="45" />
@@ -5199,7 +5199,7 @@
 		<equipment rhand="94" /> <!-- Bec de Corbin -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="3104.58" mpRegen="3" />
-			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2103.00075" magical="3505.00125" />
 			<speed>
 				<walk ground="80" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21000-21099.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21000-21099.xml
index f2bbf6b14b..be8f19a36f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21000-21099.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21000-21099.xml
@@ -4180,7 +4180,7 @@
 		<acquire exp="1436673" sp="43101" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="14640.375666667" hpRegen="8.5" mp="3024.147" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="80" />
@@ -4246,7 +4246,7 @@
 		<acquire exp="1471083" sp="44133" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="14785.403" hpRegen="8.5" mp="3081.939" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="70" />
@@ -4537,7 +4537,7 @@
 		<acquire exp="1423548" sp="42707" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="14640.375666667" hpRegen="8.5" mp="3024.147" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="92" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21300-21399.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21300-21399.xml
index 660b8c9eec..93f74ab36f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21300-21399.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21300-21399.xml
@@ -6,7 +6,7 @@
 		<acquire exp="680551" sp="10208" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -51,7 +51,7 @@
 		<acquire exp="1355598" sp="20333" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -79,7 +79,7 @@
 		<acquire exp="680551" sp="20416" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -126,7 +126,7 @@
 		<acquire exp="1355598" sp="40667" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21400-21499.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21400-21499.xml
index 35ebfeb7d8..24ff8a606d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21400-21499.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21400-21499.xml
@@ -6,7 +6,7 @@
 		<acquire exp="993837" sp="14907" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -53,7 +53,7 @@
 		<acquire exp="1943222" sp="29148" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -78,7 +78,7 @@
 		<acquire exp="993837" sp="14907" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="37" />
@@ -125,7 +125,7 @@
 		<acquire exp="1980478" sp="29707" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="37" />
@@ -152,7 +152,7 @@
 		<acquire exp="993837" sp="14907" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -199,7 +199,7 @@
 		<acquire exp="1980478" sp="29707" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -227,7 +227,7 @@
 		<acquire exp="691558" sp="10373" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="40" />
@@ -268,7 +268,7 @@
 		<acquire exp="1375920" sp="20638" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="40" />
@@ -295,7 +295,7 @@
 		<acquire exp="708492" sp="10627" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="50" />
@@ -339,7 +339,7 @@
 		<acquire exp="1387139" sp="20807" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="50" />
@@ -367,7 +367,7 @@
 		<acquire exp="1010772" sp="15161" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -410,7 +410,7 @@
 		<acquire exp="1991697" sp="29875" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="45" />
@@ -439,7 +439,7 @@
 		<acquire exp="993837" sp="14907" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="37" />
@@ -480,7 +480,7 @@
 		<acquire exp="1980478" sp="29707" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.383556667" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="37" />
@@ -508,7 +508,7 @@
 		<acquire exp="758237" sp="11373" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="80" />
@@ -548,7 +548,7 @@
 		<acquire exp="1397934" sp="20969" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="80" />
@@ -575,7 +575,7 @@
 		<acquire exp="789989" sp="11849" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="39" />
@@ -617,7 +617,7 @@
 		<acquire exp="1442599" sp="21638" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="39" />
@@ -646,7 +646,7 @@
 		<acquire exp="705317" sp="10579" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="27" />
@@ -686,7 +686,7 @@
 		<acquire exp="1388620" sp="20829" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17090.342505" hpRegen="8.5" mp="2963.865" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="27" />
@@ -713,7 +713,7 @@
 		<acquire exp="1330194" sp="19952" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="41" />
@@ -750,7 +750,7 @@
 		<acquire exp="2640882" sp="39613" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="41" />
@@ -776,7 +776,7 @@
 		<acquire exp="767945" sp="11519" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="80" />
@@ -816,7 +816,7 @@
 		<acquire exp="1430983" sp="21464" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="80" />
@@ -843,7 +843,7 @@
 		<acquire exp="1059474" sp="15892" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="41" />
@@ -881,7 +881,7 @@
 		<acquire exp="2076464" sp="31146" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="41" />
@@ -907,7 +907,7 @@
 		<acquire exp="1059474" sp="15892" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -945,7 +945,7 @@
 		<acquire exp="2076464" sp="31146" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -971,7 +971,7 @@
 		<acquire exp="1357938" sp="20369" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -1010,7 +1010,7 @@
 		<acquire exp="2673394" sp="40100" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -1038,7 +1038,7 @@
 		<acquire exp="1452658" sp="21789" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="35" />
@@ -1077,7 +1077,7 @@
 		<acquire exp="2697670" sp="40465" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="35" />
@@ -1103,7 +1103,7 @@
 		<acquire exp="2878656" sp="43179" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1146,7 +1146,7 @@
 		<acquire exp="2669276" sp="40039" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1188,7 +1188,7 @@
 		<acquire exp="3792041" sp="56880" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="21574.6007875" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="31" />
@@ -1229,7 +1229,7 @@
 		<acquire exp="1701921" sp="25528" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="39" />
@@ -1272,7 +1272,7 @@
 		<acquire exp="1701921" sp="25528" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="39" />
@@ -1314,7 +1314,7 @@
 		<acquire exp="2056090" sp="30841" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="17259.68063" hpRegen="8.5" mp="3020.505" mpRegen="3" />
-			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1188.872595" magical="811.845865" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
 				<walk ground="45" />
@@ -1340,7 +1340,7 @@
 		<acquire exp="702678" sp="10540" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="16911.39829" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="40" />
@@ -1364,7 +1364,7 @@
 		<acquire exp="702678" sp="10540" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="16911.39829" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="40" />
@@ -1387,7 +1387,7 @@
 		<acquire exp="702678" sp="10540" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="16911.39829" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="15" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21600-21699.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21600-21699.xml
index f7b5096ea3..6d2f41db0f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21600-21699.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21600-21699.xml
@@ -2716,7 +2716,7 @@
 		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
-			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="22" />
@@ -2773,7 +2773,7 @@
 		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
-			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="60" />
@@ -2810,7 +2810,7 @@
 		<acquire exp="2470" sp="75" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1108.383" hpRegen="5.5" mp="590.562" mpRegen="2.1" />
-			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="198.34591" magical="135.44454" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="164.88513" magical="120.65578" />
 			<speed>
 				<walk ground="80" />
@@ -2858,7 +2858,7 @@
 		<acquire exp="2589" sp="78" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1153.959" hpRegen="5.5" mp="619.458" mpRegen="2.1" />
-			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="210.04832" magical="143.43577" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="169.13417" magical="123.76505" />
 			<speed>
 				<walk ground="80" />
@@ -2905,7 +2905,7 @@
 		<acquire exp="2711" sp="82" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1201.434" hpRegen="5.5" mp="650.16" mpRegen="2.1" />
-			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="222.23112" magical="151.75505" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="173.43552" magical="126.91259" />
 			<speed>
 				<walk ground="100" />
@@ -2954,7 +2954,7 @@
 		<acquire exp="2835" sp="86" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1248.276" hpRegen="5.5" mp="679.056" mpRegen="2.1" />
-			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="234.89829" magical="160.40508" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="177.78746" magical="130.09715" />
 			<speed>
 				<walk ground="45" />
@@ -3003,7 +3003,7 @@
 		<acquire exp="2963" sp="89" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1297.017" hpRegen="5.5" mp="708.855" mpRegen="2.1" />
-			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="248.0526" magical="169.38777" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="182.18816" magical="133.31739" />
 			<speed>
 				<walk ground="80" />
@@ -3052,7 +3052,7 @@
 		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
-			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="27" />
@@ -3101,7 +3101,7 @@
 		<acquire exp="3226" sp="97" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1396.398" hpRegen="5.5" mp="770.259" mpRegen="2.1" />
-			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="275.82705" magical="188.35412" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="191.12803" magical="139.8592" />
 			<speed>
 				<walk ground="60" />
@@ -3145,7 +3145,7 @@
 		<acquire exp="3093" sp="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1346.391" hpRegen="5.5" mp="739.557" mpRegen="2.1" />
-			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="261.69549" magical="178.7041" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="186.63569" magical="136.5719" />
 			<speed>
 				<walk ground="80" />
@@ -3232,7 +3232,7 @@
 		<acquire exp="3362" sp="101" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1447.038" hpRegen="5.5" mp="800.961" mpRegen="2.1" />
-			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="290.44588" magical="198.33688" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="195.66302" magical="143.17771" />
 			<speed>
 				<walk ground="70" />
@@ -3630,7 +3630,7 @@
 		<acquire exp="124807" sp="3744" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2423.3825125" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="808.61705" magical="731.48967391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="808.61705" magical="731.48967391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1682.42625" magical="2804.04375" />
 			<speed>
 				<walk ground="25" />
@@ -3679,7 +3679,7 @@
 		<acquire exp="127803" sp="3834" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2103.00075" magical="3505.00125" />
 			<attribute>
 				<attack type="FIRE" value="100" />
@@ -3727,7 +3727,7 @@
 		<acquire exp="163526" sp="4905" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3029.1819575" hpRegen="8.5" mp="3104.58" mpRegen="3" />
-			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1004.88515" magical="914.34815217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2103.00075" magical="3505.00125" />
 			<speed>
 				<walk ground="25" />
@@ -3768,7 +3768,7 @@
 		<acquire exp="168076" sp="5042" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2908.034384" hpRegen="8.5" mp="3415.215" mpRegen="3" />
-			<attack physical="965.63552" magical="877.78017391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="965.63552" magical="877.78017391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2018.8944" magical="3364.824" />
 			<speed>
 				<walk ground="37" />
@@ -3809,7 +3809,7 @@
 		<acquire exp="172838" sp="5185" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2908.034384" hpRegen="8.5" mp="3415.215" mpRegen="3" />
-			<attack physical="965.63552" magical="877.78017391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="965.63552" magical="877.78017391304" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2018.8944" magical="3364.824" />
 			<speed>
 				<walk ground="45" />
@@ -3851,7 +3851,7 @@
 		<acquire exp="206169" sp="6185" attributeExp="1040" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2827.269335" hpRegen="8.5" mp="3753.285" mpRegen="3" />
-			<attack physical="939.4691" magical="853.40152173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="939.4691" magical="853.40152173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1962.8235" magical="3271.3725" />
 			<speed>
 				<walk ground="45" />
@@ -3894,7 +3894,7 @@
 		<acquire exp="178288" sp="5348" attributeExp="1134" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.5997675" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1701.32175" magical="2835.53625" />
 			<speed>
 				<walk ground="40" />
@@ -3936,7 +3936,7 @@
 		<acquire exp="181044" sp="5431" attributeExp="1134" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3063.234315" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="1016.2039" magical="924.62673913043" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1016.2039" magical="924.62673913043" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2126.6415" magical="3544.4025" />
 			<speed>
 				<walk ground="80" />
@@ -3973,7 +3973,7 @@
 		<acquire exp="172383" sp="5171" attributeExp="1134" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.5997675" hpRegen="8.5" mp="3828.51" mpRegen="3" />
-			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="817.72135" magical="739.70510869565" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1701.32175" magical="2835.53625" />
 			<speed>
 				<walk ground="70" />
@@ -4006,7 +4006,7 @@
 		<acquire exp="222900" sp="6687" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2940.744352" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="976.51936" magical="887.65356521739" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2041.6032" magical="3402.672" />
 			<speed>
 				<walk ground="23" />
@@ -4048,7 +4048,7 @@
 		<acquire exp="227862" sp="6835" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2859.043325" hpRegen="8.5" mp="3166.53" mpRegen="3" />
-			<attack physical="950.0497" magical="862.99239130435" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="950.0497" magical="862.99239130435" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1984.8825" magical="3308.1375" />
 			<speed>
 				<walk ground="13" />
@@ -4090,7 +4090,7 @@
 		<acquire exp="222497" sp="6674" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2859.043325" hpRegen="8.5" mp="2907.225" mpRegen="3" />
-			<attack physical="950.0497" magical="862.99239130435" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="950.0497" magical="862.99239130435" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1984.8825" magical="3308.1375" />
 			<attribute>
 				<attack type="DARK" value="100" />
@@ -4134,7 +4134,7 @@
 		<acquire exp="40651" sp="1219" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1380.32124" hpRegen="8.5" mp="2629.335" mpRegen="3" />
-			<attack physical="469.5384" magical="416.6452173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="469.5384" magical="416.6452173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="958.284" magical="1597.14" />
 			<attribute>
 				<attack type="DARK" value="100" />
@@ -4174,7 +4174,7 @@
 		<acquire exp="79188" sp="2375" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1399.77973" hpRegen="8.5" mp="2683.32" mpRegen="3" />
-			<attack physical="476.129" magical="422.51869565217" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="476.129" magical="422.51869565217" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="971.793" magical="1619.655" />
 			<speed>
 				<walk ground="37" />
@@ -4201,7 +4201,7 @@
 		<acquire exp="82030" sp="2460" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.868755" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="482.5999" magical="428.28065217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.5999" magical="428.28065217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.0455" magical="1641.7425" />
 			<speed>
 				<walk ground="41" />
@@ -4229,7 +4229,7 @@
 		<acquire exp="52115" sp="1563" attributeExp="770" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.99191" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.6398" magical="428.31782608696" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.131" magical="1641.885" />
 			<speed>
 				<walk ground="35" />
@@ -4275,7 +4275,7 @@
 		<acquire exp="50479" sp="1514" attributeExp="770" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.72623" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="488.6718" magical="433.67086956522" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="488.6718" magical="433.67086956522" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="997.443" magical="1662.405" />
 			<speed>
 				<walk ground="57" />
@@ -4439,7 +4439,7 @@
 		<acquire exp="94946" sp="2848" attributeExp="858" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1436.849385" hpRegen="8.5" mp="2794.83" mpRegen="3" />
-			<attack physical="482.5999" magical="428.28065217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="482.5999" magical="428.28065217391" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="985.0455" magical="1641.7425" />
 			<speed>
 				<walk ground="41" />
@@ -4467,7 +4467,7 @@
 		<acquire exp="95603" sp="2868" attributeExp="858" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1009.413" magical="1682.355" />
 			<speed>
 				<walk ground="57" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21700-21799.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21700-21799.xml
index 230b1a122d..e88b1ef8fc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21700-21799.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21700-21799.xml
@@ -1278,7 +1278,7 @@
 		<acquire exp="266169" sp="7186" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1418.9098066667" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="60" />
@@ -1383,7 +1383,7 @@
 		<acquire exp="1772332" sp="47852" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2758.7130516667" hpRegen="8.5" mp="2739.075" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="60" />
@@ -2513,7 +2513,7 @@
 		<acquire exp="240547" sp="7216" attributeExp="684" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1453.96793" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1009.413" magical="1682.355" />
 			<speed>
 				<walk ground="39" />
@@ -2545,7 +2545,7 @@
 		<acquire exp="374272" sp="11228" attributeExp="948" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2450.6202933333" hpRegen="8.5" mp="3483.36" mpRegen="3" />
-			<attack physical="817.728" magical="739.71130434783" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="817.728" magical="739.71130434783" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1701.336" magical="2835.56" />
 			<speed>
 				<walk ground="13" />
@@ -2959,7 +2959,7 @@
 		<acquire exp="101142" sp="3034" attributeExp="1230" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2423.44409" hpRegen="8.5" mp="2850.585" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="54" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21900-21999.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21900-21999.xml
index fcd446f345..5bf06723ac 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21900-21999.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/21900-21999.xml
@@ -1171,7 +1171,7 @@
 		<acquire exp="406258" sp="12188" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="3076.85475" hpRegen="8.5" mp="3416.952" mpRegen="3" />
-			<attack physical="940.9565" magical="661.831856" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="940.9565" magical="661.831856" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="355.9783" magical="237.312" />
 			<speed>
 				<walk ground="20" />
@@ -1203,7 +1203,7 @@
 		<acquire exp="616457" sp="18494" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2075.9586666667" hpRegen="8.5" mp="3484.677" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="39" />
@@ -1236,7 +1236,7 @@
 		<acquire exp="604623" sp="18139" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2075.9586666667" hpRegen="8.5" mp="3484.677" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="39" />
@@ -1270,7 +1270,7 @@
 		<acquire exp="644429" sp="19333" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="2075.9586666667" hpRegen="8.5" mp="3484.677" mpRegen="3" />
-			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1055.28566" magical="720.6233026" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.77477" magical="255.95" />
 			<speed>
 				<walk ground="40" />
@@ -1303,7 +1303,7 @@
 		<acquire exp="816485" sp="24495" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1574.4688125" hpRegen="8.5" mp="3554.208" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="60" />
@@ -1338,7 +1338,7 @@
 		<acquire exp="826818" sp="24805" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1574.4688125" hpRegen="8.5" mp="3554.208" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="39" />
@@ -1371,7 +1371,7 @@
 		<acquire exp="836463" sp="25094" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1574.4688125" hpRegen="8.5" mp="3554.208" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="43" />
@@ -1404,7 +1404,7 @@
 		<acquire exp="827507" sp="24826" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1574.4688125" hpRegen="8.5" mp="3554.208" mpRegen="3" />
-			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1099.423617" magical="750.7638096" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.86144" magical="258.94045" />
 			<speed>
 				<walk ground="30" />
@@ -2119,7 +2119,7 @@
 		<acquire exp="30" sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="41.145" hpRegen="2" mp="44.247" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="8.47458" magical="5.78704" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="44.44444" magical="32.52252" />
 			<speed>
 				<walk ground="60" />
@@ -2161,7 +2161,7 @@
 		<acquire exp="89" sp="3" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="60.135" hpRegen="2" mp="60.501" mpRegen="0.9" />
-			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="10.24492" magical="6.99595" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="47.91652" magical="35.06323" />
 			<speed>
 				<walk ground="60" />
@@ -2250,7 +2250,7 @@
 		<acquire exp="147" sp="5" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="84.189" hpRegen="2" mp="76.755" mpRegen="0.9" />
-			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
 				<walk ground="60" />
@@ -2287,7 +2287,7 @@
 		<acquire exp="472" sp="15" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="277.887" hpRegen="2.5" mp="174.279" mpRegen="1.2" />
-			<attack physical="32.16396" magical="21.96382" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="32.16396" magical="21.96382" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="76.08628" magical="55.67663" />
 			<speed>
 				<walk ground="50" />
@@ -2328,7 +2328,7 @@
 		<acquire exp="354" sp="11" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="131.031" hpRegen="2" mp="102.039" mpRegen="0.9" />
-			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="16.20165" magical="11.06363" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="57.56203" magical="42.1214" />
 			<speed>
 				<walk ground="70" />
@@ -2370,7 +2370,7 @@
 		<acquire exp="500" sp="15" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="298.143" hpRegen="2.5" mp="185.115" mpRegen="1.2" />
-			<attack physical="34.8979" magical="23.83074" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="34.8979" magical="23.83074" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="78.68469" magical="57.57804" />
 			<speed>
 				<walk ground="36" />
@@ -2407,7 +2407,7 @@
 		<acquire exp="529" sp="16" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="317.766" hpRegen="2.5" mp="193.242" mpRegen="1.2" />
-			<attack physical="37.82932" magical="25.83252" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="37.82932" magical="25.83252" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="81.34791" magical="59.52687" />
 			<speed>
 				<walk ground="36" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/24000-24099.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/24000-24099.xml
index 6b3e36b12c..5e710e879f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/24000-24099.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/24000-24099.xml
@@ -441,7 +441,7 @@
 		<acquire exp="39238" sp="1177" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1360.493285" hpRegen="8.5" mp="2574.465" mpRegen="3" />
-			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="328.27073" magical="240.21427" />
 			<speed>
 				<walk ground="27" />
@@ -705,7 +705,7 @@
 		<acquire exp="129880" sp="3896" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1360.493285" hpRegen="8.5" mp="2574.465" mpRegen="3" />
-			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="856.440559" magical="584.8378869" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="328.27073" magical="240.21427" />
 			<speed>
 				<walk ground="27" />
@@ -1596,7 +1596,7 @@
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="314.65987" magical="230.25444" />
 			<hitTime>840</hitTime>
 		</stats>
@@ -1615,7 +1615,7 @@
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1620.4119125" hpRegen="8.5" mp="2412.51" mpRegen="3" />
-			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="773.81598" magical="528.41601" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="314.65987" magical="230.25444" />
 			<speed>
 				<walk ground="30" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/25000-25099.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/25000-25099.xml
index 5db92f5223..15a4171abf 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/25000-25099.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/25000-25099.xml
@@ -3493,7 +3493,7 @@
 		<acquire exp="238359335" sp="7150781" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="3582202.704" hpRegen="319.2293199" mp="5803.581" mpRegen="3" />
-			<attack physical="3893.463882" magical="630.9983989" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="3893.463882" magical="630.9983989" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3174.043583" magical="1548.445762" />
 			<speed>
 				<walk ground="37" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/25100-25199.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/25100-25199.xml
index d81138a99d..ac3189da6e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/25100-25199.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/25100-25199.xml
@@ -466,7 +466,7 @@
 		<acquire exp="238359335" sp="7150781" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="3582202.704" hpRegen="319.2293199" mp="5803.581" mpRegen="3" />
-			<attack physical="3893.463882" magical="630.9983989" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="3893.463882" magical="630.9983989" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3174.043583" magical="1548.445762" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/25200-25299.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/25200-25299.xml
index f7b5d76a40..365716169f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/25200-25299.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/25200-25299.xml
@@ -4001,7 +4001,7 @@
 		<acquire exp="1008600000" sp="30258000" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="53409375" hpRegen="319.2293199" mp="31191.426" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="45" />
@@ -4215,7 +4215,7 @@
 		<acquire exp="1008600000" sp="30258000" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="53409375" hpRegen="319.2293199" mp="31191.426" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="45" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/25700-25799.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/25700-25799.xml
index 24feb5b3d1..2f3db4e694 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/25700-25799.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/25700-25799.xml
@@ -72,7 +72,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="45" />
@@ -137,7 +137,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="50" />
@@ -241,7 +241,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="30" />
@@ -305,7 +305,7 @@
 		<acquire exp="174960000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="1321552.16662" hpRegen="310.756323" mp="5120.61" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="90" />
@@ -369,7 +369,7 @@
 		<acquire exp="52925400" sp="1587762" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="420467.42646" hpRegen="178.4276342" mp="515402.76" mpRegen="2.4" />
-			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1495.843372" magical="729.7418166" />
 			<speed>
 				<walk ground="60" />
@@ -416,7 +416,7 @@
 		<acquire exp="52925400" sp="1587762" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="420467.42646" hpRegen="178.4276342" mp="515402.76" mpRegen="2.4" />
-			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="896.8607767" magical="141.6415533" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1495.843372" magical="729.7418166" />
 			<speed>
 				<walk ground="24" />
@@ -462,7 +462,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="50" />
@@ -529,7 +529,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="40" />
@@ -596,7 +596,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="50" />
@@ -663,7 +663,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="60" />
@@ -731,7 +731,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="60" />
@@ -799,7 +799,7 @@
 		<acquire exp="83980800" sp="2519424" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="557075.38604" hpRegen="101.2977436" mp="569046.15" mpRegen="2.4" />
-			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1468.525226" magical="462.9002732" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1781.574132" magical="869.1345416" />
 			<speed>
 				<walk ground="40" />
@@ -906,7 +906,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="13" />
@@ -952,7 +952,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="39" />
@@ -998,7 +998,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="80" />
@@ -1044,7 +1044,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="39" />
@@ -1090,7 +1090,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="50" />
@@ -1136,7 +1136,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="60" />
@@ -1182,7 +1182,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="25" />
@@ -1228,7 +1228,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="45" />
@@ -1275,7 +1275,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="79" />
@@ -1321,7 +1321,7 @@
 		<acquire exp="98560800" sp="2956824" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="639533.32367" hpRegen="294.2109061" mp="653275.14" mpRegen="2.7" />
-			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1724.618609" magical="543.624591" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2092.259531" magical="1020.701298" />
 			<speed>
 				<walk ground="60" />
@@ -1407,7 +1407,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="45" />
@@ -1485,7 +1485,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="52" />
@@ -1563,7 +1563,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="38" />
@@ -1641,7 +1641,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="40" />
@@ -1720,7 +1720,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="30" />
@@ -1818,7 +1818,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -1896,7 +1896,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -1974,7 +1974,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -2052,7 +2052,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="50" />
@@ -2130,7 +2130,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="42" />
@@ -2209,7 +2209,7 @@
 		<acquire exp="114307200" sp="3429216" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="741394.82417" hpRegen="294.2109061" mp="757324.59" mpRegen="2.7" />
-			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2150.478201" magical="713.6992296" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2427.899572" magical="1184.442087" />
 			<speed>
 				<walk ground="48" />
@@ -2307,7 +2307,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="60" />
@@ -2370,7 +2370,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="50" />
@@ -2433,7 +2433,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="50" />
@@ -2496,7 +2496,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="55" />
@@ -2559,7 +2559,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="55" />
@@ -2622,7 +2622,7 @@
 		<acquire exp="131220000" sp="3936600" raidPoints="5" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="928205.44164" hpRegen="310.756323" mp="948149.175" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="55" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/29000-29099.xml
index 73dc5f17eb..e6f0690e00 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/29000-29099.xml
@@ -11,8 +11,8 @@
 		<sex>FEMALE</sex>
 		<acquire exp="2179535" sp="65386" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="214133.04684" hpRegen="85.09694484" mp="509.76" mpRegen="1.8" />
-			<attack physical="105" magical="8" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="386384" hpRegen="208" mp="300.8" mpRegen="2.1" />
+			<attack physical="105" magical="8" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1252" magical="229" />
 			<speed>
 				<walk ground="80" />
@@ -21,11 +21,9 @@
 			<hitTime>370</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4019" level="1" /> <!-- Decrease Speed -->
-			<skill id="4021" level="1" /> <!-- Queen Ant -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -34,8 +32,11 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4021" level="1" /> <!-- Queen Ant -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4017" level="1" /> <!-- Queen Ant's Blow -->
+			<skill id="4018" level="1" /> <!-- Decrease Speed -->
+			<skill id="4019" level="1" /> <!-- Decrease Speed -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -50,118 +51,151 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="915" min="1" max="1" chance="34.81" /> <!-- Aquastone Necklace -->
-				<item id="914" min="1" max="1" chance="34.49" /> <!-- Dark Necklace -->
-				<item id="851" min="1" max="3" chance="34.18" /> <!-- Onyx Beast's Eye Earring -->
-				<item id="882" min="1" max="3" chance="33.98" /> <!-- Mithril Ring -->
-				<item id="884" min="1" max="3" chance="33.82" /> <!-- Ring of Protection -->
-				<item id="916" min="1" max="1" chance="33.3" /> <!-- Necklace of Protection -->
-				<item id="853" min="1" max="3" chance="33.09" /> <!-- Earring of Protection -->
-				<item id="883" min="1" max="3" chance="32.76" /> <!-- Aquastone Ring -->
-				<item id="2496" min="1" max="1" chance="32.23" /> <!-- Dwarven Chain Shield -->
-				<item id="355" min="1" max="1" chance="32.2" /> <!-- Dwarven Chain Mail Shirt -->
-				<item id="852" min="1" max="3" chance="32.13" /> <!-- Moonstone Earring -->
-				<item id="382" min="1" max="1" chance="31.77" /> <!-- Dwarven Chain Gaiters -->
-				<item id="399" min="1" max="1" chance="26.09" /> <!-- Rind Leather Armor -->
-				<item id="419" min="1" max="1" chance="25.86" /> <!-- Rind Leather Gaiters -->
-				<item id="500" min="1" max="1" chance="25.01" /> <!-- Great Helmet -->
-				<item id="440" min="1" max="1" chance="24.69" /> <!-- Robe of Seal -->
-				<item id="6660" min="1" max="1" chance="20.99" /> <!-- Queen Ant's Ring -->
-				<item id="1126" min="1" max="3" chance="17.27" /> <!-- Crimson Boots -->
-				<item id="418" min="1" max="1" chance="17.23" /> <!-- Plated Leather Gaiters -->
-				<item id="398" min="1" max="1" chance="16.98" /> <!-- Plated Leather Armor -->
-				<item id="2455" min="1" max="3" chance="16.87" /> <!-- Plated Leather Gloves -->
-				<item id="632" min="1" max="3" chance="16.77" /> <!-- Knight's Shield -->
-				<item id="498" min="1" max="3" chance="16.02" /> <!-- Steel Plate Helmet -->
-				<item id="70" min="1" max="1" chance="7.207" /> <!-- Claymore -->
-				<item id="396" min="1" max="1" chance="7.2" /> <!-- Salamander Skin Mail -->
-				<item id="187" min="1" max="1" chance="7.2" /> <!-- Atuba Hammer -->
-				<item id="607" min="1" max="3" chance="7.198" /> <!-- Ogre Power Gauntlets -->
-				<item id="225" min="1" max="1" chance="7.189" /> <!-- Mithril Dagger -->
-				<item id="1125" min="1" max="3" chance="7.183" /> <!-- Assault Boots -->
-				<item id="2428" min="1" max="3" chance="7.183" /> <!-- Plate Boots -->
-				<item id="320" min="1" max="1" chance="7.174" /> <!-- Blue Crystal Skull -->
-				<item id="322" min="1" max="1" chance="7.174" /> <!-- Vajra Wand -->
-				<item id="630" min="1" max="3" chance="7.174" /> <!-- Square Shield -->
-				<item id="280" min="1" max="1" chance="7.17" /> <!-- Light Crossbow -->
-				<item id="438" min="1" max="3" chance="7.161" /> <!-- Sage's Rags -->
-				<item id="159" min="1" max="1" chance="7.137" /> <!-- Bonebreaker -->
-				<item id="321" min="1" max="1" chance="7.13" /> <!-- Demon's Fangs -->
-				<item id="497" min="1" max="3" chance="7.113" /> <!-- Chain Helmet -->
-				<item id="2451" min="1" max="3" chance="7.112" /> <!-- Sage's Worn Gloves -->
-				<item id="2427" min="1" max="3" chance="7.109" /> <!-- Salamander Skin Boots -->
-				<item id="353" min="1" max="1" chance="7.105" /> <!-- Half Plate Armor -->
-				<item id="380" min="1" max="1" chance="7.101" /> <!-- Plate Gaiters -->
-				<item id="297" min="1" max="1" chance="7.099" /> <!-- Glaive -->
-				<item id="188" min="1" max="1" chance="7.099" /> <!-- Ghost Staff -->
-				<item id="2412" min="1" max="3" chance="7.096" /> <!-- Plate Helmet -->
-				<item id="190" min="1" max="1" chance="7.094" /> <!-- Atuba Mace -->
-				<item id="61" min="1" max="3" chance="7.093" /> <!-- Mithril Gloves -->
-				<item id="262" min="1" max="1" chance="7.091" /> <!-- Scallop Jamadhr -->
-				<item id="189" min="1" max="1" chance="7.08" /> <!-- Staff of Life -->
-				<item id="2499" min="1" max="1" chance="7.068" /> <!-- Elven Long Sword -->
-				<item id="2494" min="1" max="3" chance="7.019" /> <!-- Plate Shield -->
-				<item id="94" min="1" max="1" chance="6.428" /> <!-- Bec de Corbin -->
-				<item id="242" min="1" max="1" chance="6.419" /> <!-- Soulfire Dirk -->
-				<item id="73" min="1" max="1" chance="6.405" /> <!-- Shamshir -->
-				<item id="227" min="1" max="1" chance="6.364" /> <!-- Stiletto -->
-				<item id="282" min="1" max="1" chance="6.35" /> <!-- Elemental Bow -->
-				<item id="131" min="1" max="1" chance="6.332" /> <!-- Spirit Sword -->
-				<item id="133" min="1" max="1" chance="6.315" /> <!-- Raid Sword -->
-				<item id="195" min="1" max="1" chance="6.312" /> <!-- Cursed Staff -->
-				<item id="285" min="1" max="1" chance="6.311" /> <!-- Noble Elven Bow -->
-				<item id="325" min="1" max="1" chance="6.31" /> <!-- Horn of Glory -->
-				<item id="74" min="1" max="1" chance="6.298" /> <!-- Katana -->
-				<item id="631" min="1" max="3" chance="5.655" /> <!-- Eldarake -->
-				<item id="302" min="1" max="1" chance="5.651" /> <!-- Body Slasher -->
-				<item id="191" min="1" max="1" chance="5.62" /> <!-- Heavy Doom Hammer -->
-				<item id="354" min="1" max="1" chance="5.616" /> <!-- Chain Mail Shirt -->
-				<item id="2431" min="1" max="3" chance="5.612" /> <!-- Plated Leather Boots -->
-				<item id="2433" min="1" max="3" chance="5.612" /> <!-- Boots of Seal -->
-				<item id="160" min="1" max="1" chance="5.607" /> <!-- Battle Axe -->
-				<item id="2452" min="1" max="3" chance="5.602" /> <!-- Reinforced Mithril Gloves -->
-				<item id="230" min="1" max="1" chance="5.598" /> <!-- Needle Wolverine -->
-				<item id="2413" min="1" max="3" chance="5.596" /> <!-- Chain Hood -->
-				<item id="89" min="1" max="1" chance="5.596" /> <!-- Big Hammer -->
-				<item id="161" min="1" max="1" chance="5.592" /> <!-- Silver Axe -->
-				<item id="263" min="1" max="1" chance="5.591" /> <!-- Chakram -->
-				<item id="2432" min="1" max="3" chance="5.587" /> <!-- Dwarven Chain Boots -->
-				<item id="2454" min="1" max="3" chance="5.575" /> <!-- Karmian Gloves -->
-				<item id="173" min="1" max="1" chance="5.574" /> <!-- Skull Graver -->
-				<item id="62" min="1" max="3" chance="5.573" /> <!-- Reinforced Mithril Boots -->
-				<item id="2495" min="1" max="3" chance="5.573" /> <!-- Chain Shield -->
-				<item id="281" min="1" max="1" chance="5.57" /> <!-- Crystallized Ice Bow -->
-				<item id="2453" min="1" max="3" chance="5.57" /> <!-- Chain Gloves -->
-				<item id="71" min="1" max="1" chance="5.561" /> <!-- Flamberge -->
-				<item id="439" min="1" max="1" chance="5.559" /> <!-- Karmian Tunic -->
-				<item id="72" min="1" max="1" chance="5.553" /> <!-- Stormbringer -->
-				<item id="226" min="1" max="1" chance="5.542" /> <!-- Cursed Dagger -->
-				<item id="298" min="1" max="1" chance="5.54" /> <!-- Orcish Glaive -->
-				<item id="471" min="1" max="1" chance="5.538" /> <!-- Karmian Stockings -->
-				<item id="397" min="1" max="1" chance="5.531" /> <!-- Reinforced Mithril Shirt -->
-				<item id="232" min="1" max="1" chance="5.525" /> <!-- Dark Elven Dagger -->
-				<item id="193" min="1" max="1" chance="5.525" /> <!-- Stick of Faith -->
-				<item id="192" min="1" max="1" chance="5.523" /> <!-- Crystal Staff -->
-				<item id="2429" min="1" max="3" chance="5.523" /> <!-- Chain Boots -->
-				<item id="2430" min="1" max="3" chance="5.523" /> <!-- Karmian Boots -->
-				<item id="2387" min="1" max="1" chance="5.519" /> <!-- Reinforced Mithril Gaiters -->
-				<item id="194" min="1" max="1" chance="5.518" /> <!-- Heavy Doom Axe -->
-				<item id="96" min="1" max="1" chance="5.504" /> <!-- Scythe -->
-				<item id="381" min="1" max="1" chance="5.48" /> <!-- Chain Gaiters -->
-				<item id="70000" min="76" max="228" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="91527" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (D-grade) -->
-				<item id="91534" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (D-grade) -->
-				<item id="91541" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (D-grade) -->
+				<group chance="99.90714">
+					<item id="320" min="1" max="1" chance="7.15" /> <!-- Blue Crystal Skull -->
+					<item id="321" min="1" max="1" chance="7.15" /> <!-- Demon's Fangs -->
+					<item id="70" min="1" max="1" chance="7.15" /> <!-- Claymore -->
+					<item id="159" min="1" max="1" chance="7.15" /> <!-- Bonebreaker -->
+					<item id="187" min="1" max="1" chance="7.15" /> <!-- Atuba Hammer -->
+					<item id="188" min="1" max="1" chance="7.15" /> <!-- Ghost Staff -->
+					<item id="189" min="1" max="1" chance="7.15" /> <!-- Staff of Life -->
+					<item id="190" min="1" max="1" chance="7.15" /> <!-- Atuba Mace -->
+					<item id="225" min="1" max="1" chance="7.15" /> <!-- Mithril Dagger -->
+					<item id="262" min="1" max="1" chance="7.15" /> <!-- Scallop Jamadhr -->
+					<item id="280" min="1" max="1" chance="7.15" /> <!-- Light Bow -->
+					<item id="297" min="1" max="1" chance="7.15" /> <!-- Glaive -->
+					<item id="322" min="1" max="1" chance="7.15" /> <!-- Vajra Wand -->
+					<item id="2499" min="1" max="1" chance="7.05" /> <!-- Elven Long Sword -->
+				</group>
+				<group chance="100">
+					<item id="438" min="1" max="3" chance="7.15" /> <!-- Sage's Rags -->
+					<item id="61" min="1" max="3" chance="7.15" /> <!-- Mithril Gloves -->
+					<item id="353" min="1" max="1" chance="7.15" /> <!-- Half Plate Armor -->
+					<item id="380" min="1" max="1" chance="7.15" /> <!-- Plate Gaiters -->
+					<item id="396" min="1" max="1" chance="7.15" /> <!-- Salamander Skin Mail -->
+					<item id="497" min="1" max="3" chance="7.15" /> <!-- Chain Helmet -->
+					<item id="607" min="1" max="3" chance="7.15" /> <!-- Ogre Power Gauntlets -->
+					<item id="630" min="1" max="3" chance="7.15" /> <!-- Square Shield -->
+					<item id="1125" min="1" max="3" chance="7.15" /> <!-- Assault Boots -->
+					<item id="2412" min="1" max="3" chance="7.15" /> <!-- Plate Helmet -->
+					<item id="2427" min="1" max="3" chance="7.15" /> <!-- Salamander Skin Boots -->
+					<item id="2428" min="1" max="3" chance="7.15" /> <!-- Plate Boots -->
+					<item id="2451" min="1" max="3" chance="7.15" /> <!-- Sage's Worn Gloves -->
+					<item id="2494" min="1" max="3" chance="7.05" /> <!-- Plate Shield -->
+				</group>
+				<group chance="100">
+					<item id="851" min="1" max="3" chance="33.33" /> <!-- Onyx Beast's Eye Earring -->
+					<item id="882" min="1" max="3" chance="33.33" /> <!-- Mithril Ring -->
+					<item id="914" min="1" max="1" chance="33.34" /> <!-- Dark Necklace -->
+				</group>
+				<group chance="100">
+					<item id="71" min="1" max="1" chance="5" /> <!-- Flamberge -->
+					<item id="72" min="1" max="1" chance="5" /> <!-- Stormbringer -->
+					<item id="89" min="1" max="1" chance="5" /> <!-- Big Hammer -->
+					<item id="96" min="1" max="1" chance="5" /> <!-- Scythe -->
+					<item id="160" min="1" max="1" chance="5" /> <!-- Battle Axe -->
+					<item id="161" min="1" max="1" chance="5" /> <!-- Silver Axe -->
+					<item id="173" min="1" max="1" chance="5" /> <!-- Skull Graver -->
+					<item id="191" min="1" max="1" chance="5" /> <!-- Heavy Doom Hammer -->
+					<item id="192" min="1" max="1" chance="5" /> <!-- Crystal Staff -->
+					<item id="193" min="1" max="1" chance="5" /> <!-- Stick of Faith -->
+					<item id="194" min="1" max="1" chance="5" /> <!-- Heavy Doom Axe -->
+					<item id="226" min="1" max="1" chance="5" /> <!-- Cursed Dagger -->
+					<item id="230" min="1" max="1" chance="5" /> <!-- Needle Wolverine -->
+					<item id="232" min="1" max="1" chance="5" /> <!-- Dark Elven Dagger -->
+					<item id="263" min="1" max="1" chance="5" /> <!-- Chakram -->
+					<item id="281" min="1" max="1" chance="5" /> <!-- Crystallized Ice Bow -->
+					<item id="298" min="1" max="1" chance="5" /> <!-- Orcish Glaive -->
+					<item id="302" min="1" max="1" chance="5" /> <!-- Body Slasher -->
+					<item id="91884" min="1" max="1" chance="5" /> <!-- Schlager -->
+					<item id="91899" min="1" max="1" chance="5" /> <!-- Soldat Estoc -->
+				</group>
+				<group chance="100">
+					<item id="2387" min="1" max="1" chance="5.55" /> <!-- Reinforced Mithril Gaiters -->
+					<item id="2413" min="1" max="3" chance="5.55" /> <!-- Chain Hood -->
+					<item id="2429" min="1" max="3" chance="5.55" /> <!-- Chain Boots -->
+					<item id="2430" min="1" max="3" chance="5.55" /> <!-- Karmian Boots -->
+					<item id="2431" min="1" max="3" chance="5.55" /> <!-- Plated Leather Boots -->
+					<item id="2432" min="1" max="3" chance="5.55" /> <!-- Dwarven Chain Boots -->
+					<item id="2433" min="1" max="3" chance="5.55" /> <!-- Boots of Seal -->
+					<item id="2452" min="1" max="3" chance="5.55" /> <!-- Reinforced Mithril Gloves -->
+					<item id="2453" min="1" max="3" chance="5.55" /> <!-- Chain Gloves -->
+					<item id="2454" min="1" max="3" chance="5.55" /> <!-- Karmian Gloves -->
+					<item id="2495" min="1" max="3" chance="5.55" /> <!-- Chain Shield -->
+					<item id="62" min="1" max="3" chance="5.55" /> <!-- Reinforced Mithril Boots -->
+					<item id="354" min="1" max="1" chance="5.55" /> <!-- Chain Mail Shirt -->
+					<item id="381" min="1" max="1" chance="5.55" /> <!-- Chain Gaiters -->
+					<item id="397" min="1" max="1" chance="5.55" /> <!-- Reinforced Mithril Shirt -->
+					<item id="439" min="1" max="1" chance="5.55" /> <!-- Karmian Tunic -->
+					<item id="471" min="1" max="1" chance="5.55" /> <!-- Karmian Stockings -->
+					<item id="631" min="1" max="3" chance="5.65" /> <!-- Eldarake -->
+				</group>
+				<group chance="100">
+					<item id="852" min="1" max="3" chance="33.33" /> <!-- Moonstone Earring -->
+					<item id="883" min="1" max="3" chance="33.33" /> <!-- Aquastone Ring -->
+					<item id="915" min="1" max="1" chance="33.34" /> <!-- Aquastone Necklace -->
+				</group>
+				<group chance="70">
+					<item id="73" min="1" max="1" chance="7.8" /> <!-- Shamshir -->
+					<item id="74" min="1" max="1" chance="7.7" /> <!-- Katana -->
+					<item id="94" min="1" max="1" chance="7.7" /> <!-- Bec de Corbin -->
+					<item id="131" min="1" max="1" chance="7.7" /> <!-- Spirit Sword -->
+					<item id="133" min="1" max="1" chance="7.7" /> <!-- Raid Sword -->
+					<item id="195" min="1" max="1" chance="7.7" /> <!-- Cursed Staff -->
+					<item id="227" min="1" max="1" chance="7.7" /> <!-- Stiletto -->
+					<item id="242" min="1" max="1" chance="7.7" /> <!-- Soulfire Dirk -->
+					<item id="282" min="1" max="1" chance="7.7" /> <!-- Elemental Bow -->
+					<item id="285" min="1" max="1" chance="7.7" /> <!-- Noble Elven Bow -->
+					<item id="325" min="1" max="1" chance="7.7" /> <!-- Horn of Glory -->
+					<item id="91883" min="1" max="1" chance="7.6" /> <!-- Immortal Edge -->
+					<item id="91897" min="1" max="1" chance="7.6" /> <!-- Blinzlasher -->
+				</group>
+				<group chance="100">
+					<item id="355" min="1" max="1" chance="33.33" /> <!-- Dwarven Chain Mail Shirt -->
+					<item id="382" min="1" max="1" chance="33.33" /> <!-- Dwarven Chain Gaiters -->
+					<item id="2496" min="1" max="1" chance="33.34" /> <!-- Dwarven Chain Shield -->
+				</group>
+				<group chance="100">
+					<item id="399" min="1" max="1" chance="25" /> <!-- Rind Leather Armor -->
+					<item id="419" min="1" max="1" chance="25" /> <!-- Rind Leather Gaiters -->
+					<item id="440" min="1" max="1" chance="25" /> <!-- Robe of Seal -->
+					<item id="500" min="1" max="1" chance="25" /> <!-- Great Helmet -->
+				</group>
+				<group chance="100">
+					<item id="632" min="1" max="3" chance="16.66" /> <!-- Knight's Shield -->
+					<item id="1126" min="1" max="3" chance="16.66" /> <!-- Crimson Boots -->
+					<item id="498" min="1" max="3" chance="16.66" /> <!-- Steel Plate Helmet -->
+					<item id="398" min="1" max="1" chance="16.66" /> <!-- Plated Leather Armor -->
+					<item id="418" min="1" max="1" chance="16.66" /> <!-- Plated Leather Gaiters -->
+					<item id="2455" min="1" max="3" chance="16.7" /> <!-- Plated Leather Gloves -->
+				</group>
+				<group chance="100">
+					<item id="853" min="1" max="3" chance="33.33" /> <!-- Earring of Protection -->
+					<item id="884" min="1" max="3" chance="33.33" /> <!-- Ring of Protection -->
+					<item id="916" min="1" max="1" chance="33.34" /> <!-- Necklace of Protection -->
+				</group>
+				<group chance="20">
+					<item id="6660" min="1" max="1" chance="100" /> <!-- Queen Ant's Ring Lv. 1 -->
+				</group>
+				<group chance="100">
+					<item id="91527" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (D-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91534" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (D-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91541" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (D-grade) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29002" level="29" type="Monster" name="Queen Ant Larva">
+	<npc id="29002" level="38" type="Monster" name="Queen Ant Larva">
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="591" hpRegen="3.5" mp="315" mpRegen="1.5" />
-			<attack physical="89.21" magical="59.01" random="30" critical="7" accuracy="40" attackSpeed="257" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="591.9" hpRegen="3.5" mp="315.1" mpRegen="1.5" />
+			<attack physical="89.21" magical="59.01" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="118.72" magical="84.16" />
 			<speed>
 				<walk ground="40" />
@@ -170,9 +204,9 @@
 			<hitTime>350</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="true" />
+		<status attackable="true" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -181,7 +215,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="4500" aggroRange="450">
@@ -198,9 +232,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4000" hpRegen="108" mp="402" mpRegen="1.8" />
-			<attack physical="637" magical="395" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="4000" hpRegen="108" mp="402.6" mpRegen="1.8" />
+			<attack physical="637" magical="395" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="547" magical="200" />
 			<speed>
 				<walk ground="40" />
@@ -209,9 +243,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -220,7 +254,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4020" level="1" /> <!-- Recovery -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
@@ -243,9 +277,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="4343" hpRegen="115" mp="432" mpRegen="1.8" />
-			<attack physical="178" magical="27" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="4343" hpRegen="115" mp="432.7" mpRegen="1.8" />
+			<attack physical="178" magical="27" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="578" magical="211" />
 			<speed>
 				<walk ground="40" />
@@ -254,9 +288,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -265,7 +299,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="700" isAggressive="true">
@@ -287,9 +321,9 @@
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire sp="1" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="7051" hpRegen="122" mp="463" mpRegen="1.8" />
-			<attack physical="1190" magical="1074" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="7051" hpRegen="122" mp="463.3" mpRegen="1.8" />
+			<attack physical="1190" magical="1074" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="610" magical="223" />
 			<speed>
 				<walk ground="40" />
@@ -298,9 +332,9 @@
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -309,7 +343,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="700" aggroRange="450">
@@ -334,18 +368,19 @@
 		<sex>MALE</sex>
 		<acquire exp="2041407" sp="61242" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="289902.43642" hpRegen="145.2219912" mp="2901.03" mpRegen="2.1" />
-			<attack physical="722.31" magical="1398.68" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
+			<vitals hp="523103.852" hpRegen="441.65" mp="1708.8" mpRegen="20" />
+			<attack physical="722.31" magical="1398.68" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1602" magical="293" />
 			<speed>
 				<walk ground="50" />
 				<run ground="110" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -354,7 +389,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>10</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -369,85 +404,116 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="917" min="1" max="1" chance="33.35" /> <!-- Necklace of Mermaid -->
-				<item id="1149" min="1" max="3" chance="32.97" /> <!-- Shining Circlet -->
-				<item id="608" min="1" max="3" chance="32.46" /> <!-- Mithril Gauntlets -->
-				<item id="854" min="1" max="3" chance="32.43" /> <!-- Earring of Seal -->
-				<item id="885" min="1" max="3" chance="32.34" /> <!-- Ring of Ages -->
-				<item id="1127" min="1" max="3" chance="31.87" /> <!-- Forgotten Boots -->
-				<item id="2459" min="1" max="1" chance="25.94" /> <!-- Demon's Gloves -->
-				<item id="2460" min="1" max="1" chance="25.53" /> <!-- Theca Leather Gloves -->
-				<item id="472" min="1" max="1" chance="25.22" /> <!-- Demon's Stockings -->
-				<item id="2436" min="1" max="1" chance="25.13" /> <!-- Theca Leather Boots -->
-				<item id="441" min="1" max="1" chance="24.97" /> <!-- Demon's Tunic -->
-				<item id="420" min="1" max="1" chance="24.96" /> <!-- Theca Leather Gaiters -->
-				<item id="400" min="1" max="1" chance="24.4" /> <!-- Theca Leather Armor -->
-				<item id="2435" min="1" max="1" chance="24.39" /> <!-- Demon's Boots -->
-				<item id="107" min="1" max="3" chance="20.86" /> <!-- Compound Shield -->
-				<item id="499" min="1" max="3" chance="20.67" /> <!-- Mithril Helmet -->
-				<item id="2462" min="1" max="1" chance="20.56" /> <!-- Full Plate Gauntlets -->
-				<item id="356" min="1" max="1" chance="20.4" /> <!-- Full Plate Armor -->
-				<item id="1128" min="1" max="3" chance="20.31" /> <!-- Adamantite Boots -->
-				<item id="2438" min="1" max="1" chance="20.28" /> <!-- Full Plate Boots -->
-				<item id="2497" min="1" max="1" chance="20.24" /> <!-- Full Plate Shield -->
-				<item id="517" min="1" max="3" chance="20.03" /> <!-- Compound Helmet -->
-				<item id="2414" min="1" max="1" chance="19.98" /> <!-- Full Plate Helmet -->
-				<item id="64" min="1" max="1" chance="19.93" /> <!-- Compound Boots -->
-				<item id="6662" min="1" max="1" chance="19.92" /> <!-- Ring of Core -->
-				<item id="442" min="1" max="1" chance="19.84" /> <!-- Divine Tunic -->
-				<item id="603" min="1" max="3" chance="19.8" /> <!-- Divine Boots -->
-				<item id="103" min="1" max="3" chance="19.7" /> <!-- Tower Shield -->
-				<item id="2437" min="1" max="1" chance="19.62" /> <!-- Drake Leather Boots -->
-				<item id="60" min="1" max="1" chance="19.61" /> <!-- Compound Armor -->
-				<item id="401" min="1" max="1" chance="19.48" /> <!-- Drake Leather Armor -->
-				<item id="2461" min="1" max="1" chance="19.47" /> <!-- Drake Leather Gloves -->
-				<item id="2468" min="1" max="3" chance="19.27" /> <!-- Blessed Gloves -->
-				<item id="2463" min="1" max="1" chance="19.08" /> <!-- Divine Gloves -->
-				<item id="473" min="1" max="1" chance="19.05" /> <!-- Divine Stockings -->
-				<item id="888" min="1" max="3" chance="17.17" /> <!-- Blessed Ring -->
-				<item id="119" min="1" max="1" chance="17" /> <!-- Necklace of Seal -->
-				<item id="855" min="1" max="3" chance="16.98" /> <!-- Nassen's Earring -->
-				<item id="919" min="1" max="1" chance="16.94" /> <!-- Blessed Necklace -->
-				<item id="886" min="1" max="3" chance="16.11" /> <!-- Ring of Seal -->
-				<item id="857" min="1" max="3" chance="15.88" /> <!-- Holy Earring -->
-				<item id="206" min="1" max="1" chance="11.62" /> <!-- Demon's Staff -->
-				<item id="2503" min="1" max="1" chance="11.55" /> <!-- Yaksa Mace -->
-				<item id="286" min="1" max="1" chance="11.51" /> <!-- Eminence Bow -->
-				<item id="205" min="1" max="1" chance="11.44" /> <!-- Ghoul's Staff -->
-				<item id="266" min="1" max="1" chance="11.18" /> <!-- Great Pata -->
-				<item id="135" min="1" max="1" chance="11.05" /> <!-- Samurai Long Sword -->
-				<item id="228" min="1" max="1" chance="11.01" /> <!-- Crystal Dagger -->
-				<item id="299" min="1" max="1" chance="10.99" /> <!-- Orcish Poleaxe -->
-				<item id="204" min="1" max="1" chance="10.93" /> <!-- Deadman's Staff -->
-				<item id="303" min="1" max="1" chance="4.312" /> <!-- Widow Maker -->
-				<item id="95" min="1" max="1" chance="4.229" /> <!-- Poleaxe -->
-				<item id="203" min="1" max="1" chance="4.225" /> <!-- Pa'agrio Axe -->
-				<item id="162" min="1" max="1" chance="4.223" /> <!-- War Axe -->
-				<item id="283" min="1" max="1" chance="4.212" /> <!-- Akat Longbow -->
-				<item id="77" min="1" max="1" chance="4.211" /> <!-- Tsurugi -->
-				<item id="145" min="1" max="1" chance="4.208" /> <!-- Sword of Whispering Death -->
-				<item id="134" min="1" max="1" chance="4.201" /> <!-- Sword of Nightmare -->
-				<item id="197" min="1" max="1" chance="4.2" /> <!-- Paradia Staff -->
-				<item id="76" min="1" max="1" chance="4.195" /> <!-- Sword of Delusion -->
-				<item id="84" min="1" max="1" chance="4.185" /> <!-- Homunkulus' Sword -->
-				<item id="198" min="1" max="1" chance="4.183" /> <!-- Inferno Staff -->
-				<item id="174" min="1" max="1" chance="4.173" /> <!-- Nirvana Axe -->
-				<item id="132" min="1" max="1" chance="4.163" /> <!-- Ultimate Sword -->
-				<item id="196" min="1" max="1" chance="4.159" /> <!-- Stick of Eternity -->
-				<item id="233" min="1" max="1" chance="4.154" /> <!-- Dark Screamer -->
-				<item id="202" min="1" max="1" chance="4.151" /> <!-- Mace of Underworld -->
-				<item id="201" min="1" max="1" chance="4.146" /> <!-- Club of Nature -->
-				<item id="301" min="1" max="1" chance="4.143" /> <!-- Scorpion -->
-				<item id="200" min="1" max="1" chance="4.139" /> <!-- Sage's Staff -->
-				<item id="75" min="1" max="1" chance="4.127" /> <!-- Caliburs -->
-				<item id="199" min="1" max="1" chance="4.127" /> <!-- Pa'agrio Hammer -->
-				<item id="231" min="1" max="1" chance="4.111" /> <!-- Grace Dagger -->
-				<item id="265" min="1" max="1" chance="4.099" /> <!-- Fisted Blade -->
-				<item id="70000" min="297" max="891" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="91529" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (C-grade) -->
-				<item id="91536" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (C-grade) -->
-				<item id="91543" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (C-grade) -->
-				<item id="8620" min="1" max="3" chance="49.64" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				<group chance="100">
+					<item id="91897" min="1" max="1" chance="4" /> <!-- Blinzlasher -->
+					<item id="75" min="1" max="1" chance="4" /> <!-- Caliburs -->
+					<item id="76" min="1" max="1" chance="4" /> <!-- Sword of Delusion -->
+					<item id="77" min="1" max="1" chance="4" /> <!-- Tsurugi -->
+					<item id="84" min="1" max="1" chance="4" /> <!-- Homunkulus' Sword -->
+					<item id="95" min="1" max="1" chance="4" /> <!-- Poleaxe -->
+					<item id="132" min="1" max="1" chance="4" /> <!-- Ultimate Sword -->
+					<item id="134" min="1" max="1" chance="4" /> <!-- Sword of Nightmare -->
+					<item id="145" min="1" max="1" chance="4" /> <!-- Sword of Whispering Death -->
+					<item id="162" min="1" max="1" chance="4" /> <!-- War Axe -->
+					<item id="174" min="1" max="1" chance="4" /> <!-- Nirvana Axe -->
+					<item id="196" min="1" max="1" chance="4" /> <!-- Stick of Eternity -->
+					<item id="197" min="1" max="1" chance="4" /> <!-- Paradia Staff -->
+					<item id="198" min="1" max="1" chance="4" /> <!-- Inferno Staff -->
+					<item id="199" min="1" max="1" chance="4" /> <!-- Pa'agrio Hammer -->
+					<item id="200" min="1" max="1" chance="4" /> <!-- Sage's Staff -->
+					<item id="201" min="1" max="1" chance="4" /> <!-- Club of Nature -->
+					<item id="202" min="1" max="1" chance="4" /> <!-- Mace of Underworld -->
+					<item id="231" min="1" max="1" chance="4" /> <!-- Grace Dagger -->
+					<item id="233" min="1" max="1" chance="4" /> <!-- Dark Screamer -->
+					<item id="265" min="1" max="1" chance="4" /> <!-- Fisted Blade -->
+					<item id="283" min="1" max="1" chance="4" /> <!-- Akat Longbow -->
+					<item id="203" min="1" max="1" chance="4" /> <!-- Pa'agrio Axe -->
+					<item id="301" min="1" max="1" chance="4" /> <!-- Scorpio -->
+					<item id="303" min="1" max="1" chance="4" /> <!-- Widow Maker -->
+				</group>
+				<group chance="100">
+					<item id="60" min="1" max="1" chance="20" /> <!-- Compound Armor -->
+					<item id="64" min="1" max="1" chance="20" /> <!-- Compound Boots -->
+					<item id="103" min="1" max="3" chance="20" /> <!-- Tower Shield -->
+					<item id="107" min="1" max="3" chance="20" /> <!-- Compound Shield -->
+					<item id="517" min="1" max="3" chance="20" /> <!-- Compound Helmet -->
+				</group>
+				<group chance="100">
+					<item id="608" min="1" max="3" chance="33.33" /> <!-- Mithril Gauntlets -->
+					<item id="1127" min="1" max="3" chance="33.33" /> <!-- Forgotten Boots -->
+					<item id="1149" min="1" max="3" chance="33.34" /> <!-- Shining Circlet -->
+				</group>
+				<group chance="100">
+					<item id="400" min="1" max="1" chance="25" /> <!-- Theca Leather Armor -->
+					<item id="420" min="1" max="1" chance="25" /> <!-- Theca Leather Gaiters -->
+					<item id="2436" min="1" max="1" chance="25" /> <!-- Theca Leather Boots -->
+					<item id="2460" min="1" max="1" chance="25" /> <!-- Theca Leather Gloves -->
+				</group>
+				<group chance="100">
+					<item id="441" min="1" max="1" chance="25" /> <!-- Demon's Tunic -->
+					<item id="472" min="1" max="1" chance="25" /> <!-- Demon's Stockings -->
+					<item id="2435" min="1" max="1" chance="25" /> <!-- Demon's Boots -->
+					<item id="2459" min="1" max="1" chance="25" /> <!-- Demon's Gloves -->
+				</group>
+				<group chance="100">
+					<item id="854" min="1" max="3" chance="33.33" /> <!-- Earring of Seal -->
+					<item id="885" min="1" max="3" chance="33.33" /> <!-- Ring of Ages -->
+					<item id="917" min="1" max="1" chance="33.34" /> <!-- Necklace of Mermaid -->
+				</group>
+				<group chance="100">
+					<item id="135" min="1" max="1" chance="9.1" /> <!-- Samurai Long Sword -->
+					<item id="204" min="1" max="1" chance="9.1" /> <!-- Deadman's Staff -->
+					<item id="91896" min="1" max="1" chance="9.1" /> <!-- Admiral's Estoc -->
+					<item id="91882" min="1" max="1" chance="9" /> <!-- Saber Tooth -->
+					<item id="205" min="1" max="1" chance="9.1" /> <!-- Ghoul's Staff -->
+					<item id="206" min="1" max="1" chance="9.1" /> <!-- Demon's Staff -->
+					<item id="228" min="1" max="1" chance="9.1" /> <!-- Crystal Dagger -->
+					<item id="266" min="1" max="1" chance="9.1" /> <!-- Great Pata -->
+					<item id="286" min="1" max="1" chance="9.1" /> <!-- Eminence Bow -->
+					<item id="299" min="1" max="1" chance="9.1" /> <!-- Orcish Poleaxe -->
+					<item id="2503" min="1" max="1" chance="9.1" /> <!-- Yaksa Mace -->
+				</group>
+				<group chance="100">
+					<item id="356" min="1" max="1" chance="20" /> <!-- Full Plate Armor -->
+					<item id="2414" min="1" max="1" chance="20" /> <!-- Full Plate Helmet -->
+					<item id="2438" min="1" max="1" chance="20" /> <!-- Full Plate Boots -->
+					<item id="2462" min="1" max="1" chance="20" /> <!-- Full Plate Gauntlets -->
+					<item id="2497" min="1" max="1" chance="20" /> <!-- Full Plate Shield -->
+				</group>
+				<group chance="100">
+					<item id="401" min="1" max="1" chance="20" /> <!-- Drake Leather Armor -->
+					<item id="2437" min="1" max="1" chance="20" /> <!-- Drake Leather Boots -->
+					<item id="2461" min="1" max="1" chance="20" /> <!-- Drake Leather Gloves -->
+					<item id="499" min="1" max="3" chance="20" /> <!-- Mithril Helmet -->
+					<item id="1128" min="1" max="3" chance="20" /> <!-- Adamantite Boots -->
+				</group>
+				<group chance="100">
+					<item id="442" min="1" max="1" chance="20" /> <!-- Divine Tunic -->
+					<item id="473" min="1" max="1" chance="20" /> <!-- Divine Stockings -->
+					<item id="2463" min="1" max="1" chance="20" /> <!-- Divine Gloves -->
+					<item id="2468" min="1" max="3" chance="20" /> <!-- Blessed Gloves -->
+					<item id="603" min="1" max="3" chance="20" /> <!-- Divine Boots -->
+				</group>
+				<group chance="100">
+					<item id="119" min="1" max="1" chance="16.66" /> <!-- Necklace of Seal -->
+					<item id="855" min="1" max="3" chance="16.66" /> <!-- Nassen's Earring -->
+					<item id="857" min="1" max="3" chance="16.66" /> <!-- Holy Earring -->
+					<item id="886" min="1" max="3" chance="16.66" /> <!-- Ring of Seal -->
+					<item id="888" min="1" max="3" chance="16.66" /> <!-- Blessed Ring -->
+					<item id="919" min="1" max="1" chance="16.7" /> <!-- Blessed Necklace -->
+				</group>
+				<group chance="20">
+					<item id="6662" min="1" max="1" chance="100" /> <!-- Ring of Core Lv. 1 -->
+				</group>
+				<group chance="100">
+					<item id="91529" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (C-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91536" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (C-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91543" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (C-grade) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -461,9 +527,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="75" /> <!-- Caliburs -->
 		<acquire exp="13947" sp="418" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="13817" hpRegen="166" mp="747" mpRegen="2.1" />
-			<attack physical="410" magical="69" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="13817" hpRegen="166" mp="747.8" mpRegen="2.1" />
+			<attack physical="410" magical="69" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="801" magical="293" />
 			<speed>
 				<walk ground="27" />
@@ -472,9 +538,9 @@
 			<hitTime>710</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -483,9 +549,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="2300" isAggressive="true">
@@ -497,40 +561,6 @@
 			<radius normal="12" grown="14.5" />
 			<height normal="31" grown="36" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="162" min="1" max="1" chance="0.003" /> <!-- War Axe -->
-				<item id="174" min="1" max="1" chance="0.003" /> <!-- Nirvana Axe -->
-				<item id="196" min="1" max="1" chance="0.003" /> <!-- Stick of Eternity -->
-				<item id="197" min="1" max="1" chance="0.003" /> <!-- Paradia Staff -->
-				<item id="199" min="1" max="1" chance="0.003" /> <!-- Pa'agrio Hammer -->
-				<item id="200" min="1" max="1" chance="0.003" /> <!-- Sage's Staff -->
-				<item id="201" min="1" max="1" chance="0.003" /> <!-- Club of Nature -->
-				<item id="202" min="1" max="1" chance="0.003" /> <!-- Mace of Underworld -->
-				<item id="57" min="1160" max="2714" chance="70" /> <!-- Adena -->
-				<item id="1872" min="1" max="3" chance="16.14" /> <!-- Animal Bone -->
-				<item id="1865" min="1" max="3" chance="8.492" /> <!-- Varnish -->
-				<item id="1882" min="1" max="1" chance="5.7" /> <!-- Leather -->
-				<item id="2508" min="2" max="6" chance="5.317" /> <!-- Cursed Bone -->
-				<item id="1876" min="1" max="1" chance="5.163" /> <!-- Mithril Ore -->
-				<item id="2952" min="1" max="1" chance="2.172" /> <!-- Demon's Boot Fabric -->
-				<item id="3005" min="1" max="1" chance="0.97" /> <!-- Recipe: Demon's Boots -->
-				<item id="2100" min="1" max="1" chance="0.3" /> <!-- Paradia Staff Head -->
-				<item id="2097" min="1" max="1" chance="0.3" /> <!-- War Axe Blade -->
-				<item id="2098" min="1" max="1" chance="0.3" /> <!-- Nirvana Axe Blade -->
-				<item id="2231" min="1" max="1" chance="0.3" /> <!-- Recipe: Full Plate Armor -->
-				<item id="2105" min="1" max="1" chance="0.3" /> <!-- Mace of Underworld Head -->
-				<item id="2104" min="1" max="1" chance="0.3" /> <!-- Club of Nature Head -->
-				<item id="2103" min="1" max="1" chance="0.3" /> <!-- Sage's Staff Head -->
-				<item id="2099" min="1" max="1" chance="0.3" /> <!-- Stick of Eternity Shaft -->
-				<item id="2102" min="1" max="1" chance="0.3" /> <!-- Pa'agrio Hammer Head -->
-				<item id="2360" min="1" max="1" chance="0.03" /> <!-- Recipe: Orcish Poleaxe -->
-			</drop>
-			<spoil>
-				<item id="1914" min="1" max="1" chance="46.21" /> <!-- Earring of Seal Gemstone -->
-				<item id="3011" min="1" max="1" chance="22.96" /> <!-- Recipe: Divine Boots -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29008" level="55" type="Monster" name="Doom Wraith">
 		<parameters>
@@ -543,9 +573,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="1472" /> <!-- Dreadbane -->
 		<acquire exp="15169" sp="501" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="16012" hpRegen="185" mp="889" mpRegen="2.4" />
-			<attack physical="470" magical="715" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="16012" hpRegen="185" mp="889.8" mpRegen="2.4" />
+			<attack physical="470" magical="715" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="895" magical="327" />
 			<speed>
 				<walk ground="100" />
@@ -554,21 +584,19 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
 			<skill id="4001" level="5" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="700" isAggressive="true">
@@ -591,9 +619,9 @@
 		<race>PLANT</race>
 		<sex>FEMALE</sex>
 		<acquire exp="11480" sp="344" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="12544" hpRegen="154" mp="665" mpRegen="2.1" />
-			<attack physical="354" magical="60" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<attack physical="354" magical="60" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="747" magical="273" />
 			<speed>
 				<walk ground="80" />
@@ -602,19 +630,19 @@
 			<hitTime>130</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
 			<skill id="4035" level="4" /> <!-- Poison -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="800" isAggressive="true">
@@ -626,34 +654,6 @@
 			<radius normal="12" />
 			<height normal="25.5" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="1126" min="1" max="1" chance="0.075" /> <!-- Crimson Boots -->
-				<item id="2434" min="1" max="1" chance="0.075" /> <!-- Rind Leather Boots -->
-				<item id="2455" min="1" max="1" chance="0.075" /> <!-- Plated Leather Gloves -->
-				<item id="2457" min="1" max="1" chance="0.075" /> <!-- Gloves of Seal -->
-				<item id="2458" min="1" max="1" chance="0.075" /> <!-- Rind Leather Gloves -->
-				<item id="57" min="996" max="2323" chance="70" /> <!-- Adena -->
-				<item id="1866" min="1" max="1" chance="13.34" /> <!-- Suede -->
-				<item id="1342" min="30" max="90" chance="12.95" /> <!-- Steel Arrow -->
-				<item id="1867" min="2" max="6" chance="6.416" /> <!-- Animal Skin -->
-				<item id="2951" min="1" max="1" chance="4.388" /> <!-- Rind Leather Glove Design -->
-				<item id="2950" min="1" max="1" chance="4.348" /> <!-- Gloves of Seal Pattern -->
-				<item id="2948" min="1" max="1" chance="4.342" /> <!-- Rind Leather Boot Lining -->
-				<item id="1882" min="1" max="1" chance="4.245" /> <!-- Leather -->
-				<item id="1868" min="5" max="15" chance="3.845" /> <!-- Thread -->
-				<item id="2946" min="1" max="1" chance="2.929" /> <!-- Plated Leather Glove Design -->
-				<item id="2508" min="3" max="9" chance="2.632" /> <!-- Cursed Bone -->
-				<item id="1974" min="1" max="3" chance="2.22" /> <!-- Crimson Boot Fabric -->
-				<item id="1885" min="1" max="1" chance="1.585" /> <!-- High-grade Suede -->
-				<item id="2350" min="1" max="1" chance="0.03" /> <!-- Recipe: Pa'agrio Axe -->
-				<item id="2339" min="1" max="1" chance="0.03" /> <!-- Recipe: Inferno Staff -->
-			</drop>
-			<spoil>
-				<item id="1895" min="1" max="5" chance="66.24" /> <!-- Metallic Fiber -->
-				<item id="2944" min="1" max="1" chance="62.28" /> <!-- Karmian Glove Fabric -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29010" level="46" type="Monster" name="Validus">
 		<parameters>
@@ -664,29 +664,29 @@
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<acquire exp="11032" sp="330" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="12130" hpRegen="150" mp="637" mpRegen="2.1" />
-			<attack physical="337" magical="58" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="12130" hpRegen="150" mp="637.8" mpRegen="2.1" />
+			<attack physical="337" magical="58" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="729" magical="267" />
 			<speed>
 				<walk ground="70" />
 				<run ground="110" />
 			</speed>
-			<hitTime>300</hitTime>
+			<hitTime>30</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="3" /> <!-- Beast -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="3" /> <!-- Beasts -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="1200" isAggressive="true">
@@ -698,29 +698,6 @@
 			<radius normal="15" />
 			<height normal="29" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="354" min="1" max="1" chance="0.03" /> <!-- Chain Mail Shirt -->
-				<item id="232" min="1" max="1" chance="0.0075" /> <!-- Dark Elven Dagger -->
-				<item id="281" min="1" max="1" chance="0.0075" /> <!-- Crystallized Ice Bow -->
-				<item id="57" min="914" max="2141" chance="70" /> <!-- Adena -->
-				<item id="1866" min="1" max="1" chance="15.89" /> <!-- Suede -->
-				<item id="1878" min="1" max="1" chance="9.186" /> <!-- Durable Braid -->
-				<item id="1864" min="3" max="9" chance="7.663" /> <!-- Stem -->
-				<item id="1865" min="2" max="6" chance="5.755" /> <!-- Varnish -->
-				<item id="2508" min="2" max="6" chance="3.839" /> <!-- Cursed Bone -->
-				<item id="1959" min="1" max="1" chance="2.104" /> <!-- Chain Mail Shirt Material -->
-				<item id="2072" min="1" max="1" chance="0.75" /> <!-- Dark Elven Dagger Edge -->
-				<item id="2074" min="1" max="1" chance="0.75" /> <!-- Crystallized Ice Bow Shaft -->
-				<item id="2319" min="1" max="1" chance="0.075" /> <!-- Recipe: Raid Sword -->
-				<item id="951" min="1" max="1" chance="0.03" /> <!-- Scroll: Enchant Weapon (C-grade) -->
-			</drop>
-			<spoil>
-				<item id="1873" min="1" max="3" chance="88.74" /> <!-- Silver Nugget -->
-				<item id="2060" min="1" max="1" chance="3.464" /> <!-- Stormbringer Blade -->
-				<item id="2067" min="1" max="1" chance="3.185" /> <!-- Crystal Staff Head -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29011" level="49" type="Monster" name="Susceptor">
 		<parameters>
@@ -731,10 +708,10 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="13389" hpRegen="162" mp="720" mpRegen="2.1" />
-			<attack physical="391" magical="66" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<attack physical="391" magical="66" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="783" magical="286" />
 			<speed>
 				<walk ground="27" />
@@ -743,10 +720,10 @@
 			<hitTime>430</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
 			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -755,7 +732,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="1500" isAggressive="true">
@@ -778,9 +755,9 @@
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<acquire exp="16035" sp="481" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="12964" hpRegen="158" mp="692" mpRegen="2.1" />
-			<attack physical="372" magical="63" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="12964" hpRegen="158" mp="692.4" mpRegen="2.1" />
+			<attack physical="372" magical="63" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="765" magical="280" />
 			<speed>
 				<walk ground="20" />
@@ -789,22 +766,22 @@
 			<hitTime>410</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
 			<skill id="4001" level="4" /> <!-- NPC Windstrike -->
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4273" level="3" /> <!-- Resist Daggers/Rapier Weapon -->
-			<skill id="4274" level="1" /> <!-- Blunt Weapon Weak Point -->
-			<skill id="4408" level="12" /> <!-- HP Increase (4x) -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="14" /> <!-- Strong M. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="13" /> <!-- Strong M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
-			<skill id="4444" level="2" /> <!-- Higher Resist Bow/Crossbow Weapons -->
+			<skill id="4444" level="2" /> <!-- Greater Bow Resistance -->
+			<skill id="4273" level="3" /> <!-- Dagger Resistance -->
+			<skill id="4274" level="1" /> <!-- Blunt Weapon Vulnerability -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="800" isAggressive="true">
@@ -816,35 +793,6 @@
 			<radius normal="18" />
 			<height normal="34" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="1126" min="1" max="1" chance="0.075" /> <!-- Crimson Boots -->
-				<item id="2434" min="1" max="1" chance="0.075" /> <!-- Rind Leather Boots -->
-				<item id="2455" min="1" max="1" chance="0.075" /> <!-- Plated Leather Gloves -->
-				<item id="2457" min="1" max="1" chance="0.075" /> <!-- Gloves of Seal -->
-				<item id="2458" min="1" max="1" chance="0.075" /> <!-- Rind Leather Gloves -->
-				<item id="57" min="1447" max="3374" chance="70" /> <!-- Adena -->
-				<item id="1873" min="1" max="1" chance="12.81" /> <!-- Silver Nugget -->
-				<item id="1865" min="1" max="3" chance="10.09" /> <!-- Varnish -->
-				<item id="2508" min="2" max="6" chance="6.579" /> <!-- Cursed Bone -->
-				<item id="1965" min="1" max="1" chance="4.208" /> <!-- Metal Plate Helmet Material -->
-				<item id="2946" min="1" max="1" chance="3.494" /> <!-- Plated Leather Glove Design -->
-				<item id="1880" min="1" max="1" chance="3.151" /> <!-- Steel -->
-				<item id="1869" min="5" max="15" chance="3.142" /> <!-- Iron Ore -->
-				<item id="1974" min="1" max="3" chance="2.735" /> <!-- Crimson Boot Fabric -->
-				<item id="1874" min="1" max="1" chance="2.061" /> <!-- Oriharukon Ore -->
-				<item id="2948" min="1" max="3" chance="1.772" /> <!-- Rind Leather Boot Lining -->
-				<item id="2950" min="2" max="6" chance="1.296" /> <!-- Gloves of Seal Pattern -->
-				<item id="2951" min="2" max="6" chance="1.067" /> <!-- Rind Leather Glove Design -->
-				<item id="1973" min="3" max="9" chance="0.75" /> <!-- Pa'agrio Hand Design -->
-				<item id="2344" min="1" max="1" chance="0.075" /> <!-- Recipe: Grace Dagger -->
-				<item id="951" min="1" max="1" chance="0.075" /> <!-- Scroll: Enchant Weapon (C-grade) -->
-			</drop>
-			<spoil>
-				<item id="2073" min="1" max="1" chance="7.894" /> <!-- Chakram Edge -->
-				<item id="2352" min="1" max="1" chance="2.107" /> <!-- Recipe: Widow Maker -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29013" level="45" type="Monster" name="Premo">
 		<parameters>
@@ -855,9 +803,9 @@
 		<race>GIANT</race>
 		<sex>MALE</sex>
 		<acquire exp="10351" sp="310" />
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
-			<vitals hp="11721" hpRegen="146" mp="610" mpRegen="2.1" />
-			<attack physical="320" magical="55" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="11721" hpRegen="146" mp="610.8" mpRegen="2.1" />
+			<attack physical="320" magical="55" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="711" magical="260" />
 			<speed>
 				<walk ground="55" />
@@ -866,10 +814,10 @@
 			<hitTime>610</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="11" /> <!-- Giant -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
@@ -877,7 +825,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="11" /> <!-- Giants -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="1200" aggroRange="450">
@@ -889,30 +837,6 @@
 			<radius normal="21" grown="25" />
 			<height normal="35" grown="43" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="631" min="1" max="1" chance="0.3" /> <!-- Eldarake -->
-				<item id="2495" min="1" max="1" chance="0.3" /> <!-- Chain Shield -->
-				<item id="2413" min="1" max="1" chance="0.075" /> <!-- Chain Hood -->
-				<item id="57" min="859" max="2006" chance="70" /> <!-- Adena -->
-				<item id="1868" min="1" max="3" chance="17.95" /> <!-- Thread -->
-				<item id="1866" min="1" max="1" chance="12.31" /> <!-- Suede -->
-				<item id="1867" min="1" max="3" chance="8.405" /> <!-- Animal Skin -->
-				<item id="1964" min="1" max="1" chance="6.108" /> <!-- Eldarake Temper -->
-				<item id="2945" min="1" max="1" chance="6.014" /> <!-- Chain Shield Fragment -->
-				<item id="2936" min="1" max="1" chance="5.526" /> <!-- Chain Hood Pattern -->
-				<item id="1882" min="1" max="1" chance="4.181" /> <!-- Leather -->
-				<item id="1885" min="1" max="1" chance="1.519" /> <!-- High-grade Suede -->
-				<item id="2207" min="1" max="1" chance="0.3" /> <!-- Recipe: Karmian Tunic -->
-				<item id="2323" min="1" max="1" chance="0.075" /> <!-- Recipe: Elemental Bow -->
-				<item id="2326" min="1" max="1" chance="0.075" /> <!-- Recipe: Horn of Glory -->
-			</drop>
-			<spoil>
-				<item id="1876" min="1" max="1" chance="80.65" /> <!-- Mithril Ore -->
-				<item id="1962" min="1" max="1" chance="13.24" /> <!-- Karmian Tunic Pattern -->
-				<item id="2073" min="1" max="1" chance="3.192" /> <!-- Chakram Edge -->
-			</spoil>
-		</dropLists>
 	</npc>
 	<npc id="29014" level="50" type="GrandBoss" name="Orfen">
 		<parameters>
@@ -923,13 +847,13 @@
 				<npc id="29016" count="4" respawnTime="360" weightPoint="1" />
 			</minions>
 		</parameters>
-		<race>ELEMENTAL</race>
+		<race>FAIRY</race>
 		<sex>FEMALE</sex>
 		<acquire exp="8872500" sp="266175" raidPoints="300" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="289902.43642" hpRegen="145.2219912" mp="2901.03" mpRegen="2.1" />
-			<attack physical="722.31" magical="1398.68" random="30" critical="7" accuracy="40" attackSpeed="172" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="1602" magical="293" />
+			<vitals hp="523103.852" hpRegen="441.65" mp="1708.8" mpRegen="20" />
+			<attack physical="3652" magical="1535" random="10" critical="4" accuracy="0" attackSpeed="253" type="SWORD" range="80" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -937,12 +861,9 @@
 			<hitTime>710</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4062" level="1" /> <!-- Orfen -->
-			<skill id="4063" level="1" /> <!-- Paralysis -->
-			<skill id="4064" level="1" /> <!-- Paralysis -->
+			<skill id="4416" level="13" /> <!-- Fairies -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -951,7 +872,10 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="13" /> <!-- Fairies -->
+			<skill id="4062" level="1" /> <!-- Orfen -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4063" level="1" /> <!-- Paralysis -->
+			<skill id="4064" level="1" /> <!-- Paralysis -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -966,59 +890,92 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="856" min="1" max="3" chance="34.93" /> <!-- Adamantite Earring -->
-				<item id="918" min="1" max="1" chance="33.56" /> <!-- Adamantite Necklace -->
-				<item id="887" min="1" max="3" chance="32.7" /> <!-- Adamantite Ring -->
-				<item id="2379" min="1" max="1" chance="25.04" /> <!-- Avadon Gaiters -->
-				<item id="2415" min="1" max="1" chance="24.89" /> <!-- Sealed Avadon Circlet -->
-				<item id="2376" min="1" max="1" chance="24.58" /> <!-- Avadon Breastplate -->
-				<item id="673" min="1" max="1" chance="23.9" /> <!-- Avadon Shield -->
-				<item id="499" min="1" max="3" chance="20.96" /> <!-- Mithril Helmet -->
-				<item id="2463" min="1" max="1" chance="20.59" /> <!-- Divine Gloves -->
-				<item id="401" min="1" max="1" chance="20.42" /> <!-- Drake Leather Armor -->
-				<item id="6661" min="1" max="1" chance="20.16" /> <!-- Orfen's Earring -->
-				<item id="356" min="1" max="1" chance="20.15" /> <!-- Full Plate Armor -->
-				<item id="2438" min="1" max="1" chance="20.12" /> <!-- Full Plate Boots -->
-				<item id="603" min="1" max="3" chance="19.69" /> <!-- Divine Boots -->
-				<item id="2462" min="1" max="1" chance="19.66" /> <!-- Full Plate Gauntlets -->
-				<item id="2414" min="1" max="1" chance="19.62" /> <!-- Full Plate Helmet -->
-				<item id="2461" min="1" max="1" chance="19.54" /> <!-- Drake Leather Gloves -->
-				<item id="2437" min="1" max="1" chance="19.3" /> <!-- Drake Leather Boots -->
-				<item id="2497" min="1" max="3" chance="19.29" /> <!-- Full Plate Shield -->
-				<item id="2468" min="1" max="3" chance="19.23" /> <!-- Blessed Gloves -->
-				<item id="473" min="1" max="1" chance="19.21" /> <!-- Divine Stockings -->
-				<item id="442" min="1" max="1" chance="19.06" /> <!-- Divine Tunic -->
-				<item id="1128" min="1" max="3" chance="19.02" /> <!-- Adamantite Boots -->
-				<item id="888" min="1" max="3" chance="17.23" /> <!-- Blessed Ring -->
-				<item id="919" min="1" max="1" chance="16.93" /> <!-- Blessed Necklace -->
-				<item id="855" min="1" max="3" chance="16.77" /> <!-- Nassen's Earring -->
-				<item id="119" min="1" max="1" chance="16.39" /> <!-- Necklace of Seal -->
-				<item id="886" min="1" max="3" chance="16.34" /> <!-- Ring of Seal -->
-				<item id="857" min="1" max="3" chance="16.24" /> <!-- Holy Earring -->
-				<item id="204" min="1" max="1" chance="11.65" /> <!-- Deadman's Staff -->
-				<item id="228" min="1" max="1" chance="11.64" /> <!-- Crystal Dagger -->
-				<item id="286" min="1" max="1" chance="11.54" /> <!-- Eminence Bow -->
-				<item id="2503" min="1" max="1" chance="11.53" /> <!-- Yaksa Mace -->
-				<item id="206" min="1" max="1" chance="11.41" /> <!-- Demon's Staff -->
-				<item id="299" min="1" max="1" chance="11.35" /> <!-- Orcish Poleaxe -->
-				<item id="205" min="1" max="1" chance="11.33" /> <!-- Ghoul's Staff -->
-				<item id="266" min="1" max="1" chance="11.22" /> <!-- Great Pata -->
-				<item id="135" min="1" max="1" chance="10.59" /> <!-- Samurai Long Sword -->
-				<item id="947" min="2" max="8" chance="100" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-				<item id="91536" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (C-grade) -->
-				<item id="91529" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (C-grade) -->
-				<item id="70000" min="198" max="593" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="91543" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (C-grade) -->
-				<item id="948" min="10" max="30" chance="100" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="8620" min="1" max="3" chance="49.83" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="4051" min="20" max="80" chance="12.9" /> <!-- Adamantite Necklace Chain -->
-				<item id="4065" min="20" max="80" chance="12.66" /> <!-- Avadon Gaiter Material -->
-				<item id="4049" min="20" max="80" chance="12.51" /> <!-- Adamantite Earring Gemstone -->
-				<item id="4050" min="20" max="80" chance="12.51" /> <!-- Adamantite Ring Wire -->
-				<item id="4071" min="20" max="80" chance="12.27" /> <!-- Avadon Robe Fabric -->
-				<item id="4072" min="20" max="80" chance="12.21" /> <!-- Sealed Avadon Circlet Pattern -->
-				<item id="4064" min="20" max="80" chance="12.2" /> <!-- Avadon Breastplate Part -->
-				<item id="4439" min="20" max="80" chance="12.11" /> <!-- Avadon Shield Fragment -->
+				<group chance="100">
+					<item id="135" min="1" max="1" chance="9.1" /> <!-- Samurai Long Sword -->
+					<item id="204" min="1" max="1" chance="9.1" /> <!-- Deadman's Staff -->
+					<item id="205" min="1" max="1" chance="9.1" /> <!-- Ghoul's Staff -->
+					<item id="206" min="1" max="1" chance="9.1" /> <!-- Demon's Staff -->
+					<item id="228" min="1" max="1" chance="9.1" /> <!-- Crystal Dagger -->
+					<item id="266" min="1" max="1" chance="9.1" /> <!-- Great Pata -->
+					<item id="286" min="1" max="1" chance="9.1" /> <!-- Eminence Bow -->
+					<item id="299" min="1" max="1" chance="9.1" /> <!-- Orcish Poleaxe -->
+					<item id="2503" min="1" max="1" chance="9.1" /> <!-- Yaksa Mace -->
+					<item id="91896" min="1" max="1" chance="9.05" /> <!-- Admiral's Estoc -->
+					<item id="91882" min="1" max="1" chance="9.05" /> <!-- Saber Tooth -->
+				</group>
+				<group chance="100">
+					<item id="356" min="1" max="1" chance="20" /> <!-- Full Plate Armor -->
+					<item id="2497" min="1" max="3" chance="20" /> <!-- Full Plate Shield -->
+					<item id="2414" min="1" max="1" chance="20" /> <!-- Full Plate Helmet -->
+					<item id="2438" min="1" max="1" chance="20" /> <!-- Full Plate Boots -->
+					<item id="2462" min="1" max="1" chance="20" /> <!-- Full Plate Gauntlets -->
+				</group>
+				<group chance="100">
+					<item id="2461" min="1" max="1" chance="20" /> <!-- Drake Leather Gloves -->
+					<item id="2437" min="1" max="1" chance="20" /> <!-- Drake Leather Boots -->
+					<item id="401" min="1" max="1" chance="20" /> <!-- Drake Leather Armor -->
+					<item id="603" min="1" max="3" chance="20" /> <!-- Divine Boots -->
+					<item id="1128" min="1" max="3" chance="20" /> <!-- Adamantite Boots -->
+				</group>
+				<group chance="100">
+					<item id="442" min="1" max="1" chance="20" /> <!-- Divine Tunic -->
+					<item id="473" min="1" max="1" chance="20" /> <!-- Divine Stockings -->
+					<item id="2463" min="1" max="1" chance="20" /> <!-- Divine Gloves -->
+					<item id="2468" min="2" max="2" chance="20" /> <!-- Blessed Gloves -->
+					<item id="499" min="2" max="2" chance="20" /> <!-- Mithril Helmet -->
+				</group>
+				<group chance="100">
+					<item id="119" min="1" max="1" chance="16.66" /> <!-- Necklace of Seal -->
+					<item id="855" min="1" max="3" chance="16.66" /> <!-- Nassen's Earring -->
+					<item id="857" min="1" max="3" chance="16.66" /> <!-- Holy Earring -->
+					<item id="886" min="1" max="3" chance="16.66" /> <!-- Ring of Seal -->
+					<item id="888" min="1" max="3" chance="16.66" /> <!-- Blessed Ring -->
+					<item id="919" min="1" max="1" chance="16.7" /> <!-- Blessed Necklace -->
+				</group>
+				<group chance="100">
+					<item id="2376" min="1" max="1" chance="25" /> <!-- Avadon Breastplate -->
+					<item id="2379" min="1" max="1" chance="25" /> <!-- Avadon Gaiters -->
+					<item id="2415" min="1" max="1" chance="25" /> <!-- Sealed Avadon Circlet -->
+					<item id="673" min="1" max="1" chance="25" /> <!-- Avadon Shield -->
+				</group>
+				<group chance="100">
+					<item id="856" min="1" max="3" chance="33.33" /> <!-- Adamantite Earring -->
+					<item id="887" min="1" max="3" chance="33.33" /> <!-- Adamantite Ring -->
+					<item id="918" min="1" max="1" chance="33.34" /> <!-- Adamantite Necklace -->
+				</group>
+				<group chance="100">
+					<item id="4049" min="20" max="80" chance="11" /> <!-- Adamantite Earring Gemstone -->
+					<item id="4050" min="20" max="80" chance="11" /> <!-- Adamantite Ring Wire -->
+					<item id="4051" min="20" max="80" chance="11" /> <!-- Adamantite Necklace Chain -->
+					<item id="4064" min="20" max="80" chance="11" /> <!-- Avadon Breastplate Part -->
+					<item id="4065" min="20" max="80" chance="11" /> <!-- Avadon Gaiter Material -->
+					<item id="4071" min="20" max="80" chance="11" /> <!-- Avadon Robe Fabric -->
+					<item id="4072" min="20" max="80" chance="11" /> <!-- Sealed Avadon Circlet Pattern -->
+					<item id="4439" min="20" max="80" chance="11" /> <!-- Avadon Shield Fragment -->
+					<item id="1917" min="20" max="80" chance="6" /> <!-- Sage's Necklace Chain -->
+					<item id="1919" min="20" max="80" chance="6" /> <!-- Sage's Ring Gemstone -->
+				</group>
+				<group chance="30">
+					<item id="6661" min="1" max="1" chance="100" /> <!-- Orfen's Earring Lv. 1 -->
+				</group>
+				<group chance="100">
+					<item id="947" min="2" max="8" chance="100" /> <!-- Scroll: Enchant Weapon (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="948" min="10" max="30" chance="100" /> <!-- Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="20">
+					<item id="8620" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
+				<group chance="100">
+					<item id="91529" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (C-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91536" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (C-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91543" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (C-grade) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -1028,13 +985,13 @@
 			<param name="MoveAroundSocial1" value="70" />
 			<param name="MoveAroundSocial2" value="70" />
 		</parameters>
-		<race>BEAST</race>
+		<race>BUG</race>
 		<sex>MALE</sex>
-		<acquire exp="16035" sp="481" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="16035" sp="481" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="158" mp="36936" mpRegen="2.1" />
-			<attack physical="298" magical="40" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="765" magical="280" />
+			<attack physical="298" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1042,9 +999,9 @@
 			<hitTime>540</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1053,7 +1010,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="2500" aggroRange="450">
@@ -1072,13 +1029,13 @@
 			<param name="MoveAroundSocial1" value="70" />
 			<param name="MoveAroundSocial2" value="70" />
 		</parameters>
-		<race>BEAST</race>
+		<race>BUG</race>
 		<sex>MALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="162" mp="36936" mpRegen="2.1" />
-			<attack physical="1058" magical="1563" random="30" critical="15" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="783" magical="286" />
+			<attack physical="1058" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1086,9 +1043,9 @@
 			<hitTime>540</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1097,7 +1054,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="2700" aggroRange="450">
@@ -1118,11 +1075,11 @@
 		</parameters>
 		<race>BUG</race>
 		<sex>FEMALE</sex>
-		<acquire exp="16035" sp="481" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="16035" sp="481" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="158" mp="36936" mpRegen="2.1" />
-			<attack physical="298" magical="40" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="765" magical="280" />
+			<attack physical="298" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1130,9 +1087,9 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1141,7 +1098,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="2700" aggroRange="450">
@@ -1157,11 +1114,11 @@
 	<npc id="29018" level="49" type="Monster" name="Riba Iren">
 		<race>BUG</race>
 		<sex>FEMALE</sex>
-		<acquire exp="2915" sp="215" /> <!-- Need confirm retail values -->
-		<stats str="40" int="41" dex="30" wit="20" con="43" men="20">
+		<acquire exp="2915" sp="215" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="10619" hpRegen="162" mp="36936" mpRegen="2.1" />
-			<attack physical="1058" magical="1563" random="30" critical="7" accuracy="40" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="783" magical="286" />
+			<attack physical="1058" magical="1535" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2001" magical="976" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1169,9 +1126,9 @@
 			<hitTime>450</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="12" /> <!-- Bug -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1180,8 +1137,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="12" /> <!-- Bugs -->
-			<skill id="4516" level="1" /> <!-- Orfen Heal -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="2900" isAggressive="true">
@@ -1199,27 +1155,19 @@
 		<sex>MALE</sex>
 		<acquire exp="262720917" sp="63053" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="7500000" hpRegen="1000" mp="18000" mpRegen="99" />
-			<attack physical="3260" magical="1700" random="30" critical="4" accuracy="40" attackSpeed="206" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="440" magical="440" />
+			<vitals hp="7000000" hpRegen="1000" mp="18000" mpRegen="99" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3840" magical="825" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4106" level="1" /> <!-- Antharas Stun -->
-			<skill id="4108" level="1" /> <!-- Antharas Terror -->
-			<skill id="4109" level="1" /> <!-- Curse of Antharas -->
-			<skill id="4110" level="2" /> <!-- Breath Attack -->
-			<skill id="4111" level="1" /> <!-- Antharas Fossilization -->
-			<skill id="4112" level="1" /> <!-- Ordinary Attack -->
-			<skill id="4113" level="1" /> <!-- Animal doing ordinary attack -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1228,9 +1176,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5092" level="1" /> <!-- Antharas Terror -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1239,92 +1187,36 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists> <!-- CT2.5 -->
-			<drop>
-				<item id="8620" min="10" max="30" chance="50" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="80" min="1" max="2" chance="25" /> <!-- Tallum Blade -->
-				<item id="98" min="1" max="2" chance="25" /> <!-- Halberd -->
-				<item id="269" min="1" max="2" chance="25" /> <!-- Blood Tornado -->
-				<item id="2504" min="1" max="2" chance="25" /> <!-- Meteor Shower -->
-				<item id="235" min="1" max="2" chance="25" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="2" chance="25" /> <!-- Carnage Bow -->
-				<item id="150" min="1" max="2" chance="25" /> <!-- Elemental Sword -->
-				<item id="212" min="1" max="2" chance="25" /> <!-- Dasparion's Staff -->
-				<item id="81" min="1" max="2" chance="25" /> <!-- Dragon Slayer -->
-				<item id="151" min="1" max="2" chance="25" /> <!-- Sword of Miracles -->
-				<item id="2500" min="1" max="2" chance="25" /> <!-- Dark Legion's Edge -->
-				<item id="164" min="1" max="2" chance="25" /> <!-- Elysian -->
-				<item id="236" min="1" max="2" chance="20" /> <!-- Soul Separator -->
-				<item id="270" min="1" max="2" chance="20" /> <!-- Dragon Grinder -->
-				<item id="289" min="1" max="2" chance="20" /> <!-- Soul Bow -->
-				<item id="213" min="1" max="2" chance="20" /> <!-- Branch of the Mother Tree -->
-				<item id="305" min="1" max="2" chance="20" /> <!-- Tallum Glaive -->
-				<item id="6326" min="1" max="5" chance="30" /> <!-- Sealed Majestic Necklace -->
-				<item id="6327" min="1" max="5" chance="35" /> <!-- Sealed Majestic Earring -->
-				<item id="6328" min="1" max="5" chance="35" /> <!-- Sealed Majestic Ring -->
-				<item id="6323" min="1" max="5" chance="30" /> <!-- Sealed Phoenix Necklace -->
-				<item id="6324" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Earring -->
-				<item id="6325" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Ring -->
-				<item id="5287" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5297" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5304" min="1" max="3" chance="25" /> <!-- Sealed Tallum Tunic -->
-				<item id="5311" min="1" max="3" chance="35" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5320" min="1" max="3" chance="35" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="30" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="3" chance="25" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5301" min="1" max="3" chance="25" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5308" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5316" min="1" max="3" chance="8" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5323" min="1" max="3" chance="8" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5329" min="1" max="3" chance="9" /> <!-- Sealed Majestic Robe -->
-				<item id="5288" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5298" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="30" /> <!-- Sealed Tallum Stockings -->
-				<item id="5289" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5294" min="1" max="3" chance="25" /> <!-- Sealed Tallum Helmet -->
-				<item id="5312" min="1" max="3" chance="25" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5317" min="1" max="3" chance="25" /> <!-- Sealed Majestic Circlet -->
-				<item id="5291" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5296" min="1" max="3" chance="25" /> <!-- Sealed Tallum Boots -->
-				<item id="5314" min="1" max="3" chance="25" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5319" min="1" max="3" chance="25" /> <!-- Sealed Majestic Boots -->
-				<item id="5290" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5295" min="1" max="3" chance="25" /> <!-- Sealed Tallum Gloves -->
-				<item id="5313" min="1" max="3" chance="25" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5318" min="1" max="3" chance="25" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5292" min="1" max="3" chance="40" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="40" /> <!-- Sealed Shield of Nightmare -->
-				<item id="729" min="1" max="19" chance="100" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="1538" min="1" max="59" chance="100" /> <!-- Blessed Scroll of Escape -->
-				<item id="3936" min="1" max="39" chance="100" /> <!-- Blessed Scroll of Resurrection -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="9000000" max="13000000" chance="100" /> <!-- Adena -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29020" level="80" type="GrandBoss" name="Baium">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<acquire exp="1024738848" sp="30742165" raidPoints="450" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="73892999.75369" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="3374.18" magical="2200" random="30" critical="4" accuracy="40" attackSpeed="206" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3300" magical="2200" />
+			<vitals hp="133333333" hpRegen="6666" mp="18000" mpRegen="99" />
+			<attack physical="25931" magical="8204" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3202" magical="2134" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="true" undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4127" level="1" /> <!-- Baium: General Attack -->
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4256" level="1" /> <!-- Stun Resistance -->
+			<skill id="4127" level="1" /> <!-- Baium: General Attack -->
 		</skillList>
 		<corpseTime>13</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1337,83 +1229,107 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="6328" min="1" max="3" chance="51.37" /> <!-- Sealed Majestic Ring -->
-				<item id="49580" min="1" max="1" chance="29.92" /> <!-- Baium's Ring -->
-				<item id="6327" min="1" max="1" chance="20.85" /> <!-- Sealed Majestic Earring -->
-				<item id="7892" min="1" max="1" chance="17.48" /> <!-- Spell Breaker -->
-				<item id="7883" min="1" max="1" chance="17.02" /> <!-- Guardian's Sword -->
-				<item id="7900" min="1" max="1" chance="16.87" /> <!-- Ice Storm Hammer -->
-				<item id="7893" min="1" max="1" chance="16.47" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="16.35" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="16.02" /> <!-- Star Buster -->
-				<item id="6325" min="1" max="3" chance="14.26" /> <!-- Sealed Phoenix Ring -->
-				<item id="6326" min="1" max="1" chance="7.986" /> <!-- Sealed Majestic Necklace -->
-				<item id="5292" min="1" max="3" chance="6.982" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="1" chance="5.989" /> <!-- Sealed Shield of Nightmare -->
-				<item id="7894" min="1" max="1" chance="5.055" /> <!-- Spiritual Eye -->
-				<item id="98" min="1" max="1" chance="5.045" /> <!-- Halberd -->
-				<item id="5296" min="1" max="3" chance="5.041" /> <!-- Sealed Tallum Boots -->
-				<item id="5289" min="1" max="3" chance="5.025" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5295" min="1" max="3" chance="5.019" /> <!-- Sealed Tallum Gloves -->
-				<item id="288" min="1" max="1" chance="5.014" /> <!-- Carnage Bow -->
-				<item id="289" min="1" max="1" chance="5.011" /> <!-- Soul Bow -->
-				<item id="269" min="1" max="1" chance="5.006" /> <!-- Blood Tornado -->
-				<item id="151" min="1" max="1" chance="4.999" /> <!-- Sword of Miracles -->
-				<item id="5290" min="1" max="3" chance="4.982" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="7884" min="1" max="1" chance="4.976" /> <!-- Infernal Master -->
-				<item id="5294" min="1" max="3" chance="4.973" /> <!-- Sealed Tallum Helmet -->
-				<item id="150" min="1" max="1" chance="4.966" /> <!-- Elemental Sword -->
-				<item id="235" min="1" max="1" chance="4.959" /> <!-- Bloody Orchid -->
-				<item id="7899" min="1" max="1" chance="4.95" /> <!-- Destroyer Hammer -->
-				<item id="80" min="1" max="1" chance="4.948" /> <!-- Tallum Blade -->
-				<item id="2504" min="1" max="1" chance="4.941" /> <!-- Meteor Shower -->
-				<item id="5291" min="1" max="3" chance="4.93" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="270" min="1" max="1" chance="4.06" /> <!-- Dragon Grinder -->
-				<item id="212" min="1" max="1" chance="4.043" /> <!-- Dasparion's Staff -->
-				<item id="164" min="1" max="1" chance="4.031" /> <!-- Elysian -->
-				<item id="236" min="1" max="1" chance="4.028" /> <!-- Soul Separator -->
-				<item id="7902" min="1" max="1" chance="4.025" /> <!-- Doom Crusher -->
-				<item id="81" min="1" max="1" chance="4.021" /> <!-- Dragon Slayer -->
-				<item id="305" min="1" max="1" chance="4.021" /> <!-- Tallum Glaive -->
-				<item id="7895" min="1" max="1" chance="4.015" /> <!-- Flaming Dragon Skull -->
-				<item id="6324" min="1" max="1" chance="3.996" /> <!-- Sealed Phoenix Earring -->
-				<item id="213" min="1" max="1" chance="3.985" /> <!-- Branch of the Mother Tree -->
-				<item id="2500" min="1" max="1" chance="3.955" /> <!-- Dark Legion's Edge -->
-				<item id="5314" min="1" max="1" chance="3.065" /> <!-- Sealed Boots of Nightmare -->
-				<item id="49683" min="1" max="1" chance="3.042" /> <!-- Talisman of Baium -->
-				<item id="5319" min="1" max="1" chance="3.039" /> <!-- Sealed Majestic Boots -->
-				<item id="5293" min="1" max="1" chance="3.033" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5297" min="1" max="1" chance="3.031" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5318" min="1" max="1" chance="3.025" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5298" min="1" max="1" chance="3.01" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5312" min="1" max="1" chance="3.009" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5304" min="1" max="1" chance="3.006" /> <!-- Sealed Tallum Tunic -->
-				<item id="5287" min="1" max="1" chance="2.976" /> <!-- Sealed Dark Crystal Breastplate -->
-				<item id="5308" min="1" max="1" chance="2.972" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5313" min="1" max="1" chance="2.967" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5288" min="1" max="1" chance="2.962" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5317" min="1" max="1" chance="2.96" /> <!-- Sealed Majestic Circlet -->
-				<item id="5301" min="1" max="1" chance="2.953" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5305" min="1" max="1" chance="2.931" /> <!-- Sealed Tallum Stockings -->
-				<item id="5320" min="1" max="1" chance="2.055" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="1" chance="2.055" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5311" min="1" max="1" chance="2.014" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5316" min="1" max="1" chance="2.013" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5329" min="1" max="1" chance="1.985" /> <!-- Sealed Majestic Robe -->
-				<item id="5323" min="1" max="1" chance="1.962" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="6323" min="1" max="1" chance="0.75" /> <!-- Sealed Phoenix Necklace -->
-				<item id="91545" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (B-grade) -->
-				<item id="91538" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (B-grade) -->
-				<item id="8621" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Version) -->
-				<item id="91531" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (B-grade) -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="33814" min="2" max="4" chance="50.49" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="729" min="1" max="1" chance="50.46" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="730" min="1" max="1" chance="50.33" /> <!-- Scroll: Enchant Armor (A-grade) -->
-				<item id="49756" min="2" max="4" chance="49.81" /> <!-- Cloth Piece -->
-				<item id="33808" min="1" max="1" chance="49.36" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="49682" min="1" max="1" chance="27.45" /> <!-- Baium's Soul -->
-				<item id="90899" min="1" max="1" chance="2.979" /> <!-- Blessed Agathion's Soul -->
+				<group chance="100">
+					<item id="80" min="1" max="1" chance="4.2" /> <!-- Tallum Blade -->
+					<item id="81" min="1" max="1" chance="4.2" /> <!-- Dragon Slayer -->
+					<item id="98" min="1" max="1" chance="4.2" /> <!-- Halberd -->
+					<item id="150" min="1" max="1" chance="4.2" /> <!-- Elemental Sword -->
+					<item id="151" min="1" max="1" chance="4.2" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="1" chance="4.2" /> <!-- Elysian -->
+					<item id="212" min="1" max="1" chance="4.2" /> <!-- Dasparion's Staff -->
+					<item id="213" min="1" max="1" chance="4.2" /> <!-- Branch of the Mother Tree -->
+					<item id="235" min="1" max="1" chance="4.2" /> <!-- Bloody Orchid -->
+					<item id="236" min="1" max="1" chance="4.2" /> <!-- Soul Separator -->
+					<item id="269" min="1" max="1" chance="4.2" /> <!-- Blood Tornado -->
+					<item id="270" min="1" max="1" chance="4.2" /> <!-- Dragon Grinder -->
+					<item id="288" min="1" max="1" chance="4.2" /> <!-- Carnage Bow -->
+					<item id="289" min="1" max="1" chance="4.2" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="1" chance="4.2" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="1" chance="4.2" /> <!-- Dark Legion's Edge -->
+					<item id="2504" min="1" max="1" chance="4.1" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="1" chance="4.1" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="1" chance="4.1" /> <!-- Spiritual Eye -->
+					<item id="7895" min="1" max="1" chance="4.1" /> <!-- Flaming Dragon Skull -->
+					<item id="7899" min="1" max="1" chance="4.1" /> <!-- Destroyer Hammer -->
+					<item id="91903" min="1" max="1" chance="4.1" /> <!-- Lacerator -->
+					<item id="91888" min="1" max="1" chance="4.1" /> <!-- Undertaker -->
+					<item id="7902" min="1" max="1" chance="4.1" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="100">
+					<item id="7883" min="1" max="1" chance="11" /> <!-- Guardian's Sword -->
+					<item id="7889" min="1" max="1" chance="11" /> <!-- Wizard's Tear -->
+					<item id="7892" min="1" max="1" chance="14" /> <!-- Spell Breaker -->
+					<item id="7893" min="1" max="1" chance="11" /> <!-- Kaim Vanul's Bones -->
+					<item id="7900" min="1" max="1" chance="14" /> <!-- Ice Storm Hammer -->
+					<item id="91885" min="1" max="1" chance="14" /> <!-- Dismantler -->
+					<item id="91900" min="1" max="1" chance="14" /> <!-- Colichemarde -->
+					<item id="7901" min="1" max="1" chance="11" /> <!-- Star Buster -->
+				</group>
+				<group chance="100">
+					<item id="5287" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5292" min="1" max="3" chance="7" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5293" min="1" max="1" chance="3" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="3" chance="5" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="3" chance="5" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="3" chance="5" /> <!-- Sealed Tallum Boots -->
+					<item id="5297" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5301" min="1" max="1" chance="3" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="1" chance="3" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="1" chance="3" /> <!-- Sealed Tallum Stockings -->
+					<item id="5308" min="1" max="1" chance="3" /> <!-- Sealed Dark Crystal Robe -->
+					<item id="5311" min="1" max="1" chance="2" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="1" chance="3" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="1" chance="3" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="1" chance="3" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5315" min="1" max="1" chance="6" /> <!-- Sealed Shield of Nightmare -->
+					<item id="5316" min="1" max="1" chance="2" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="1" chance="3" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="1" chance="3" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="1" chance="3" /> <!-- Sealed Majestic Boots -->
+					<item id="5320" min="1" max="1" chance="2" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5323" min="1" max="1" chance="2" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5326" min="1" max="1" chance="2" /> <!-- Sealed Robe of Nightmare -->
+					<item id="5329" min="1" max="1" chance="2" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="100">
+					<item id="6323" min="1" max="1" chance="1" /> <!-- Sealed Phoenix Necklace -->
+					<item id="6324" min="1" max="1" chance="4" /> <!-- Sealed Phoenix Earring -->
+					<item id="6325" min="1" max="3" chance="15" /> <!-- Sealed Phoenix Ring -->
+					<item id="6326" min="1" max="1" chance="8" /> <!-- Sealed Majestic Necklace -->
+					<item id="6327" min="1" max="1" chance="20" /> <!-- Sealed Majestic Earring -->
+					<item id="6328" min="1" max="3" chance="52" /> <!-- Sealed Majestic Ring -->
+				</group>
+				<group chance="100">
+					<item id="33808" min="1" max="1" chance="50" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
+					<item id="33814" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="729" min="1" max="1" chance="50" /> <!-- Scroll: Enchant Weapon (A-grade) -->
+					<item id="730" min="1" max="1" chance="50" /> <!-- Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="30">
+					<item id="49580" min="1" max="1" chance="100" /> <!-- Baium's Ring Lv. 1 -->
+				</group>
+				<group chance="3">
+					<item id="49683" min="1" max="1" chance="100" /> <!-- Talisman of Baium -->
+				</group>
+				<group chance="100">
+					<item id="8621" min="1" max="3" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original) -->
+				</group>
+				<group chance="100">
+					<item id="91531" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91538" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91545" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (B-grade) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
@@ -1422,9 +1338,9 @@
 		<sex>MALE</sex>
 		<equipment rhand="93" /> <!-- Winged Spear -->
 		<acquire exp="11520" sp="2" />
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="290966.74193" hpRegen="8.5" mp="1608.045" mpRegen="3" />
-			<attack physical="395" magical="371" random="30" critical="4" accuracy="40" attackSpeed="206" type="POLE" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="747660" hpRegen="158" mp="1475" mpRegen="3" />
+			<attack physical="4185" magical="371" random="10" critical="4" accuracy="0" attackSpeed="253" type="POLE" range="80" distance="80" width="120" />
 			<defence physical="5108" magical="1686" />
 			<speed>
 				<walk ground="50" />
@@ -1433,11 +1349,18 @@
 			<hitTime>760</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" />
 		<skillList>
-			<skill id="4132" level="1" /> <!-- Spear: Pound the Ground -->
-			<skill id="4133" level="1" /> <!-- Heal -->
 			<skill id="4416" level="8" /> <!-- Angel -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="11" /> <!-- Spear -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="300" isAggressive="true">
@@ -1455,9 +1378,9 @@
 		<sex>MALE</sex>
 		<acquire exp="102487500" sp="3074625" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="36946499.75369" hpRegen="310.756323" mp="20787.765" mpRegen="3" />
-			<attack physical="33864" magical="42273" random="30" critical="4" accuracy="40" attackSpeed="206" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3680" magical="4661" />
+			<vitals hp="20000000" hpRegen="2981.0298102981" mp="12240" mpRegen="10" />
+			<attack physical="15182.9268292683" magical="6600.03819341452" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2692.68292682927" magical="1794.92939666239" />
 			<speed>
 				<walk ground="42" />
 				<run ground="190" />
@@ -1465,13 +1388,21 @@
 			<hitTime>590</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4221" level="1" /> <!-- Range Dual Attack -->
-			<skill id="4220" level="1" /> <!-- Dual Attack -->
-			<skill id="4218" level="1" /> <!-- Drain -->
-			<skill id="4219" level="1" /> <!-- Hold -->
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4071" level="1" /> <!-- Bow Resistance -->
+			<skill id="4116" level="2" /> <!-- Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>300</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1482,84 +1413,106 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="6328" min="1" max="3" chance="51.41" /> <!-- Sealed Majestic Ring -->
-				<item id="90763" min="1" max="1" chance="20.55" /> <!-- Zaken's Earring -->
-				<item id="6327" min="1" max="3" chance="19.7" /> <!-- Sealed Majestic Earring -->
-				<item id="7900" min="1" max="3" chance="17.47" /> <!-- Ice Storm Hammer -->
-				<item id="7883" min="1" max="3" chance="16.48" /> <!-- Guardian's Sword -->
-				<item id="7892" min="1" max="3" chance="16.46" /> <!-- Spell Breaker -->
-				<item id="7893" min="1" max="3" chance="16.42" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="3" chance="15.98" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="3" chance="15.2" /> <!-- Star Buster -->
-				<item id="6325" min="1" max="3" chance="14.87" /> <!-- Sealed Phoenix Ring -->
-				<item id="6326" min="1" max="3" chance="7.868" /> <!-- Sealed Majestic Necklace -->
-				<item id="5292" min="1" max="3" chance="6.818" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="5.831" /> <!-- Sealed Shield of Nightmare -->
-				<item id="80" min="1" max="3" chance="4.942" /> <!-- Tallum Blade -->
-				<item id="7899" min="1" max="3" chance="4.939" /> <!-- Destroyer Hammer -->
-				<item id="151" min="1" max="3" chance="4.918" /> <!-- Sword of Miracles -->
-				<item id="2504" min="1" max="3" chance="4.914" /> <!-- Meteor Shower -->
-				<item id="5291" min="1" max="3" chance="4.911" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5296" min="1" max="3" chance="4.91" /> <!-- Sealed Tallum Boots -->
-				<item id="98" min="1" max="3" chance="4.908" /> <!-- Halberd -->
-				<item id="5289" min="1" max="3" chance="4.907" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="7884" min="1" max="3" chance="4.906" /> <!-- Infernal Master -->
-				<item id="5290" min="1" max="3" chance="4.9" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5294" min="1" max="3" chance="4.889" /> <!-- Sealed Tallum Helmet -->
-				<item id="7894" min="1" max="3" chance="4.889" /> <!-- Spiritual Eye -->
-				<item id="150" min="1" max="3" chance="4.886" /> <!-- Elemental Sword -->
-				<item id="269" min="1" max="3" chance="4.871" /> <!-- Blood Tornado -->
-				<item id="235" min="1" max="3" chance="4.863" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="3" chance="4.859" /> <!-- Carnage Bow -->
-				<item id="5295" min="1" max="3" chance="4.857" /> <!-- Sealed Tallum Gloves -->
-				<item id="289" min="1" max="3" chance="4.836" /> <!-- Soul Bow -->
-				<item id="270" min="1" max="3" chance="3.99" /> <!-- Dragon Grinder -->
-				<item id="212" min="1" max="3" chance="3.987" /> <!-- Dasparion's Staff -->
-				<item id="2500" min="1" max="3" chance="3.974" /> <!-- Dark Legion's Edge -->
-				<item id="81" min="1" max="3" chance="3.954" /> <!-- Dragon Slayer -->
-				<item id="305" min="1" max="3" chance="3.952" /> <!-- Tallum Glaive -->
-				<item id="6324" min="1" max="3" chance="3.923" /> <!-- Sealed Phoenix Earring -->
-				<item id="236" min="1" max="3" chance="3.921" /> <!-- Soul Separator -->
-				<item id="7895" min="1" max="3" chance="3.893" /> <!-- Flaming Dragon Skull -->
-				<item id="7902" min="1" max="3" chance="3.891" /> <!-- Doom Crusher -->
-				<item id="164" min="1" max="3" chance="3.874" /> <!-- Elysian -->
-				<item id="213" min="1" max="3" chance="3.855" /> <!-- Branch of the Mother Tree -->
-				<item id="5314" min="1" max="3" chance="2.999" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5287" min="1" max="3" chance="2.954" /> <!-- Sealed Dark Crystal Breastplate -->
-				<item id="5319" min="1" max="3" chance="2.953" /> <!-- Sealed Majestic Boots -->
-				<item id="5288" min="1" max="3" chance="2.945" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5317" min="1" max="3" chance="2.937" /> <!-- Sealed Majestic Circlet -->
-				<item id="5293" min="1" max="3" chance="2.931" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5304" min="1" max="3" chance="2.925" /> <!-- Sealed Tallum Tunic -->
-				<item id="5301" min="1" max="3" chance="2.92" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5297" min="1" max="3" chance="2.919" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5305" min="1" max="3" chance="2.917" /> <!-- Sealed Tallum Stockings -->
-				<item id="5308" min="1" max="3" chance="2.914" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5312" min="1" max="3" chance="2.908" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5318" min="1" max="3" chance="2.901" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5313" min="1" max="3" chance="2.886" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5298" min="1" max="3" chance="2.877" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5320" min="1" max="3" chance="1.983" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="1.947" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5311" min="1" max="3" chance="1.936" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5323" min="1" max="3" chance="1.93" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5316" min="1" max="3" chance="1.906" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5329" min="1" max="3" chance="1.895" /> <!-- Sealed Majestic Robe -->
-				<item id="6323" min="1" max="3" chance="0.75" /> <!-- Sealed Phoenix Necklace -->
-				<item id="91545" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (B-grade) -->
-				<item id="91538" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (B-grade) -->
-				<item id="91531" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (B-grade) -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="1" max="3" chance="100" /> <!-- Cloth Piece -->
-				<item id="730" min="6" max="12" chance="50.95" /> <!-- Scroll: Enchant Armor (A-grade) -->
-				<item id="33814" min="5" max="15" chance="50.39" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33808" min="2" max="4" chance="49.76" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="729" min="2" max="4" chance="49.56" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="90899" min="1" max="1" chance="2.95" /> <!-- Blessed Agathion's Soul -->
+				<group chance="98">
+					<item id="80" min="1" max="3" chance="4.2" /> <!-- Tallum Blade -->
+					<item id="81" min="1" max="3" chance="4.2" /> <!-- Dragon Slayer -->
+					<item id="98" min="1" max="3" chance="4.2" /> <!-- Halberd -->
+					<item id="150" min="1" max="3" chance="4.2" /> <!-- Elemental Sword -->
+					<item id="151" min="1" max="3" chance="4.2" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="3" chance="4.2" /> <!-- Elysian -->
+					<item id="212" min="1" max="3" chance="4.2" /> <!-- Dasparion's Staff -->
+					<item id="213" min="1" max="3" chance="4.2" /> <!-- Branch of the Mother Tree -->
+					<item id="235" min="1" max="3" chance="4.2" /> <!-- Bloody Orchid -->
+					<item id="236" min="1" max="3" chance="4.2" /> <!-- Soul Separator -->
+					<item id="269" min="1" max="3" chance="4.2" /> <!-- Blood Tornado -->
+					<item id="270" min="1" max="3" chance="4.2" /> <!-- Dragon Grinder -->
+					<item id="288" min="1" max="3" chance="4.2" /> <!-- Carnage Bow -->
+					<item id="289" min="1" max="3" chance="4.2" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="3" chance="4.2" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="3" chance="4.2" /> <!-- Dark Legion's Edge -->
+					<item id="2504" min="1" max="3" chance="4.1" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="3" chance="4.1" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="3" chance="4.1" /> <!-- Spiritual Eye -->
+					<item id="7895" min="1" max="3" chance="4.1" /> <!-- Flaming Dragon Skull -->
+					<item id="7899" min="1" max="3" chance="4.1" /> <!-- Destroyer Hammer -->
+					<item id="91889" min="1" max="3" chance="4.1" /> <!-- Divine Pain -->
+					<item id="91903" min="1" max="3" chance="4.1" /> <!-- Lacerator -->
+					<item id="7902" min="1" max="3" chance="4.1" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="98">
+					<item id="7883" min="1" max="3" chance="17" /> <!-- Guardian's Sword -->
+					<item id="7889" min="1" max="3" chance="16" /> <!-- Wizard's Tear -->
+					<item id="7892" min="1" max="3" chance="17" /> <!-- Spell Breaker -->
+					<item id="7893" min="1" max="3" chance="17" /> <!-- Kaim Vanul's Bones -->
+					<item id="7900" min="1" max="3" chance="17" /> <!-- Ice Storm Hammer -->
+					<item id="7901" min="1" max="3" chance="16" /> <!-- Star Buster -->
+				</group>
+				<group chance="98">
+					<item id="5287" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="3" chance="5" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5292" min="1" max="3" chance="7" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5293" min="1" max="3" chance="3" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="3" chance="5" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="3" chance="5" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="3" chance="5" /> <!-- Sealed Tallum Boots -->
+					<item id="5297" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5301" min="1" max="3" chance="3" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="3" chance="3" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="3" chance="3" /> <!-- Sealed Tallum Stockings -->
+					<item id="5308" min="1" max="3" chance="3" /> <!-- Sealed Dark Crystal Robe -->
+					<item id="5311" min="1" max="3" chance="2" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="3" chance="3" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="3" chance="3" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="3" chance="3" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5315" min="1" max="3" chance="6" /> <!-- Sealed Shield of Nightmare -->
+					<item id="5316" min="1" max="3" chance="2" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="3" chance="3" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="3" chance="3" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="3" chance="3" /> <!-- Sealed Majestic Boots -->
+					<item id="5320" min="1" max="3" chance="2" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5323" min="1" max="3" chance="2" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5326" min="1" max="3" chance="2" /> <!-- Sealed Robe of Nightmare -->
+					<item id="5329" min="1" max="3" chance="2" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="98">
+					<item id="6323" min="1" max="3" chance="1" /> <!-- Sealed Phoenix Necklace -->
+					<item id="6324" min="1" max="3" chance="4" /> <!-- Sealed Phoenix Earring -->
+					<item id="6325" min="1" max="3" chance="15" /> <!-- Sealed Phoenix Ring -->
+					<item id="6326" min="1" max="3" chance="8" /> <!-- Sealed Majestic Necklace -->
+					<item id="6327" min="1" max="3" chance="20" /> <!-- Sealed Majestic Earring -->
+					<item id="6328" min="1" max="3" chance="52" /> <!-- Sealed Majestic Ring -->
+				</group>
+				<group chance="100">
+					<item id="33808" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
+					<item id="33814" min="5" max="15" chance="50" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="729" min="2" max="4" chance="50" /> <!-- Scroll: Enchant Weapon (A-grade) -->
+					<item id="730" min="8" max="10" chance="50" /> <!-- Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="20">
+					<item id="90763" min="1" max="1" chance="100" /> <!-- Zaken's Earring Lv. 1 -->
+				</group>
+				<group chance="100">
+					<item id="49756" min="1" max="3" chance="100" /> <!-- Cloth Piece -->
+				</group>
+				<group chance="100">
+					<item id="91531" min="1" max="1" chance="100" /> <!-- Elite Weapon Varnish (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91538" min="1" max="1" chance="100" /> <!-- Elite Armor Varnish (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91545" min="1" max="1" chance="100" /> <!-- Elite Accessory Varnish (B-grade) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29023" level="74" type="Monster" name="Maiden Doll">
+	<npc id="29023" level="58" type="Monster" name="Maiden Doll">
 		<parameters>
 			<param name="MoveAroundSocial" value="50" />
 			<param name="MoveAroundSocial1" value="50" />
@@ -1570,33 +1523,31 @@
 		<equipment rhand="5129" /> <!-- Doll Knife -->
 		<acquire exp="129198" sp="3875" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1828" hpRegen="6.5" mp="832" mpRegen="2.4" />
-			<attack physical="442" magical="302" random="30" critical="4" accuracy="40" attackSpeed="253" type="DUAL" range="40" distance="80" width="120" />
+			<vitals hp="1828" hpRegen="6.5" mp="832.4" mpRegen="2.4" />
+			<attack physical="442" magical="302" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="DUAL" range="40" distance="80" width="120" />
 			<defence physical="261" magical="191" />
 			<speed>
 				<walk ground="22" />
 				<run ground="150" />
 			</speed>
-			<hitTime>500</hitTime>
+			<hitTime>50</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="5" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4085" level="1" /> <!-- Critical Damage -->
-			<skill id="4086" level="1" /> <!-- Critical Chance -->
-			<skill id="4408" level="11" /> <!-- HP Increase (3x) -->
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
 			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="9" /> <!-- Average M. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="19" /> <!-- Dual-Sword Weapons -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4333" level="5" /> <!-- Dark Attack Resistance -->
-			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="4415" level="19" /> <!-- Dual Sword -->
+			<skill id="4071" level="5" /> <!-- Bow Resistance -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1604,22 +1555,8 @@
 			<radius normal="6" />
 			<height normal="12" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="97" min="1" max="1" chance="0.0075" /> <!-- Lance -->
-				<item id="268" min="1" max="1" chance="0.0075" /> <!-- Bellion Cestus -->
-				<item id="57" min="2433" max="5685" chance="70" /> <!-- Adena -->
-				<item id="1887" min="1" max="1" chance="10.68" /> <!-- Varnish of Purity -->
-				<item id="4120" min="1" max="1" chance="1.603" /> <!-- Bellion Cestus Edge -->
-				<item id="4115" min="1" max="1" chance="1.574" /> <!-- Lance Blade -->
-			</drop>
-			<spoil>
-				<item id="948" min="1" max="1" chance="4.296" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="947" min="1" max="1" chance="0.75" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-			</spoil>
-		</dropLists>
 	</npc>
-	<npc id="29024" level="74" type="Monster" name="Veil Master">
+	<npc id="29024" level="59" type="Monster" name="Veil Master">
 		<parameters>
 			<param name="MoveAroundSocial" value="114" />
 			<param name="MoveAroundSocial1" value="114" />
@@ -1630,7 +1567,7 @@
 		<acquire exp="90904" sp="2727" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1880" hpRegen="6.5" mp="861" mpRegen="2.4" />
-			<attack physical="461" magical="315" random="30" critical="4" accuracy="40" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="461" magical="315" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="267" magical="195" />
 			<speed>
 				<walk ground="70" />
@@ -1639,66 +1576,9 @@
 			<hitTime>740</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="5" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4085" level="1" /> <!-- Critical Damage -->
-			<skill id="4086" level="1" /> <!-- Critical Chance -->
-			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
-			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
-			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
-			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
-			<skill id="4412" level="11" /> <!-- Average P. Def. -->
-			<skill id="4413" level="11" /> <!-- Average M. Def. -->
-			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4333" level="5" /> <!-- Dark Attack Resistance -->
 			<skill id="4416" level="9" /> <!-- Demons -->
-		</skillList>
-		<exCrtEffect>true</exCrtEffect>
-		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
-		<collision>
-			<radius normal="12" />
-			<height normal="40" />
-		</collision>
-		<dropLists>
-			<drop>
-				<item id="79" min="1" max="1" chance="0.003" /> <!-- Damascus -->
-				<item id="171" min="1" max="1" chance="0.003" /> <!-- Deadman's Glory -->
-				<item id="57" min="1372" max="3205" chance="70" /> <!-- Adena -->
-				<item id="1895" min="1" max="1" chance="11.11" /> <!-- Metallic Fiber -->
-				<item id="1876" min="1" max="1" chance="8.019" /> <!-- Mithril Ore -->
-				<item id="1866" min="2" max="6" chance="6.628" /> <!-- Suede -->
-				<item id="1879" min="1" max="1" chance="6.623" /> <!-- Cokes -->
-				<item id="1870" min="5" max="15" chance="3.946" /> <!-- Coal -->
-				<item id="1871" min="9" max="27" chance="2.235" /> <!-- Charcoal -->
-				<item id="4114" min="1" max="1" chance="0.75" /> <!-- Damascus Sword Blade -->
-				<item id="4116" min="1" max="1" chance="0.75" /> <!-- Deadman's Glory Stone -->
-			</drop>
-			<spoil>
-				<item id="948" min="1" max="1" chance="2.453" /> <!-- Scroll: Enchant Armor (B-grade) -->
-				<item id="947" min="1" max="1" chance="0.3" /> <!-- Scroll: Enchant Weapon (B-grade) -->
-			</spoil>
-		</dropLists>
-	</npc>
-	<npc id="29025" level="75" type="Folk" name="Baium">
-		<race>HUMANOID</race>
-		<sex>MALE</sex>
-		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="1709400" hpRegen="8.5" mp="18000" mpRegen="3" />
-			<attack physical="874.18" magical="596.95" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="233.61" magical="233.61" />
-			<speed>
-				<walk ground="50" />
-				<run ground="120" />
-			</speed>
-			<abnormalResist physical="230" magical="230" />
-		</stats>
-		<status attackable="false" undying="true" />
-		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1707,7 +1587,44 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4071" level="5" /> <!-- Bow Resistance -->
+			<skill id="4085" level="1" /> <!-- Critical Damage -->
+			<skill id="4086" level="1" /> <!-- Critical Chance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+		</skillList>
+		<exCrtEffect>true</exCrtEffect>
+		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
+		<collision>
+			<radius normal="12" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="29025" level="75" type="Folk" name="Baium">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="1709400" hpRegen="718" mp="18000" mpRegen="99" />
+			<attack physical="1874.18" magical="1596.95" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3300" magical="2200" />
+			<speed>
+				<walk ground="50" />
+				<run ground="120" />
+			</speed>
+			<hitTime>60</hitTime>
+			<abnormalResist physical="230" magical="230" />
+		</stats>
+		<status attackable="false" undying="true" />
+		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="300" aggroRange="4296" />
@@ -1727,7 +1644,7 @@
 		<equipment rhand="232" /> <!-- Dark Elven Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1933" hpRegen="6.5" mp="804" mpRegen="2.4" />
-			<attack physical="420" magical="328" random="10" critical="8" accuracy="40" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
+			<attack physical="420" magical="328" random="5" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="272" magical="199" />
 			<speed>
 				<walk ground="14" />
@@ -1736,9 +1653,9 @@
 			<hitTime>760</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1746,10 +1663,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="7" /> <!-- Daggers -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4415" level="7" /> <!-- Dagger -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1769,7 +1684,7 @@
 		<equipment rhand="225" /> <!-- Mithril Dagger -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="1776" hpRegen="6.5" mp="584" mpRegen="2.1" />
-			<attack physical="371" magical="289" random="10" critical="8" accuracy="40" attackSpeed="289" type="DAGGER" range="40" distance="80" width="120" />
+			<attack physical="371" magical="289" random="5" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="256" magical="187" />
 			<speed>
 				<walk ground="11" />
@@ -1778,9 +1693,9 @@
 			<hitTime>740</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1788,10 +1703,8 @@
 			<skill id="4412" level="11" /> <!-- Average P. Def. -->
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
-			<skill id="4415" level="7" /> <!-- Daggers -->
-			<skill id="4275" level="2" /> <!-- Holy Attack Vulnerability -->
-			<skill id="4278" level="1" /> <!-- Dark Attack -->
-			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4415" level="7" /> <!-- Dagger -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai aggroRange="300" clanHelpRange="300" isAggressive="true" />
@@ -1803,14 +1716,10 @@
 	<npc id="29045" level="85" type="Folk" name="Frintezza">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="643059.482835" hpRegen="319.2293199" mp="38410.582" mpRegen="3" />
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="428076.229929773" hpRegen="2484.3" mp="23423.9034583234" mpRegen="3.15" />
 			<attack physical="2641.63342970569" magical="971.856593649426" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
 			<defence physical="4218.55484265502" magical="3093.6078479881" />
-			<attribute>
-				<attack type="WIND" value="350" />
-				<defence fire="300" water="300" wind="370" earth="250" holy="300" dark="300" default="300" />
-			</attribute>
 			<speed>
 				<walk ground="30" />
 				<run ground="31" />
@@ -1819,8 +1728,17 @@
 			<abnormalResist physical="230" magical="230" />
 		</stats>
 		<skillList>
-			<skill id="4416" level="6" /> <!-- Humanoids -->
-			<skill id="5464" level="1" /> <!-- Wind Attack -->
+			<skill id="4416" level="6" /> <!-- Humanoid -->
+			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="1" /> <!-- Bare Hands -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<corpseTime>15</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1839,14 +1757,10 @@
 		<sex>MALE</sex>
 		<equipment rhand="8204" /> <!-- Monster Only (Follower of Frintezza Calibur) -->
 		<acquire exp="130849003" sp="31403" />
-		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="19146585" hpRegen="248.43" mp="17588" mpRegen="109" />
-			<attack physical="3135.90530099925" magical="1442.51644402476" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="1342.97453242915" magical="2089.07149518896" />
-			<attribute>
-				<attack type="DARK" value="280" />
-				<defence fire="200" water="200" wind="200" earth="200" holy="150" dark="200" default="300" />
-			</attribute>
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="32000000" hpRegen="1" mp="2025740" mpRegen="1000" />
+			<attack physical="35810" magical="4375" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="2505" magical="1452" />
 			<speed>
 				<walk ground="240" />
 				<run ground="111" />
@@ -1855,8 +1769,8 @@
 			<abnormalResist physical="230" magical="230" />
 		</stats>
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="4" /> <!-- Resist Bow/Crossbow Weapons -->
+			<skill id="4416" level="9" /> <!-- Demons -->
+			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -1865,12 +1779,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="5078" level="1" /> <!-- Frintezza Critical Power -->
-			<skill id="4494" level="1" /> <!-- Raid Boss -->
-			<skill id="5467" level="1" /> <!-- Dark Attacks -->
-			<skill id="5017" level="1" /> <!-- Demon -->
-			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4071" level="4" /> <!-- Bow Resistance -->
+			<skill id="5078" level="1" /> <!-- Frintezza Critical Damage -->
 		</skillList>
 		<corpseTime>18</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -1890,13 +1801,15 @@
 		<sex>MALE</sex>
 		<equipment rhand="8222" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="56970000" hpRegen="319.2293199" mp="3510317.685" mpRegen="3" />
-			<attack physical="8184.13934" magical="2579.001338" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3584.547554" magical="1748.708651" />
+			<vitals hp="40000000" hpRegen="1" mp="2025740" mpRegen="1000" />
+			<attack physical="35810" magical="4375" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="2505" magical="1452" />
 			<speed>
 				<walk ground="250" />
 				<run ground="155" />
 			</speed>
+			<hitTime>430</hitTime>
+			<abnormalResist physical="230" magical="230" />
 		</stats>
 		<status attackable="true" />
 		<collision>
@@ -1904,134 +1817,8 @@
 			<height normal="112.8" />
 		</collision>
 		<skillList>
-			<skill id="4494" level="1" /> <!-- Raid Boss -->
 			<skill id="4416" level="9" /> <!-- Demons -->
-		</skillList>
-		<dropLists>
-			<drop>
-				<item id="91550" min="1" max="1" chance="4.947" /> <!-- Frintezza's Necklace -->
-				<item id="5293" min="1" max="1" chance="1.138" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5313" min="1" max="1" chance="1.099" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5296" min="1" max="1" chance="1.09" /> <!-- Sealed Tallum Boots -->
-				<item id="5297" min="1" max="1" chance="1.087" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5312" min="1" max="1" chance="1.086" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5304" min="1" max="1" chance="1.08" /> <!-- Sealed Tallum Tunic -->
-				<item id="5308" min="1" max="1" chance="1.075" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5311" min="1" max="1" chance="1.068" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5316" min="1" max="1" chance="1.056" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5298" min="1" max="1" chance="1.051" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5329" min="1" max="1" chance="1.049" /> <!-- Sealed Majestic Robe -->
-				<item id="5288" min="1" max="1" chance="1.04" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5305" min="1" max="1" chance="1.037" /> <!-- Sealed Tallum Stockings -->
-				<item id="5314" min="1" max="1" chance="1.033" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5315" min="1" max="1" chance="1.033" /> <!-- Sealed Shield of Nightmare -->
-				<item id="5319" min="1" max="1" chance="1.023" /> <!-- Sealed Majestic Boots -->
-				<item id="5301" min="1" max="1" chance="1.021" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5291" min="1" max="1" chance="1.019" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5290" min="1" max="1" chance="1.018" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5294" min="1" max="1" chance="1.012" /> <!-- Sealed Tallum Helmet -->
-				<item id="5320" min="1" max="1" chance="1.007" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5287" min="1" max="1" chance="1.004" /> <!-- Sealed Dark Crystal Breastplate -->
-				<item id="5317" min="1" max="1" chance="0.997" /> <!-- Sealed Majestic Circlet -->
-				<item id="5295" min="1" max="1" chance="0.995" /> <!-- Sealed Tallum Gloves -->
-				<item id="5318" min="1" max="1" chance="0.992" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5323" min="1" max="1" chance="0.991" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5292" min="1" max="1" chance="0.987" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5326" min="1" max="1" chance="0.984" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5289" min="1" max="1" chance="0.978" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="7884" min="1" max="1" chance="0.75" /> <!-- Infernal Master -->
-				<item id="7894" min="1" max="1" chance="0.75" /> <!-- Spiritual Eye -->
-				<item id="7899" min="1" max="1" chance="0.75" /> <!-- Destroyer Hammer -->
-				<item id="7902" min="1" max="1" chance="0.75" /> <!-- Doom Crusher -->
-				<item id="7895" min="1" max="1" chance="0.75" /> <!-- Flaming Dragon Skull -->
-				<item id="213" min="1" max="1" chance="0.75" /> <!-- Branch of the Mother Tree -->
-				<item id="80" min="1" max="1" chance="0.75" /> <!-- Tallum Blade -->
-				<item id="81" min="1" max="1" chance="0.75" /> <!-- Dragon Slayer -->
-				<item id="98" min="1" max="1" chance="0.75" /> <!-- Halberd -->
-				<item id="150" min="1" max="1" chance="0.75" /> <!-- Elemental Sword -->
-				<item id="151" min="1" max="1" chance="0.75" /> <!-- Sword of Miracles -->
-				<item id="164" min="1" max="1" chance="0.75" /> <!-- Elysian -->
-				<item id="212" min="1" max="1" chance="0.75" /> <!-- Dasparion's Staff -->
-				<item id="235" min="1" max="1" chance="0.75" /> <!-- Bloody Orchid -->
-				<item id="236" min="1" max="1" chance="0.75" /> <!-- Soul Separator -->
-				<item id="2504" min="1" max="1" chance="0.75" /> <!-- Meteor Shower -->
-				<item id="2500" min="1" max="1" chance="0.75" /> <!-- Dark Legion's Edge -->
-				<item id="305" min="1" max="1" chance="0.75" /> <!-- Tallum Glaive -->
-				<item id="289" min="1" max="1" chance="0.75" /> <!-- Soul Bow -->
-				<item id="288" min="1" max="1" chance="0.75" /> <!-- Carnage Bow -->
-				<item id="270" min="1" max="1" chance="0.75" /> <!-- Dragon Grinder -->
-				<item id="269" min="1" max="1" chance="0.75" /> <!-- Blood Tornado -->
-				<item id="8688" min="1" max="1" chance="0.3" /> <!-- Daimon Crystal -->
-				<item id="8687" min="1" max="1" chance="0.3" /> <!-- Cabrio's Hand -->
-				<item id="8686" min="1" max="1" chance="0.3" /> <!-- Themis' Tongue -->
-				<item id="8685" min="1" max="1" chance="0.3" /> <!-- Sobekk's Hurricane -->
-				<item id="8684" min="1" max="1" chance="0.3" /> <!-- Shyeed's Bow -->
-				<item id="8683" min="1" max="1" chance="0.3" /> <!-- Tiphon's Spear -->
-				<item id="8681" min="1" max="1" chance="0.3" /> <!-- Behemoth' Tuning Fork -->
-				<item id="8680" min="1" max="1" chance="0.3" /> <!-- Barakiel's Axe -->
-				<item id="8679" min="1" max="1" chance="0.3" /> <!-- Sword of Ipos -->
-				<item id="8678" min="1" max="1" chance="0.3" /> <!-- Sirra's Blade -->
-				<item id="8682" min="1" max="1" chance="0.3" /> <!-- Naga Storm -->
-				<item id="8619" min="1" max="1" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Language Version) -->
-				<item id="70000" min="20" max="60" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="33815" min="1" max="1" chance="50.22" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
-				<item id="8620" min="1" max="1" chance="49.14" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="33809" min="1" max="1" chance="48.78" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
-				<item id="49756" min="1" max="1" chance="9.943" /> <!-- Cloth Piece -->
-				<item id="91548" min="1" max="1" chance="9.939" /> <!-- Special Armor Varnish (A-grade) -->
-				<item id="91549" min="1" max="1" chance="9.939" /> <!-- Special Accessory Varnish (A-grade) -->
-				<item id="91500" min="1" max="1" chance="0.75" /> <!-- Basalt Battlehammer Crafting Pack -->
-				<item id="91515" min="1" max="1" chance="0.75" /> <!-- Sealed Draconic Leather Armor Crafting Pack -->
-				<item id="91516" min="1" max="1" chance="0.75" /> <!-- Sealed Draconic Leather Gloves Crafting Pack -->
-				<item id="91517" min="1" max="1" chance="0.75" /> <!-- Sealed Draconic Leather Boots Crafting Pack -->
-				<item id="91518" min="1" max="1" chance="0.75" /> <!-- Sealed Draconic Leather Helmet Crafting Pack -->
-				<item id="91519" min="1" max="1" chance="0.75" /> <!-- Sealed Major Arcana Robe Crafting Pack -->
-				<item id="91520" min="1" max="1" chance="0.75" /> <!-- Sealed Major Arcana Gloves Crafting Pack -->
-				<item id="91521" min="1" max="1" chance="0.75" /> <!-- Sealed Major Arcana Boots Crafting Pack -->
-				<item id="91522" min="1" max="1" chance="0.75" /> <!-- Sealed Major Arcana Circlet Crafting Pack -->
-				<item id="91523" min="1" max="1" chance="0.75" /> <!-- Sealed Tateossian Earring Crafting Pack -->
-				<item id="91524" min="1" max="1" chance="0.75" /> <!-- Sealed Tateossian Ring Crafting Pack -->
-				<item id="91525" min="1" max="1" chance="0.75" /> <!-- Sealed Tateossian Necklace Crafting Pack -->
-				<item id="90898" min="1" max="1" chance="0.75" /> <!-- Agathion's Soul -->
-				<item id="91514" min="1" max="1" chance="0.75" /> <!-- Sealed Imperial Crusader Helmet Crafting Pack -->
-				<item id="91513" min="1" max="1" chance="0.75" /> <!-- Sealed Imperial Crusader Shield Crafting Pack -->
-				<item id="91501" min="1" max="1" chance="0.75" /> <!-- Imperial Staff Crafting Pack -->
-				<item id="91502" min="1" max="1" chance="0.75" /> <!-- Angel Slayer Crafting Pack -->
-				<item id="91503" min="1" max="1" chance="0.75" /> <!-- Dragon Hunter Axe Crafting Pack -->
-				<item id="91504" min="1" max="1" chance="0.75" /> <!-- Saint Spear Crafting Pack -->
-				<item id="91505" min="1" max="1" chance="0.75" /> <!-- Demon Splinter Crafting Pack -->
-				<item id="91506" min="1" max="1" chance="0.75" /> <!-- Heaven's Divider Crafting Pack -->
-				<item id="91507" min="1" max="1" chance="0.75" /> <!-- Arcana Mace Crafting Pack -->
-				<item id="91508" min="1" max="1" chance="0.75" /> <!-- Draconic Bow Crafting Pack -->
-				<item id="91509" min="1" max="1" chance="0.75" /> <!-- Sealed Imperial Crusader Breastplate Crafting Pack -->
-				<item id="91499" min="1" max="1" chance="0.75" /> <!-- Forgotten Blade Crafting Pack -->
-				<item id="91511" min="1" max="1" chance="0.75" /> <!-- Sealed Imperial Crusader Gauntlets Crafting Pack -->
-				<item id="91512" min="1" max="1" chance="0.75" /> <!-- Sealed Imperial Crusader Boots Crafting Pack -->
-				<item id="91510" min="1" max="1" chance="0.75" /> <!-- Sealed Imperial Crusader Gaiters Crafting Pack -->
-			</drop>
-		</dropLists>
-	</npc>
-	<npc id="29048" level="85" type="Monster" name="Evil Spirit">
-		<race>CONSTRUCT</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="82844" hpRegen="1.03" mp="2177" mpRegen="1.03" />
-			<attack physical="1637.21079615435" magical="1151.5428303933" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="1637.38608949103" magical="1091.59072648368" evasion="3" />
-			<attribute>
-				<attack type="WIND" value="280" />
-				<defence fire="200" water="200" wind="200" earth="150" holy="200" dark="200" default="220" />
-			</attribute>
-			<speed>
-				<walk ground="10" />
-				<run ground="1" />
-			</speed>
-			<hitTime>500</hitTime>
-			<abnormalResist physical="10" magical="10" />
-		</stats>
-		<status undying="false" />
-		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2040,8 +1827,160 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
-			<skill id="5464" level="1" /> <!-- Wind Attacks -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4071" level="4" /> <!-- Bow Resistance -->
+			<skill id="5078" level="1" /> <!-- Frintezza Critical Damage -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<group chance="30">
+					<item id="80" min="1" max="1" chance="4.54" /> <!-- Tallum Blade -->
+					<item id="81" min="1" max="1" chance="4.54" /> <!-- Dragon Slayer -->
+					<item id="98" min="1" max="1" chance="4.54" /> <!-- Halberd -->
+					<item id="150" min="1" max="1" chance="4.54" /> <!-- Elemental Sword -->
+					<item id="151" min="1" max="1" chance="4.54" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="1" chance="4.54" /> <!-- Elysian -->
+					<item id="212" min="1" max="1" chance="4.54" /> <!-- Dasparion's Staff -->
+					<item id="213" min="1" max="1" chance="4.54" /> <!-- Branch of the Mother Tree -->
+					<item id="235" min="1" max="1" chance="4.54" /> <!-- Bloody Orchid -->
+					<item id="236" min="1" max="1" chance="4.54" /> <!-- Soul Separator -->
+					<item id="269" min="1" max="1" chance="4.54" /> <!-- Blood Tornado -->
+					<item id="270" min="1" max="1" chance="4.54" /> <!-- Dragon Grinder -->
+					<item id="288" min="1" max="1" chance="4.54" /> <!-- Carnage Bow -->
+					<item id="289" min="1" max="1" chance="4.54" /> <!-- Soul Bow -->
+					<item id="305" min="1" max="1" chance="4.54" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="1" chance="4.54" /> <!-- Dark Legion's Edge -->
+					<item id="2504" min="1" max="1" chance="4.54" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="1" chance="4.54" /> <!-- Infernal Master -->
+					<item id="7894" min="1" max="1" chance="4.54" /> <!-- Spiritual Eye -->
+					<item id="7895" min="1" max="1" chance="4.54" /> <!-- Flaming Dragon Skull -->
+					<item id="7899" min="1" max="1" chance="4.54" /> <!-- Destroyer Hammer -->
+					<item id="7902" min="1" max="1" chance="4.66" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="10">
+					<item id="8678" min="1" max="1" chance="9.09" /> <!-- Sirra's Blade -->
+					<item id="8679" min="1" max="1" chance="9.09" /> <!-- Sword of Ipos -->
+					<item id="8680" min="1" max="1" chance="9.09" /> <!-- Barakiel's Axe -->
+					<item id="8681" min="1" max="1" chance="9.09" /> <!-- Behemoth' Tuning Fork -->
+					<item id="8682" min="1" max="1" chance="9.09" /> <!-- Naga Storm -->
+					<item id="8683" min="1" max="1" chance="9.09" /> <!-- Tiphon's Spear -->
+					<item id="8684" min="1" max="1" chance="9.09" /> <!-- Shyeed's Bow -->
+					<item id="8685" min="1" max="1" chance="9.09" /> <!-- Sobekk's Hurricane -->
+					<item id="8686" min="1" max="1" chance="9.09" /> <!-- Themis' Tongue -->
+					<item id="8687" min="1" max="1" chance="9.09" /> <!-- Cabrio's Hand -->
+					<item id="8688" min="1" max="1" chance="9.1" /> <!-- Daimon Crystal -->
+				</group>
+				<group chance="50">
+					<item id="5287" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5292" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5293" min="1" max="1" chance="3.56" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="1" chance="3.44" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="1" chance="3.44" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="1" chance="3.44" /> <!-- Sealed Tallum Boots -->
+					<item id="5297" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5301" min="1" max="1" chance="3.44" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="1" chance="3.44" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="1" chance="3.44" /> <!-- Sealed Tallum Stockings -->
+					<item id="5308" min="1" max="1" chance="3.44" /> <!-- Sealed Dark Crystal Robe -->
+					<item id="5311" min="1" max="1" chance="3.44" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="1" chance="3.44" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="1" chance="3.44" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="1" chance="3.44" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5315" min="1" max="1" chance="3.56" /> <!-- Sealed Shield of Nightmare -->
+					<item id="5316" min="1" max="1" chance="3.44" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="1" chance="3.44" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="1" chance="3.44" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="1" chance="3.44" /> <!-- Sealed Majestic Boots -->
+					<item id="5320" min="1" max="1" chance="3.44" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5323" min="1" max="1" chance="3.44" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5326" min="1" max="1" chance="3.44" /> <!-- Sealed Robe of Nightmare -->
+					<item id="5329" min="1" max="1" chance="3.44" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="100">
+					<item id="33809" min="1" max="1" chance="50" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
+					<item id="33815" min="1" max="1" chance="50" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="24">
+					<item id="91499" min="1" max="1" chance="3.7" /> <!-- Forgotten Blade Crafting Pack -->
+					<item id="91500" min="1" max="1" chance="3.7" /> <!-- Basalt Battlehammer Crafting Pack -->
+					<item id="91501" min="1" max="1" chance="3.7" /> <!-- Imperial Staff Crafting Pack -->
+					<item id="91502" min="1" max="1" chance="3.7" /> <!-- Angel Slayer Crafting Pack -->
+					<item id="91503" min="1" max="1" chance="3.7" /> <!-- Dragon Hunter Axe Crafting Pack -->
+					<item id="91504" min="1" max="1" chance="3.7" /> <!-- Saint Spear Crafting Pack -->
+					<item id="91505" min="1" max="1" chance="3.7" /> <!-- Demon Splinter Crafting Pack -->
+					<item id="91506" min="1" max="1" chance="3.7" /> <!-- Heaven's Divider Crafting Pack -->
+					<item id="91507" min="1" max="1" chance="3.7" /> <!-- Arcana Mace Crafting Pack -->
+					<item id="91508" min="1" max="1" chance="3.7" /> <!-- Draconic Bow Crafting Pack -->
+					<item id="91509" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Breastplate Crafting Pack -->
+					<item id="91510" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Gaiters Crafting Pack -->
+					<item id="91511" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Gauntlets Crafting Pack -->
+					<item id="91512" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Boots Crafting Pack -->
+					<item id="91513" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Shield Crafting Pack -->
+					<item id="91514" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Helmet Crafting Pack -->
+					<item id="91515" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Armor Crafting Pack -->
+					<item id="91516" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Gloves Crafting Pack -->
+					<item id="91517" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Boots Crafting Pack -->
+					<item id="91518" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Helmet Crafting Pack -->
+					<item id="91519" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Robe Crafting Pack -->
+					<item id="91520" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Gloves Crafting Pack -->
+					<item id="91521" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Boots Crafting Pack -->
+					<item id="91522" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Circlet Crafting Pack -->
+					<item id="91523" min="1" max="1" chance="3.7" /> <!-- Sealed Tateossian Earring Crafting Pack -->
+					<item id="91524" min="1" max="1" chance="3.7" /> <!-- Sealed Tateossian Ring Crafting Pack -->
+					<item id="91525" min="1" max="1" chance="3.8" /> <!-- Sealed Tateossian Necklace Crafting Pack -->
+				</group>
+				<group chance="2">
+					<item id="91547" min="1" max="1" chance="100" /> <!-- Special Weapon Varnish (A-grade) -->
+				</group>
+				<group chance="10">
+					<item id="91548" min="1" max="1" chance="100" /> <!-- Special Armor Varnish (A-grade) -->
+				</group>
+				<group chance="10">
+					<item id="91549" min="1" max="1" chance="100" /> <!-- Special Accessory Varnish (A-grade) -->
+				</group>
+				<group chance="6">
+					<item id="91550" min="1" max="1" chance="100" /> <!-- Frintezza's Necklace Lv. 1 -->
+				</group>
+				<group chance="100">
+					<item id="8619" min="1" max="2" chance="100" /> <!-- Ancient Book: Divine Inspiration (Original Language) -->
+				</group>
+				<group chance="50">
+					<item id="8620" min="1" max="1" chance="100" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
+				</group>
+			</drop>
+		</dropLists>
+	</npc>
+	<npc id="29048" level="85" type="Monster" name="Evil Spirit">
+		<race>CONSTRUCT</race>
+		<sex>FEMALE</sex>
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="126582.278481013" hpRegen="1" mp="2177.28986625269" mpRegen="1.03" />
+			<attack physical="35810" magical="4375" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="2505" magical="1452" />
+			<speed>
+				<walk ground="10" />
+				<run ground="1" />
+			</speed>
+			<hitTime>50</hitTime>
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="true" noSleepMode="true" />
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="1" /> <!-- Bare Hands -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="CORPSE" clanHelpRange="1000" isAggressive="true" aggroRange="6000">
@@ -2057,24 +1996,20 @@
 	<npc id="29049" level="85" type="Monster" name="Evil Spirit">
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="82844" hpRegen="1.03" mp="2177" mpRegen="1.03" />
-			<attack physical="1637.21079615435" magical="1151.5428303933" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="1637.38608949103" magical="1091.59072648368" evasion="3" />
-			<attribute>
-				<attack type="WIND" value="280" />
-				<defence fire="200" water="200" wind="200" earth="150" holy="200" dark="200" default="220" />
-			</attribute>
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="126582.278481013" hpRegen="1" mp="2177.28986625269" mpRegen="1.03" />
+			<attack physical="35810" magical="4375" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="2505" magical="1452" />
 			<speed>
 				<walk ground="10" />
 				<run ground="1" />
 			</speed>
-			<hitTime>500</hitTime>
+			<hitTime>50</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2083,8 +2018,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
-			<skill id="5464" level="1" /> <!-- Wind Attacks -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="CORPSE" clanHelpRange="1000" isAggressive="true" aggroRange="6000">
@@ -2100,14 +2034,10 @@
 	<npc id="29050" level="85" type="Monster" name="Halisha's Breath">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="12996" hpRegen="1.01" mp="20560" mpRegen="3.03" />
-			<attack physical="1556.78628597682" magical="1073.71405840992" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="642.236873936287" magical="428.157916018841" evasion="1" />
-			<attribute>
-				<attack type="DARK" value="280" />
-				<defence fire="200" water="200" wind="200" earth="200" holy="150" dark="200" default="220" />
-			</attribute>
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="44350.854" hpRegen="1" mp="20560.2695810843" mpRegen="3.03" />
+			<attack physical="47554.9" magical="12177.6875" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="1562.9247648" magical="857.7603864" />
 			<speed>
 				<walk ground="30" />
 				<run ground="200" />
@@ -2115,9 +2045,9 @@
 			<hitTime>430</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="9" /> <!-- Demons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2126,9 +2056,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="3" /> <!-- Light Armor Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="5467" level="1" /> <!-- Dark Attacks -->
-			<skill id="5009" level="1" /> <!-- Frintezza Ghost Fighter -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="2000" isAggressive="true">
@@ -2144,14 +2072,10 @@
 	<npc id="29051" level="85" type="Monster" name="Halisha's Breath">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="12996" hpRegen="1.01" mp="20560" mpRegen="3.03" />
-			<attack physical="1556.78628597682" magical="1073.71405840992" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="642.236873936287" magical="428.157916018841" evasion="1" />
-			<attribute>
-				<attack type="DARK" value="280" />
-				<defence fire="200" water="200" wind="200" earth="200" holy="150" dark="200" default="220" />
-			</attribute>
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="44350.854" hpRegen="1" mp="20560.2695810843" mpRegen="3.03" />
+			<attack physical="47554.9" magical="12177.6875" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="1562.9247648" magical="857.7603864" />
 			<speed>
 				<walk ground="30" />
 				<run ground="200" />
@@ -2159,9 +2083,9 @@
 			<hitTime>430</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="9" /> <!-- Demons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2170,9 +2094,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="3" /> <!-- Light Armor Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="9" /> <!-- Demons -->
-			<skill id="5467" level="1" /> <!-- Dark Attacks -->
-			<skill id="5010" level="1" /> <!-- Frintezza Ghost Mage -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="2000" isAggressive="true">
@@ -2188,19 +2110,20 @@
 	<npc id="29052" level="85" type="Monster" name="">
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="3960" hpRegen="8.585" mp="2056" mpRegen="3.03" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="3960.03406422627" hpRegen="8.585" mp="2056.8288406974" mpRegen="3.03" />
 			<attack physical="1216.23928591939" magical="838.839108132747" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
-			<defence physical="3864.96881246637" magical="2826.6352584085" evasion="1" />
+			<defence physical="3864.96881246637" magical="2826.6352584085" />
 			<speed>
 				<walk ground="10" />
 				<run ground="1" />
 			</speed>
-			<hitTime>500</hitTime>
+			<hitTime>50</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2209,7 +2132,6 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED">
@@ -2222,22 +2144,23 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="29053" level="84" type="Monster" name="">
+	<npc id="29053" level="85" type="Monster" name="">
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="5448" hpRegen="8.5" mp="2036" mpRegen="3" />
-			<attack physical="1456.32495032888" magical="994.481156766258" random="10" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
+			<vitals hp="5448.83722464782" hpRegen="8.5" mp="2036.46419871029" mpRegen="3" />
+			<attack physical="1456.32495032888" magical="994.481156766258" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
 			<defence physical="383.421920892449" magical="280.571522036227" />
 			<speed>
 				<walk ground="10" />
 				<run ground="1" />
 			</speed>
-			<hitTime>500</hitTime>
+			<hitTime>50</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2246,8 +2169,6 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
-			<skill id="5004" level="1" /> <!-- Dimensional Stun -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED">
@@ -2260,28 +2181,27 @@
 			<height normal="58" />
 		</collision>
 	</npc>
-	<npc id="29066" level="1" type="GrandBoss" name="Antharas">
+	<npc id="29066" level="75" type="GrandBoss" name="Antharas">
 		<parameters>
 			<param name="ultra_respawn_time" value="8" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<acquire exp="262720917" sp="63053" />
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="6100000" hpRegen="2" mp="1800000" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="6100000" hpRegen="1100" mp="1800000" mpRegen="1000" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="3456" magical="862.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2290,8 +2210,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -2302,73 +2223,6 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists> <!-- CT2.5 -->
-			<drop>
-				<item id="8620" min="10" max="30" chance="50" /> <!-- Ancient Book: Divine Inspiration (Manuscript) -->
-				<item id="80" min="1" max="2" chance="25" /> <!-- Tallum Blade -->
-				<item id="98" min="1" max="2" chance="25" /> <!-- Halberd -->
-				<item id="269" min="1" max="2" chance="25" /> <!-- Blood Tornado -->
-				<item id="2504" min="1" max="2" chance="25" /> <!-- Meteor Shower -->
-				<item id="235" min="1" max="2" chance="25" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="2" chance="25" /> <!-- Carnage Bow -->
-				<item id="150" min="1" max="2" chance="25" /> <!-- Elemental Sword -->
-				<item id="212" min="1" max="2" chance="25" /> <!-- Dasparion's Staff -->
-				<item id="81" min="1" max="2" chance="25" /> <!-- Dragon Slayer -->
-				<item id="151" min="1" max="2" chance="25" /> <!-- Sword of Miracles -->
-				<item id="2500" min="1" max="2" chance="25" /> <!-- Dark Legion's Edge -->
-				<item id="164" min="1" max="2" chance="25" /> <!-- Elysian -->
-				<item id="236" min="1" max="2" chance="20" /> <!-- Soul Separator -->
-				<item id="270" min="1" max="2" chance="20" /> <!-- Dragon Grinder -->
-				<item id="289" min="1" max="2" chance="20" /> <!-- Soul Bow -->
-				<item id="213" min="1" max="2" chance="20" /> <!-- Branch of the Mother Tree -->
-				<item id="305" min="1" max="2" chance="20" /> <!-- Tallum Glaive -->
-				<item id="6326" min="1" max="5" chance="30" /> <!-- Sealed Majestic Necklace -->
-				<item id="6327" min="1" max="5" chance="35" /> <!-- Sealed Majestic Earring -->
-				<item id="6328" min="1" max="5" chance="35" /> <!-- Sealed Majestic Ring -->
-				<item id="6323" min="1" max="5" chance="30" /> <!-- Sealed Phoenix Necklace -->
-				<item id="6324" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Earring -->
-				<item id="6325" min="1" max="5" chance="35" /> <!-- Sealed Phoenix Ring -->
-				<item id="5287" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5297" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5304" min="1" max="3" chance="25" /> <!-- Sealed Tallum Tunic -->
-				<item id="5311" min="1" max="3" chance="35" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5320" min="1" max="3" chance="35" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="30" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="3" chance="25" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5301" min="1" max="3" chance="25" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="5308" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="5316" min="1" max="3" chance="8" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5323" min="1" max="3" chance="8" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5329" min="1" max="3" chance="9" /> <!-- Sealed Majestic Robe -->
-				<item id="5288" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5298" min="1" max="3" chance="35" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="30" /> <!-- Sealed Tallum Stockings -->
-				<item id="5289" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5294" min="1" max="3" chance="25" /> <!-- Sealed Tallum Helmet -->
-				<item id="5312" min="1" max="3" chance="25" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5317" min="1" max="3" chance="25" /> <!-- Sealed Majestic Circlet -->
-				<item id="5291" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5296" min="1" max="3" chance="25" /> <!-- Sealed Tallum Boots -->
-				<item id="5314" min="1" max="3" chance="25" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5319" min="1" max="3" chance="25" /> <!-- Sealed Majestic Boots -->
-				<item id="5290" min="1" max="3" chance="25" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="5295" min="1" max="3" chance="25" /> <!-- Sealed Tallum Gloves -->
-				<item id="5313" min="1" max="3" chance="25" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5318" min="1" max="3" chance="25" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5292" min="1" max="3" chance="40" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="3" chance="40" /> <!-- Sealed Shield of Nightmare -->
-				<item id="729" min="1" max="19" chance="100" /> <!-- Scroll: Enchant Weapon (A-grade) -->
-				<item id="1538" min="1" max="59" chance="100" /> <!-- Blessed Scroll of Escape -->
-				<item id="3936" min="1" max="39" chance="100" /> <!-- Blessed Scroll of Resurrection -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="14000000" max="18000000" chance="100" /> <!-- Adena -->
-				<item id="57" min="9000000" max="13000000" chance="100" /> <!-- Adena -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29061" displayId="31842" level="70" type="Teleporter" name="Teleportation Cubic">
 		<race>ETC</race>
@@ -2384,28 +2238,6 @@
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="false" />
-		<skillList>
-			<skill id="4045" level="1" />
-			<!-- Resist Full Magic Attack -->
-			<skill id="4408" level="1" />
-			<!-- HP Increase (1x) -->
-			<skill id="4409" level="1" />
-			<!-- MP Increase (1x) -->
-			<skill id="4410" level="11" />
-			<!-- Average P. Atk. -->
-			<skill id="4411" level="11" />
-			<!-- Average M. Atk. -->
-			<skill id="4412" level="11" />
-			<!-- Average P. Def. -->
-			<skill id="4413" level="11" />
-			<!-- Average M. Def. -->
-			<skill id="4414" level="2" />
-			<!-- Standard Type -->
-			<skill id="4415" level="3" />
-			<!-- One-handed Sword -->
-			<skill id="4416" level="19" />
-			<!-- Others -->
-		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="300" isAggressive="true" aggroRange="500" />
 		<collision>
@@ -2413,7 +2245,7 @@
 			<height normal="80" />
 		</collision>
 	</npc>
-	<npc id="29067" level="1" type="GrandBoss" name="Antharas">
+	<npc id="29067" level="75" type="GrandBoss" name="Antharas">
 		<parameters>
 			<param name="ultra_respawn_time" value="5" />
 		</parameters>
@@ -2422,19 +2254,18 @@
 		<acquire exp="262720918" sp="29116376" raidPoints="30780" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="6800000" hpRegen="1100" mp="1800000" mpRegen="1000" />
-			<attack physical="4900" magical="2550" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4900" magical="2550" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3456" magical="862.5" />
 			<speed>
 				<walk ground="50" />
 				<run ground="186" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
-			<skill id="4071" level="2" /> <!-- Resist Bow/Crossbow Weapons -->
-			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2443,8 +2274,9 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -2455,91 +2287,6 @@
 			<radius normal="300" />
 			<height normal="300" />
 		</collision>
-		<dropLists>
-			<drop>
-				<item id="5292" min="1" max="1" chance="51.25" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="5315" min="1" max="1" chance="50.84" /> <!-- Sealed Shield of Nightmare -->
-				<item id="90992" min="1" max="1" chance="29.03" /> <!-- Antharas' Earring -->
-				<item id="5329" min="1" max="1" chance="20.5" /> <!-- Sealed Majestic Robe -->
-				<item id="5311" min="1" max="1" chance="20.37" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5323" min="1" max="1" chance="20.04" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5320" min="1" max="1" chance="19.68" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5326" min="1" max="1" chance="19.57" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5293" min="1" max="1" chance="19.15" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5316" min="1" max="1" chance="19.09" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="7900" min="1" max="1" chance="17.8" /> <!-- Ice Storm Hammer -->
-				<item id="5308" min="1" max="1" chance="17.77" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="7892" min="1" max="1" chance="17.72" /> <!-- Spell Breaker -->
-				<item id="5301" min="1" max="1" chance="17.33" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="7883" min="1" max="1" chance="16.92" /> <!-- Guardian's Sword -->
-				<item id="7893" min="1" max="1" chance="16.91" /> <!-- Kaim Vanul's Bones -->
-				<item id="7889" min="1" max="1" chance="16.68" /> <!-- Wizard's Tear -->
-				<item id="7901" min="1" max="1" chance="15.89" /> <!-- Star Buster -->
-				<item id="5319" min="1" max="1" chance="13.64" /> <!-- Sealed Majestic Boots -->
-				<item id="5313" min="1" max="1" chance="13.35" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5312" min="1" max="1" chance="13.17" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5288" min="1" max="1" chance="13.03" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5314" min="1" max="1" chance="12.9" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5318" min="1" max="1" chance="12.85" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5305" min="1" max="1" chance="12.76" /> <!-- Sealed Tallum Stockings -->
-				<item id="5295" min="1" max="1" chance="12.67" /> <!-- Sealed Tallum Gloves -->
-				<item id="5289" min="1" max="1" chance="12.66" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5317" min="1" max="1" chance="12.7" /> <!-- Sealed Majestic Circlet -->
-				<item id="5298" min="1" max="1" chance="12.59" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5296" min="1" max="1" chance="12.45" /> <!-- Sealed Tallum Boots -->
-				<item id="5304" min="1" max="1" chance="12.44" /> <!-- Sealed Tallum Tunic -->
-				<item id="5294" min="1" max="1" chance="12.34" /> <!-- Sealed Tallum Helmet -->
-				<item id="5297" min="1" max="1" chance="12.19" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5287" min="1" max="1" chance="11.92" /> <!-- Sealed Dark Crystal breastplate -->
-				<item id="5291" min="1" max="1" chance="10.018" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5290" min="1" max="1" chance="9.982" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="2500" min="1" max="1" chance="9.154" /> <!-- Dark Legion's Edge -->
-				<item id="7902" min="1" max="1" chance="9.146" /> <!-- Doom Crusher -->
-				<item id="81" min="1" max="1" chance="9.146" /> <!-- Dragon Slayer -->
-				<item id="80" min="1" max="1" chance="9.144" /> <!-- Tallum Blade -->
-				<item id="7895" min="1" max="1" chance="9.136" /> <!-- Flaming Dragon Skull -->
-				<item id="213" min="1" max="1" chance="9.134" /> <!-- Branch of the Mother Tree -->
-				<item id="236" min="1" max="1" chance="9.13" /> <!-- Soul Separator -->
-				<item id="7899" min="1" max="1" chance="9.129" /> <!-- Destroyer Hammer -->
-				<item id="2504" min="1" max="1" chance="9.126" /> <!-- Meteor Shower -->
-				<item id="305" min="1" max="1" chance="9.124" /> <!-- Tallum Glaive -->
-				<item id="164" min="1" max="1" chance="9.124" /> <!-- Elysian -->
-				<item id="270" min="1" max="1" chance="9.122" /> <!-- Dragon Grinder -->
-				<item id="150" min="1" max="1" chance="9.103" /> <!-- Elemental Sword -->
-				<item id="235" min="1" max="1" chance="9.095" /> <!-- Bloody Orchid -->
-				<item id="288" min="1" max="1" chance="9.08" /> <!-- Carnage Bow -->
-				<item id="269" min="1" max="1" chance="9.077" /> <!-- Blood Tornado -->
-				<item id="7884" min="1" max="1" chance="9.073" /> <!-- Infernal Master -->
-				<item id="98" min="1" max="1" chance="9.07" /> <!-- Halberd -->
-				<item id="7894" min="1" max="1" chance="9.067" /> <!-- Spiritual Eye -->
-				<item id="212" min="1" max="1" chance="9.029" /> <!-- Dasparion's Staff -->
-				<item id="289" min="1" max="1" chance="9.025" /> <!-- Soul Bow -->
-				<item id="151" min="1" max="1" chance="9.024" /> <!-- Sword of Miracles -->
-				<item id="8683" min="1" max="1" chance="8.378" /> <!-- Tiphon's Spear -->
-				<item id="8684" min="1" max="1" chance="8.378" /> <!-- Shyeed's Bow -->
-				<item id="8682" min="1" max="1" chance="8.368" /> <!-- Naga Storm -->
-				<item id="8688" min="1" max="1" chance="8.356" /> <!-- Daimon Crystal -->
-				<item id="8678" min="1" max="1" chance="8.356" /> <!-- Sirra's Blade -->
-				<item id="8680" min="1" max="1" chance="8.331" /> <!-- Barakiel's Axe -->
-				<item id="8681" min="1" max="1" chance="8.328" /> <!-- Behemoth' Tuning Fork -->
-				<item id="8686" min="1" max="1" chance="8.324" /> <!-- Themis' Tongue -->
-				<item id="8679" min="1" max="1" chance="8.317" /> <!-- Sword of Ipos -->
-				<item id="8687" min="1" max="1" chance="8.295" /> <!-- Cabrio's Hand -->
-				<item id="5706" min="1" max="1" chance="8.273" /> <!-- Damascus*Damascus -->
-				<item id="8685" min="1" max="1" chance="8.268" /> <!-- Sobekk's Hurricane -->
-				<item id="90998" min="1" max="3" chance="100" /> <!-- Balthus Knights' Glittering Varnish -->
-				<item id="90997" min="3" max="7" chance="100" /> <!-- Balthus Knights' Shining Varnish -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="3" max="7" chance="100" /> <!-- Cloth Piece -->
-				<item id="33815" min="2" max="4" chance="50.21" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
-				<item id="33814" min="2" max="4" chance="49.99" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="33809" min="2" max="4" chance="49.83" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
-				<item id="33807" min="2" max="4" chance="49.36" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
-				<item id="33813" min="2" max="4" chance="48.95" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
-				<item id="33808" min="2" max="4" chance="48.94" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="90899" min="1" max="1" chance="2.932" /> <!-- Blessed Agathion's Soul -->
-			</drop>
-		</dropLists>
 	</npc>
 	<npc id="29068" level="84" type="GrandBoss" name="Antharas" title="Land Dragon">
 		<parameters>
@@ -2549,21 +2296,31 @@
 		<sex>MALE</sex>
 		<acquire exp="40664236032" sp="9759416" raidPoints="1000" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="197047999.75369" hpRegen="319.2293199" mp="3440344.575" mpRegen="3" />
-			<attack physical="4799.20533" magical="263.60854" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="3974.13793" magical="496.01325" />
+			<vitals hp="355555555" hpRegen="3853564.5" mp="2025740" mpRegen="1000" />
+			<attack physical="35810" magical="3783.6" random="5" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="25054.3352601156" magical="14520.4745968969" />
 			<speed>
 				<walk ground="50" />
 				<run ground="279" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status undying="false" noSleepMode="true" isDeathPenalty="true" />
+		<status attackable="true" noSleepMode="true" isDeathPenalty="true" />
 		<skillList>
-			<skill id="4112" level="1" /> <!-- Ordinary Attack -->
-			<skill id="5093" level="1" /> <!-- Antharas Meteor -->
 			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="4122" level="1" /> <!-- Antharas -->
+			<skill id="4071" level="2" /> <!-- Bow Resistance -->
 		</skillList>
 		<corpseTime>14</corpseTime>
 		<exCrtEffect>true</exCrtEffect>
@@ -2576,125 +2333,169 @@
 		</collision>
 		<dropLists>
 			<drop>
-				<item id="5315" min="1" max="3" chance="50.88" /> <!-- Sealed Shield of Nightmare -->
-				<item id="5292" min="1" max="3" chance="50.75" /> <!-- Sealed Dark Crystal Shield -->
-				<item id="90992" min="1" max="1" chance="31.42" /> <!-- Antharas' Earring -->
-				<item id="5323" min="1" max="3" chance="20.73" /> <!-- Sealed Majestic Leather Armor -->
-				<item id="5316" min="1" max="3" chance="20.3" /> <!-- Sealed Majestic Plate Armor -->
-				<item id="5311" min="1" max="3" chance="20.19" /> <!-- Sealed Armor of Nightmare -->
-				<item id="5326" min="1" max="3" chance="19.87" /> <!-- Sealed Robe of Nightmare -->
-				<item id="5320" min="1" max="3" chance="19.15" /> <!-- Sealed Leather Armor of Nightmare -->
-				<item id="5293" min="1" max="3" chance="19.11" /> <!-- Sealed Tallum Plate Armor -->
-				<item id="5329" min="1" max="3" chance="19.07" /> <!-- Sealed Majestic Robe -->
-				<item id="5308" min="1" max="3" chance="18.29" /> <!-- Sealed Dark Crystal Robe -->
-				<item id="7883" min="1" max="3" chance="17.31" /> <!-- Guardian's Sword -->
-				<item id="7892" min="1" max="3" chance="17.29" /> <!-- Spell Breaker -->
-				<item id="7893" min="1" max="3" chance="17.02" /> <!-- Kaim Vanul's Bones -->
-				<item id="5301" min="1" max="3" chance="16.88" /> <!-- Sealed Tallum Leather Armor -->
-				<item id="7900" min="1" max="3" chance="16.8" /> <!-- Ice Storm Hammer -->
-				<item id="7901" min="1" max="3" chance="15.63" /> <!-- Star Buster -->
-				<item id="7889" min="1" max="3" chance="15.21" /> <!-- Wizard's Tear -->
-				<item id="5317" min="1" max="3" chance="13.87" /> <!-- Sealed Majestic Circlet -->
-				<item id="5313" min="1" max="3" chance="13.67" /> <!-- Sealed Gauntlets of Nightmare -->
-				<item id="5314" min="1" max="3" chance="13.61" /> <!-- Sealed Boots of Nightmare -->
-				<item id="5319" min="1" max="3" chance="13.6" /> <!-- Sealed Majestic Boots -->
-				<item id="5318" min="1" max="3" chance="13.13" /> <!-- Sealed Majestic Gauntlets -->
-				<item id="5298" min="1" max="3" chance="12.88" /> <!-- Sealed Dark Crystal Leggings -->
-				<item id="5305" min="1" max="3" chance="12.79" /> <!-- Sealed Tallum Stockings -->
-				<item id="5297" min="1" max="3" chance="12.77" /> <!-- Sealed Dark Crystal Leather Armor -->
-				<item id="5312" min="1" max="3" chance="12.75" /> <!-- Sealed Helm of Nightmare -->
-				<item id="5288" min="1" max="3" chance="12.53" /> <!-- Sealed Dark Crystal Gaiters -->
-				<item id="5289" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Helmet -->
-				<item id="5295" min="1" max="3" chance="12.23" /> <!-- Sealed Tallum Gloves -->
-				<item id="5304" min="1" max="3" chance="12.09" /> <!-- Sealed Tallum Tunic -->
-				<item id="5294" min="1" max="3" chance="12.04" /> <!-- Sealed Tallum Helmet -->
-				<item id="5287" min="1" max="3" chance="11.98" /> <!-- Sealed Dark Crystal Breastplate -->
-				<item id="5296" min="1" max="3" chance="11.89" /> <!-- Sealed Tallum Boots -->
-				<item id="5291" min="1" max="3" chance="9.985" /> <!-- Sealed Dark Crystal Boots -->
-				<item id="5290" min="1" max="3" chance="9.93" /> <!-- Sealed Dark Crystal Gloves -->
-				<item id="7895" min="1" max="1" chance="9.156" /> <!-- Flaming Dragon Skull -->
-				<item id="2504" min="1" max="1" chance="9.146" /> <!-- Meteor Shower -->
-				<item id="213" min="1" max="1" chance="9.144" /> <!-- Branch of the Mother Tree -->
-				<item id="270" min="1" max="1" chance="9.13" /> <!-- Dragon Grinder -->
-				<item id="164" min="1" max="1" chance="9.114" /> <!-- Elysian -->
-				<item id="289" min="1" max="1" chance="9.102" /> <!-- Soul Bow -->
-				<item id="150" min="1" max="1" chance="9.096" /> <!-- Elemental Sword -->
-				<item id="151" min="1" max="1" chance="9.091" /> <!-- Sword of Miracles -->
-				<item id="236" min="1" max="1" chance="9.088" /> <!-- Soul Separator -->
-				<item id="80" min="1" max="1" chance="9.088" /> <!-- Tallum Blade -->
-				<item id="7894" min="1" max="1" chance="9.087" /> <!-- Spiritual Eye -->
-				<item id="288" min="1" max="1" chance="9.078" /> <!-- Carnage Bow -->
-				<item id="7884" min="1" max="1" chance="9.074" /> <!-- Infernal Master -->
-				<item id="235" min="1" max="1" chance="9.069" /> <!-- Bloody Orchid -->
-				<item id="81" min="1" max="1" chance="9.066" /> <!-- Dragon Slayer -->
-				<item id="212" min="1" max="1" chance="9.062" /> <!-- Dasparion's Staff -->
-				<item id="269" min="1" max="1" chance="9.054" /> <!-- Blood Tornado -->
-				<item id="305" min="1" max="1" chance="9.05" /> <!-- Tallum Glaive -->
-				<item id="7902" min="1" max="1" chance="9.049" /> <!-- Doom Crusher -->
-				<item id="7899" min="1" max="1" chance="9.046" /> <!-- Destroyer Hammer -->
-				<item id="98" min="1" max="1" chance="9.045" /> <!-- Halberd -->
-				<item id="2500" min="1" max="1" chance="9.035" /> <!-- Dark Legion's Edge -->
-				<item id="8686" min="1" max="1" chance="8.409" /> <!-- Themis' Tongue -->
-				<item id="8682" min="1" max="1" chance="8.401" /> <!-- Naga Storm -->
-				<item id="5706" min="1" max="1" chance="8.377" /> <!-- Damascus*Damascus -->
-				<item id="8688" min="1" max="1" chance="8.341" /> <!-- Daimon Crystal -->
-				<item id="8678" min="1" max="1" chance="8.323" /> <!-- Sirra's Blade -->
-				<item id="8687" min="1" max="1" chance="8.316" /> <!-- Cabrio's Hand -->
-				<item id="8684" min="1" max="1" chance="8.307" /> <!-- Shyeed's Bow -->
-				<item id="8680" min="1" max="1" chance="8.305" /> <!-- Barakiel's Axe -->
-				<item id="8683" min="1" max="1" chance="8.281" /> <!-- Tiphon's Spear -->
-				<item id="8685" min="1" max="1" chance="8.269" /> <!-- Sobekk's Hurricane -->
-				<item id="8679" min="1" max="1" chance="8.265" /> <!-- Sword of Ipos -->
-				<item id="8681" min="1" max="1" chance="8.265" /> <!-- Behemoth' Tuning Fork -->
-				<item id="959" min="1" max="1" chance="100" /> <!-- Scroll: Enchant Weapon (S-grade) -->
-				<item id="90998" min="1" max="3" chance="100" /> <!-- Balthus Knights' Glittering Varnish -->
-				<item id="90997" min="2" max="8" chance="100" /> <!-- Balthus Knights' Shining Varnish -->
-				<item id="70000" min="1356" max="4068" chance="100" /> <!-- Sealed Rune - Stage 1 -->
-				<item id="49756" min="3" max="7" chance="100" /> <!-- Cloth Piece -->
-				<item id="960" min="1" max="1" chance="100" /> <!-- Scroll: Enchant Armor (S-grade) -->
-				<item id="91548" min="1" max="1" chance="51.05" /> <!-- Special Armor Varnish (A-grade) -->
-				<item id="33815" min="2" max="4" chance="50.92" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
-				<item id="33808" min="2" max="8" chance="50.82" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
-				<item id="33813" min="2" max="8" chance="50.06" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
-				<item id="91549" min="1" max="1" chance="50.02" /> <!-- Special Accessory Varnish (A-grade) -->
-				<item id="33807" min="2" max="8" chance="49.81" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
-				<item id="33809" min="2" max="4" chance="49.15" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
-				<item id="33814" min="2" max="8" chance="48.99" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
-				<item id="91547" min="1" max="1" chance="29.16" /> <!-- Special Weapon Varnish (A-grade) -->
-				<item id="91497" min="1" max="1" chance="19.02" /> <!-- Dual Weapon Crafting Stamp (S-grade) -->
-				<item id="91516" min="1" max="1" chance="3.768" /> <!-- Sealed Draconic Leather Gloves Crafting Pack -->
-				<item id="91510" min="1" max="1" chance="3.762" /> <!-- Sealed Imperial Crusader Gaiters Crafting Pack -->
-				<item id="91518" min="1" max="1" chance="3.752" /> <!-- Sealed Draconic Leather Helmet Crafting Pack -->
-				<item id="91508" min="1" max="1" chance="3.75" /> <!-- Draconic Bow Crafting Pack -->
-				<item id="91502" min="1" max="1" chance="3.746" /> <!-- Angel Slayer Crafting Pack -->
-				<item id="91523" min="1" max="1" chance="3.745" /> <!-- Sealed Tateossian Earring Crafting Pack -->
-				<item id="91512" min="1" max="1" chance="3.742" /> <!-- Sealed Imperial Crusader Boots Crafting Pack -->
-				<item id="91504" min="1" max="1" chance="3.737" /> <!-- Saint Spear Crafting Pack -->
-				<item id="91505" min="1" max="1" chance="3.735" /> <!-- Demon Splinter Crafting Pack -->
-				<item id="91525" min="1" max="1" chance="3.737" /> <!-- Sealed Tateossian Necklace Crafting Pack -->
-				<item id="91514" min="1" max="1" chance="3.715" /> <!-- Sealed Imperial Crusader Helmet Crafting Pack -->
-				<item id="91513" min="1" max="1" chance="3.714" /> <!-- Sealed Imperial Crusader Shield Crafting Pack -->
-				<item id="91520" min="1" max="1" chance="3.709" /> <!-- Sealed Major Arcana Gloves Crafting Pack -->
-				<item id="91503" min="1" max="1" chance="3.709" /> <!-- Dragon Hunter Axe Crafting Pack -->
-				<item id="91515" min="1" max="1" chance="3.708" /> <!-- Sealed Draconic Leather Armor Crafting Pack -->
-				<item id="91517" min="1" max="1" chance="3.707" /> <!-- Sealed Draconic Leather Boots Crafting Pack -->
-				<item id="91524" min="1" max="1" chance="3.704" /> <!-- Sealed Tateossian Ring Crafting Pack -->
-				<item id="91501" min="1" max="1" chance="3.703" /> <!-- Imperial Staff Crafting Pack -->
-				<item id="91506" min="1" max="1" chance="3.683" /> <!-- Heaven's Divider Crafting Pack -->
-				<item id="91511" min="1" max="1" chance="3.677" /> <!-- Sealed Imperial Crusader Gauntlets Crafting Pack -->
-				<item id="91519" min="1" max="1" chance="3.675" /> <!-- Sealed Major Arcana Robe Crafting Pack -->
-				<item id="91507" min="1" max="1" chance="3.667" /> <!-- Arcana Mace Crafting Pack -->
-				<item id="91500" min="1" max="1" chance="3.663" /> <!-- Basalt Battlehammer Crafting Pack -->
-				<item id="91521" min="1" max="1" chance="3.645" /> <!-- Sealed Major Arcana Boots Crafting Pack -->
-				<item id="91522" min="1" max="1" chance="3.644" /> <!-- Sealed Major Arcana Circlet Crafting Pack -->
-				<item id="91499" min="1" max="1" chance="3.643" /> <!-- Forgotten Blade Crafting Pack -->
-				<item id="91509" min="1" max="1" chance="3.639" /> <!-- Sealed Imperial Crusader Breastplate Crafting Pack -->
-				<item id="90899" min="1" max="1" chance="2.942" /> <!-- Blessed Agathion's Soul -->
+				<group chance="100">
+					<item id="80" min="1" max="1" chance="8.4" /> <!-- Tallum Blade -->
+					<item id="98" min="1" max="1" chance="8.4" /> <!-- Halberd -->
+					<item id="150" min="1" max="1" chance="8.4" /> <!-- Elemental Sword -->
+					<item id="212" min="1" max="1" chance="8.4" /> <!-- Dasparion's Staff -->
+					<item id="235" min="1" max="1" chance="8.3" /> <!-- Bloody Orchid -->
+					<item id="269" min="1" max="1" chance="8.3" /> <!-- Blood Tornado -->
+					<item id="288" min="1" max="1" chance="8.3" /> <!-- Carnage Bow -->
+					<item id="2504" min="1" max="1" chance="8.3" /> <!-- Meteor Shower -->
+					<item id="7884" min="1" max="1" chance="8.3" /> <!-- Infernal Master -->
+					<item id="91903" min="1" max="1" chance="8.3" /> <!-- Lacerator -->
+					<item id="7894" min="1" max="1" chance="8.3" /> <!-- Spiritual Eye -->
+					<item id="7899" min="1" max="1" chance="8.3" /> <!-- Destroyer Hammer -->
+				</group>
+				<group chance="100">
+					<item id="81" min="1" max="1" chance="8.4" /> <!-- Dragon Slayer -->
+					<item id="151" min="1" max="1" chance="8.4" /> <!-- Sword of Miracles -->
+					<item id="164" min="1" max="1" chance="8.4" /> <!-- Elysian -->
+					<item id="213" min="1" max="1" chance="8.4" /> <!-- Branch of the Mother Tree -->
+					<item id="236" min="1" max="1" chance="8.3" /> <!-- Soul Separator -->
+					<item id="270" min="1" max="1" chance="8.3" /> <!-- Dragon Grinder -->
+					<item id="289" min="1" max="1" chance="8.3" /> <!-- Soul Bow -->
+					<item id="91888" min="1" max="1" chance="8.3" /> <!-- Undertaker -->
+					<item id="305" min="1" max="1" chance="8.3" /> <!-- Tallum Glaive -->
+					<item id="2500" min="1" max="1" chance="8.3" /> <!-- Dark Legion's Edge -->
+					<item id="7895" min="1" max="1" chance="8.3" /> <!-- Flaming Dragon Skull -->
+					<item id="7902" min="1" max="1" chance="8.3" /> <!-- Doom Crusher -->
+				</group>
+				<group chance="100">
+					<item id="7883" min="1" max="3" chance="17" /> <!-- Guardian's Sword -->
+					<item id="7889" min="1" max="3" chance="16" /> <!-- Wizard's Tear -->
+					<item id="7892" min="1" max="3" chance="17" /> <!-- Spell Breaker -->
+					<item id="7893" min="1" max="3" chance="17" /> <!-- Kaim Vanul's Bones -->
+					<item id="7900" min="1" max="3" chance="17" /> <!-- Ice Storm Hammer -->
+					<item id="7901" min="1" max="3" chance="16" /> <!-- Star Buster -->
+				</group>
+				<group chance="100">
+					<item id="8678" min="1" max="1" chance="7.2" /> <!-- Sirra's Blade -->
+					<item id="91887" min="1" max="1" chance="7.2" /> <!-- Durendal -->
+					<item id="91902" min="1" max="1" chance="7.2" /> <!-- Éclair Bijou -->
+					<item id="8679" min="1" max="1" chance="7.2" /> <!-- Sword of Ipos -->
+					<item id="8680" min="1" max="1" chance="7.2" /> <!-- Barakiel's Axe -->
+					<item id="8681" min="1" max="1" chance="7.2" /> <!-- Behemoth' Tuning Fork -->
+					<item id="8682" min="1" max="1" chance="7.1" /> <!-- Naga Storm -->
+					<item id="8683" min="1" max="1" chance="7.1" /> <!-- Tiphon's Spear -->
+					<item id="8684" min="1" max="1" chance="7.1" /> <!-- Shyeed's Bow -->
+					<item id="8685" min="1" max="1" chance="7.1" /> <!-- Sobekk's Hurricane -->
+					<item id="8686" min="1" max="1" chance="7.1" /> <!-- Themis' Tongue -->
+					<item id="8687" min="1" max="1" chance="7.1" /> <!-- Cabrio's Hand -->
+					<item id="8688" min="1" max="1" chance="7.1" /> <!-- Daimon Crystal -->
+					<item id="5706" min="1" max="1" chance="7.1" /> <!-- Damascus*Damascus -->
+				</group>
+				<group chance="100">
+					<item id="5287" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal breastplate -->
+					<item id="5288" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Gaiters -->
+					<item id="5289" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Helmet -->
+					<item id="5290" min="1" max="3" chance="10" /> <!-- Sealed Dark Crystal Gloves -->
+					<item id="5291" min="1" max="3" chance="10" /> <!-- Sealed Dark Crystal Boots -->
+					<item id="5297" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Leather Armor -->
+					<item id="5298" min="1" max="3" chance="12.5" /> <!-- Sealed Dark Crystal Leggings -->
+					<item id="5308" min="1" max="3" chance="17.5" /> <!-- Sealed Dark Crystal Robe -->
+				</group>
+				<group chance="100">
+					<item id="5293" min="1" max="3" chance="20" /> <!-- Sealed Tallum Plate Armor -->
+					<item id="5294" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Helmet -->
+					<item id="5295" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Gloves -->
+					<item id="5296" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Boots -->
+					<item id="5301" min="1" max="3" chance="17.5" /> <!-- Sealed Tallum Leather Armor -->
+					<item id="5304" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Tunic -->
+					<item id="5305" min="1" max="3" chance="12.5" /> <!-- Sealed Tallum Stockings -->
+				</group>
+				<group chance="100">
+					<item id="5311" min="1" max="3" chance="20" /> <!-- Sealed Armor of Nightmare -->
+					<item id="5312" min="1" max="3" chance="13.34" /> <!-- Sealed Helm of Nightmare -->
+					<item id="5313" min="1" max="3" chance="13.33" /> <!-- Sealed Gauntlets of Nightmare -->
+					<item id="5314" min="1" max="3" chance="13.33" /> <!-- Sealed Boots of Nightmare -->
+					<item id="5320" min="1" max="3" chance="20" /> <!-- Sealed Leather Armor of Nightmare -->
+					<item id="5326" min="1" max="3" chance="20" /> <!-- Sealed Robe of Nightmare -->
+				</group>
+				<group chance="100">
+					<item id="5316" min="1" max="3" chance="20" /> <!-- Sealed Majestic Plate Armor -->
+					<item id="5317" min="1" max="3" chance="13.34" /> <!-- Sealed Majestic Circlet -->
+					<item id="5318" min="1" max="3" chance="13.33" /> <!-- Sealed Majestic Gauntlets -->
+					<item id="5319" min="1" max="3" chance="13.33" /> <!-- Sealed Majestic Boots -->
+					<item id="5323" min="1" max="3" chance="20" /> <!-- Sealed Majestic Leather Armor -->
+					<item id="5329" min="1" max="3" chance="20" /> <!-- Sealed Majestic Robe -->
+				</group>
+				<group chance="100">
+					<item id="5292" min="1" max="3" chance="50" /> <!-- Sealed Dark Crystal Shield -->
+					<item id="5315" min="1" max="3" chance="50" /> <!-- Sealed Shield of Nightmare -->
+				</group>
+				<group chance="100">
+					<item id="33809" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Weapon (A-grade) -->
+					<item id="33815" min="2" max="4" chance="50" /> <!-- Improved Scroll: Enchant Armor (A-grade) -->
+				</group>
+				<group chance="100">
+					<item id="33808" min="3" max="7" chance="50" /> <!-- Improved Scroll: Enchant Weapon (B-grade) -->
+					<item id="33814" min="3" max="7" chance="50" /> <!-- Improved Scroll: Enchant Armor (B-grade) -->
+				</group>
+				<group chance="100">
+					<item id="33807" min="3" max="7" chance="50" /> <!-- Improved Scroll: Enchant Weapon (C-grade) -->
+					<item id="33813" min="3" max="7" chance="50" /> <!-- Improved Scroll: Enchant Armor (C-grade) -->
+				</group>
+				<group chance="100">
+					<item id="90997" min="3" max="7" chance="100" /> <!-- Balthus Knights' Shining Varnish -->
+				</group>
+				<group chance="100">
+					<item id="90998" min="1" max="3" chance="100" /> <!-- Balthus Knights' Glittering Varnish -->
+				</group>
+				<group chance="30">
+					<item id="90992" min="1" max="1" chance="100" /> <!-- Antharas' Earring Lv. 1 -->
+				</group>
+				<group chance="100">
+					<item id="91547" min="1" max="1" chance="100" /> <!-- Special Weapon Varnish (A-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91548" min="1" max="1" chance="100" /> <!-- Special Armor Varnish (A-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91549" min="1" max="1" chance="100" /> <!-- Special Accessory Varnish (A-grade) -->
+				</group>
+				<group chance="100">
+					<item id="91499" min="1" max="1" chance="3.7" /> <!-- Forgotten Blade Crafting Pack -->
+					<item id="91500" min="1" max="1" chance="3.7" /> <!-- Basalt Battlehammer Crafting Pack -->
+					<item id="91501" min="1" max="1" chance="3.7" /> <!-- Imperial Staff Crafting Pack -->
+					<item id="91502" min="1" max="1" chance="3.7" /> <!-- Angel Slayer Crafting Pack -->
+					<item id="91503" min="1" max="1" chance="3.7" /> <!-- Dragon Hunter Axe Crafting Pack -->
+					<item id="91504" min="1" max="1" chance="3.7" /> <!-- Saint Spear Crafting Pack -->
+					<item id="91505" min="1" max="1" chance="3.7" /> <!-- Demon Splinter Crafting Pack -->
+					<item id="91506" min="1" max="1" chance="3.7" /> <!-- Heaven's Divider Crafting Pack -->
+					<item id="91507" min="1" max="1" chance="3.7" /> <!-- Arcana Mace Crafting Pack -->
+					<item id="91508" min="1" max="1" chance="3.7" /> <!-- Draconic Bow Crafting Pack -->
+					<item id="91509" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Breastplate Crafting Pack -->
+					<item id="91510" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Gaiters Crafting Pack -->
+					<item id="91511" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Gauntlets Crafting Pack -->
+					<item id="91512" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Boots Crafting Pack -->
+					<item id="91513" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Shield Crafting Pack -->
+					<item id="91514" min="1" max="1" chance="3.7" /> <!-- Sealed Imperial Crusader Helmet Crafting Pack -->
+					<item id="91515" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Armor Crafting Pack -->
+					<item id="91516" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Gloves Crafting Pack -->
+					<item id="91517" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Boots Crafting Pack -->
+					<item id="91518" min="1" max="1" chance="3.7" /> <!-- Sealed Draconic Leather Helmet Crafting Pack -->
+					<item id="91519" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Robe Crafting Pack -->
+					<item id="91520" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Gloves Crafting Pack -->
+					<item id="91521" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Boots Crafting Pack -->
+					<item id="91522" min="1" max="1" chance="3.7" /> <!-- Sealed Major Arcana Circlet Crafting Pack -->
+					<item id="91523" min="1" max="1" chance="3.7" /> <!-- Sealed Tateossian Earring Crafting Pack -->
+					<item id="91524" min="1" max="1" chance="3.7" /> <!-- Sealed Tateossian Ring Crafting Pack -->
+					<item id="91525" min="1" max="1" chance="3.8" /> <!-- Sealed Tateossian Necklace Crafting Pack -->
+				</group>
+				<group chance="20">
+					<item id="91497" min="1" max="1" chance="100" /> <!-- Dual Weapon Crafting Stamp (S-grade) -->
+				</group>
+				<group chance="100">
+					<item id="959" min="1" max="1" chance="100" /> <!-- Scroll: Enchant Weapon (S-grade) -->
+				</group>
+				<group chance="100">
+					<item id="960" min="1" max="1" chance="100" /> <!-- Scroll: Enchant Armor (S-grade) -->
+				</group>
 			</drop>
 		</dropLists>
 	</npc>
 	<npc id="29069" level="84" type="Monster" name="Behemoth Dragon">
-		<!-- Todo: CT2.5 -->
 		<parameters>
 			<param name="RootingManage" value="0" />
 			<skill name="PhysicalSpecial" id="5095" level="1" />
@@ -2703,21 +2504,31 @@
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="369465" hpRegen="8.5" mp="24863.19" mpRegen="3" />
-			<attack physical="3584.56902102981" magical="1386.66000087809" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="1071.29474264312" magical="522.626863116263" evasion="-18" />
+			<vitals hp="949367" hpRegen="22" mp="22800" mpRegen="30" />
+			<attack physical="14519" magical="11667" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="1370" magical="851" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" />
+		<status attackable="true" isDeathPenalty="true" />
 		<skillList>
-			<skill id="5095" level="1" /> <!-- Antharas Subordinate Melee Attack -->
-			<skill id="5096" level="1" /> <!-- Antharas Subordinate Remote Attack -->
 			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="5095" level="1" /> <!-- Antharas Subordinate Melee Attack -->
+			<skill id="5096" level="1" /> <!-- Antharas Subordinate Remote Attack -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" clanHelpRange="300" isAggressive="true">
@@ -2728,26 +2539,27 @@
 			<height normal="54" />
 		</collision>
 	</npc>
-	<npc id="29070" level="79" type="Monster" name="Dragon Bomber">
-		<!-- Todo: CT2.5 -->
+	<npc id="29070" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1353" hpRegen="8.5" mp="1809" mpRegen="3" />
-			<attack physical="1094.11758465172" magical="4902.24" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<vitals hp="1353.6766" hpRegen="8.5" mp="1809" mpRegen="3" />
+			<attack physical="1094.11758465172" magical="4902.24" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.098247547707" magical="261.308998696584" />
 			<speed>
 				<walk ground="35" />
 				<run ground="250" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2756,10 +2568,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2768,25 +2578,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29071" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29071" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="245" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2795,9 +2606,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2806,25 +2616,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29072" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29072" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="255" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2833,9 +2644,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2844,25 +2654,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29073" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29073" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="247" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2871,9 +2682,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2882,25 +2692,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29074" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29074" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="252" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2909,9 +2720,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2920,25 +2730,26 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29075" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29075" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1000" hpRegen="2" mp="1607" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1000" hpRegen="8.5" mp="1607.4" mpRegen="3" />
+			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="35" />
 				<run ground="243" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2947,9 +2758,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5097" level="1" /> <!-- Antharas Self-destruction -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="100" clanHelpRange="300" isAggressive="true" />
@@ -2958,25 +2768,27 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="29076" level="1" type="Monster" name="Dragon Bomber">
+	<npc id="29076" level="75" type="Monster" name="Dragon Bomber">
 		<parameters>
 			<skill name="SelfRangeDDMagic" id="5094" level="1" />
 		</parameters>
-		<race>FAIRY</race>
+		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="1353" hpRegen="2" mp="1809" mpRegen="0.9" />
-			<attack physical="8.47458" magical="5.78704" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
-			<defence physical="44.44444" magical="32.52252" />
+			<vitals hp="1353.6766" hpRegen="8.5" mp="1809" mpRegen="3" />
+			<attack physical="1094.11758465172" magical="4902.24" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="357.098247547707" magical="261.308998696584" />
 			<speed>
 				<walk ground="35" />
 				<run ground="250" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status undying="false" noSleepMode="true" />
+		<status attackable="true" noSleepMode="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -2985,9 +2797,8 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 			<skill id="5094" level="1" /> <!-- Antharas Subordinate Suicide -->
-			<skill id="5465" level="1" /> <!-- Earth Attacks -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="200" clanHelpRange="300" isAggressive="true" />
@@ -2996,7 +2807,7 @@
 			<height normal="34.5" />
 		</collision>
 	</npc>
-	<npc id="29077" level="78" type="Monster" name="">
+	<npc id="29077" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="177456" />
 			<param name="suicide2_x" value="177120" />
@@ -3016,19 +2827,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3037,7 +2849,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3046,7 +2858,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29078" level="78" type="Monster" name="">
+	<npc id="29078" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175952" />
 			<param name="suicide2_x" value="175712" />
@@ -3066,19 +2878,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3087,7 +2900,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3096,7 +2909,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29079" level="78" type="Monster" name="">
+	<npc id="29079" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175120" />
 			<param name="suicide2_x" value="175024" />
@@ -3116,19 +2929,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3137,7 +2951,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3146,7 +2960,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29080" level="78" type="Monster" name="">
+	<npc id="29080" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="174640" />
 			<param name="suicide2_x" value="174576" />
@@ -3166,19 +2980,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3187,7 +3002,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3196,7 +3011,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29081" level="78" type="Monster" name="">
+	<npc id="29081" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="173968" />
 			<param name="suicide2_x" value="173856" />
@@ -3216,19 +3031,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3237,7 +3053,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3246,7 +3062,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29082" level="78" type="Monster" name="">
+	<npc id="29082" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="173920" />
 			<param name="suicide2_x" value="174064" />
@@ -3266,19 +3082,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3287,7 +3104,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3296,7 +3113,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29083" level="78" type="Monster" name="">
+	<npc id="29083" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="174704" />
 			<param name="suicide2_x" value="174800" />
@@ -3316,19 +3133,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3337,7 +3155,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3346,7 +3164,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29084" level="78" type="Monster" name="">
+	<npc id="29084" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="175424" />
 			<param name="suicide2_x" value="175632" />
@@ -3366,19 +3184,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3387,7 +3206,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3396,7 +3215,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29085" level="78" type="Monster" name="">
+	<npc id="29085" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="176880" />
 			<param name="suicide2_x" value="177200" />
@@ -3416,19 +3235,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3437,7 +3257,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3446,7 +3266,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29086" level="78" type="Monster" name="">
+	<npc id="29086" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="178368" />
 			<param name="suicide2_x" value="178592" />
@@ -3466,19 +3286,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3487,7 +3308,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3496,7 +3317,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29087" level="78" type="Monster" name="">
+	<npc id="29087" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="179696" />
 			<param name="suicide2_x" value="179920" />
@@ -3516,19 +3337,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3537,7 +3359,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3546,7 +3368,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29088" level="78" type="Monster" name="">
+	<npc id="29088" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180592" />
 			<param name="suicide2_x" value="180752" />
@@ -3566,19 +3388,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3587,7 +3410,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3596,7 +3419,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29089" level="78" type="Monster" name="">
+	<npc id="29089" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180896" />
 			<param name="suicide2_x" value="180784" />
@@ -3616,19 +3439,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3637,7 +3461,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3646,7 +3470,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29090" level="78" type="Monster" name="">
+	<npc id="29090" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180496" />
 			<param name="suicide2_x" value="180512" />
@@ -3666,19 +3490,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3687,7 +3512,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3696,7 +3521,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29091" level="78" type="Monster" name="">
+	<npc id="29091" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180896" />
 			<param name="suicide2_x" value="181040" />
@@ -3716,19 +3541,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3737,7 +3563,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3746,7 +3572,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29092" level="78" type="Monster" name="">
+	<npc id="29092" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180720" />
 			<param name="suicide2_x" value="180640" />
@@ -3766,19 +3592,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3787,7 +3614,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3796,7 +3623,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29093" level="78" type="Monster" name="">
+	<npc id="29093" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="180048" />
 			<param name="suicide2_x" value="179920" />
@@ -3816,19 +3643,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3837,7 +3665,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3846,7 +3674,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29094" level="78" type="Monster" name="">
+	<npc id="29094" level="75" type="Monster" name="">
 		<parameters>
 			<param name="suicide1_x" value="178848" />
 			<param name="suicide2_x" value="178560" />
@@ -3866,19 +3694,20 @@
 		</parameters>
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2802" hpRegen="8.5" mp="1607" mpRegen="3" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2802.89989" hpRegen="8.5" mp="1607.4" mpRegen="3" />
 			<attack physical="855.81387" magical="584.40994" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="332.70061" magical="243.45587" />
 			<speed>
 				<walk ground="1" />
 				<run ground="20" />
 			</speed>
+			<hitTime>60</hitTime>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="true" />
 		<skillList>
-			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
 			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
 			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
@@ -3887,7 +3716,7 @@
 			<skill id="4413" level="11" /> <!-- Average M. Def. -->
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
-			<skill id="4416" level="2" /> <!-- Magic Creatures -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="450" />
@@ -3896,20 +3725,34 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="29099" level="80" type="Folk" name="Baium">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="53342293" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+	<npc id="29099" level="80" type="RaidBoss" name="Baium">
+		<race>UNDEAD</race>
+		<sex>MALE</sex>
+		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
+			<vitals hp="35555555.2" hpRegen="2629" mp="18000" mpRegen="99" />
+			<attack physical="13829.6" magical="4375.2" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="2048.8" magical="1365.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<hitTime>60</hitTime>
+			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
+		<skillList>
+			<skill id="4416" level="1" /> <!-- Undead -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="3" /> <!-- One-handed Sword -->
+			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
+			<skill id="4256" level="1" /> <!-- Stun Resistance -->
+		</skillList>
 		<collision>
 			<radius normal="65" />
 			<height normal="174" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/29100-29199.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/29100-29199.xml
index d8441bf977..fea47b2222 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/29100-29199.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/29100-29199.xml
@@ -6,7 +6,7 @@
 		<equipment rhand="93" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="290966.74193" hpRegen="8.5" mp="1608.045" mpRegen="3" />
-			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="970.5375485" magical="662.7513291" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="341.375" magical="249.80341" />
 			<speed>
 				<walk ground="50" />
@@ -47,7 +47,7 @@
 		<acquire exp="0" sp="0" raidPoints="1000" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="24630999.75369" hpRegen="319.2293199" mp="3440344.575" mpRegen="3" />
-			<attack physical="3152.927754" magical="1289.681983" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="3152.927754" magical="1289.681983" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3500.450389" magical="1707.68215" />
 			<speed>
 				<walk ground="50" />
@@ -69,7 +69,7 @@
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="197048" hpRegen="8.5" mp="24863.19" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="55" />
@@ -90,7 +90,7 @@
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="394096" hpRegen="8.5" mp="24863.19" mpRegen="3" />
-			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="1144.731301" magical="781.7030834" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="357.86723" magical="261.87171" />
 			<speed>
 				<walk ground="55" />
@@ -112,7 +112,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="60" />
@@ -212,7 +212,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="80" />
@@ -310,7 +310,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="60" />
@@ -408,7 +408,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="40" />
@@ -701,7 +701,7 @@
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="11083949.50738" hpRegen="310.756323" mp="20787.765" mpRegen="3" />
-			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="2451.22348" magical="868.8760268" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="2788.494256" magical="1360.356908" />
 			<speed>
 				<walk ground="42" />
@@ -723,7 +723,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="60" />
@@ -823,7 +823,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="80" />
@@ -921,7 +921,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="60" />
@@ -1019,7 +1019,7 @@
 		<acquire exp="806880000" sp="21785760" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
 			<vitals hp="13854937.5" hpRegen="319.2293199" mp="30569.67" mpRegen="3" />
-			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="4522.433913" magical="3088.236091" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="3335.250614" magical="1627.090034" />
 			<speed>
 				<walk ground="40" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/36700-36799.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/36700-36799.xml
index e9f9214303..581166294c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/36700-36799.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/npcs/36700-36799.xml
@@ -466,7 +466,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -493,7 +493,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -520,7 +520,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -547,7 +547,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -597,7 +597,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -624,7 +624,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -651,7 +651,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
@@ -678,7 +678,7 @@
 		<acquire exp="384" sp="0" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
 			<vitals hp="5691.73148" hpRegen="7.5" mp="3197.505" mpRegen="2.7" />
-			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<attack physical="521.12391" magical="355.86007" random="30" critical="4.75" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="257.34267" magical="188.3122" />
 			<speed>
 				<walk ground="60" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/02000-02099.xml
index 5b383600e7..dceb8ac69b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/02000-02099.xml
@@ -231,10 +231,16 @@
 	</skill>
 	<skill id="2013" toLevel="2" name="Scroll of Escape">
 		<icon>icon.skill0000</icon>
-		<hitTime>20000</hitTime>
+		<hitTime>
+			<value level="1">20000</value>
+			<value level="2">1000</value>
+		</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>736</itemConsumeId> <!-- Scroll of Escape -->
+		<itemConsumeId>
+			<value level="1">736</value> <!-- Scroll of Escape -->
+			<value level="2">49087</value> <!-- Improved Scroll of Escape -->
+		</itemConsumeId>
 		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/39000-39099.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/39000-39099.xml
index d5c11b7c5f..85162cef90 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/39000-39099.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/39000-39099.xml
@@ -1234,7 +1234,7 @@
 		<hitTime>1000</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>49087</itemConsumeId> <!-- Improved Scroll of Escape -->
+		<itemConsumeId>49500</itemConsumeId> <!-- Greater Scroll of Escape -->
 		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/39100-39199.xml
index 9690e7aca4..a17dbcb993 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/39100-39199.xml
@@ -57,7 +57,19 @@
 	</skill>
 	<skill id="39103" toLevel="1" name="Hero's HP Recovery Potion">
 		<icon>icon.etc_reagent_white_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<amount>500</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39104" toLevel="1" name="Hero Cube - 7-day">
 		<icon>icon.sa_cube</icon>
@@ -91,7 +103,7 @@
 		<icon>icon.etc_scroll_of_resurrection_i01</icon>
 		<castRange>400</castRange>
 		<effectPoint>1</effectPoint>
-		<effectRange>600</effectRange>
+		<effectRange>900</effectRange>
 		<hitTime>1000</hitTime>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<itemConsumeCount>1</itemConsumeCount>
@@ -104,6 +116,9 @@
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpResurrection" />
+			<condition name="TargetMyParty">
+				<includeMe>false</includeMe>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="Resurrection">
@@ -2201,6 +2216,59 @@
 	</skill>
 	<skill id="39199" toLevel="1" name="Hero's Wondrous Cubic - 7-day">
 		<icon>icon.sa_cube</icon>
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<reuseDelay>-1</reuseDelay>
+		<hitTime>500</hitTime>
+		<coolTime>500</coolTime>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpEncumbered">
+				<weightPercent>20</weightPercent>
+				<slotsPercent>10</slotsPercent>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="RestorationRandom">
+				<items>
+					<item chance="16">
+						<item id="49487" count="2"/> <!-- Soulshot Ticket -->
+					</item>
+					<item chance="4">
+						<item id="49772" count="1"/> <!-- Scroll of Mood Melody -->
+					</item>
+					<item chance="16.49">
+						<item id="49488" count="5"/> <!-- Major Healing Potion -->
+					</item>
+					<item chance="20">
+						<item id="35669" count="1"/> <!-- Angel Cat's Blessing -->
+					</item>
+					<item chance="5">
+						<item id="49533" count="1"/> <!-- Quick Hero Healing Potion -->
+					</item>
+					<item chance="10">
+						<item id="49542" count="1"/> <!-- Improved Scroll of Resurrection -->
+					</item>
+					<item chance="14.5">
+						<item id="49536" count="1"/> <!-- Box of Scroll of Escape to the Base -->
+					</item>
+					<item chance="2">
+						<item id="49489" count="3"/> <!-- Parts of Enchantment Scrolls Chest -->
+					</item>
+					<item chance="10">
+						<item id="49416" count="1"/> <!-- Blade Spirit -->
+					</item>
+					<item chance="0.01">
+						<item id="49859" count="1"/> <!-- Weapon Exchange Coupon -->
+					</item>
+					<item chance="2">
+						<item id="49490" count="1"/> <!-- Fishing Kit -->
+					</item>
+				</items>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/55200-55299.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/55200-55299.xml
index 479dae0f67..e95bf170e7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/55200-55299.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/55200-55299.xml
@@ -500,7 +500,7 @@
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>ATTACK_TIME_DOWN</abnormalType>
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer’s Potion -->
+		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer's Potion -->
 		<mpConsume>75</mpConsume>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/documentation.txt
index fe3b07718d..1b59e36f35 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/documentation.txt
@@ -11,6 +11,8 @@ AddHuntingTime: Add time for time limited hunting zones. (l2jmobius)
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -158,10 +160,11 @@ HpCpHealCritical: HpCp heal effects always trigger Magic Critical Hit.
 HpCpHeal: Increases current HP by a given amount. If the given amount exceeds maximum HP, it increases current CP with the rest value as well.
 HpDrain: Magical attack that absorbs given percentage of the damage inflicted as HP.
 Hp: Increases current HP by a static value.
-HpLimit: Increase a character's max hp limit (l2jmobius)
+HpLimit: Increase a character's max hp limit. (l2jmobius)
 HpRegen: HP Regeneration stat.
 HpToOwner: DOT effect that absorbs HP over time.
 IgnoreDeath: Become undying. Hp cannot decrease below 1.
+IgnoreReduceDamage: Ignore ReduceDamage effect implementation. (l2jmobius)
 ImmobileDamageBonus: Bonus damage to immobile targets. (l2jmobius)
 ImmobileDamageResist: Resist damage while immobile. (l2jmobius)
 ImmobilePetBuff: Causes your pet to become immobilized.
@@ -201,7 +204,6 @@ MAtk: M. Atk. stat.
 MAtkByPAtk: M. Atk. bonus from P. Atk stat. (l2jmobius)
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
@@ -265,6 +267,7 @@ RearDamage: Multiplier for damage done from behind the target. (l2jmobius)
 RebalanceHP: Balances targets' current HP.
 RebalanceHPSummon: Balances targets' current HP for summons.
 RecoverVitalityInPeaceZone: Recover periodically vitality when player is in a peace zone. (l2jmobius)
+ReduceDamage: Reduce damage effect implementation.
 ReduceCancel: Magic skill casting interruption stat.
 ReduceDropPenalty: Reduces EXP lost and death penalty chance.
 ReflectMagic: Deflects magical damage back to the attacker.
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java
index 84fce12ab4..1da2032efc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java
@@ -631,6 +631,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	
 	// --------------------------------------------------
 	// FloodProtector Settings
@@ -1279,6 +1280,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2134,6 +2136,7 @@ public class Config
 			ENABLE_AUTO_SKILL = generalConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = generalConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = generalConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = generalConfig.getBoolean("AssistLeader", false);
 			
 			// Load FloodProtector config file
 			final PropertiesParser floodProtectorConfig = new PropertiesParser(FLOOD_PROTECTOR_CONFIG_FILE);
@@ -3256,6 +3259,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index a50cbb8033..8378c362cb 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index 7da7b6a28d..60e1308527 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -548,9 +548,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 2260001e17..380989e049 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
index 40b4ea1c3d..ae43e8d744 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
@@ -25,4 +25,9 @@ import org.l2jmobius.gameserver.model.actor.Player;
 public interface IPlayerActionHandler
 {
 	void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed);
+	
+	default boolean isPetAction()
+	{
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index ff1583b1d8..9cd9eed8f1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -63,7 +63,7 @@ public class DailyTaskManager
 	private static final Set<Integer> RESET_SKILLS = new HashSet<>();
 	static
 	{
-		// No known skills.
+		RESET_SKILLS.add(39199); // Hero's Wondrous Cubic
 	}
 	public static final Set<Integer> RESET_ITEMS = new HashSet<>();
 	static
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
index 543c76f7c1..d936f9b1e6 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
@@ -100,6 +100,7 @@ public class IdManager
 				cleanCount += statement.executeUpdate("DELETE FROM character_shortcuts WHERE character_shortcuts.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_skills WHERE character_skills.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_skills_save WHERE character_skills_save.charId NOT IN (SELECT charId FROM characters);");
+				cleanCount += statement.executeUpdate("DELETE FROM character_spirits WHERE character_spirits.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_subclasses WHERE character_subclasses.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_instance_time WHERE character_instance_time.charId NOT IN (SELECT charId FROM characters);");
 				
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 0c2f5d59de..0b7ad4e019 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -215,7 +215,7 @@ public class ShortCuts implements IRestorable
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
 				newsc.setAutoUse(sc.isAutoUse());
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 8790780474..56e60aa2fc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1289,7 +1289,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2817,7 +2817,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2830,189 +2830,151 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
-								case ELEMENTAL_SPIRIT_EARTH_ATTACK:
-								case ELEMENTAL_SPIRIT_EARTH_DEFENSE:
-								case ELEMENTAL_SPIRIT_FIRE_ATTACK:
-								case ELEMENTAL_SPIRIT_FIRE_DEFENSE:
-								case ELEMENTAL_SPIRIT_WATER_ATTACK:
-								case ELEMENTAL_SPIRIT_WATER_DEFENSE:
-								case ELEMENTAL_SPIRIT_WIND_ATTACK:
-								case ELEMENTAL_SPIRIT_WIND_DEFENSE:
-								{
-									info.addComponentType(UserInfoType.ATT_SPIRITS);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
+							}
+							case ELEMENTAL_SPIRIT_EARTH_ATTACK:
+							case ELEMENTAL_SPIRIT_EARTH_DEFENSE:
+							case ELEMENTAL_SPIRIT_FIRE_ATTACK:
+							case ELEMENTAL_SPIRIT_FIRE_DEFENSE:
+							case ELEMENTAL_SPIRIT_WATER_ATTACK:
+							case ELEMENTAL_SPIRIT_WATER_DEFENSE:
+							case ELEMENTAL_SPIRIT_WIND_ATTACK:
+							case ELEMENTAL_SPIRIT_WIND_DEFENSE:
+							{
+								info.addComponentType(UserInfoType.ATT_SPIRITS);
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						sendPacket(info);
+					}
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
index d38268cc3b..dd01d3306d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4490,7 +4490,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8237,9 +8237,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 8d7dc0eb54..11d18fc2eb 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -854,7 +855,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -875,7 +876,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -900,7 +908,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -908,7 +916,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -954,7 +969,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index ea1abbff9b..074a4ae995 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -863,15 +862,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -882,8 +879,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -892,7 +893,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -965,33 +966,6 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
@@ -1001,9 +975,17 @@ public class CreatureStat
 		// Notify recalculation to child classes.
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 150f95c365..73f94bfe57 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 3155a27f10..ec3d03a6f5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
index 97397f753f..9d5faa0c61 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
@@ -57,7 +57,10 @@ public enum CommissionItemType
 	NECKLACE(31),
 	BELT(32),
 	BRACELET(33),
+	AGATHION(62),
 	HAIR_ACCESSORY(34),
+	BROOCH_JEWEL(63),
+	ARTIFACT(64),
 	// Supplies
 	POTION(35),
 	SCROLL_ENCHANT_WEAPON(36),
@@ -65,6 +68,7 @@ public enum CommissionItemType
 	SCROLL_OTHER(38),
 	SOULSHOT(39),
 	SPIRITSHOT(40),
+	OTHER_SUPPLIES(41),
 	// Pet Goods
 	PET_EQUIPMENT(42),
 	PET_SUPPLIES(43),
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
index eb10918430..3a194d1660 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
@@ -47,8 +47,8 @@ public enum CommissionTreeType
 		CommissionItemType.SPEAR,
 		CommissionItemType.OTHER_WEAPON),
 	ARMOR(1, CommissionItemType.HELMET, CommissionItemType.ARMOR_TOP, CommissionItemType.ARMOR_PANTS, CommissionItemType.FULL_BODY, CommissionItemType.GLOVES, CommissionItemType.FEET, CommissionItemType.SHIELD, CommissionItemType.SIGIL, CommissionItemType.UNDERWEAR, CommissionItemType.CLOAK),
-	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.HAIR_ACCESSORY),
-	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT),
+	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.AGATHION, CommissionItemType.HAIR_ACCESSORY, CommissionItemType.BROOCH_JEWEL, CommissionItemType.ARTIFACT),
+	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT, CommissionItemType.OTHER_SUPPLIES),
 	PET_GOODS(4, CommissionItemType.PET_EQUIPMENT, CommissionItemType.PET_SUPPLIES),
 	MISC(
 		5,
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0b6092b2d9..1e393ec4bf 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2216,6 +2216,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index 281d957b09..ba369c8c2e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -39,6 +39,7 @@ import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AgathionData;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -52,6 +53,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -71,12 +73,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPi
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
 import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -91,6 +95,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1637,7 +1642,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2557,6 +2564,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2581,6 +2593,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2606,6 +2620,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 57cbcf1f6d..d38e4d8834 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -774,7 +774,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -926,7 +927,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index fca1209fce..f9015699c4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -657,7 +657,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -680,7 +680,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -715,7 +715,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java
index c9901fff53..9cd52a0a31 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -91,6 +91,7 @@ public enum Stat
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
 	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
+	IGNORE_REDUCE_DAMAGE("ignoreReduceDamage"),
 	
 	// ELEMENTAL SPIRITS
 	ELEMENTAL_SPIRIT_FIRE_ATTACK("elementalSpiritFireAttack"),
@@ -144,7 +145,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	MAGIC_CRITICAL_RATE_BY_CRITICAL_RATE("mCritRateByRCrit", Stat::defaultValue, MathUtil::add, MathUtil::mul, 0, 0),
 	BLOW_RATE("blowRate"),
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index 647873dac0..6cc98e9690 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -44,7 +44,18 @@ public class MCritRateFinalizer implements IStatFunction
 		
 		final double physicalBonus = (creature.getStat().getMul(Stat.MAGIC_CRITICAL_RATE_BY_CRITICAL_RATE, 1) - 1) * creature.getStat().getCriticalHit();
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, (baseValue * witBonus * 10) + physicalBonus), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, (baseValue * witBonus * 10) + physicalBonus), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index c305987ba6..c29c9ba398 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -93,6 +93,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index c5257ff589..1aff35bfd5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 7a7a847000..65d1357865 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -108,6 +108,11 @@ public class RequestAcquireSkill implements ClientPacket
 		
 		final int skillId = player.getReplacementSkill(_id);
 		final Skill existingSkill = player.getKnownSkill(skillId); // Mobius: Keep existing sublevel.
+		if ((_level > 65536000) && (existingSkill != null) && (existingSkill.getSubLevel() > 1000))
+		{
+			_level -= existingSkill.getSubLevel() * 65536;
+		}
+		
 		final Skill skill = SkillData.getInstance().getSkill(skillId, _level, existingSkill == null ? 0 : existingSkill.getSubLevel());
 		if (skill == null)
 		{
@@ -608,7 +613,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList();
 		player.updateShortCuts(_id, skill.getLevel(), skill.getSubLevel());
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 14c84055da..63f5c4a527 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -87,7 +87,7 @@ public class RequestShortCutReg implements ClientPacket
 		else if (_page == 23)
 		{
 			final Item item = player.getInventory().getItemByObjectId(_id);
-			if ((item != null) && !item.isPotion())
+			if (((item != null) && !item.isPotion()) || (_type == ShortcutType.ACTION))
 			{
 				return;
 			}
@@ -148,7 +148,7 @@ public class RequestShortCutReg implements ClientPacket
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		sc.setAutoUse(_active);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 		player.sendPacket(new ExActivateAutoShortcut(sc, _active));
 		
 		// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index e5b1b8a192..07ed7641a9 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,128 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 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, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 92, 93,
-		94,	1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index dcc44cb9f3..2e152e2e29 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -207,7 +207,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		ServerPackets.EX_PET_INFO.writeId(this);
 		writeInt(_summon.getObjectId());
-		writeByte(_value); // // 0=teleported 1=default 2=summoned
+		writeByte(_value); // 0=teleported 1=default 2=summoned
 		writeShort(37); // mask_bits_37
 		writeBytes(_masks);
 		// Block 1
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
index a4539909c2..f7ac12028d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
@@ -167,7 +167,7 @@ public class FakePlayerInfo extends ServerPacket
 		writeByte(_npc.getTeam().getId());
 		writeInt(_clan != null ? _clan.getCrestLargeId() : 0);
 		writeByte(_fpcHolder.getNobleLevel());
-		writeByte(_fpcHolder.isHero());
+		writeByte(_fpcHolder.isHero() ? 2 : 0); // 152 - Value for enabled changed to 2
 		writeByte(_fpcHolder.isFishing());
 		writeInt(_fpcHolder.getBaitLocationX());
 		writeInt(_fpcHolder.getBaitLocationY());
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index f93c9e5e69..03909a2746 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
deleted file mode 100644
index 52a4032d14..0000000000
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
new file mode 100644
index 0000000000..62bb425a5a
--- /dev/null
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -0,0 +1,182 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeByte(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 05aaedf2c5..46c9ccb5a9 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,20 +19,21 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
+		player.restoreAutoShortcutVisual();
 	}
 	
 	@Override
@@ -54,8 +55,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 9c1fbbcab8..851b53dc09 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -43,13 +49,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -60,8 +69,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 68ca369edf..37f3211b0a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 0bee2f4e34..ec006a3d5c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -42,6 +44,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	
@@ -96,6 +99,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking when in offline play.
+							if (player.isOfflinePlay() && player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -121,23 +135,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -145,6 +168,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -179,32 +205,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -303,6 +352,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 5899235fcb..66c93af753 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,7 +35,9 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.effects.EffectType;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemUse;
@@ -46,12 +48,12 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.EffectScope;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +383,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
@@ -394,7 +397,24 @@ public class AutoUseTaskManager
 							final IPlayerActionHandler actionHandler = PlayerActionHandler.getInstance().getHandler(actionHolder.getHandler());
 							if (actionHandler != null)
 							{
-								actionHandler.useAction(player, actionHolder, false, false);
+								if (!actionHandler.isPetAction())
+								{
+									actionHandler.useAction(player, actionHolder, false, false);
+								}
+								else
+								{
+									final Summon summon = player.getAnyServitor();
+									if ((summon != null) && !summon.isAlikeDead())
+									{
+										final Skill skill = summon.getKnownSkill(actionHolder.getOptionId());
+										if ((skill != null) && !canSummonCastSkill(player, summon, skill))
+										{
+											continue ACTIONS;
+										}
+										
+										actionHandler.useAction(player, actionHolder, false, false);
+									}
+								}
 							}
 						}
 					}
@@ -477,6 +497,59 @@ public class AutoUseTaskManager
 			
 			return !player.isSkillDisabled(skill) && skill.checkCondition(player, target, false);
 		}
+		
+		private boolean canSummonCastSkill(Player player, Summon summon, Skill skill)
+		{
+			if (skill.isBad() && (player.getTarget() == null))
+			{
+				return false;
+			}
+			
+			final int mpConsume = skill.getMpConsume() + skill.getMpInitialConsume();
+			if ((((mpConsume != 0) && (mpConsume > (int) Math.floor(summon.getCurrentMp()))) || ((skill.getHpConsume() != 0) && (skill.getHpConsume() > (int) Math.floor(summon.getCurrentHp())))))
+			{
+				return false;
+			}
+			
+			if (summon.isSkillDisabled(skill))
+			{
+				return false;
+			}
+			
+			if (((player.getTarget() != null) && !skill.checkCondition(summon, player.getTarget(), false)) || ((player.getTarget() == null) && !skill.checkCondition(summon, player, false)))
+			{
+				return false;
+			}
+			
+			if ((skill.getItemConsumeCount() > 0) && (summon.getInventory().getInventoryItemCount(skill.getItemConsumeId(), -1) < skill.getItemConsumeCount()))
+			{
+				return false;
+			}
+			
+			if (skill.getTargetType().equals(TargetType.SELF) || skill.getTargetType().equals(TargetType.SUMMON))
+			{
+				final BuffInfo summonInfo = summon.getEffectList().getBuffInfoBySkillId(skill.getId());
+				return (summonInfo != null) && (summonInfo.getTime() >= REUSE_MARGIN_TIME);
+			}
+			
+			if ((skill.getEffects(EffectScope.GENERAL) != null) && skill.getEffects(EffectScope.GENERAL).stream().anyMatch(a -> a.getEffectType().equals(EffectType.MANAHEAL_BY_LEVEL)) && (player.getCurrentMpPercent() > 80))
+			{
+				return false;
+			}
+			
+			final BuffInfo buffInfo = player.getEffectList().getBuffInfoBySkillId(skill.getId());
+			final BuffInfo abnormalBuffInfo = player.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
+			if (abnormalBuffInfo != null)
+			{
+				if (buffInfo != null)
+				{
+					return (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()));
+				}
+				return (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel()) || abnormalBuffInfo.isAbnormalType(AbnormalType.NONE);
+			}
+			
+			return true;
+		}
 	}
 	
 	public synchronized void startAutoUseTask(Player player)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/buffer_schemes.sql
index 1784421092..bd964c8cc2 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/buffer_schemes.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL,
     PRIMARY KEY (`object_id`,`scheme_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle.sql
index 7ffcebed6b..3445dea47a 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/characters.sql
index ea2aace011..60e1a786a2 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/characters.sql
@@ -60,4 +60,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_data.sql
index 1748b666e3..a1ca68fe43 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_data.sql
@@ -23,4 +23,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort.sql
index 00eb12a37e..33143b0805 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort_siege_guards.sql
index 19df57a3b9..43763210b4 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort_spawnlist.sql
index 22303a9b09..144979acd9 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,4 +11,4 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/grandboss_data.sql
index d77aedac84..eac8b7ff70 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, -21610, 181594, -5734, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/heroes.sql
index 2fc8753f90..49a371cbd5 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/heroes.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/items.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/lottery.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/lottery.sql
index bab15221c2..268ffd60fd 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/lottery.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/lottery.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `lottery` (
   `enddate` bigint(13) unsigned NOT NULL DEFAULT '0',
   `finished` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`idnr`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/olympiad_fights.sql
index ccd4ac94ec..f25cc4c1fa 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(4) NOT NULL DEFAULT 0,
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/pets.sql
index 4ffa7cd2b6..298b2e2df0 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/login/gameservers.sql
index 6d03350ae4..adf3119d08 100644
--- a/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_Classic_Interlude/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('1', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/config/Custom/AutoPlay.ini b/L2J_Mobius_Classic_Interlude/dist/game/config/Custom/AutoPlay.ini
index 9a4fd4bf2e..6e9d9628be 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/config/Custom/AutoPlay.ini
+++ b/L2J_Mobius_Classic_Interlude/dist/game/config/Custom/AutoPlay.ini
@@ -19,6 +19,11 @@ EnableAutoItem = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 # Enable .play command only for premium players.
 # Premium System must be enabled.
 # Default: False
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_Classic_Interlude/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_Classic_Interlude/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/config/General.ini b/L2J_Mobius_Classic_Interlude/dist/game/config/General.ini
index 0d6e0d49f9..46c0eeef52 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_Interlude/dist/game/config/General.ini
@@ -430,8 +430,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/ActionData.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/ActionData.xml
index 965751da7b..5412428b46 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/ActionData.xml
@@ -1,219 +1,248 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
-	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
-	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="38" handler="Ride" /> <!-- Mount/Dismount -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
-	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
-	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
-	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
-	<action id="70" handler="AirshipAction" option="4" /> <!-- Exit Airship -->
-	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
-	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
-	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
-	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
-	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Nightshade - Shade Sacrifice -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
-	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="0" handler="SitStand" /> <!-- Toggle Sit/Stand. (/sit, /stand) -->
+	<action id="1" handler="RunWalk" /> <!-- Toggle Walk/Run. (/walk, /run) -->
+	<action id="2" handler="None" /> <!-- Attacks selected target(s), or takes a general action if the target cannot be attacked. Hold down the Ctrl key and click to attack by force. (/attack, /attackforce) -->
+	<action id="3" handler="None" /> <!-- Request a trade from the selected target. (/trade) -->
+	<action id="4" handler="None" /> <!-- Select the nearest attackable target. (/targetnext) -->
+	<action id="5" handler="None" /> <!-- Pick up items that are scattered nearby. (/pickup) -->
+	<action id="6" handler="None" /> <!-- Change to the target of the currently selected player. (/assist) -->
+	<action id="7" handler="None" /> <!-- Invite the selected person to your party. (/invite) -->
+	<action id="8" handler="None" /> <!-- Leave the party. (/leave) -->
+	<action id="9" handler="None" /> <!-- If you are the leader of the party, dismiss selected members from your party. (/dismiss) -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Sets up a private store to sell your items. (/vendor) -->
+	<action id="11" handler="None" /> <!-- Display the party matching window to search for parties or to add members to your party. (/partymatching) -->
+	<action id="12" handler="SocialAction" option="2" /> <!-- Emote: Greet others with a kind "hello." (/socialhello) -->
+	<action id="13" handler="SocialAction" option="3" /> <!-- Emote: Let everyone know that you or someone else is victorious! (/socialvictory) -->
+	<action id="14" handler="SocialAction" option="4" /> <!-- Emote: Rouse your allies and charge! (/socialcharge) -->
+	<action id="15" handler="PetHold" /> <!-- Have your pet follow you or stay and hold its ground. -->
+	<action id="16" handler="PetAttack" /> <!-- Attack target. -->
+	<action id="17" handler="PetStop" /> <!-- Stop current action. -->
+	<action id="18" handler="None" /> <!-- Pick up nearby items. -->
+	<action id="19" handler="UnsummonPet" /> <!-- Returns your pet back to its home. -->
+	<action id="20" handler="None" /> <!-- Use special skill. -->
+	<action id="21" handler="ServitorHold" /> <!-- Have your summons follow you or stay and hold its ground. -->
+	<action id="22" handler="ServitorAttack" /> <!-- Attack target. -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="24" handler="SocialAction" option="6" /> <!-- Emote: Respond positively. (/socialyes) -->
+	<action id="25" handler="SocialAction" option="5" /> <!-- Emote: Respond negatively. (/socialno) -->
+	<action id="26" handler="SocialAction" option="7" /> <!-- Emote: Show your respect and bow. (/socialbow) -->
+	<action id="27" handler="None" /> <!-- Use special skill. -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Sets up a private store to purchase items. (/buy) -->
+	<action id="29" handler="SocialAction" option="8" /> <!-- Emote: You have no idea what's going on. (/socialunaware) -->
+	<action id="30" handler="SocialAction" option="9" /> <!-- Emote: I'm waiting... (/socialwaiting) -->
+	<action id="31" handler="SocialAction" option="10" /> <!-- Emote: Have a good laugh. (/sociallaugh) -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Toggle between Attack/Move modes. -->
+	<action id="33" handler="SocialAction" option="11" /> <!-- Emote: Applaud. (/socialapplause) -->
+	<action id="34" handler="SocialAction" option="12" /> <!-- Emote: Serve them up your best dance moves. (/socialdance) -->
+	<action id="35" handler="SocialAction" option="13" /> <!-- Emote: Show grief. (/socialsad) -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Poison gas attack. -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Set up a private workshop that creates items by using Dwarven recipes in exchange for a fee. (/dwarvenmanufacture) -->
+	<action id="38" handler="Ride" /> <!-- Toggle mount/dismount when near or on an NPC that can be ridden. (/mount, /dismount, /mountdismount) -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Exploding corpse attack. -->
+	<action id="40" handler="None" /> <!-- Enhances a target's evaluation score. (/evaluate) -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Attacks castle gates, walls, or headquarters by shooting a cannon. -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Reflects damage back to an enemy. -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Attacks target and nearby enemies by creating a whirling surge of water. -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Attacks an enemy with a powerful explosion. -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Restores the summoner's MP. -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Attacks an enemy by summoning up a devastating storm. -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Damages an enemy and heals the servitor at the same time. -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Attacks the enemy by shooting a cannon. -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Attack with a fit of rage. -->
+	<action id="50" handler="None" /> <!-- The selected party member will become the new party leader. (/changepartyleader) -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Removes shackles from the Servitor and sets him free. -->
+	<action id="53" handler="ServitorMove" /> <!-- Move to the target. -->
+	<action id="54" handler="PetMove" /> <!-- Move to the target. -->
+	<action id="55" handler="None" /> <!-- Toggle recording and stop recording of replay files. (/start_replayrecording, /stop_replayrecording, /startstop_replayrecording) -->
+	<action id="56" handler="None" /> <!-- Invite the selected target to a command channel. (/channelinvite) -->
+	<action id="57" handler="None" /> <!-- Highlights private store and private workshop messages that contain the search word. (/findprivatestore) -->
+	<action id="58" handler="None" /> <!-- Challenges another character to a duel. (Command: /duel) -->
+	<action id="59" handler="None" /> <!-- Withdrawing from a duel means losing it. (Command: /withdraw) -->
+	<action id="61" handler="PrivateStore" option="8" /> <!-- Open a personal store for package sale. (/packagesale) -->
+	<action id="62" handler="SocialAction" option="14" /> <!-- Charm Pose (Command: /charm) -->
+	<action id="64" handler="TeleportBookmark" /> <!-- Opens the window of an Unoccupied Teleport Device that enables to move freely from one location with a Teleport Device to another. (Command: /teleportbookmark) -->
+	<action id="65" handler="BotReport" /> <!-- Reports the targeted player as a suspected bot. (Command: /AutoHuntingReport) -->
+	<action id="66" handler="SocialAction" option="15" /> <!-- Allows character to strike shy pose. (command: /shyness) -->
+	<action id="67" handler="AirshipAction" option="1" /> <!-- Allows you to control the Airship. -->
+	<action id="68" handler="AirshipAction" option="2" /> <!-- Relinquishes control of the Airship. -->
+	<action id="69" handler="AirshipAction" option="3" /> <!-- Choose from pre-designated locations. -->
+	<action id="70" handler="AirshipAction" option="4" /> <!-- Disembarks from the Airship. -->
+	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange bows with another person. (command: /two-personbow) -->
+	<action id="72" handler="SocialAction" option="17" /> <!-- High Five another person. (command: /hi-five) -->
+	<action id="73" handler="SocialAction" option="18" /> <!-- Dance with another player. (command: /coupledance) -->
+	<action id="76" handler="None" /> <!-- Invite the selected target as friends. (Commands: /friendinvite, /addfriend, /registerfriend) -->
+	<action id="77" handler="None" /> <!-- Start or end recording videos. (Commands: /startrecording, /stoprecording, /startstoprecording) -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Applies Token 1 to the target. Can be only used in a group. (Command: /tacticalsign1) -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Applies Token 2 to the target. Can be only used in a group. (Command: /tacticalsign2) -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Applies Token 3 to the target. Can be only used in a group. (Command: /tacticalsign3) -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Applies Token 4 to the target. Can be only used in a group. (Command: /tacticalsign4) -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Automatically focuses on the target marked with Token 1. Can be only used in a group. (Command: /targettacticalsign1) -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Automatically focuses on the target marked with Token 2. Can be only used in a group. (Command: /targettacticalsign2) -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Automatically focuses on the target marked with Token 3. Can be only used in a group. (Command: /targettacticalsign3) -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Automatically focuses on the target marked with Token 4. Can be only used in a group. (Command: /targettacticalsign4) -->
+	<action id="87" handler="SocialAction" option="28" /> <!-- Gesture of Proposal (Command: /Socialpropose) -->
+	<action id="88" handler="SocialAction" option="29" /> <!-- Gesture of Provocation (Command: /Socialprovocation) -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off (Command: /Socialbeauty) -->
+	<action id="92" handler="None" /> <!-- Selects the previous target. (Command: /targetprev) -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Attacks castle gates, walls, or headquarters with a powerful strike. -->
+	<action id="1001" handler="None" /> <!-- A reckless yet powerful attack that must be used with extreme caution. -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Incites those around the summon to attack you. -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- A surprise attack that inflicts damage and stuns the opponent. -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Instantly increases P. Def. and M. Def. significantly. Character is immovable while this skill is in effect. -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- A magical attack. -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Recovers the pet's HP. -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Temporarily increases your party's chance to land a critical attack and also increases the power of the attack if successful. -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Temporarily increases your party's P. Atk and accuracy. -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Has a chance to remove curses from party members. -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Temporarily increases your party's MP regeneration. -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Temporarily shortens your party's spell re-use timer. -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Remove a curse from your party. -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Provokes an opponent to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Provokes multiple enemies around the caster to attack and strikes them with a curse that decreases their P. Def and M. Def. -->
+	<action id="1015" handler="ServitorSkillUse" option="4707" /> <!-- Sacrifice HP in order to regenerate the HP of a selected target. -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- A powerful blow on the enemy's vital points -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- A stunning blow that inflicts damage and instantly throws an enemy into a state of stun. -->
+	
+	<!-- Actions 1018 to 1030 are present in the Client, but are not used in Classic. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Inflict a deadly curse on an enemy that absorbs their HP. -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kat the Cat -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mew the Cat -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Kai the Cat -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Boxer the Unicorn -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Mirage the Unicorn -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Merrow the Unicorn. -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Shadow. -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by Shadow. -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by Silhouette -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Skill #1 that is used by reanimated man -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by reanimated man -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Skill #2 that is used by corrupted man -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King: A powerful slashing attack. Over-hit is possible. -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King: Slashes at surrounding enemies while spinning in the air. Over-hit is possible. -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King: Immobilizes the surrounding enemies. -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn: Powerful rear kicks that stun and damage an enemy. Over-hit is possible. -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn: Pounds the target and surrounding enemies with a tremendous onrush of water. -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord: Detonates a corpse, inflicting damage to nearby enemies. -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord: Blades attached to each arm slash out in a devastating attack. Over-hit is possible. -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord: Curses nearby enemies, poisoning them and reducing their Atk. Spd. -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon: Fires a projectile a short distance. Consumes 4 Flash Gunpowder. -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon: Fires a projectile a long distance. Consumes 5 Flash Gunpowder. -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Viciously bite an enemy. -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Scratch an enemy with both paws. Causes bleeding. -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awaken hidden powers. -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Decrease a nearby enemy's P. Atk./M. Atk. with a wolf cry. -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Decrease a nearby enemy's attack speed/magic speed with a strider roar. -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Viciously bite an enemy. -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Cause both damage and shock at the same time. Instantly stuns an enemy. -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Breath fire in front of you. -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Dominate nearby enemies with a mighty roar. -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Increases maximum HP temporarily. -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Increases maximum MP temporarily. -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Increases Atk. Spd. temporarily. -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Increases Casting Spd. temporarily. -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Temporarily decreases the target's MP consumption of skills. Consumes Spirit Ore. -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Increases M. Atk. power temporarily. -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Temporarily increases the critical rate of damage attack magic. -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Temporarily increases the critical attack power. -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Temporarily increases the probability of critical attack. -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Temporarily increases Accuracy. -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Rapidly attacks the enemy twice. -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Inflicts shock and damage to the enemy at the same time with a powerful spin attack. -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Attacks nearby enemies with a doll heap attack. -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakens a hidden ability. -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of thunder. -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack on nearby enemies when hit. -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Awakens a hidden ability to inflict a powerful attack on the enemy. Requires application of the Awakening skill. -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Control put in place to prevent the use of a buff upon the master. 5-minute duration. -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Powerfully attacks the target. -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- A powerful attack that pierces through a target. -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies by spinning your own body like a whirlwind. -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Attacks a front-line enemy with a powerful lance thrust. -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Shouts a victory cry that increases your abilities. -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Powerfully attacks the target. -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Gathers energy into your body, then releases it in a destructive blast. -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Hits enemies with a powerful wave of force. -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Emits a loud roar that amplifies your abilities. -->
+	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Charges toward the enemy and inflicts damage. -->
+	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Cancels the target's de-buff. -->
+	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Emits a spread of ring-shaped flames. -->
+	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Attacks the enemy with a powerful flaming beak. -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Toggles you between Attack and Support modes. -->
+	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- At a certain probability, removes one or several buffs from an enemy. -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Decreases the enemy's Dark attribute by 25. -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Aims at the enemy's vital spot. -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Strike multiple enemies at the front with the tail. -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Viciously bite an enemy. -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Causes nearby enemies to flee in fear. -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Increases your speed. -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Greatly increases its master's speed. -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Attacks the target with a chance to decrease target's speed. -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Increases the speed of its master and their party. -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Teleports its master to the Seed of Annihilation. -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Teleports its master and their party to the Seed of Annihilation. -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Attack the target. -->
+	<action id="1100" handler="ServitorMove" /> <!-- Move to a designated location. -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop current action. -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Make the servitor disappear by cancelling the summoning. -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Do not counter-attack. -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Counter-attack when the master or itself is attacked. -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Damages and provokes the target. -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Rolls over and delivers a shock to the ground stunning the surrounding targets. -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Bites the target to inflict damage. -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Damages the target and absorbs some of its HP. -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Attacks the surrounding enemies and blocks their physical skills. -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Flourishes claws and frontally attacks enemies. -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Dashes toward enemies to inflict damage and Stun them. -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Inflicts damage onto the enemies with a flame. -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Flies straight into the enemy. -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Purifies the master. -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Attack the enemy by darting a feather. -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Hurt the enemy by attacking them with sharp claws. -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Recover the targets near the tree and clear any debuff. -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Attacks nearby targets with a powerful punch. -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Provokes nearby enemies. -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Bites the enemy. -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Provokes nearby enemies. -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Bites the enemy. -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Provokes nearby enemies. -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Temporarily Stuns nearby enemies. -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Bites the enemy. -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Pounces on the target to inflict damage and decrease their Speed by 100. -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Attacks the enemy with the touch of death. -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Creates a space of death near the enemy to inflict damage. -->
+	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Attacks nearby enemies and blocks their P. Skills. -->
+	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Rushes to the enemy to inflict damage and Stun. -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Can express affection to Rudolph. Affection Level rises by 25%. Warning: Can be used only when a Rudolph requests expression of affection, and cannot be used while transformed! -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Increases Max HP by 20%, Max MP by 20%, and the Speed by 20% for 5 minutes. Increases the Debuff Resistance by 10%. Reuse delay 10 minutes. Consumes 3 Rose Essence(s) during skill use. Doesn't overlap with other buffs except Critical Seduction. -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- For 30 minutes, increases party members' Max HP by 30%, Max MP by 30%, Max CP by 30%, P. Def. by 30%, magic M. Def. by 30%, Speed by 20, P. Atk. by 10%, and magic M. Atk. by 20%. Decreases MP consumption for skill use by 15%. Reuse delay 5 minutes. Consumes 10 Rose Essence(s) during skill use. -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Attacks the enemy with the power of lightning. -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Inflicts a swift magic attack upon contacted enemies nearby. -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Attacks nearby enemies with the power of lightning. -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Restricts to prevent the use of a buff upon the master. 5 minute duration. -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Inflicts a powerful attack that seems to pierce through the target. -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Attacks nearby enemies. -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impales an enemy with a sword. -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Raises one's own abilities. -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Inflicts a powerful attack on the target. -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Gathered energy within ones self can be focused and used to attack an enemy. -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Fires a shock wave to attack enemies at the front. -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Raises one's own abilities. -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switches between attack mode and support mode. -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Instantly restores the master's HP by 10%. Increases the master's Debuff Resistance by 80%, Buff-canceling Attack Resistance by 40%, Speed by 10, P. Def. by 20%, and M. Def. by 20%, and decreases MP consumption for all skills by 50% for 1 minute. -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/DoorData.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/DoorData.xml
index 9fadc1cc3d..bde51d4d2e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/DoorData.xml
@@ -8491,6 +8491,176 @@
 		<openStatus default="open" />
 	</door>
 	
+	<!-- 21_16 FIXME: Rune clanhall doors cannot be found in client. -->
+	<door id="21160001" name="rune_castle_agit_002_001">
+		<nodes nodeZ="872">
+			<node x="37679" y="-50432" />
+			<node x="37726" y="-50433" />
+			<node x="37726" y="-50423" />
+			<node x="37678" y="-50424" />
+		</nodes>
+		<location x="37680" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160002" name="rune_castle_agit_002_002">
+		<nodes nodeZ="872">
+			<node x="37724" y="-50432" />
+			<node x="37771" y="-50432" />
+			<node x="37771" y="-50423" />
+			<node x="37723" y="-50424" />
+		</nodes>
+		<location x="37770" y="-50428" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160003" name="rune_castle_agit_003_001">
+		<nodes nodeZ="872">
+			<node x="38527" y="-50151" />
+			<node x="38570" y="-50131" />
+			<node x="38566" y="-50122" />
+			<node x="38524" y="-50144" />
+		</nodes>
+		<location x="38527" y="-50147" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160004" name="rune_castle_agit_003_002">
+		<nodes nodeZ="872">
+			<node x="38569" y="-50132" />
+			<node x="38610" y="-50111" />
+			<node x="38606" y="-50103" />
+			<node x="38564" y="-50124" />
+		</nodes>
+		<location x="38607" y="-50108" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160005" name="rune_castle_agit_004_001">
+		<nodes nodeZ="872">
+			<node x="39122" y="-49542" />
+			<node x="39145" y="-49501" />
+			<node x="39137" y="-49498" />
+			<node x="39115" y="-49539" />
+		</nodes>
+		<location x="39119" y="-49539" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160006" name="rune_castle_agit_004_002">
+		<nodes nodeZ="872">
+			<node x="39145" y="-49503" />
+			<node x="39167" y="-49462" />
+			<node x="39160" y="-49459" />
+			<node x="39136" y="-49498" />
+		</nodes>
+		<location x="39163" y="-49461" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160007" name="rune_castle_agit_001_001">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48291" />
+			<node x="39341" y="-48245" />
+			<node x="39335" y="-48245" />
+			<node x="39334" y="-48290" />
+		</nodes>
+		<location x="39338" y="-48290" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160008" name="rune_castle_agit_001_002">
+		<nodes nodeZ="870">
+			<node x="39341" y="-48246" />
+			<node x="39342" y="-48199" />
+			<node x="39334" y="-48199" />
+			<node x="39334" y="-48246" />
+		</nodes>
+		<location x="39338" y="-48200" z="870" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160009" name="rune_castle_agit_005_001">
+		<nodes nodeZ="872">
+			<node x="39176" y="-47024" />
+			<node x="39155" y="-46982" />
+			<node x="39147" y="-46986" />
+			<node x="39169" y="-47026" />
+		</nodes>
+		<location x="39172" y="-47024" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160010" name="rune_castle_agit_005_002">
+		<nodes nodeZ="872">
+			<node x="39154" y="-46982" />
+			<node x="39133" y="-46942" />
+			<node x="39127" y="-46945" />
+			<node x="39148" y="-46986" />
+		</nodes>
+		<location x="39130" y="-46944" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160011" name="rune_castle_agit_006_001">
+		<nodes nodeZ="872">
+			<node x="38626" y="-46372" />
+			<node x="38586" y="-46350" />
+			<node x="38581" y="-46358" />
+			<node x="38623" y="-46379" />
+		</nodes>
+		<location x="38624" y="-46375" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160012" name="rune_castle_agit_006_002">
+		<nodes nodeZ="872">
+			<node x="38587" y="-46350" />
+			<node x="38545" y="-46330" />
+			<node x="38542" y="-46336" />
+			<node x="38583" y="-46358" />
+		</nodes>
+		<location x="38544" y="-46333" z="872" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160013" name="rune_castle_agit_007_001">
+		<nodes nodeZ="873">
+			<node x="37787" y="-46044" />
+			<node x="37741" y="-46044" />
+			<node x="37741" y="-46051" />
+			<node x="37787" y="-46050" />
+		</nodes>
+		<location x="37787" y="-46047" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	<door id="21160014" name="rune_castle_agit_007_002">
+		<nodes nodeZ="873">
+			<node x="37743" y="-46043" />
+			<node x="37697" y="-46045" />
+			<node x="37697" y="-46051" />
+			<node x="37742" y="-46051" />
+		</nodes>
+		<location x="37697" y="-46048" z="873" height="450" />
+		<stats basePDef="644" baseMDef="518" baseHpMax="316500" />
+		<status showHp="false" />
+		<openStatus openMethod="BY_CLICK" default="close" />
+	</door>
+	
 	<!-- 21_17 -->
 	<door id="21170001" name="Rune_bodeful_fortress_s.Rune_bf_azit_gate_door">
 		<nodes nodeZ="544">
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 5b501b1f1b..bcc74a8afe 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -254,6 +255,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/EffectMasterHandler.java
index daef615a57..97c8c4c84e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -41,6 +41,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AirBind", AirBind::new);
@@ -225,7 +227,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtk", MAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyVital", ModifyVital::new);
 		EffectHandler.getInstance().registerHandler("Mp", Mp::new);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index cd446ab812..2775ff29a4 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -182,6 +182,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 43be5cfc4a..ae0fba5834 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,55 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 3ce6e28c2a..798a363468 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,46 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/experience.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/experience.xml
index 3892efec36..9ef9e70e83 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/experience.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/experience.xml
@@ -2,110 +2,89 @@
 <table maxLevel="107" maxPetLevel="99" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/experience.xsd">
 	<experience level="1" tolevel="0" trainingRate="0" />
 	<experience level="2" tolevel="68" trainingRate="0" />
-	<experience level="3" tolevel="363" trainingRate="0" />
-	<experience level="4" tolevel="1168" trainingRate="0" />
-	<experience level="5" tolevel="2884" trainingRate="0" />
-	<experience level="6" tolevel="6038" trainingRate="0" />
-	<experience level="7" tolevel="11287" trainingRate="0" />
-	<experience level="8" tolevel="19423" trainingRate="0" />
-	<experience level="9" tolevel="31378" trainingRate="0" />
-	<experience level="10" tolevel="48229" trainingRate="0" />
-	<experience level="11" tolevel="71202" trainingRate="0" />
-	<experience level="12" tolevel="101677" trainingRate="0" />
-	<experience level="13" tolevel="141193" trainingRate="0" />
-	<experience level="14" tolevel="191454" trainingRate="0" />
-	<experience level="15" tolevel="254330" trainingRate="0" />
-	<experience level="16" tolevel="331867" trainingRate="0" />
-	<experience level="17" tolevel="426288" trainingRate="0" />
-	<experience level="18" tolevel="540000" trainingRate="0" />
-	<experience level="19" tolevel="675596" trainingRate="0.4" />
-	<experience level="20" tolevel="835862" trainingRate="0.4" />
-	<experience level="21" tolevel="920357" trainingRate="0.4" />
-	<experience level="22" tolevel="1015431" trainingRate="0.4" />
-	<experience level="23" tolevel="1123336" trainingRate="0.4" />
-	<experience level="24" tolevel="1246808" trainingRate="0.4" />
-	<experience level="25" tolevel="1389235" trainingRate="0.4" />
-	<experience level="26" tolevel="1554904" trainingRate="0.4" />
-	<experience level="27" tolevel="1749413" trainingRate="0.4" />
-	<experience level="28" tolevel="1980499" trainingRate="0.4" />
-	<experience level="29" tolevel="2260321" trainingRate="0.4" />
-	<experience level="30" tolevel="2634751" trainingRate="0.4" />
-	<experience level="31" tolevel="2844287" trainingRate="0.4" />
-	<experience level="32" tolevel="3093068" trainingRate="0.4" />
-	<experience level="33" tolevel="3389496" trainingRate="0.4" />
-	<experience level="34" tolevel="3744042" trainingRate="0.4" />
-	<experience level="35" tolevel="4169902" trainingRate="0.4" />
-	<experience level="36" tolevel="4683988" trainingRate="0.4" />
-	<experience level="37" tolevel="5308556" trainingRate="0.4" />
-	<experience level="38" tolevel="6074376" trainingRate="0.4" />
-	<experience level="39" tolevel="7029248" trainingRate="0.4" />
-	<experience level="40" tolevel="8342182" trainingRate="0.4" />
-	<experience level="41" tolevel="8718976" trainingRate="0.4" />
-	<experience level="42" tolevel="12842357" trainingRate="0.4" />
-	<experience level="43" tolevel="14751932" trainingRate="0.4" />
-	<experience level="44" tolevel="17009030" trainingRate="0.4" />
-	<experience level="45" tolevel="19686117" trainingRate="0.4" />
-	<experience level="46" tolevel="22875008" trainingRate="0.4" />
-	<experience level="47" tolevel="26695470" trainingRate="0.4" />
-	<experience level="48" tolevel="31312332" trainingRate="0.4" />
-	<experience level="49" tolevel="36982854" trainingRate="0.4" />
-	<experience level="50" tolevel="44659561" trainingRate="0.4" />
-	<experience level="51" tolevel="48128727" trainingRate="0.4" />
-	<experience level="52" tolevel="52277875" trainingRate="0.4" />
-	<experience level="53" tolevel="57248635" trainingRate="0.4" />
-	<experience level="54" tolevel="63216221" trainingRate="0.4" />
-	<experience level="55" tolevel="70399827" trainingRate="0.4" />
-	<experience level="56" tolevel="79078300" trainingRate="0.4" />
-	<experience level="57" tolevel="89616178" trainingRate="0.3" />
-	<experience level="58" tolevel="102514871" trainingRate="0.3" />
-	<experience level="59" tolevel="118552044" trainingRate="0.3" />
-	<experience level="60" tolevel="140517709" trainingRate="0.2" />
-	<experience level="61" tolevel="153064754" trainingRate="0.2" />
-	<experience level="62" tolevel="168231664" trainingRate="0.2" />
-	<experience level="63" tolevel="186587702" trainingRate="0.2" />
-	<experience level="64" tolevel="208840245" trainingRate="0.2" />
-	<experience level="65" tolevel="235877658" trainingRate="0.2" />
-	<experience level="66" tolevel="268833561" trainingRate="0.15" />
-	<experience level="67" tolevel="309192920" trainingRate="0.15" />
-	<experience level="68" tolevel="358998712" trainingRate="0.15" />
-	<experience level="69" tolevel="421408669" trainingRate="0.1" />
-	<experience level="70" tolevel="493177635" trainingRate="0.1" />
-	<experience level="71" tolevel="555112374" trainingRate="0.1" />
-	<experience level="72" tolevel="630494192" trainingRate="0.1" />
-	<experience level="73" tolevel="722326994" trainingRate="0.1" />
-	<experience level="74" tolevel="834354722" trainingRate="0.05" />
-	<experience level="75" tolevel="971291524" trainingRate="0.05" />
-	<experience level="76" tolevel="1139165674" trainingRate="0.05" />
-	<experience level="77" tolevel="1345884863" trainingRate="0.05" />
-	<experience level="78" tolevel="1602331019" trainingRate="0.05" />
-	<experience level="79" tolevel="1902355477" trainingRate="0.05" />
-	<experience level="80" tolevel="2288742870" trainingRate="0.05" />
-	<experience level="81" tolevel="2703488268" trainingRate="0.025" />
-	<experience level="82" tolevel="3281805791" trainingRate="0.025" />
-	<experience level="83" tolevel="3928736800" trainingRate="0.025" />
-	<experience level="84" tolevel="4572352438" trainingRate="0.025" />
-	<experience level="85" tolevel="5432434004" trainingRate="0.025" />
-	<experience level="86" tolevel="12074543196" trainingRate="0.02" />
-	<experience level="87" tolevel="21923573162" trainingRate="0.01" />
-	<experience level="88" tolevel="39133185964" trainingRate="0.01" />
-	<experience level="89" tolevel="53473809657" trainingRate="0.01" />
-	<experience level="90" tolevel="79256490796" trainingRate="0.01" />
-	<experience level="91" tolevel="112393696116" trainingRate="0.01" />
-	<experience level="92" tolevel="154329787685" trainingRate="0.005" />
-	<experience level="93" tolevel="203542226665" trainingRate="0.005" />
-	<experience level="94" tolevel="271881875436" trainingRate="0.004" />
-	<experience level="95" tolevel="349555499437" trainingRate="0.003" />
-	<experience level="96" tolevel="482840015388" trainingRate="0.0025" />
-	<experience level="97" tolevel="726451834408" trainingRate="0.0018" />
-	<experience level="98" tolevel="1149904090077" trainingRate="0.001" />
-	<experience level="99" tolevel="1798492743100" trainingRate="0.0005" />
-	<experience level="100" tolevel="6019956790712" trainingRate="0.0002" />
-	<experience level="101" tolevel="16946124602908" trainingRate="0.0001" />
-	<experience level="102" tolevel="43523955372407" trainingRate="0.0001" />
-	<experience level="103" tolevel="84422086452639" trainingRate="0.0001" />
-	<experience level="104" tolevel="188752303396110" trainingRate="0.0001" />
-	<experience level="105" tolevel="358035537321346" trainingRate="0.0001" />
-	<experience level="106" tolevel="3514822095225670" trainingRate="0.0001" />
-	<experience level="107" tolevel="7302965964710870" trainingRate="0.0001" />
-	<experience level="108" tolevel="12302965964710870" trainingRate="0.0001" />
+	<experience level="3" tolevel="364" trainingRate="0" />
+	<experience level="4" tolevel="1169" trainingRate="0" />
+	<experience level="5" tolevel="2885" trainingRate="0" />
+	<experience level="6" tolevel="6039" trainingRate="0" />
+	<experience level="7" tolevel="11288" trainingRate="0" />
+	<experience level="8" tolevel="19424" trainingRate="0" />
+	<experience level="9" tolevel="31379" trainingRate="0" />
+	<experience level="10" tolevel="48230" trainingRate="0" />
+	<experience level="11" tolevel="71203" trainingRate="0" />
+	<experience level="12" tolevel="101678" trainingRate="0" />
+	<experience level="13" tolevel="141194" trainingRate="0" />
+	<experience level="14" tolevel="191455" trainingRate="0" />
+	<experience level="15" tolevel="254331" trainingRate="0" />
+	<experience level="16" tolevel="331868" trainingRate="0" />
+	<experience level="17" tolevel="426289" trainingRate="0" />
+	<experience level="18" tolevel="540001" trainingRate="0" />
+	<experience level="19" tolevel="675597" trainingRate="0.4" />
+	<experience level="20" tolevel="835864" trainingRate="0.4" />
+	<experience level="21" tolevel="1023785" trainingRate="0.4" />
+	<experience level="22" tolevel="1439215" trainingRate="0.4" />
+	<experience level="23" tolevel="1948497" trainingRate="0.4" />
+	<experience level="24" tolevel="2568850" trainingRate="0.4" />
+	<experience level="25" tolevel="3320625" trainingRate="0.4" />
+	<experience level="26" tolevel="4227172" trainingRate="0.4" />
+	<experience level="27" tolevel="5315161" trainingRate="0.4" />
+	<experience level="28" tolevel="6614929" trainingRate="0.4" />
+	<experience level="29" tolevel="8161929" trainingRate="0.4" />
+	<experience level="30" tolevel="9995812" trainingRate="0.4" />
+	<experience level="31" tolevel="12162655" trainingRate="0.4" />
+	<experience level="32" tolevel="14713777" trainingRate="0.4" />
+	<experience level="33" tolevel="17708475" trainingRate="0.4" />
+	<experience level="34" tolevel="21213445" trainingRate="0.4" />
+	<experience level="35" tolevel="25304463" trainingRate="0.4" />
+	<experience level="36" tolevel="30067485" trainingRate="0.4" />
+	<experience level="37" tolevel="35599858" trainingRate="0.4" />
+	<experience level="38" tolevel="42010312" trainingRate="0.4" />
+	<experience level="39" tolevel="49421366" trainingRate="0.4" />
+	<experience level="40" tolevel="57972427" trainingRate="0.4" />
+	<experience level="41" tolevel="67818553" trainingRate="0.4" />
+	<experience level="42" tolevel="79135431" trainingRate="0.4" />
+	<experience level="43" tolevel="92117896" trainingRate="0.4" />
+	<experience level="44" tolevel="106985763" trainingRate="0.4" />
+	<experience level="45" tolevel="123986756" trainingRate="0.4" />
+	<experience level="46" tolevel="143394645" trainingRate="0.4" />
+	<experience level="47" tolevel="165516618" trainingRate="0.4" />
+	<experience level="48" tolevel="190696911" trainingRate="0.4" />
+	<experience level="49" tolevel="219317613" trainingRate="0.4" />
+	<experience level="50" tolevel="251805374" trainingRate="0.4" />
+	<experience level="51" tolevel="288635909" trainingRate="0.4" />
+	<experience level="52" tolevel="330338848" trainingRate="0.4" />
+	<experience level="53" tolevel="377507026" trainingRate="0.4" />
+	<experience level="54" tolevel="430790086" trainingRate="0.4" />
+	<experience level="55" tolevel="490916803" trainingRate="0.4" />
+	<experience level="56" tolevel="558693890" trainingRate="0.4" />
+	<experience level="57" tolevel="635018116" trainingRate="0.3" />
+	<experience level="58" tolevel="720879370" trainingRate="0.3" />
+	<experience level="59" tolevel="817380319" trainingRate="0.3" />
+	<experience level="60" tolevel="925741335" trainingRate="0.2" />
+	<experience level="61" tolevel="1047311009" trainingRate="0.2" />
+	<experience level="62" tolevel="1183577349" trainingRate="0.2" />
+	<experience level="63" tolevel="1336187067" trainingRate="0.2" />
+	<experience level="64" tolevel="1506967658" trainingRate="0.2" />
+	<experience level="65" tolevel="1697936136" trainingRate="0.2" />
+	<experience level="66" tolevel="1911306680" trainingRate="0.15" />
+	<experience level="67" tolevel="2149533465" trainingRate="0.15" />
+	<experience level="68" tolevel="2415323168" trainingRate="0.15" />
+	<experience level="69" tolevel="2711646440" trainingRate="0.1" />
+	<experience level="70" tolevel="3041801165" trainingRate="0.1" />
+	<experience level="71" tolevel="3409398455" trainingRate="0.1" />
+	<experience level="72" tolevel="3818421441" trainingRate="0.1" />
+	<experience level="73" tolevel="4273257148" trainingRate="0.1" />
+	<experience level="74" tolevel="4778730308" trainingRate="0.05" />
+	<experience level="75" tolevel="5340152664" trainingRate="0.05" />
+	<experience level="76" tolevel="5963335189" trainingRate="0.05" />
+	<experience level="77" tolevel="7138805250" trainingRate="0.05" />
+	<experience level="78" tolevel="9372198366" trainingRate="0.05" />
+	<experience level="79" tolevel="16072377713" trainingRate="0.05" />
+	<experience level="80" tolevel="38406308871" trainingRate="0.05" />
+	<experience level="81" tolevel="150075964661" trainingRate="0.025" />
+	<experience level="82" tolevel="279783329566" trainingRate="0.025" />
+	<experience level="83" tolevel="454748284485" trainingRate="0.025" />
+	<experience level="84" tolevel="673468617187" trainingRate="0.025" />
+	<experience level="85" tolevel="2020405851561" trainingRate="0.025" />
+	<experience level="86" tolevel="8755092023431" trainingRate="0.025" />
+	<experience level="87" tolevel="16836715429675" trainingRate="0.025" />
 </table>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/items/46200-46299.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/items/46200-46299.xml
index 39c035e99c..dad37bbefe 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/items/46200-46299.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/items/46200-46299.xml
@@ -795,14 +795,19 @@
 	<item id="46254" name="Dandy's Golden Ball" type="EtcItem">
 		<!-- For 1 hr., XP/SP gain +100%, and changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or XP Buff 50%. -->
 		<set name="icon" val="icon.ev_dinos_baseball_gold" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="etcitem_type" val="SCROLL" />
 		<set name="is_stackable" val="true" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="is_freightable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="18471" level="1" /> <!-- Dandy's Golden Ball -->
+		</skills>
 	</item>
 	<item id="46255" name="Automatic Appearance: Halloween Outfit" type="EtcItem">
 		<!-- Changes the appearance of upper armor into that of a Halloween Outfit. Works on one-pieces too. -->
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/16300-16399.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/16300-16399.xml
index 36b7b1c7a5..f1f3ee17f8 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/16300-16399.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/16300-16399.xml
@@ -794,6 +794,22 @@
 		<reuseDelay>5000</reuseDelay>
 		<effectPoint>-150</effectPoint>
 		<isDebuff>true</isDebuff>
+		<activateRate>80</activateRate>
+		<affectRange>900</affectRange>
+		<basicProperty>PHYSICAL</basicProperty>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<trait>PULL</trait>
+		<effects>
+			<effect name="AirBind" />
+			<effect name="Bluff">
+				<chance>100</chance>
+			</effect>
+			<effect name="PullBack">
+				<speed>600</speed>
+				<delay>600</delay>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="16388" toLevel="1" name="Kain's Wrath">
 		<!-- Consumed by vengeful fury toward all who harm Giselle. -->
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/18400-18499.xml
index 075118bfaa..98aff3a6ab 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/18400-18499.xml
@@ -877,8 +877,30 @@
 		<!-- For 1 hr., XP/SP gain +100%, and changes the appearance of your armor into that of an NC Dinos uniform. Cannot be stacked with the Fall of the Dragon or XP Buff 50%. -->
 		<icon>icon.ev_dinos_baseball_gold</icon>
 		<operateType>A2</operateType>
+		<effectPoint>1</effectPoint>
+		<abnormalType>CHANGEBODY</abnormalType>
+		<abnormalVisualEffect>CHANGE_DINOS</abnormalVisualEffect>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>46254</itemConsumeId> <!-- Dandy's Home Run Ball -->
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>-3</magicLevel>
+		<abnormalLevel>2</abnormalLevel>
+		<abnormalTime>3600</abnormalTime>
 		<reuseDelay>15000</reuseDelay>
+		<irreplacableBuff>true</irreplacableBuff>
+		<stayAfterDeath>true</stayAfterDeath>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="ExpModify">
+				<amount>100</amount>
+			</effect>
+			<effect name="SpModify">
+				<amount>100</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18472" toLevel="6" name="Giveaway Number 1">
 		<icon>icon.skill0000</icon>
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30000-30099.xml
index 4e1e1a1278..8adacbda05 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/30000-30099.xml
@@ -1841,8 +1841,8 @@
 		<operateType>P</operateType>
 		<magicLevel>85</magicLevel>
 		<effects>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>350</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/documentation.txt
index 5c66bef756..07bde1f1c6 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/documentation.txt
@@ -10,6 +10,8 @@ AddHate: Instant effect that increases target's hate towards you.
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -196,7 +198,6 @@ ManaHealPercent: Increases current MP by a given percentage.
 MAtk: M. Atk. stat.
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyVital: Modifies current HP/MP/CP
 MpConsumePerLevel: Consumes mana over time depending on your level.
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java
index 6d847a3245..346f86fa1a 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java
@@ -1214,6 +1214,7 @@ public class Config
 	public static boolean ENABLE_AUTO_SKILL;
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static boolean AUTO_PLAY_PREMIUM;
 	public static Set<Integer> DISABLED_AUTO_SKILLS = new HashSet<>();
 	public static Set<Integer> DISABLED_AUTO_ITEMS = new HashSet<>();
@@ -1289,6 +1290,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2526,6 +2528,7 @@ public class Config
 			ENABLE_AUTO_SKILL = autoPlayConfig.getBoolean("EnableAutoSkill", true);
 			ENABLE_AUTO_ITEM = autoPlayConfig.getBoolean("EnableAutoItem", true);
 			RESUME_AUTO_PLAY = autoPlayConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = autoPlayConfig.getBoolean("AssistLeader", false);
 			AUTO_PLAY_PREMIUM = autoPlayConfig.getBoolean("AutoPlayPremium", false);
 			DISABLED_AUTO_SKILLS.clear();
 			final String disabledSkills = autoPlayConfig.getString("DisabledSkillIds", "");
@@ -3282,6 +3285,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index a50cbb8033..8378c362cb 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index 603e7d33be..dd968ed772 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -549,9 +549,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 2260001e17..380989e049 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 36f3461010..efc07efb38 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -230,7 +230,7 @@ public class ShortCuts implements IRestorable
 			if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL))
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 55f0ee03a0..d5c28f7140 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1288,7 +1288,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2816,7 +2816,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2829,178 +2829,142 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							case STAT_CHA:
+							case STAT_LUC:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						player.refreshExpertisePenalty();
-						sendPacket(info);
+					}
+					player.refreshExpertisePenalty();
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
index 5768d32c69..306e020129 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -4513,7 +4513,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8204,9 +8204,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java
index cc23c2a6f2..98b7163e50 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -68,9 +68,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 import org.l2jmobius.gameserver.network.serverpackets.SummonInfo;
@@ -211,7 +211,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -375,10 +375,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		if (!isPet())
-		{
-			super.onDecay();
-		}
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -412,14 +409,18 @@ public abstract class Summon extends Playable
 			}
 		}
 		
-		// pet will be deleted along with all his items
+		// Pet will be deleted along with all his items.
 		if (getInventory() != null)
 		{
 			getInventory().destroyAllItems("pet deleted", _owner, this);
 		}
+		
 		decayMe();
 		
-		CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		if (!isPet())
+		{
+			CharSummonTable.getInstance().removeServitor(_owner, getObjectId());
+		}
 	}
 	
 	public void unSummon(Player owner)
@@ -846,7 +847,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -867,7 +868,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -892,7 +900,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -900,7 +908,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -946,7 +961,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index ea1abbff9b..79fab5d65e 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -863,15 +862,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -882,8 +879,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -892,7 +893,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -965,45 +966,26 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
 		
-		// Notify recalculation to child classes.
+		// Notify recalculation to child classes
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 438e73d4cc..a2436eebf0 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0b6092b2d9..1e393ec4bf 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2216,6 +2216,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index 35994a13a2..fbc7576f7b 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -38,6 +38,7 @@ import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
 import org.l2jmobius.gameserver.enums.AttributeType;
@@ -50,6 +51,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -67,12 +69,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDr
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPickup;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -80,11 +84,13 @@ import org.l2jmobius.gameserver.model.options.EnchantOptions;
 import org.l2jmobius.gameserver.model.options.Options;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.SkillConditionScope;
 import org.l2jmobius.gameserver.model.variables.ItemVariables;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1578,7 +1584,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2202,6 +2210,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2226,6 +2239,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2251,6 +2266,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 66f6f634be..59ab4324f3 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -736,7 +736,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, Item::getVisualId))
 				{
 					update = true;
@@ -888,7 +889,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(player, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 1692c9fcd7..ec97ae1f75 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -652,7 +652,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -675,7 +675,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -710,7 +710,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 6894ac0fba..e2e6bb404c 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -129,7 +129,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	BLOW_RATE("blowRate"),
 	BLOW_RATE_DEFENCE("blowRateDefence"),
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index d96c2e25ae..0ca58d9970 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -43,7 +43,18 @@ public class MCritRateFinalizer implements IStatFunction
 		}
 		
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index c305987ba6..c29c9ba398 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -93,6 +93,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index c5257ff589..1aff35bfd5 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index c6fd6dc758..9f04d53165 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -701,7 +701,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList(false);
 		player.updateShortCuts(_id, _level, 0);
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index c16d3301f0..7c284015a5 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -63,6 +63,6 @@ public class RequestShortCutReg implements ClientPacket
 		
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 	}
 }
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index d78d842163..07ed7641a9 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,127 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 38, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 49, 50, 51,
-		52, 53, 54, 55,
-		56, 57, 58, 59,
-		60, 61, 62, 63,
-		64, 65, 66, 67,
-		68, 69, 70, 71,
-		72, 73, 74, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index dcc44cb9f3..2e152e2e29 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -67,7 +67,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -207,7 +207,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		ServerPackets.EX_PET_INFO.writeId(this);
 		writeInt(_summon.getObjectId());
-		writeByte(_value); // // 0=teleported 1=default 2=summoned
+		writeByte(_value); // 0=teleported 1=default 2=summoned
 		writeShort(37); // mask_bits_37
 		writeBytes(_masks);
 		// Block 1
@@ -240,9 +240,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -260,11 +260,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -288,9 +288,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -321,7 +320,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index f93c9e5e69..03909a2746 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
deleted file mode 100644
index 52a4032d14..0000000000
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeByte(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
-		{
-			writeLong(_summon.getStat().getExp()); // 0% absolute value
-		}
-		else
-		{
-			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
-		}
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(0); // TODO: Find me
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
-		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-	}
-}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
new file mode 100644
index 0000000000..62bb425a5a
--- /dev/null
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetSummonInfo.java
@@ -0,0 +1,182 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isShowSummonAnimation() ? 2 : _value); // 0=teleported 1=default 2=summoned
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeByte(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		if (_summon.getExpForThisLevel() > _summon.getStat().getExp())
+		{
+			writeLong(_summon.getStat().getExp()); // 0% absolute value
+		}
+		else
+		{
+			writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+		}
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(0); // TODO: Find me
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(_summon.getOwner().getSummonPoints()); // Used Summon Points
+		writeByte(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+	}
+}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 83e29f7bed..3ee2b1ef96 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,19 +19,19 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
 	}
 	
@@ -53,8 +53,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 8872c0cf63..c2b8c8f51a 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -42,13 +48,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -59,8 +68,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 68ca369edf..37f3211b0a 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 1f54b5040f..0d5d066d25 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -24,6 +25,7 @@ import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
@@ -40,6 +42,7 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
@@ -95,6 +98,17 @@ public class AutoPlayTaskManager
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
+							// Logic adjustment for summons not attacking.
+							if (player.hasSummon())
+							{
+								for (Summon summon : player.getServitors().values())
+								{
+									if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+									{
+										summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+									}
+								}
+							}
 							continue PLAY;
 						}
 						
@@ -120,23 +134,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -144,6 +167,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -178,32 +204,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -302,6 +351,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 7cd7dd9696..c56221841f 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
@@ -51,7 +52,6 @@ import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -381,8 +381,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/buffer_schemes.sql
index 1784421092..bd964c8cc2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/buffer_schemes.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL,
     PRIMARY KEY (`object_id`,`scheme_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle.sql
index c7b5613401..9fb7fea4e6 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 -- (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_random_craft.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_random_craft.sql
index 977113bbe3..c83402513c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_random_craft.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_random_craft.sql
@@ -25,4 +25,4 @@ CREATE TABLE IF NOT EXISTS `character_random_craft` (
   `item_5_locked` TINYINT NOT NULL DEFAULT 0,
   `item_5_lock_left` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_ranking_history.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_ranking_history.sql
index 3f938ba850..d2da345dec 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_ranking_history.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_ranking_history.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_ranking_history` (
   `ranking` int(20) NOT NULL,
   `exp` bigint(20) NOT NULL,
   PRIMARY KEY (`charId`,`day`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_spirits.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_spirits.sql
index ac73d8dbe3..bb4044039f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_spirits.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_spirits.sql
@@ -11,6 +11,5 @@ CREATE TABLE `character_spirits`
     `crit_rate_points`   TINYINT      NOT NULL DEFAULT 0,
     `crit_damage_points` TINYINT      NOT NULL DEFAULT 0,
     `in_use`             BOOLEAN      NOT NULL DEFAULT FALSE,
-    PRIMARY KEY (`charId`, `type`),
-    FOREIGN KEY FK_CHARACTER_SPIRITS (`charId`) REFERENCES characters (`charId`) ON DELETE CASCADE
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+    PRIMARY KEY (`charId`, `type`)
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/characters.sql
index 4df7d3f88c..f39a66c2db 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/characters.sql
@@ -62,4 +62,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_data.sql
index f8b64d99db..49f88c0122 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_data.sql
@@ -24,4 +24,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort.sql
index bb4f761682..caf1e50e76 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 -- (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort_siege_guards.sql
index 19df57a3b9..43763210b4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort_spawnlist.sql
index 22303a9b09..144979acd9 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,4 +11,4 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/grandboss_data.sql
index b4a1f552fd..7cf6d2865d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, 93069, 8925, -3904, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/heroes.sql
index ae59eb8ba1..f2ee5692a8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/heroes.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/items.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/olympiad_fights.sql
index ccd4ac94ec..f25cc4c1fa 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(4) NOT NULL DEFAULT 0,
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/pet_evolves.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/pet_evolves.sql
index e825631c85..51fcd5eba8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/pet_evolves.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/pet_evolves.sql
@@ -5,4 +5,4 @@ CREATE TABLE `pet_evolves` (
 	`level` int NOT NULL DEFAULT '0',
 	PRIMARY KEY  (`itemObjId`, `index`, `level`),
     UNIQUE KEY `pet_evolves` (`itemObjId`, `index`, `level`)
-) ENGINE=MyISAM;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/pet_skills.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/pet_skills.sql
index 2b502c7738..b680f21972 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/pet_skills.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/pet_skills.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `pet_skills` (
   `skillId` INT NOT NULL DEFAULT 0,
   `skillLevel` INT(3) NOT NULL DEFAULT 1,
   PRIMARY KEY (`petObjItemId`,`skillId`,`skillLevel`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/pets.sql
index 58b188bbcd..b7e9d545db 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/General.ini b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/General.ini
index 4230956e3e..3844e15f0c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/General.ini
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/General.ini
@@ -430,8 +430,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
@@ -640,6 +640,11 @@ AutoPlayAttackAction = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 
 # ---------------------------------------------------------------------------
 # Share Location Settings
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/ActionData.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/ActionData.xml
index 677c57eb99..c3a56c5a7f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/ActionData.xml
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
+	<action id="0" handler="SitStand" /> <!-- Sit/Stand -->
+	<action id="1" handler="RunWalk" /> <!-- Walk/Run -->
+	<action id="2" handler="None" /> <!-- Attack -->
+	<action id="3" handler="None" /> <!-- Trade -->
+	<action id="4" handler="None" /> <!-- Next Target (Melee) -->
+	<action id="5" handler="None" /> <!-- Pick Up -->
+	<action id="6" handler="None" /> <!-- Assist -->
+	<action id="7" handler="None" /> <!-- Invite -->
+	<action id="8" handler="None" /> <!-- Leave Party -->
+	<action id="9" handler="None" /> <!-- Dismiss Party Member -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store - Sell -->
 	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
+	<action id="16" handler="PetAttack" /> <!-- Pet's attack -->
+	<action id="17" handler="PetStop" /> <!-- Cancel pet's action -->
+	<action id="19" handler="UnsummonPet" /> <!-- Recall a pet -->
+	<action id="20" handler="None" /> <!-- Special skill -->
+	<action id="21" handler="ServitorHold" /> <!-- Change the servitor's movement mode -->
+	<action id="22" handler="ServitorAttack" /> <!-- Servitor's attack -->
+	<action id="23" handler="ServitorStop" /> <!-- Cancel servitor's action -->
 	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
+	<action id="27" handler="None" /> <!-- Special skill -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store - Buy -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Switch Mode -->
 	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Toxic Smoke -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Workshop -->
+	<action id="38" handler="Ride" /> <!-- Mount/Dismount -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Parasite Burst -->
+	<action id="40" handler="None" /> <!-- Recommend -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Cannon -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Self Damage Shield -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Hydro Screw -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Boom Attack -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Master Recharge -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mega Storm Strike -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Steal Blood -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mech. Cannon -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Wield Temper -->
+	<action id="50" handler="None" /> <!-- Change Party Leader -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Unsummon -->
+	<action id="53" handler="ServitorMove" /> <!-- Move -->
+	<action id="56" handler="None" /> <!-- Command Channel Invite -->
+	<action id="64" handler="TeleportBookmark" /> <!-- My Teleports -->
 	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
 	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
 	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
@@ -50,169 +50,208 @@
 	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
 	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
 	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
+	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Use of Token 1 -->
+	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Use of Token 2 -->
+	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Use of Token 3 -->
+	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Use of Token 4 -->
+	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Target by Token 1 -->
+	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Target by Token 2 -->
+	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Target by Token 3 -->
+	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Target by Token 4 -->
 	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
 	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="50094" /> <!-- Nightshade - Shadow's Despair -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off -->
+	<action id="93" handler="None" /> <!-- Next Target (Range) -->
+	<action id="96" handler="None" /> <!-- Strike Back -->
+	<action id="97" handler="None" /> <!-- Combat Mode -->
+	<action id="98" handler="None" /> <!-- Disapproval -->
+	<action id="99" handler="None" /> <!-- Show your location -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Hammer -->
+	<action id="1001" handler="None" /> <!-- Ultimate Bombastic Buster -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Hostile Feeling -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wild Stun -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wild Defense -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Bright Burst -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Bright Heal -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Blessing of Queen -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Gift of Queen -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cure of Queen -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Blessing of Seraphim -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Gift of Seraphim -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Cure of Seraphim -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Curse of Shade -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Mass Curse of Shade -->
+	<action id="1015" handler="ServitorSkillUse" option="50094" /> <!-- Shadow's Despair -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Blow -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Strike -->
+	
+	<!-- TODO: Find skill ids. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Cursed Drain Energy -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Kat the Cat Skill 2 -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Mew the Cat Skill 2 -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Kai the Cat Skill 2 -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Boxer the Unicorn Skill 2 -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Mirage the Unicorn Skill 2 -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Merrow the Unicorn Skill 2 -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Shadow Skill 1 -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Shadow Skill 2 -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Silhouette Skill 2 -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Reanimated Man Skill 1 -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Reanimated Man Skill 2 -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Corrupted Man Skill 2 -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Slash -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Spin Slash -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Grip of the Cat -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Whiplash -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Tidal Wave -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Corpse Burst -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Dicing Death -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Dark Curse -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Cannon Fodder -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Big Bang -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Bite Attack -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Maul -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Cry of the Wolf -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awakening -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Wolf Howl -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider Roar -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast Bite -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast Stun Attack -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast Fire Breath -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast Roar -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Blessed Body -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Blessed Soul -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Haste -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Acumen -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Clarity -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Empower -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Wild Magic -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Death Whisper -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Focus -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Guidance -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Death Blow -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Double Attack -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Spin Attack -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Meteor Shower -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakening -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Thunder Bolt -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Flash -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Lightning Wave -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Flare -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Buff Control -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Power Striker -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Piercing Attack -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Whirlwind -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Lance Smash -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Battle Cry -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Power Smash -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Energy Burst -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Shock Wave -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Howl -->
 	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
 	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
 	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
 	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch Tactics -->
+	<action id="1085" handler="ServitorSkillUse" option="4707" /> <!-- Shade Sacrifice -->
 	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
 	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
 	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Tail Strike -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Strider Bite -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Strider Fear -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Strider Dash -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen Strike -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen Wind Walk -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Maguen Power Strike -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen Wind Walk -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen Return -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Maguen Party Return -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Servitor's attack -->
+	<action id="1100" handler="ServitorMove" /> <!-- Servitor's movement -->
+	<action id="1101" handler="ServitorStop" /> <!-- Cancel servitor's action -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Unsummon -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Passive -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Key Security -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Bear Claw -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Bear Tumbling -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Cougar Bite -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Cougar Pounce -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Reaper Touch -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Reaper Power -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Lion Roar -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Lion Claw -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Lion Dash -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Lion Flame -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Flight -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Purity -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Feather -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Sharp Claw -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Blessing of Life -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Punch -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Feline Aggression -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Feline Stun -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Feline Bite -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Feline Pounce -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Feline Touch -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Feline Power -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Unicorn's Aggression -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Unicorn's Stun -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Unicorn's Bite -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Unicorn's Pounce -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Unicorn's Touch -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Unicorn's Power -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Phantom Aggression -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Phantom Stun -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Phantom Bite -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Phantom Pounce -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Phantom Touch -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Phantom Power -->
+	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Panther Roar -->
+	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Panther Rush -->
+	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Magic Missile -->
+	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Digging -->
+	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Chain Block -->
+	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Blocked Target Change -->
+	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Breaking Blaster -->
+	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Blinking Attack -->
+	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Beast Within -->
+	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Hide -->
+	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Strong Bite -->
+	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dire Claw -->
+	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Leap Attack -->
+	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Last Dire Claw -->
+	<action id="1156" handler="ServitorSkillUse" option="49032" /> <!-- Horn Thrust -->
+	<action id="1157" handler="ServitorSkillUse" option="49033" /> <!-- Rump Stun -->
+	<action id="1158" handler="ServitorSkillUse" option="49034" /> <!-- Pulling Body -->
+	<action id="1159" handler="ServitorSkillUse" option="49035" /> <!-- Breath of Hurricane -->
+	<action id="1160" handler="ServitorSkillUse" option="49042" /> <!-- Arrow Feather -->
+	<action id="1161" handler="ServitorSkillUse" option="49043" /> <!-- Quick Jump -->
+	
+	<!-- TODO: Find skill ids. -->
+	<action id="1162" handler="ServitorSkillUse" option="0" /> <!-- Feather Trap -->
+	<action id="1163" handler="ServitorSkillUse" option="0" /> <!-- Trap Explosion -->
+	
+	<action id="1164" handler="ServitorSkillUse" option="49044" /> <!-- Scout's Strike -->
+	<action id="1165" handler="ServitorSkillUse" option="49052" /> <!-- Crippling Bite -->
+	<action id="1166" handler="ServitorSkillUse" option="49054" /> <!-- Rushing Assault -->
+	<action id="1167" handler="ServitorSkillUse" option="49055" /> <!-- Wild Roar and Dash -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Hand of Warmth -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Rosy Seduction -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Art of Seduction -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Thunder Bolt -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Flash -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Lightning Wave -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Buff Control -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Piercing Attack -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Spin Attack -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impale -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Battle Cry -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Power Smash -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Energy Burst -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Shock Wave -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Burst -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switch Tactics -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Cat the Ranger Boost -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/CategoryData.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/CategoryData.xml
index 45f3b66a2f..ca6343e1c4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/CategoryData.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/CategoryData.xml
@@ -363,6 +363,38 @@
 	<category name="WYVERN_GROUP">
 		<id>15955</id> <!-- wyvern -->
 	</category>
+	<category name="PET_GROUP">
+		<id>16079</id> <!-- Buffalo Calf -->
+		<id>16080</id> <!-- Black Buffalo -->
+		<id>16081</id> <!-- White Buffalo -->
+		<id>16082</id> <!-- Black Combat Buffalo -->
+		<id>16083</id> <!-- White Combat Buffalo -->
+		<id>16084</id> <!-- Tiger Cub -->
+		<id>16085</id> <!-- White Tiger -->
+		<id>16086</id> <!-- Tiger -->
+		<id>16087</id> <!-- White Sharp clawed Tiger -->
+		<id>16088</id> <!-- Steel Sharp clawed Tiger -->
+		<id>16089</id> <!-- Kookaburra Chick -->
+		<id>16090</id> <!-- Red Kookaburra -->
+		<id>16091</id> <!-- Blue Kookaburra -->
+		<id>16092</id> <!-- Red Combat Kookaburra -->
+		<id>16093</id> <!-- Blue Combat Kookaburra -->
+		<id>16094</id> <!-- Dragon Hatchling -->
+		<id>16095</id> <!-- Green Dragon -->
+		<id>16096</id> <!-- Red Dragon -->
+		<id>16097</id> <!-- Earth Dragon -->
+		<id>16098</id> <!-- Fire Dragon -->
+		<id>16099</id> <!-- Hawk Hatchling -->
+		<id>16100</id> <!-- Red Hawk -->
+		<id>16101</id> <!-- Blue Hawk -->
+		<id>16102</id> <!-- Red Combat Hawk -->
+		<id>16103</id> <!-- Blue Combat Hawk -->
+		<id>16104</id> <!-- Wolf Cub -->
+		<id>16105</id> <!-- Black Wolf -->
+		<id>16106</id> <!-- While Wolf -->
+		<id>16107</id> <!-- Black Steel Wolf -->
+		<id>16108</id> <!-- White Steel Wolf -->
+	</category>
 	<category name="SUBJOB_GROUP_KNIGHT">
 		<id>5</id> <!-- paladin -->
 		<id>6</id> <!-- dark_avenger -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/PetExtractData.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/PetExtractData.xml
new file mode 100644
index 0000000000..db6643827e
--- /dev/null
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/PetExtractData.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/PetExtractData.xsd">
+	<extraction petLevel="50" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+</list>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0008995.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0008995.xml
index 3f6daa7c89..073b7a8f58 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0008995.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0008995.xml
@@ -3,7 +3,7 @@
 	<item id="90" price="0" /> <!-- Goat Head Staff -->
 	<item id="178" price="0" /> <!-- Bone Staff -->
 	<item id="183" price="0" /> <!-- Mystic Staff -->
-	<item id="184" price="0" /> <!-- Conjuror´s Staff -->
+	<item id="184" price="0" /> <!-- Conjuror's Staff -->
 	<item id="185" price="0" /> <!-- Staff of Mana -->
 	<item id="186" price="0" /> <!-- Staff of Magic -->
 	<item id="187" price="0" /> <!-- Atuba Hammer -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0008997.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0008997.xml
index 80076adb1d..42cab86e8f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0008997.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0008997.xml
@@ -8,12 +8,12 @@
 	<item id="313" price="0" /> <!-- Temptation of Abyss -->
 	<item id="314" price="0" /> <!-- Proof of Revenge -->
 	<item id="315" price="0" /> <!-- Divine Tome -->
-	<item id="316" price="0" /> <!-- Sage´s Blood -->
+	<item id="316" price="0" /> <!-- Sage's Blood -->
 	<item id="317" price="0" /> <!-- Tome of Blood -->
 	<item id="318" price="0" /> <!-- Crucifix of Blood -->
 	<item id="319" price="0" /> <!-- Eye of Infinity -->
 	<item id="320" price="0" /> <!-- Blue Crystall Skull -->
-	<item id="321" price="0" /> <!-- Demon´s Fangs -->
+	<item id="321" price="0" /> <!-- Demon's Fangs -->
 	<item id="322" price="0" /> <!-- Vajra Wang -->
 	<item id="323" price="0" /> <!-- Ancient Reagent -->
 	<item id="7885" price="0" /> <!-- Priest Sword -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0008998.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0008998.xml
index 62a0d611d9..025f6328d2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0008998.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0008998.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="6" price="0" /> <!-- Apprentice´s Wand -->
-	<item id="7" price="0" /> <!-- Apprentice´s Rod -->
+	<item id="6" price="0" /> <!-- Apprentice's Wand -->
+	<item id="7" price="0" /> <!-- Apprentice's Rod -->
 	<item id="747" price="0" /> <!-- Wand of Adept -->
 </list>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0008999.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0008999.xml
index a53e594a01..b55c1d74be 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0008999.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0008999.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="99" price="0" /> <!-- Apprentice´s Spellbook -->
+	<item id="99" price="0" /> <!-- Apprentice's Spellbook -->
 	<item id="100" price="0" /> <!-- Voodoo Doll -->
-	<item id="308" price="0" /> <!-- Buffalo´s Horn -->
-	<item id="309" price="0" /> <!-- Tear´s of Eva -->
+	<item id="308" price="0" /> <!-- Buffalo's Horn -->
+	<item id="309" price="0" /> <!-- Tear's of Eva -->
 	<item id="310" price="0" /> <!-- Relic of the Saints -->
 	<item id="311" price="0" /> <!-- Crucifix of Blessing -->
 	<item id="91676" price="0" /> <!-- Reinforced Voodoo Doll -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009002.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009002.xml
index 7a99859da0..82b8c47d24 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009002.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009002.xml
@@ -2,7 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="8" price="0" /> <!-- Willow Staff -->
 	<item id="9" price="0" /> <!-- Cedar Staff -->
-	<item id="176" price="0" /> <!-- Apprentice´s Staff -->
+	<item id="176" price="0" /> <!-- Apprentice's Staff -->
 	<item id="177" price="0" /> <!-- Mage Staff -->
 	<item id="744" price="0" /> <!-- Staff of Sentinel -->
 	<item id="754" price="0" /> <!-- Red Sunset Staff -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009905001.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009905001.xml
index 393837b9fd..83935767b9 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009905001.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009905001.xml
@@ -90,8 +90,8 @@
 	<item id="93867" price="0" /> <!-- Rare Spellbook: Amazing Thunder Storm -->
 	<item id="93869" price="0" /> <!-- Spellbook: Elemental Burst -->
 	<item id="93870" price="0" /> <!-- Spellbook: Ethereal Strike -->
-	<item id="94046" price="0" /> <!-- Rare Spellbook: Glorious Warrior´s Ability -->
-	<item id="94047" price="0" /> <!-- Spellbook: Glorious Warrior´s Ability -->
+	<item id="94046" price="0" /> <!-- Rare Spellbook: Glorious Warrior's Ability -->
+	<item id="94047" price="0" /> <!-- Spellbook: Glorious Warrior's Ability -->
 	<item id="94137" price="0" /> <!-- Rare Spellbook: Devour -->
 	<item id="94138" price="0" /> <!-- Rare Spellbook: Pain of Sagittarius -->
 	<item id="94139" price="0" /> <!-- Rare Spellbook: Morale -->
@@ -104,7 +104,7 @@
 	<item id="94323" price="0" /> <!-- Rare Spellbook: Frantic Pace -->
 	<item id="94324" price="0" /> <!-- Spellbook: Song of Earth -->
 	<item id="94325" price="0" /> <!-- Spellbook: The Song of the Hunter -->
-	<item id="94326" price="0" /> <!-- Spellbook: Warrior´s Dance -->
+	<item id="94326" price="0" /> <!-- Spellbook: Warrior's Dance -->
 	<item id="94327" price="0" /> <!-- Spellbook: Dance of Fire -->
 	<item id="94497" price="0" /> <!-- Spellbook: Life Force Harmony -->
 	<item id="94498" price="0" /> <!-- Spellbook: Titan Champiion -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009918001.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009918001.xml
index 67f8c0386d..508ef4a377 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009918001.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009918001.xml
@@ -4,6 +4,6 @@
 	<item id="93961" price="0" /> <!-- Buffalo Necklace -->
 	<item id="93962" price="0" /> <!-- Tiger Necklace -->
 	<item id="93963" price="0" /> <!-- Kookaburra Necklace -->
-	<item id="93964" price="0" /> <!-- Dragon´s Necklace -->
+	<item id="93964" price="0" /> <!-- Dragon's Necklace -->
 	<item id="93965" price="0" /> <!-- Hawk Necklace -->
 </list>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009919002.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009919002.xml
index 3d61bf39f3..12a0e94e60 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009919002.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009919002.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="49523" price="0" /> <!-- Demon´s Circlet STR +1, INT +1 -->
+	<item id="49523" price="0" /> <!-- Demon's Circlet STR +1, INT +1 -->
 	<item id="49530" price="0" /> <!-- Blue Dinasty Circlet -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009928.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009928.xml
index 6d8332d6a9..ebce730eb6 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009928.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009928.xml
@@ -37,13 +37,13 @@
 	<item id="49694" price="0" /> <!-- Magical Potion of Leaping (Lv. 2) -->
 	<item id="49695" price="0" /> <!-- Magical Potion of Leaping (Lv. 3) -->
 	<item id="90273" price="0" /> <!-- Magical Potion of Leaping (Lv. 4) -->
-	<item id="49854" price="0" /> <!-- Maliss´MP Replenishing Potion -->
+	<item id="49854" price="0" /> <!-- Maliss' MP Replenishing Potion -->
 	<item id="90043" price="0" /> <!-- Dark Assassin Transformation Potion -->
-	<item id="90879" price="0" /> <!-- Sayha´s Grace Potion -->
+	<item id="90879" price="0" /> <!-- Sayha's Grace Potion -->
 	<item id="91027" price="0" /> <!-- Dragon Miracle Potion -->
 	<item id="91856" price="0" /> <!-- Special Dragon Miracle Potion Lv.1 -->
 	<item id="92410" price="0" /> <!-- Special Dragon Miracle Potion Lv.2 -->
-	<item id="91028" price="0" /> <!-- High-grade Maliss´HP Recovery Potion -->
+	<item id="91028" price="0" /> <!-- High-grade Maliss' HP Recovery Potion -->
 	<item id="91158" price="0" /> <!-- Maphr Potion -->
 	<item id="91189" price="0" /> <!-- Fire Attack Potion -->
 	<item id="91190" price="0" /> <!-- Water Attack Potion -->
@@ -55,6 +55,6 @@
 	<item id="91833" price="0" /> <!-- Improved Earth Attack Potion -->
 	<item id="91757" price="0" /> <!-- Magic Lamp Charging Potion Potion -->
 	<item id="91774" price="0" /> <!-- Miraculous Rudolph Potion -->
-	<item id="93967" price="0" /> <!-- Pet´s HP Potion -->
+	<item id="93967" price="0" /> <!-- Pet's HP Potion -->
 	<item id="94221" price="0" /> <!-- Growth Potion -->
 </list>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009930.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009930.xml
index d455f653cc..ee374854bc 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009930.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009930.xml
@@ -43,14 +43,14 @@
 	<item id="49104" price="0" /> <!-- Scroll of Escape: Hunters Village -->
 	<item id="49106" price="0" /> <!-- Scroll of Escape Entrance to Dragon Valley -->
 	<item id="49502" price="0" /> <!-- Scroll of Escape: Giran Harbor -->
-	<item id="49538" price="0" /> <!-- Scroll of Escape: Antharas´ Lair -->
+	<item id="49538" price="0" /> <!-- Scroll of Escape: Antharas' Lair -->
 	<item id="49540" price="0" /> <!-- Scroll of Escape: Entrance Orc Barracks -->
-	<item id="90766" price="0" /> <!-- Scroll of Escape: Entrance to the Evil´s Isle -->
+	<item id="90766" price="0" /> <!-- Scroll of Escape: Entrance to the Evil's Isle -->
 	<item id="91197" price="0" /> <!-- Scroll of Escape: Forge of the Gods -->
 	<item id="91198" price="0" /> <!-- Scroll of Escape: Garden of Eva -->
 	<item id="91199" price="0" /> <!-- Scroll of Escape: Land of Winds -->
 	<item id="91200" price="0" /> <!-- Scroll of Escape: Wall of Argos -->
-	<item id="91646" price="0" /> <!-- Scroll of Escape: Unbearable Wolves´Howli -->
+	<item id="91646" price="0" /> <!-- Scroll of Escape: Unbearable Wolves' Howli -->
 	<item id="91647" price="0" /> <!-- Scroll of Escape: Troubled Forest -->
 	<item id="91648" price="0" /> <!-- Scroll of Escape: Cleaning-up The Grounds -->
 	<item id="91649" price="0" /> <!-- Scroll of Escape: Plundered Graves -->
@@ -74,8 +74,8 @@
 	<item id="91964" price="0" /> <!-- Scroll of Escape: Tower of Insolence (11th Floor) -->
 	<item id="91965" price="0" /> <!-- Scroll of Escape: Tower of Insolence (12th Floor) -->
 	<item id="93319" price="0" /> <!-- Scroll of Escape: Quatermaster Mathorn -->
-	<item id="93336" price="0" /> <!-- Scroll of Escape: Antharas´s Lair Interior -->
-	<item id="93950" price="0" /> <!-- Scroll of Escape: Antharas´s Lair -->
+	<item id="93336" price="0" /> <!-- Scroll of Escape: Antharas's Lair Interior -->
+	<item id="93950" price="0" /> <!-- Scroll of Escape: Antharas's Lair -->
 	<item id="737" price="0" /> <!-- Scroll of Resurrection -->
 	<item id="3936" price="0" /> <!-- Blessed Scroll of Resurrection -->
 	<item id="93617" price="0" /> <!-- SP Scroll (High Grade) -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009931.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009931.xml
index fdcc3fd917..408d164a08 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009931.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009931.xml
@@ -34,23 +34,23 @@
 	<item id="93133" price="0" /> <!-- Scroll: Enchant Agathion -->
 	<item id="90963" price="0" /> <!-- Stable Scroll: Enchant Agathion -->
 	<item id="90149" price="0" /> <!-- Savior Scroll: Enchant Weapon -->
-	<item id="90990" price="0" /> <!-- Scroll: Enchant Savior´s Earring -->
-	<item id="90494" price="0" /> <!-- Eva´s Scroll: Enchant Hair Accessory -->
-	<item id="90885" price="0" /> <!-- Stabilized Eva´s Scroll: Enchant Hair Accessory -->
+	<item id="90990" price="0" /> <!-- Scroll: Enchant Savior's Earring -->
+	<item id="90494" price="0" /> <!-- Eva's Scroll: Enchant Hair Accessory -->
+	<item id="90885" price="0" /> <!-- Stabilized Eva's Scroll: Enchant Hair Accessory -->
 	<item id="90958" price="0" /> <!-- Scroll: Enchant Fishing Weapon -->
 	<item id="91187" price="0" /> <!-- Scroll: Enchant Spirit Accessory -->
-	<item id="91575" price="0" /> <!-- Scroll: Enchant Yogi´s Weapon(Event) -->
-	<item id="91722" price="0" /> <!-- Scroll: Enchant Special Sayha´s Cloak -->
+	<item id="91575" price="0" /> <!-- Scroll: Enchant Yogi's Weapon(Event) -->
+	<item id="91722" price="0" /> <!-- Scroll: Enchant Special Sayha's Cloak -->
 	<item id="91756" price="0" /> <!-- Scroll: Enchant Talisman of Aden -->
 	<item id="91863" price="0" /> <!-- Scroll: Enchant Dragon Belt -->
 	<item id="91951" price="0" /> <!-- Scroll: Enchant Talisman of Baium -->
 	<item id="91966" price="0" /> <!-- Scroll: Enchant Ring of Insolence -->
-	<item id="91967" price="0" /> <!-- Scroll: Enchant Dragon Valley´s Earring -->
+	<item id="91967" price="0" /> <!-- Scroll: Enchant Dragon Valley's Earring -->
 	<item id="92017" price="0" /> <!-- Scroll: Enchant Talisman of Eva -->
 	<item id="92402" price="0" /> <!-- Scroll: Enchant Talisman of Speed -->
-	<item id="93043" price="0" /> <!-- Adventurer´s Scroll: Enchant Hair Accessory -->
-	<item id="93045" price="0" /> <!-- Scroll: Enchant Adventurer´s Cloak -->
-	<item id="93046" price="0" /> <!-- Scroll: Enchant Adventurer´s Belt -->
+	<item id="93043" price="0" /> <!-- Adventurer's Scroll: Enchant Hair Accessory -->
+	<item id="93045" price="0" /> <!-- Scroll: Enchant Adventurer's Cloak -->
+	<item id="93046" price="0" /> <!-- Scroll: Enchant Adventurer's Belt -->
 	<item id="93329" price="0" /> <!-- Scroll: Enchant Talisman of Authority -->
 	<item id="94169" price="0" /> <!-- Scroll: Enchant Circlet of Hero -->
 	<item id="94305" price="0" /> <!-- Scroll: Enchant Stats (Exchangeable) -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009946.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009946.xml
index c881844cf0..6549e6ab78 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009946.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009946.xml
@@ -61,10 +61,10 @@
 	<item id="4199" price="0" /> <!-- Recipe: Bow of Peril (100%) -->
 	<item id="4952" price="0" /> <!-- Recipe: Sealed Avadon Circlet (60%) -->
 	<item id="4953" price="0" /> <!-- Recipe: Sealed Avadon Gloves (60%) -->
-	<item id="4958" price="0" /> <!-- Recipe: Sealed Zubei´s Boots (60%) -->
+	<item id="4958" price="0" /> <!-- Recipe: Sealed Zubei's Boots (60%) -->
 	<item id="4959" price="0" /> <!-- Recipe: Sealed Avadon Boots (60%) -->
-	<item id="4960" price="0" /> <!-- Recipe: Sealed Zubei´s Gauntlets (60%) -->
-	<item id="4962" price="0" /> <!-- Recipe: Sealed Zubei´s Helmet (60%) -->
+	<item id="4960" price="0" /> <!-- Recipe: Sealed Zubei's Gauntlets (60%) -->
+	<item id="4962" price="0" /> <!-- Recipe: Sealed Zubei's Helmet (60%) -->
 	<item id="4990" price="0" /> <!-- Recipe: Sealed Blue Wolf Helmet (60%) -->
 	<item id="4991" price="0" /> <!-- Recipe: Sealed Doom Helmet (60%) -->
 	<item id="4992" price="0" /> <!-- Recipe: Sealed Blue Wolf Boots (60%) -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009946001.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009946001.xml
index b64d6192e7..9e4a29e100 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009946001.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009946001.xml
@@ -24,8 +24,8 @@
 	<item id="6891" price="0" /> <!-- Recipe: Dragon Hunter Axe (30%) -->
 	<item id="6893" price="0" /> <!-- Recipe: Saint Spear (30%) -->
 	<item id="6895" price="0" /> <!-- Recipe: Demon Splinter (30%) -->
-	<item id="6897" price="0" /> <!-- Recipe: Haven´s Divider (30%) -->
+	<item id="6897" price="0" /> <!-- Recipe: Haven's Divider (30%) -->
 	<item id="6899" price="0" /> <!-- Recipe: Arcana Mace (30%) -->
 	<item id="7580" price="0" /> <!-- Recipe: Draconic Bow (30%) -->
-	<item id="93912" price="0" /> <!-- Recipe: Flame Sword´s Blade (10%) -->
+	<item id="93912" price="0" /> <!-- Recipe: Flame Sword's Blade (10%) -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009954.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009954.xml
index 80fc92f2c1..74c42ea66c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009954.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009954.xml
@@ -11,7 +11,7 @@
 	<item id="5726" price="0" /> <!-- Zubei's Boots - Heavy Armor -->
 	<item id="93532" price="0" /> <!-- Zubei's Boots (Heavy) - Sealed -->
 	<item id="633" price="0" /> <!-- Zubei's Shield - Heavy Armor -->
-	<item id="93116" price="0" /> <!-- Zubei´s Sigil - Sealed -->
+	<item id="93116" price="0" /> <!-- Zubei's Sigil - Sealed -->
 	<item id="90461" price="0" /> <!-- Blue Wolf Helmet - Heavy Armor -->
 	<item id="93550" price="0" /> <!-- Blue Wolf Helmet (Heavy) - Sealed -->
 	<item id="358" price="0" /> <!-- Blue Wolf Breastplate - Heavy Armor -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009954002.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009954002.xml
index 00f3b95dd4..9e813aba9f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009954002.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009954002.xml
@@ -3,9 +3,9 @@
 	<item id="90460" price="0" /> <!-- Zubei's Helmet - Robe Armor -->
 	<item id="93549" price="0" /> <!-- Zubei's Helmet (Robe) - Sealed -->
 	<item id="2397" price="0" /> <!-- Tunic of Zubei - Robe Armor -->
-	<item id="93513" price="0" /> <!-- Zubei´s Tunic - Sealed -->
+	<item id="93513" price="0" /> <!-- Zubei's Tunic - Sealed -->
 	<item id="2402" price="0" /> <!-- Stockings of Zubei - Robe Armor -->
-	<item id="93516" price="0" /> <!-- Zubei´s Stockings - Sealed -->
+	<item id="93516" price="0" /> <!-- Zubei's Stockings - Sealed -->
 	<item id="5712" price="0" /> <!-- Zubei's Gauntlets - Robe Armor -->
 	<item id="93522" price="0" /> <!-- Zubei's Gauntlets (Robe) - Sealed -->
 	<item id="5728" price="0" /> <!-- Zubei's Boots - Robe Armor -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009960.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009960.xml
index 2181a417e7..51367f5dea 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009960.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009960.xml
@@ -5,6 +5,6 @@
 	<item id="114" price="0" /> <!-- Earring of Strength -->
 	<item id="115" price="0" /> <!-- Earring of Wisdom -->
 	<item id="845" price="0" /> <!-- Cat's Eye Earring -->
-	<item id="91953" price="0" /> <!-- Dragon Valley´s Earring -->
+	<item id="91953" price="0" /> <!-- Dragon Valley's Earring -->
 	<item id="94616" price="0" /> <!-- Pirate Earring (Event) -->
 </list>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009961003.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009961003.xml
index 1918b0307a..726f2322e5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009961003.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009961003.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="6661" price="0" /> <!-- Orfen´s Earring -->
-	<item id="92328" price="0" /> <!-- Orfen´s Earring Lv. 1 -->
-	<item id="49575" price="0" /> <!-- Orfen´s Earring Lv. 2 -->
-	<item id="49578" price="0" /> <!-- Orfen´s Earring Lv. 3 -->
-	<item id="91379" price="0" /> <!-- Orfen´s Earring Lv. 4 -->
+	<item id="6661" price="0" /> <!-- Orfen's Earring -->
+	<item id="92328" price="0" /> <!-- Orfen's Earring Lv. 1 -->
+	<item id="49575" price="0" /> <!-- Orfen's Earring Lv. 2 -->
+	<item id="49578" price="0" /> <!-- Orfen's Earring Lv. 3 -->
+	<item id="91379" price="0" /> <!-- Orfen's Earring Lv. 4 -->
 	<item id="90763" price="0" /> <!-- Zaken's Earring -->
 	<item id="90764" price="0" /> <!-- Zaken's Earring Lv. 2 -->
 	<item id="90765" price="0" /> <!-- Zaken's Earring Lv. 3 -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009978.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009978.xml
index 9609a6a3b7..1f825b07cf 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009978.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0009978.xml
@@ -20,8 +20,8 @@
 	<item id="90732" price="0" /> <!-- +8 B-grade Armor Set Coupon -->
 	<item id="90768" price="0" /> <!-- Hair Accessory Coupon -->
 	<item id="91159" price="0" /> <!-- Agathion Exchange Coupon -->
-	<item id="91226" price="0" /> <!-- Red´s Weapon Coupon -->
-	<item id="91227" price="0" /> <!-- Sayha´s Coupon -->
+	<item id="91226" price="0" /> <!-- Red's Weapon Coupon -->
+	<item id="91227" price="0" /> <!-- Sayha's Coupon -->
 	<item id="91631" price="0" /> <!-- Crafting Supplies Coupon -->
 	<item id="93448" price="0" /> <!-- A-grade Weapon Coupon -->
 	<item id="93449" price="0" /> <!-- A-grade Armor Coupon -->
@@ -40,11 +40,11 @@
 	<item id="93974" price="0" /> <!-- Best Dye Coupon -->
 	<item id="94093" price="0" /> <!-- High-grade Item Craft Coupon -->
 	<item id="94623" price="0" /> <!-- Belt Craft Coupon -->
-	<item id="46444" price="0" /> <!-- Kain´s Soul Crystal Lv.1 -->
-	<item id="46459" price="0" /> <!-- Mermoden´s Soul Crystal Lv.1 -->
-	<item id="46474" price="0" /> <!-- Leona´s Soul Crystal Lv.1 -->
-	<item id="46489" price="0" /> <!-- Pantheon´s Soul Crystal Lv.1 -->
-	<item id="46504" price="0" /> <!-- Lionel´s Soul Crystal Lv.1 -->
+	<item id="46444" price="0" /> <!-- Kain's Soul Crystal Lv.1 -->
+	<item id="46459" price="0" /> <!-- Mermoden's Soul Crystal Lv.1 -->
+	<item id="46474" price="0" /> <!-- Leona's Soul Crystal Lv.1 -->
+	<item id="46489" price="0" /> <!-- Pantheon's Soul Crystal Lv.1 -->
+	<item id="46504" price="0" /> <!-- Lionel's Soul Crystal Lv.1 -->
 	<item id="90534" price="0" /> <!-- Sigel Soul Crystal Lv.1 -->
 	<item id="90535" price="0" /> <!-- Sigel Soul Crystal Lv.2 -->
 	<item id="90536" price="0" /> <!-- Sigel Soul Crystal Lv.3 -->
@@ -180,34 +180,34 @@
 	<item id="90706" price="0" /> <!-- Sealed Soul Crystal Lv.13 -->
 	<item id="90707" price="0" /> <!-- Sealed Soul Crystal Lv.14 -->
 	<item id="90708" price="0" /> <!-- Sealed Soul Crystal Lv.15 -->
-	<item id="91163" price="0" /> <!-- Anakim´s Soul Crystal Lv.1 (Rare) -->
-	<item id="91164" price="0" /> <!-- Anakim´s Soul Crystal Lv.2 (Rare) -->
-	<item id="91165" price="0" /> <!-- Anakim´s Soul Crystal Lv.3 (Rare) -->
-	<item id="91166" price="0" /> <!-- Anakim´s Soul Crystal Lv.4 (Rare) -->
-	<item id="91167" price="0" /> <!-- Anakim´s Soul Crystal Lv.5 (Rare) -->
-	<item id="91168" price="0" /> <!-- Anakim´s Soul Crystal Lv.6 (Rare) -->
-	<item id="91169" price="0" /> <!-- Anakim´s Soul Crystal Lv.7 (Rare) -->
-	<item id="91170" price="0" /> <!-- Anakim´s Soul Crystal Lv.8 (Rare) -->
-	<item id="91171" price="0" /> <!-- Anakim´s Soul Crystal Lv.9 (Rare) -->
-	<item id="91172" price="0" /> <!-- Anakim´s Soul Crystal Lv.10 (Rare) -->
-	<item id="92925" price="0" /> <!-- Anakim´s Soul Crystal Lv.11 (Rare) -->
-	<item id="92926" price="0" /> <!-- Anakim´s Soul Crystal Lv.12 (Rare) -->
-	<item id="92927" price="0" /> <!-- Anakim´s Soul Crystal Lv.13 (Rare) -->
-	<item id="92928" price="0" /> <!-- Anakim´s Soul Crystal Lv.14 (Rare) -->
-	<item id="92929" price="0" /> <!-- Anakim´s Soul Crystal Lv.15 (Rare) -->
-	<item id="91173" price="0" /> <!-- Lilith´s Soul Crystal Lv.1 (Rare) -->
-	<item id="91174" price="0" /> <!-- Lilith´s Soul Crystal Lv.2 (Rare) -->
-	<item id="91175" price="0" /> <!-- Lilith´s Soul Crystal Lv.3 (Rare) -->
-	<item id="91176" price="0" /> <!-- Lilith´s Soul Crystal Lv.4 (Rare) -->
-	<item id="91177" price="0" /> <!-- Lilith´s Soul Crystal Lv.5 (Rare) -->
-	<item id="91178" price="0" /> <!-- Lilith´s Soul Crystal Lv.6 (Rare) -->
-	<item id="91179" price="0" /> <!-- Lilith´s Soul Crystal Lv.7 (Rare) -->
-	<item id="91180" price="0" /> <!-- Lilith´s Soul Crystal Lv.8 (Rare) -->
-	<item id="91181" price="0" /> <!-- Lilith´s Soul Crystal Lv.9 (Rare) -->
-	<item id="91182" price="0" /> <!-- Lilith´s Soul Crystal Lv.10 (Rare) -->
-	<item id="92920" price="0" /> <!-- Lilith´s Soul Crystal Lv.11 (Rare) -->
-	<item id="92921" price="0" /> <!-- Lilith´s Soul Crystal Lv.12 (Rare) -->
-	<item id="92922" price="0" /> <!-- Lilith´s Soul Crystal Lv.13 (Rare) -->
-	<item id="92923" price="0" /> <!-- Lilith´s Soul Crystal Lv.14 (Rare) -->
-	<item id="92924" price="0" /> <!-- Lilith´s Soul Crystal Lv.15 (Rare) -->
+	<item id="91163" price="0" /> <!-- Anakim's Soul Crystal Lv.1 (Rare) -->
+	<item id="91164" price="0" /> <!-- Anakim's Soul Crystal Lv.2 (Rare) -->
+	<item id="91165" price="0" /> <!-- Anakim's Soul Crystal Lv.3 (Rare) -->
+	<item id="91166" price="0" /> <!-- Anakim's Soul Crystal Lv.4 (Rare) -->
+	<item id="91167" price="0" /> <!-- Anakim's Soul Crystal Lv.5 (Rare) -->
+	<item id="91168" price="0" /> <!-- Anakim's Soul Crystal Lv.6 (Rare) -->
+	<item id="91169" price="0" /> <!-- Anakim's Soul Crystal Lv.7 (Rare) -->
+	<item id="91170" price="0" /> <!-- Anakim's Soul Crystal Lv.8 (Rare) -->
+	<item id="91171" price="0" /> <!-- Anakim's Soul Crystal Lv.9 (Rare) -->
+	<item id="91172" price="0" /> <!-- Anakim's Soul Crystal Lv.10 (Rare) -->
+	<item id="92925" price="0" /> <!-- Anakim's Soul Crystal Lv.11 (Rare) -->
+	<item id="92926" price="0" /> <!-- Anakim's Soul Crystal Lv.12 (Rare) -->
+	<item id="92927" price="0" /> <!-- Anakim's Soul Crystal Lv.13 (Rare) -->
+	<item id="92928" price="0" /> <!-- Anakim's Soul Crystal Lv.14 (Rare) -->
+	<item id="92929" price="0" /> <!-- Anakim's Soul Crystal Lv.15 (Rare) -->
+	<item id="91173" price="0" /> <!-- Lilith's Soul Crystal Lv.1 (Rare) -->
+	<item id="91174" price="0" /> <!-- Lilith's Soul Crystal Lv.2 (Rare) -->
+	<item id="91175" price="0" /> <!-- Lilith's Soul Crystal Lv.3 (Rare) -->
+	<item id="91176" price="0" /> <!-- Lilith's Soul Crystal Lv.4 (Rare) -->
+	<item id="91177" price="0" /> <!-- Lilith's Soul Crystal Lv.5 (Rare) -->
+	<item id="91178" price="0" /> <!-- Lilith's Soul Crystal Lv.6 (Rare) -->
+	<item id="91179" price="0" /> <!-- Lilith's Soul Crystal Lv.7 (Rare) -->
+	<item id="91180" price="0" /> <!-- Lilith's Soul Crystal Lv.8 (Rare) -->
+	<item id="91181" price="0" /> <!-- Lilith's Soul Crystal Lv.9 (Rare) -->
+	<item id="91182" price="0" /> <!-- Lilith's Soul Crystal Lv.10 (Rare) -->
+	<item id="92920" price="0" /> <!-- Lilith's Soul Crystal Lv.11 (Rare) -->
+	<item id="92921" price="0" /> <!-- Lilith's Soul Crystal Lv.12 (Rare) -->
+	<item id="92922" price="0" /> <!-- Lilith's Soul Crystal Lv.13 (Rare) -->
+	<item id="92923" price="0" /> <!-- Lilith's Soul Crystal Lv.14 (Rare) -->
+	<item id="92924" price="0" /> <!-- Lilith's Soul Crystal Lv.15 (Rare) -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020001.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020001.xml
index f75583bd9f..d6aefb919f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020001.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020001.xml
@@ -55,7 +55,7 @@
 	<item id="48046" price="0" /> <!-- Scroll: Enchant Agathion -->
 	<item id="90963" price="0" /> <!-- Stable Scroll: Enchant Agathion -->
 	<item id="91623" price="0" /> <!-- Stable Scroll: Enchant High Quality Agathion -->
-	<item id="93040" price="0" /> <!-- Stable Scroll: Enchant Adventurer´s Agathion Griffin -->
+	<item id="93040" price="0" /> <!-- Stable Scroll: Enchant Adventurer's Agathion Griffin -->
 	<item id="93133" price="0" /> <!-- Scroll: Enchant Agathion -->
 	<item id="91159" price="0" /> <!-- Agathion Exchange Coupon -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020002.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020002.xml
index 3a13b785e9..77c46e2cdf 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020002.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020002.xml
@@ -11,19 +11,19 @@
 	<item id="90788" price="0" /> <!-- Fire Dragon Belt (7-Day) -->
 	<item id="90861" price="0" /> <!-- Fire Dragon Belt (30-Day) -->
 	<item id="90985" price="0" /> <!-- Earth Dragon Belt (30-Day) -->
-	<item id="91095" price="0" /> <!-- Earth Dragon Belt - Venir´s Blessing Lv1 -->
-	<item id="91096" price="0" /> <!-- Earth Dragon Belt - Venir´s Blessing Lv2 -->
-	<item id="91097" price="0" /> <!-- Earth Dragon Belt - Venir´s Blessing Lv3 -->
-	<item id="91098" price="0" /> <!-- Fire Dragon Belt - Venir´s Blessing Lv1 -->
-	<item id="91099" price="0" /> <!-- Fire Dragon Belt - Venir´s Blessing Lv2 -->
-	<item id="91100" price="0" /> <!-- Fire Dragon Belt - Venir´s Blessing Lv3 -->
-	<item id="91146" price="0" /> <!-- Earth Dragon Belt - Venir´s Blessing Lv4 -->
-	<item id="91147" price="0" /> <!-- Fire Dragon Belt - Venir´s Blessing Lv4 -->
+	<item id="91095" price="0" /> <!-- Earth Dragon Belt - Venir's Blessing Lv1 -->
+	<item id="91096" price="0" /> <!-- Earth Dragon Belt - Venir's Blessing Lv2 -->
+	<item id="91097" price="0" /> <!-- Earth Dragon Belt - Venir's Blessing Lv3 -->
+	<item id="91098" price="0" /> <!-- Fire Dragon Belt - Venir's Blessing Lv1 -->
+	<item id="91099" price="0" /> <!-- Fire Dragon Belt - Venir's Blessing Lv2 -->
+	<item id="91100" price="0" /> <!-- Fire Dragon Belt - Venir's Blessing Lv3 -->
+	<item id="91146" price="0" /> <!-- Earth Dragon Belt - Venir's Blessing Lv4 -->
+	<item id="91147" price="0" /> <!-- Fire Dragon Belt - Venir's Blessing Lv4 -->
 	<item id="91862" price="0" /> <!-- Dragon Belt -->
-	<item id="91862" price="0" /> <!-- Adventurer´s Belt -->
+	<item id="91862" price="0" /> <!-- Adventurer's Belt -->
 	<item id="94623" price="0" /> <!-- Belt Craft Coupon -->
 	<item id="91863" price="0" /> <!-- Scroll: Enchant Dragon Belt -->
-	<item id="93046" price="0" /> <!-- Scroll: Enchant Adventurer´s Belt -->
+	<item id="93046" price="0" /> <!-- Scroll: Enchant Adventurer's Belt -->
 	<item id="93717" price="0" /> <!-- +3 Talisman/Belt Coupon -->
 	<item id="93718" price="0" /> <!-- +4 Talisman/Belt Coupon -->
 	<item id="93719" price="0" /> <!-- +5 Talisman/Belt Coupon -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020003.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020003.xml
index 6634be2a44..8daa3b4a67 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020003.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020003.xml
@@ -28,6 +28,6 @@
 	<item id="91003" price="0" /> <!-- Agathion Bracelet Lv. 1 (1-Day) -->
 	<item id="91060" price="0" /> <!-- Bracelet of Authority -->
 	<item id="91415" price="0" /> <!-- Bracelet of Authority (30-Day) -->
-	<item id="91993" price="0" /> <!-- Adventurer´s Agathion Bracelet -->
-	<item id="91994" price="0" /> <!-- Adventurer´s Bracelet -->
+	<item id="91993" price="0" /> <!-- Adventurer's Agathion Bracelet -->
+	<item id="91994" price="0" /> <!-- Adventurer's Bracelet -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020004.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020004.xml
index 96c61fb1c5..c10abbce14 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020004.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020004.xml
@@ -10,5 +10,5 @@
 	<item id="91417" price="0" /> <!-- Brooch lv.4 (30-Day) -->
 	<item id="91304" price="0" /> <!-- Brooch lv.5 -->
 	<item id="91760" price="0" /> <!-- Brooch lv.5 (30-Day) -->
-	<item id="91932" price="0" /> <!-- Adventurer´s Brooch -->
+	<item id="91932" price="0" /> <!-- Adventurer's Brooch -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020005.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020005.xml
index 1631b3531f..155b820f5f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020005.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020005.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="21713" price="0" /> <!-- Zaken´s Sealed Cloak -->
-	<item id="21716" price="0" /> <!-- Zaken´s Cloak -->
-	<item id="90973" price="0" /> <!-- Zaken´s Cloak (30-Day) -->
-	<item id="30372" price="0" /> <!-- Hero´s Cloak -->
+	<item id="21713" price="0" /> <!-- Zaken's Sealed Cloak -->
+	<item id="21716" price="0" /> <!-- Zaken's Cloak -->
+	<item id="90973" price="0" /> <!-- Zaken's Cloak (30-Day) -->
+	<item id="30372" price="0" /> <!-- Hero's Cloak -->
 	<item id="30373" price="0" /> <!-- Glorious Cloak -->
 	<item id="34925" price="0" /> <!-- Cloak of Light -->
 	<item id="34926" price="0" /> <!-- Cloak of Darkness -->
-	<item id="91210" price="0" /> <!-- Black Sayha´s Cloak -->
-	<item id="91211" price="0" /> <!-- White Sayha´s Cloak -->
-	<item id="91212" price="0" /> <!-- Red Sayha´s Cloak -->
-	<item id="91719" price="0" /> <!-- Special Black Sayha´s Cloak -->
-	<item id="91720" price="0" /> <!-- Special White Sayha´s Cloak -->
-	<item id="91721" price="0" /> <!-- Special Red Sayha´s Cloak -->
-	<item id="93041" price="0" /> <!-- Adventurer´s Cloak -->
+	<item id="91210" price="0" /> <!-- Black Sayha's Cloak -->
+	<item id="91211" price="0" /> <!-- White Sayha's Cloak -->
+	<item id="91212" price="0" /> <!-- Red Sayha's Cloak -->
+	<item id="91719" price="0" /> <!-- Special Black Sayha's Cloak -->
+	<item id="91720" price="0" /> <!-- Special White Sayha's Cloak -->
+	<item id="91721" price="0" /> <!-- Special Red Sayha's Cloak -->
+	<item id="93041" price="0" /> <!-- Adventurer's Cloak -->
 	<item id="93301" price="0" /> <!-- Cloak of Protection -->
-	<item id="94372" price="0" /> <!-- Death Knight´s Cloak BM -->
-	<item id="91227" price="0" /> <!-- Sayha´s Cloak Coupon -->
+	<item id="94372" price="0" /> <!-- Death Knight's Cloak BM -->
+	<item id="91227" price="0" /> <!-- Sayha's Cloak Coupon -->
 	<item id="93302" price="0" /> <!-- Scroll: Enchant Cloak of Protection -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020006.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020006.xml
index 278f4ac783..35bfa3cba2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020006.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020006.xml
@@ -10,7 +10,7 @@
 	<item id="91423" price="0" /> <!-- Baium Doll Lv. 3 -->
 	<item id="94155" price="0" /> <!-- Orfen Doll Lv. 1 -->
 	<item id="91424" price="0" /> <!-- Orfen Doll Lv. 3 -->
-	<item id="91604" price="0" /> <!-- Rare Frintezza´s Doll Lv. 2 -->
-	<item id="94509" price="0" /> <!-- Frintezza´s Doll Lv. 1 -->
-	<item id="91605" price="0" /> <!-- Frintezza´s Doll Lv. 3 -->
+	<item id="91604" price="0" /> <!-- Rare Frintezza's Doll Lv. 2 -->
+	<item id="94509" price="0" /> <!-- Frintezza's Doll Lv. 1 -->
+	<item id="91605" price="0" /> <!-- Frintezza's Doll Lv. 3 -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020007.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020007.xml
index 4aa18239df..9d055b0723 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020007.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020007.xml
@@ -75,32 +75,32 @@
 	<item id="91073" price="0" /> <!-- Radiant Talisman of Authority Lv. 3 -->
 	<item id="91074" price="0" /> <!-- Radiant Talisman of Authority Lv. 4 -->
 	<item id="91075" price="0" /> <!-- Radiant Talisman of Authority Lv. 5 -->
-	<item id="91077" price="0" /> <!-- Venir´s Talisman Lv. 1 -->
-	<item id="91078" price="0" /> <!-- Venir´s Talisman Lv. 2 -->
-	<item id="91079" price="0" /> <!-- Venir´s Talisman Lv. 3 -->
-	<item id="91080" price="0" /> <!-- Venir´s Talisman Lv. 4 -->
-	<item id="91081" price="0" /> <!-- Venir´s Talisman Lv. 5 -->
-	<item id="91082" price="0" /> <!-- Venir´s Talisman Lv. 6 -->
-	<item id="91083" price="0" /> <!-- Venir´s Talisman Lv. 7 -->
-	<item id="91084" price="0" /> <!-- Venir´s Talisman Lv. 8 -->
-	<item id="91085" price="0" /> <!-- Venir´s Talisman Lv. 9 -->
-	<item id="91086" price="0" /> <!-- Venir´s Talisman Lv. 10 -->
-	<item id="91087" price="0" /> <!-- Venir´s Talisman Lv. 11 -->
-	<item id="91088" price="0" /> <!-- Venir´s Talisman Lv. 12 -->
-	<item id="91089" price="0" /> <!-- Venir´s Talisman Lv. 13 -->
-	<item id="91090" price="0" /> <!-- Venir´s Talisman Lv. 14 -->
-	<item id="91091" price="0" /> <!-- Venir´s Talisman Lv. 15 -->
-	<item id="91092" price="0" /> <!-- Venir´s Talisman Lv. 16 -->
-	<item id="91093" price="0" /> <!-- Venir´s Talisman Lv. 17 -->
-	<item id="91094" price="0" /> <!-- Venir´s Talisman Lv. 18 -->
-	<item id="91140" price="0" /> <!-- Venir´s Talisman Lv. 19 -->
-	<item id="91141" price="0" /> <!-- Venir´s Talisman Lv. 20 -->
-	<item id="91142" price="0" /> <!-- Venir´s Talisman Lv. 21 -->
-	<item id="91143" price="0" /> <!-- Venir´s Talisman Lv. 22 -->
-	<item id="91144" price="0" /> <!-- Venir´s Talisman Lv. 23 -->
-	<item id="91145" price="0" /> <!-- Venir´s Talisman Lv. 24 -->
-	<item id="91791" price="0" /> <!-- Venir´s Talisman Lv. 25 -->
-	<item id="91792" price="0" /> <!-- Venir´s Talisman Lv. 26 -->
+	<item id="91077" price="0" /> <!-- Venir's Talisman Lv. 1 -->
+	<item id="91078" price="0" /> <!-- Venir's Talisman Lv. 2 -->
+	<item id="91079" price="0" /> <!-- Venir's Talisman Lv. 3 -->
+	<item id="91080" price="0" /> <!-- Venir's Talisman Lv. 4 -->
+	<item id="91081" price="0" /> <!-- Venir's Talisman Lv. 5 -->
+	<item id="91082" price="0" /> <!-- Venir's Talisman Lv. 6 -->
+	<item id="91083" price="0" /> <!-- Venir's Talisman Lv. 7 -->
+	<item id="91084" price="0" /> <!-- Venir's Talisman Lv. 8 -->
+	<item id="91085" price="0" /> <!-- Venir's Talisman Lv. 9 -->
+	<item id="91086" price="0" /> <!-- Venir's Talisman Lv. 10 -->
+	<item id="91087" price="0" /> <!-- Venir's Talisman Lv. 11 -->
+	<item id="91088" price="0" /> <!-- Venir's Talisman Lv. 12 -->
+	<item id="91089" price="0" /> <!-- Venir's Talisman Lv. 13 -->
+	<item id="91090" price="0" /> <!-- Venir's Talisman Lv. 14 -->
+	<item id="91091" price="0" /> <!-- Venir's Talisman Lv. 15 -->
+	<item id="91092" price="0" /> <!-- Venir's Talisman Lv. 16 -->
+	<item id="91093" price="0" /> <!-- Venir's Talisman Lv. 17 -->
+	<item id="91094" price="0" /> <!-- Venir's Talisman Lv. 18 -->
+	<item id="91140" price="0" /> <!-- Venir's Talisman Lv. 19 -->
+	<item id="91141" price="0" /> <!-- Venir's Talisman Lv. 20 -->
+	<item id="91142" price="0" /> <!-- Venir's Talisman Lv. 21 -->
+	<item id="91143" price="0" /> <!-- Venir's Talisman Lv. 22 -->
+	<item id="91144" price="0" /> <!-- Venir's Talisman Lv. 23 -->
+	<item id="91145" price="0" /> <!-- Venir's Talisman Lv. 24 -->
+	<item id="91791" price="0" /> <!-- Venir's Talisman Lv. 25 -->
+	<item id="91792" price="0" /> <!-- Venir's Talisman Lv. 26 -->
 	<item id="91592" price="0" /> <!-- Dimensional Talisman Lv. 1 -->
 	<item id="91593" price="0" /> <!-- Dimensional Talisman Lv. 2 -->
 	<item id="91594" price="0" /> <!-- Dimensional Talisman Lv. 3 -->
@@ -113,7 +113,7 @@
 	<item id="91601" price="0" /> <!-- Dimensional Talisman Lv. 10 -->
 	<item id="91637" price="0" /> <!-- Anniversary Talisman -->
 	<item id="91745" price="0" /> <!-- Talisman of Aden -->
-	<item id="91937" price="0" /> <!-- Adventurer´s Talisman -->
+	<item id="91937" price="0" /> <!-- Adventurer's Talisman -->
 	<item id="92403" price="0" /> <!-- Talisman of Speed -->
 	<item id="92018" price="0" /> <!-- Talisman of Eva -->
 	<item id="94119" price="0" /> <!-- Talisman of Baium(Sealed) -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020008.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020008.xml
index 62627d1a58..a46de855df 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020008.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0020008.xml
@@ -9,8 +9,8 @@
 	<item id="91246" price="0" /> <!-- Dragon Pendant Lv. 3 -->
 	<item id="91247" price="0" /> <!-- Dragon Pendant Lv. 4 -->
 	<item id="91248" price="0" /> <!-- Blessed Dragon Pendant -->
-	<item id="93296" price="0" /> <!-- Einhasad´s Pendant Lv. 1 -->
-	<item id="93297" price="0" /> <!-- Einhasad´s Pendant Lv. 2 -->
-	<item id="93298" price="0" /> <!-- Einhasad´s Pendant Lv. 3 -->
-	<item id="93299" price="0" /> <!-- Einhasad´s Pendant Lv. 4 -->
+	<item id="93296" price="0" /> <!-- Einhasad's Pendant Lv. 1 -->
+	<item id="93297" price="0" /> <!-- Einhasad's Pendant Lv. 2 -->
+	<item id="93298" price="0" /> <!-- Einhasad's Pendant Lv. 3 -->
+	<item id="93299" price="0" /> <!-- Einhasad's Pendant Lv. 4 -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0030050001.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0030050001.xml
index a99f30147b..962f274a28 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0030050001.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0030050001.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="92755" price="0" /> <!-- Zubei´s Breastplate Part -->
-	<item id="92756" price="0" /> <!-- Zubei´s Gaiters Material -->
-	<item id="92759" price="0" /> <!-- Zubei´s Leather Shirt Fabric -->
-	<item id="92760" price="0" /> <!-- Zubei´s Leather Gaiter Texture -->
+	<item id="92755" price="0" /> <!-- Zubei's Breastplate Part -->
+	<item id="92756" price="0" /> <!-- Zubei's Gaiters Material -->
+	<item id="92759" price="0" /> <!-- Zubei's Leather Shirt Fabric -->
+	<item id="92760" price="0" /> <!-- Zubei's Leather Gaiter Texture -->
 	<item id="92757" price="0" /> <!-- Avadon Breastplate Part -->
 	<item id="92758" price="0" /> <!-- Avadon Gaiters Material -->
 	<item id="92761" price="0" /> <!-- Avadon Leather Armor Lining -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0030050002.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0030050002.xml
index 08c1f07d75..2ae7cf8bc9 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0030050002.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0030050002.xml
@@ -3,7 +3,7 @@
 	<item id="92788" price="0" /> <!-- Pata Blade -->
 	<item id="92789" price="0" /> <!-- Great Sword Blade -->
 	<item id="92790" price="0" /> <!-- Heavy War Axe Head -->
-	<item id="92791" price="0" /> <!-- Spirit´s Staff Head -->
+	<item id="92791" price="0" /> <!-- Spirit's Staff Head -->
 	<item id="92792" price="0" /> <!-- Keshanberk Blade -->
 	<item id="92793" price="0" /> <!-- Sword of Valhalla Blade -->
 	<item id="92794" price="0" /> <!-- Kris Edge -->
@@ -13,9 +13,9 @@
 	<item id="92798" price="0" /> <!-- Great Axe Head -->
 	<item id="92799" price="0" /> <!-- Damascus Sword Blade -->
 	<item id="92800" price="0" /> <!-- Lance Blade -->
-	<item id="92801" price="0" /> <!-- Deadman´s Glory Stone -->
+	<item id="92801" price="0" /> <!-- Deadman's Glory Stone -->
 	<item id="92802" price="0" /> <!-- Art of Battle Axe Blade -->
-	<item id="92804" price="0" /> <!-- Demon´s Dagger Edge -->
+	<item id="92804" price="0" /> <!-- Demon's Dagger Edge -->
 	<item id="92805" price="0" /> <!-- Bellion Cestus Edge -->
 	<item id="92806" price="0" /> <!-- Bow of Peril Shaft -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0030051002.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0030051002.xml
index bda5734f08..f23114d6e4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0030051002.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0030051002.xml
@@ -4,8 +4,8 @@
 	<item id="92865" price="0" /> <!-- Imperial Staff Head -->
 	<item id="92868" price="0" /> <!-- Divine Spear Blade -->
 	<item id="92869" price="0" /> <!-- Demon Splinter Blade -->
-	<item id="92870" price="0" /> <!-- Heaven´s Divider Edge -->
+	<item id="92870" price="0" /> <!-- Heaven's Divider Edge -->
 	<item id="92871" price="0" /> <!-- Arcana Mace Head -->
 	<item id="92889" price="0" /> <!-- Draconic Bow Shaft -->
-	<item id="93911" price="0" /> <!-- Flame´s Sword´s Blade -->
+	<item id="93911" price="0" /> <!-- Flame's Sword's Blade -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0030056002.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0030056002.xml
index 76edbade05..6a8a587098 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0030056002.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0030056002.xml
@@ -11,9 +11,9 @@
 	<item id="92848" price="0" /> <!-- Blood Tornado Edge -->
 	<item id="92849" price="0" /> <!-- Tallum Glaive Edge -->
 	<item id="92850" price="0" /> <!-- Halberd Edge -->
-	<item id="92851" price="0" /> <!-- Desparion´s Staff Head Edge -->
+	<item id="92851" price="0" /> <!-- Desparion's Staff Head Edge -->
 	<item id="92852" price="0" /> <!-- Branch of Mother Tree Head -->
-	<item id="92853" price="0" /> <!-- Dark Legion´s Edge Blade -->
+	<item id="92853" price="0" /> <!-- Dark Legion's Edge Blade -->
 	<item id="92854" price="0" /> <!-- Sword of Miracles -->
 	<item id="92855" price="0" /> <!-- Elemental Sword Edge -->
 	<item id="92856" price="0" /> <!-- Tallum Blade Edge -->
@@ -21,13 +21,13 @@
 	<item id="92893" price="0" /> <!-- Flaming Dragon Skull Piece -->
 	<item id="92895" price="0" /> <!-- Destroyer Hammer Piece -->
 	<item id="92891" price="0" /> <!-- Infernal Master Blade -->
-	<item id="92897" price="0" /> <!-- Sirra´s Blade Edge -->
+	<item id="92897" price="0" /> <!-- Sirra's Blade Edge -->
 	<item id="92898" price="0" /> <!-- Sword of Ipos -->
-	<item id="92899" price="0" /> <!-- Barakiel´s Axe Piece -->
-	<item id="92900" price="0" /> <!-- Behemoth´s Tunning Piece -->
-	<item id="92901" price="0" /> <!-- Naga´s Storm Piece -->
-	<item id="92902" price="0" /> <!-- Tiphon´s Spear Edge -->
-	<item id="92903" price="0" /> <!-- Shyeed´s Bow Shaft -->
-	<item id="92905" price="0" /> <!-- Themis´Tongue Piece -->
+	<item id="92899" price="0" /> <!-- Barakiel's Axe Piece -->
+	<item id="92900" price="0" /> <!-- Behemoth's Tunning Piece -->
+	<item id="92901" price="0" /> <!-- Naga's Storm Piece -->
+	<item id="92902" price="0" /> <!-- Tiphon's Spear Edge -->
+	<item id="92903" price="0" /> <!-- Shyeed's Bow Shaft -->
+	<item id="92905" price="0" /> <!-- Themis' Tongue Piece -->
 	<item id="92907" price="0" /> <!-- Daimon Crystal Fragment -->
 </list>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0300539.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0300539.xml
index b3ab899ffa..6f74ceb05e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0300539.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0300539.xml
@@ -5,18 +5,18 @@
 	<item id="49505" price="0" /> <!-- Sealed Bootle -->
 	<item id="6353" price="0" /> <!-- Blue Gemstone -->
 	<item id="8765" price="0" /> <!-- Red Gem -->
-	<item id="8868" price="0" /> <!-- Ziggo´s Jewel -->
+	<item id="8868" price="0" /> <!-- Ziggo's Jewel -->
 	<item id="90045" price="0" /> <!-- Magical Tablet -->
 	<item id="91936" price="0" /> <!-- Adventure Rough Jewel Lv.1 -->
 	<item id="93065" price="0" /> <!-- Adventure Rough Jewel Lv.2 -->
-	<item id="91935" price="0" /> <!-- Adventurer´s Aghation Griffin -->
-	<item id="93040" price="0" /> <!-- Enchant Scroll Adventurer´s Aghation Griffin -->
-	<item id="93044" price="0" /> <!-- Adventurer´s Sheep Hat -->
-	<item id="93042" price="0" /> <!-- Adventurer´s Belt -->
-	<item id="93043" price="0" /> <!-- Enchant Scroll Adventurer´s Sheep Hat -->
-	<item id="93046" price="0" /> <!-- Enchant Scroll Adventurer´s Belt -->
-	<item id="93041" price="0" /> <!-- Adventurer´s Cloak -->
-	<item id="93045" price="0" /> <!-- Enchant Scroll Adventurer´s Cloak -->
+	<item id="91935" price="0" /> <!-- Adventurer's Aghation Griffin -->
+	<item id="93040" price="0" /> <!-- Enchant Scroll Adventurer's Aghation Griffin -->
+	<item id="93044" price="0" /> <!-- Adventurer's Sheep Hat -->
+	<item id="93042" price="0" /> <!-- Adventurer's Belt -->
+	<item id="93043" price="0" /> <!-- Enchant Scroll Adventurer's Sheep Hat -->
+	<item id="93046" price="0" /> <!-- Enchant Scroll Adventurer's Belt -->
+	<item id="93041" price="0" /> <!-- Adventurer's Cloak -->
+	<item id="93045" price="0" /> <!-- Enchant Scroll Adventurer's Cloak -->
 	<item id="91652" price="0" /> <!-- Giant Cobweb -->
 	<item id="91653" price="0" /> <!-- Venom Sac -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0300539002.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0300539002.xml
index 1972b1ca00..3c82f1a013 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0300539002.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/buylists/custom/0300539002.xml
@@ -43,9 +43,9 @@
 	<item id="49508" price="0" /> <!-- Normal Bait Event -->
 	<item id="49563" price="0" /> <!-- 1,000,000,000 Adena Event -->
 	<item id="49564" price="0" /> <!-- 10,000,000,000 Adena Event -->
-	<item id="49565" price="0" /> <!-- Misfety´s Gift Event -->
-	<item id="49566" price="0" /> <!-- Roa´s Gift Event -->
-	<item id="49567" price="0" /> <!-- Roa´s Lost Item Event -->
+	<item id="49565" price="0" /> <!-- Misfety's Gift Event -->
+	<item id="49566" price="0" /> <!-- Roa's Gift Event -->
+	<item id="49567" price="0" /> <!-- Roa's Lost Item Event -->
 	<item id="49697" price="0" /> <!-- Special Pirate Fruit Event -->
 	<item id="49775" price="0" /> <!-- Red Spined Event -->
 	<item id="49776" price="0" /> <!-- Green Spined Event -->
@@ -58,30 +58,30 @@
 	<item id="71738" price="0" /> <!-- Fire Dragon Pendant Chest +6 Event -->
 	<item id="94429" price="0" /> <!-- Primeval Isle Supplies Event -->
 	<item id="94430" price="0" /> <!-- Primeval Garden Supplies Event -->
-	<item id="93987" price="0" /> <!-- Primeval Isle´s Treasure Chest Event -->
-	<item id="93988" price="0" /> <!-- Alligator Island´s Treasure Chest Event -->
-	<item id="94431" price="0" /> <!-- Alligator Island´s Supplies Event -->
-	<item id="93989" price="0" /> <!-- Primeval Garden´s Treasure Chest Event -->
+	<item id="93987" price="0" /> <!-- Primeval Isle's Treasure Chest Event -->
+	<item id="93988" price="0" /> <!-- Alligator Island's Treasure Chest Event -->
+	<item id="94431" price="0" /> <!-- Alligator Island's Supplies Event -->
+	<item id="93989" price="0" /> <!-- Primeval Garden's Treasure Chest Event -->
 	<item id="93991" price="0" /> <!-- Tower of Insolence Treasure Chest Event -->
 	<item id="93982" price="0" /> <!-- Baium Treasure Chest Event -->
 	<item id="71775" price="0" /> <!-- Golden Ticket Event -->
 	<item id="90189" price="0" /> <!-- Blue Spined Event -->
-	<item id="90407" price="0" /> <!-- Chef´s Fish Stew - Victory Event -->
-	<item id="90408" price="0" /> <!-- Chef´s Fish Stew - Fire Event -->
-	<item id="90409" price="0" /> <!-- Chef´s Fish Stew - Water Event -->
-	<item id="90410" price="0" /> <!-- Chef´s Fish Stew - Wind Event -->
-	<item id="90410" price="0" /> <!-- Chef´s Fish Stew Box Event -->
+	<item id="90407" price="0" /> <!-- Chef's Fish Stew - Victory Event -->
+	<item id="90408" price="0" /> <!-- Chef's Fish Stew - Fire Event -->
+	<item id="90409" price="0" /> <!-- Chef's Fish Stew - Water Event -->
+	<item id="90410" price="0" /> <!-- Chef's Fish Stew - Wind Event -->
+	<item id="90410" price="0" /> <!-- Chef's Fish Stew Box Event -->
 	<item id="90793" price="0" /> <!-- Shiny Jewelry Box Event -->
 	<item id="90508" price="0" /> <!-- Special Dragon Fruit Lv.1 Event -->
 	<item id="90794" price="0" /> <!-- Shining Scroll of Mood Melody Event -->
 	<item id="90831" price="0" /> <!-- Transformation Scroll: White Assassin Event -->
-	<item id="90835" price="0" /> <!-- Life Control Tower´s Scroll of Blessing Event -->
-	<item id="90666" price="0" /> <!-- Sayha´s Storm Lv.1 Event -->
-	<item id="90874" price="0" /> <!-- Sayha´s Storm Lv.2 Event -->
-	<item id="93073" price="0" /> <!-- Sayha´s Storm Lv.3 Event -->
-	<item id="91776" price="0" /> <!-- Sayha´s Gust Event -->
+	<item id="90835" price="0" /> <!-- Life Control Tower's Scroll of Blessing Event -->
+	<item id="90666" price="0" /> <!-- Sayha's Storm Lv.1 Event -->
+	<item id="90874" price="0" /> <!-- Sayha's Storm Lv.2 Event -->
+	<item id="93073" price="0" /> <!-- Sayha's Storm Lv.3 Event -->
+	<item id="91776" price="0" /> <!-- Sayha's Gust Event -->
 	<item id="91157" price="0" /> <!-- Marphr Potion Event -->
-	<item id="91575" price="0" /> <!-- Scroll: Enchant Yogi´s Weapon Event -->
+	<item id="91575" price="0" /> <!-- Scroll: Enchant Yogi's Weapon Event -->
 	<item id="91689" price="0" /> <!-- Blessed Scroll of Escape Event -->
 	<item id="91690" price="0" /> <!-- Special HP Recovery Potion Event -->
 	<item id="91691" price="0" /> <!-- Special MP Recovery Potion Event -->
@@ -90,8 +90,8 @@
 	<item id="93370" price="0" /> <!-- Einhasad Blessing Scroll Event -->
 	<item id="91772" price="0" /> <!-- Scroll: PK Event -->
 	<item id="91777" price="0" /> <!-- Magic Fire Event -->
-	<item id="91793" price="0" /> <!-- Lakfi-Lakfi´s Fortune Box Event -->
-	<item id="91794" price="0" /> <!-- Lakfi-Lakfi´s Oink Event -->
+	<item id="91793" price="0" /> <!-- Lakfi-Lakfi's Fortune Box Event -->
+	<item id="91794" price="0" /> <!-- Lakfi-Lakfi's Oink Event -->
 	<item id="91795" price="0" /> <!-- Improved Star Candy Event -->
 	<item id="91796" price="0" /> <!-- Lucky Sack Event -->
 	<item id="91797" price="0" /> <!-- Lucky Sack Event -->
@@ -104,19 +104,19 @@
 	<item id="91849" price="0" /> <!-- Golden Piggy-Bank Event -->
 	<item id="91850" price="0" /> <!-- Piggy-Bank Event -->
 	<item id="91851" price="0" /> <!-- Golden Piggy-Bank Event -->
-	<item id="91852" price="0" /> <!-- Little Piggy´s Star Candy Event -->
-	<item id="91865" price="0" /> <!-- Paágrio´s Summoning Stick (PA Event) -->
+	<item id="91852" price="0" /> <!-- Little Piggy's Star Candy Event -->
+	<item id="91865" price="0" /> <!-- Paágrio's Summoning Stick (PA Event) -->
 	<item id="91867" price="0" /> <!-- Enchant Scroll (PA Event) -->
 	<item id="91868" price="0" /> <!-- Special Enchant Scroll (PA Event) -->
-	<item id="91911" price="0" /> <!-- Sayha´s Buff Scroll Event -->
-	<item id="93753" price="0" /> <!-- Sayha´s Cookie Event -->
-	<item id="93999" price="0" /> <!-- Sayha´s Blessing Cube (5000 pcs) Event -->
+	<item id="91911" price="0" /> <!-- Sayha's Buff Scroll Event -->
+	<item id="93753" price="0" /> <!-- Sayha's Cookie Event -->
+	<item id="93999" price="0" /> <!-- Sayha's Blessing Cube (5000 pcs) Event -->
 	<item id="91975" price="0" /> <!-- Combat Scroll Event -->
-	<item id="91983" price="0" /> <!-- Primeval Isle´s Time Stone Event -->
-	<item id="91984" price="0" /> <!-- Ancient Pirates´Tomb´s Time Stone Event -->
-	<item id="91985" price="0" /> <!-- Heavenly Rift´s Time Stone Event -->
-	<item id="92400" price="0" /> <!-- Forgotten Primeval Garden´s Time Stone Event -->
-	<item id="93904" price="0" /> <!-- Antharas´Lair´s Time Stone Event -->
+	<item id="91983" price="0" /> <!-- Primeval Isle's Time Stone Event -->
+	<item id="91984" price="0" /> <!-- Ancient Pirates' Tomb's Time Stone Event -->
+	<item id="91985" price="0" /> <!-- Heavenly Rift's Time Stone Event -->
+	<item id="92400" price="0" /> <!-- Forgotten Primeval Garden's Time Stone Event -->
+	<item id="93904" price="0" /> <!-- Antharas' Lair's Time Stone Event -->
 	<item id="93688" price="0" /> <!-- Honey Rice Cakes Event -->
 	<item id="93689" price="0" /> <!-- Honey Bean Cakes Event -->
 	<item id="93690" price="0" /> <!-- Honey Sesame Cakes Event -->
@@ -128,17 +128,17 @@
 	<item id="93701" price="0" /> <!-- Charging Stone of Random Craft - Charge Event -->
 	<item id="93707" price="0" /> <!-- Mark of Revenge Event -->
 	<item id="93709" price="0" /> <!-- High-grade Spellbook Chest Event -->
-	<item id="93753" price="0" /> <!-- Pumpkin Ghost´s Noble Candy Event -->
+	<item id="93753" price="0" /> <!-- Pumpkin Ghost's Noble Candy Event -->
 	<item id="93754" price="0" /> <!-- Halloween Mask Box Event -->
 	<item id="93916" price="0" /> <!-- Card Pounch Event -->
 	<item id="93918" price="0" /> <!-- Lucky Energy Card Event -->
-	<item id="93917" price="0" /> <!-- Drakan´s Special Card Pouch Event -->
-	<item id="93919" price="0" /> <!-- Drakan´s Reward Pack - Warrior Event -->
-	<item id="93920" price="0" /> <!-- Drakan´s Reward Pack - Hero Event -->
-	<item id="93921" price="0" /> <!-- Drakan´s Reward Pack - Angel Event -->
-	<item id="93922" price="0" /> <!-- Drakan´s Reward Pack - Demon Event -->
-	<item id="93923" price="0" /> <!-- Drakan´s Reward Pack - Orc Event -->
-	<item id="93923" price="0" /> <!-- Drakan´s Reward Pack - Orc Event -->
+	<item id="93917" price="0" /> <!-- Drakan's Special Card Pouch Event -->
+	<item id="93919" price="0" /> <!-- Drakan's Reward Pack - Warrior Event -->
+	<item id="93920" price="0" /> <!-- Drakan's Reward Pack - Hero Event -->
+	<item id="93921" price="0" /> <!-- Drakan's Reward Pack - Angel Event -->
+	<item id="93922" price="0" /> <!-- Drakan's Reward Pack - Demon Event -->
+	<item id="93923" price="0" /> <!-- Drakan's Reward Pack - Orc Event -->
+	<item id="93923" price="0" /> <!-- Drakan's Reward Pack - Orc Event -->
 	<item id="93993" price="0" /> <!-- Anniversary Gift Box Event -->
 	<item id="93993" price="0" /> <!-- Anniversary Cake Event -->
 	<item id="94052" price="0" /> <!-- Anniversary Coin Event -->
@@ -160,8 +160,8 @@
 	<item id="94196" price="0" /> <!-- New Year Lucky Pouch Event -->
 	<item id="94197" price="0" /> <!-- Rat Hole Key Event -->
 	<item id="94198" price="0" /> <!-- Order to Destroy Black Anvil Guild Camp Event -->
-	<item id="94199" price="0" /> <!-- Black Anvil Guild Camp´s Time Stone Event -->
-	<item id="94200" price="0" /> <!-- Scroll of Random Escape Black Anvil Guild Camp´s Event -->
+	<item id="94199" price="0" /> <!-- Black Anvil Guild Camp's Time Stone Event -->
+	<item id="94200" price="0" /> <!-- Scroll of Random Escape Black Anvil Guild Camp's Event -->
 	<item id="94201" price="0" /> <!-- Dark Bezoar Event -->
 	<item id="94202" price="0" /> <!-- Transformation Scroll: Queen Ant Event -->
 	<item id="94203" price="0" /> <!-- Transformation Scroll: Orfen Event -->
@@ -180,24 +180,24 @@
 	<item id="94215" price="0" /> <!-- Shiny Jewelry Box Event -->
 	<item id="94273" price="0" /> <!-- Chocolate Event -->
 	<item id="94274" price="0" /> <!-- White Chocolate Event -->
-	<item id="94290" price="0" /> <!-- Valentine´s Day Gift Basket Event -->
-	<item id="94291" price="0" /> <!-- White Day´s Gift Basket Event -->
+	<item id="94290" price="0" /> <!-- Valentine's Day Gift Basket Event -->
+	<item id="94291" price="0" /> <!-- White Day's Gift Basket Event -->
 	<item id="94291" price="0" /> <!-- Iron Gate Guild Gift Box Event -->
 	<item id="94380" price="0" /> <!-- Scroll: Boost Attack Event -->
 	<item id="94381" price="0" /> <!-- Scroll: Boost Defense Event -->
 	<item id="94384" price="0" /> <!-- Scroll: Enchant Rare Accessories Event -->
 	<item id="94386" price="0" /> <!-- Improved Scroll: Enchant Rare Accessories Event -->
-	<item id="94439" price="0" /> <!-- Augustina´s Essence Lv.1 Event -->
-	<item id="94440" price="0" /> <!-- Augustina´s Essence Lv.2 Event -->
+	<item id="94439" price="0" /> <!-- Augustina's Essence Lv.1 Event -->
+	<item id="94440" price="0" /> <!-- Augustina's Essence Lv.2 Event -->
 	<item id="94441" price="0" /> <!-- Festival Ticket Event -->
-	<item id="94442" price="0" /> <!-- Augustina´s Essence Lv.3 Event -->
-	<item id="94443" price="0" /> <!-- Augustina´s Essence Lv.4 Event -->
-	<item id="94444" price="0" /> <!-- Baium´s Trial Coupon Event -->
-	<item id="94449" price="0" /> <!-- Kit: Baium´s Trial Coupon Event -->
-	<item id="94445" price="0" /> <!-- Augustina´s Coupon Event -->
-	<item id="94446" price="0" /> <!-- Augustina´s Seed Event -->
-	<item id="94447" price="0" /> <!-- Augustina´s Daily Gift Box Event -->
-	<item id="94448" price="0" /> <!-- Augustina´s Gift Box Event -->
+	<item id="94442" price="0" /> <!-- Augustina's Essence Lv.3 Event -->
+	<item id="94443" price="0" /> <!-- Augustina's Essence Lv.4 Event -->
+	<item id="94444" price="0" /> <!-- Baium's Trial Coupon Event -->
+	<item id="94449" price="0" /> <!-- Kit: Baium's Trial Coupon Event -->
+	<item id="94445" price="0" /> <!-- Augustina's Coupon Event -->
+	<item id="94446" price="0" /> <!-- Augustina's Seed Event -->
+	<item id="94447" price="0" /> <!-- Augustina's Daily Gift Box Event -->
+	<item id="94448" price="0" /> <!-- Augustina's Gift Box Event -->
 	<item id="94482" price="0" /> <!-- Pet Treat Event -->
 	<item id="94483" price="0" /> <!-- Treat Coupon Event -->
 	<item id="94484" price="0" /> <!-- Pet Buff Scroll Event -->
@@ -236,20 +236,20 @@
 	<item id="94556" price="0" /> <!-- Iron Gate Guild Secret Box Event -->
 	<item id="94557" price="0" /> <!-- Iron Gate Guild Secret Box Event -->
 	<item id="94558" price="0" /> <!-- Iron Gate Guild Secret Box Event -->
-	<item id="94559" price="0" /> <!-- Sayha´s Blessing Scroll Event -->
-	<item id="94560" price="0" /> <!-- Iron Gate Guild´s Bronze Key Event -->
-	<item id="94561" price="0" /> <!-- Iron Gate Guild´s Bronze Key Fragment Event -->
+	<item id="94559" price="0" /> <!-- Sayha's Blessing Scroll Event -->
+	<item id="94560" price="0" /> <!-- Iron Gate Guild's Bronze Key Event -->
+	<item id="94561" price="0" /> <!-- Iron Gate Guild's Bronze Key Fragment Event -->
 	<item id="94562" price="0" /> <!-- Transformation Scroll: Queen Ant (High-grade) Event -->
 	<item id="94566" price="0" /> <!-- Unknown Coupon Event -->
-	<item id="94567" price="0" /> <!-- Zaken´s Headquarters Coupon Event -->
+	<item id="94567" price="0" /> <!-- Zaken's Headquarters Coupon Event -->
 	<item id="94568" price="0" /> <!-- Pirate Jewelry Box Event -->
-	<item id="94569" price="0" /> <!-- Zaken´s Treasure Chest Event -->
-	<item id="94615" price="0" /> <!-- Forgotten Primeval Garden´s Time Stone Event -->
-	<item id="94620" price="0" /> <!-- Primeval Isle´s Time Stone Event -->
+	<item id="94569" price="0" /> <!-- Zaken's Treasure Chest Event -->
+	<item id="94615" price="0" /> <!-- Forgotten Primeval Garden's Time Stone Event -->
+	<item id="94620" price="0" /> <!-- Primeval Isle's Time Stone Event -->
 	<item id="99026" price="0" /> <!-- Christmas Cube Event -->
-	<item id="10250" price="0" /> <!-- Adventurer´s Hat Event -->
+	<item id="10250" price="0" /> <!-- Adventurer's Hat Event -->
 	<item id="93415" price="0" /> <!-- Formal Wear Event -->
-	<item id="93421" price="0" /> <!-- Valakas´Necklace Event -->
+	<item id="93421" price="0" /> <!-- Valakas' Necklace Event -->
 	<item id="93996" price="0" /> <!-- Anniversary Party Hat Event -->
 	<item id="94614" price="0" /> <!-- Pirate Earring Event -->
 	<item id="47927" price="0" /> <!-- Magic Fan - Blue Event -->
@@ -258,6 +258,6 @@
 	<item id="93994" price="0" /> <!-- Anniversary Cheer Pompoms Event -->
 	<item id="71844" price="0" /> <!-- Cheer Pompoms From Don Quijote Event -->
 	<item id="91162" price="0" /> <!-- Golden Cheer Pompoms Event -->
-	<item id="91574" price="0" /> <!-- Yogi´s Weapon Event -->
+	<item id="91574" price="0" /> <!-- Yogi's Weapon Event -->
 
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30731.htm b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30731.htm
index 7d5bb217c7..daf4f90fc3 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30731.htm
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30731.htm
@@ -9,7 +9,7 @@ The Pet Manager Association is always happy to assist you and your pet.<br>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/exchange.htm">"Here is a Pet Coupon. Give me a pet."</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30827.htm b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30827.htm
index 830447a916..1a6e7f97c6 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30827.htm
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30827.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30828.htm b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30828.htm
index 0a7f19fda4..81b47f5ca8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30828.htm
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30828.htm
@@ -10,7 +10,7 @@ Pet Manager Waters:<br>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30829.htm b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30829.htm
index 61e46bf654..67f60c6f2e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30829.htm
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30829.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30830.htm b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30830.htm
index 6b1860ae08..26536da2b6 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30830.htm
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30830.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30831.htm b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30831.htm
index b707cd690d..04d1428ac0 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30831.htm
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/30831.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/31067.htm b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/31067.htm
index 9ff970708b..5963bbead2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/31067.htm
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/31067.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/31265.htm b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/31265.htm
index 5de92941aa..acd3d39c17 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/31265.htm
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/31265.htm
@@ -10,7 +10,7 @@ Perhaps I should write a book, eh? "The Impact of Striders on the History of the
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/31309.htm b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/31309.htm
index 9487647c8a..3d6ff06a25 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/31309.htm
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/31309.htm
@@ -10,7 +10,7 @@ Oh, hello. Ah, you noticed my pure-bred black-striped Alpine Cougar, eh? It is n
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/31954.htm b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/31954.htm
index c8025dde3e..e0218b5231 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/31954.htm
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/31954.htm
@@ -10,7 +10,7 @@ As the number of people who interested in raising pets increases these days, the
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/33579.htm b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/33579.htm
index c67cae00f5..cafc07db04 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/33579.htm
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/petmanager/33579.htm
@@ -7,7 +7,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">"I want to evolve a pet."</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/exchange.htm">"Here is a Pet Coupon. Give me a pet."</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/instances/DwellingOfSpirits.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/instances/DwellingOfSpirits.xml
index 24a5c3b457..c5467892ab 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/instances/DwellingOfSpirits.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/instances/DwellingOfSpirits.xml
@@ -35,13 +35,6 @@
 		<reset day="SUNDAY" hour="6" minute="30" />
 	</reenter>
 	<spawnlist>
-		<group name="ExitPortal" spawnByDefault="false">
-			<npc id="15970" x="-114343" y="-77747" z="-11442" heading="46786" /> <!-- Exit Portal -->
-			<npc id="15971" x="-114343" y="-77747" z="-11442" heading="46786" /> <!-- Exit Portal -->
-			<npc id="15972" x="-114343" y="-77720" z="-11442" heading="46786" /> <!-- Exit Portal -->
-			<npc id="15973" x="-114343" y="-77733" z="-11442" heading="46786" /> <!-- Exit Portal -->
-			<npc id="15974" x="-114343" y="-77755" z="-11442" heading="46786" /> <!-- Exit Portal -->
-		</group>
 		<group name="sealstone" spawnByDefault="true">
 			<npc id="34178" x="-114324" y="-78273" z="-11433" heading="15825" /> <!-- Seal Stone -->
 		</group>
@@ -49,77 +42,53 @@
 			<npc id="34176" x="-114324" y="-78273" z="-11433" heading="15474" /> <!-- Animael -->
 		</group>
 		<group name="NormalMobs" spawnByDefault="false">
-			<npc id="22272" x="-114091" y="-77461" z="-11443" heading="16383" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114048" y="-77429" z="-11443" heading="6673" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114045" y="-77406" z="-11443" heading="24645" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113837" y="-76943" z="-11443" heading="8327" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113945" y="-76923" z="-11443" heading="30858" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114859" y="-76897" z="-11443" heading="58120" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114785" y="-76841" z="-11443" heading="55942" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114711" y="-76987" z="-11443" heading="61107" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114699" y="-77113" z="-11443" heading="16383" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114723" y="-77045" z="-11443" heading="57831" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114852" y="-78363" z="-11443" heading="657" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114984" y="-78475" z="-11443" heading="1141" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114916" y="-78442" z="-11443" heading="65129" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114841" y="-78428" z="-11443" heading="63813" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114938" y="-78411" z="-11443" heading="9120" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113616" y="-78459" z="-11443" heading="30680" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113622" y="-78398" z="-11443" heading="28616" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113591" y="-78301" z="-11442" heading="37105" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113604" y="-78239" z="-11443" heading="35386" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113693" y="-78249" z="-11443" heading="29763" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113568" y="-78336" z="-11442" heading="28986" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113818" y="-78174" z="-11443" heading="55979" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-114618" y="-77313" z="-11443" heading="22097" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-113589" y="-78333" z="-11443" heading="30535" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-114840" y="-78561" z="-11443" heading="32322" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113933" y="-77703" z="-11443" heading="1785" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113872" y="-77793" z="-11443" heading="60399" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114852" y="-77864" z="-11443" heading="13028" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114822" y="-77925" z="-11443" heading="17015" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-114554" y="-78998" z="-11443" heading="8750" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114193" y="-78871" z="-11441" heading="32032" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114105" y="-79053" z="-11443" heading="2811" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114456" y="-79050" z="-11443" heading="30111" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-113845" y="-78477" z="-11443" heading="62467" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Corrupted Fairy -->
+			<npc id="22272" x="-114091" y="-77461" z="-11443" heading="16383" respawnTime="60sec" />
+			<npc id="22271" x="-114048" y="-77429" z="-11443" heading="6673" respawnTime="60sec" />
+			<npc id="22271" x="-114045" y="-77406" z="-11443" heading="24645" respawnTime="60sec" />
+			<npc id="22271" x="-113837" y="-76943" z="-11443" heading="8327" respawnTime="60sec" />
+			<npc id="22271" x="-113945" y="-76923" z="-11443" heading="30858" respawnTime="60sec" />
+			<npc id="22271" x="-114859" y="-76897" z="-11443" heading="58120" respawnTime="60sec" />
+			<npc id="22271" x="-114785" y="-76841" z="-11443" heading="55942" respawnTime="60sec" />
+			<npc id="22271" x="-114711" y="-76987" z="-11443" heading="61107" respawnTime="60sec" />
+			<npc id="22271" x="-114699" y="-77113" z="-11443" heading="16383" respawnTime="60sec" />
+			<npc id="22271" x="-114723" y="-77045" z="-11443" heading="57831" respawnTime="60sec" />
+			<npc id="22271" x="-114852" y="-78363" z="-11443" heading="657" respawnTime="60sec" />
+			<npc id="22271" x="-114984" y="-78475" z="-11443" heading="1141" respawnTime="60sec" />
+			<npc id="22271" x="-114916" y="-78442" z="-11443" heading="65129" respawnTime="60sec" />
+			<npc id="22271" x="-114841" y="-78428" z="-11443" heading="63813" respawnTime="60sec" />
+			<npc id="22271" x="-114938" y="-78411" z="-11443" heading="9120" respawnTime="60sec" />
+			<npc id="22271" x="-113616" y="-78459" z="-11443" heading="30680" respawnTime="60sec" />
+			<npc id="22271" x="-113622" y="-78398" z="-11443" heading="28616" respawnTime="60sec" />
+			<npc id="22271" x="-113591" y="-78301" z="-11442" heading="37105" respawnTime="60sec" />
+			<npc id="22271" x="-113604" y="-78239" z="-11443" heading="35386" respawnTime="60sec" />
+			<npc id="22271" x="-113693" y="-78249" z="-11443" heading="29763" respawnTime="60sec" />
+			<npc id="22271" x="-113568" y="-78336" z="-11442" heading="28986" respawnTime="60sec" />
+			<npc id="22271" x="-113818" y="-78174" z="-11443" heading="55979" respawnTime="60sec" />
+			<npc id="22272" x="-114618" y="-77313" z="-11443" heading="22097" respawnTime="60sec" />
+			<npc id="22272" x="-113589" y="-78333" z="-11443" heading="30535" respawnTime="60sec" />
+			<npc id="22272" x="-114840" y="-78561" z="-11443" heading="32322" respawnTime="60sec" />
+			<npc id="22271" x="-113933" y="-77703" z="-11443" heading="1785" respawnTime="60sec" />
+			<npc id="22271" x="-113872" y="-77793" z="-11443" heading="60399" respawnTime="60sec" />
+			<npc id="22271" x="-114852" y="-77864" z="-11443" heading="13028" respawnTime="60sec" />
+			<npc id="22271" x="-114822" y="-77925" z="-11443" heading="17015" respawnTime="60sec" />
+			<npc id="22272" x="-114554" y="-78998" z="-11443" heading="8750" respawnTime="60sec" />
+			<npc id="22271" x="-114193" y="-78871" z="-11441" heading="32032" respawnTime="60sec" />
+			<npc id="22271" x="-114105" y="-79053" z="-11443" heading="2811" respawnTime="60sec" />
+			<npc id="22271" x="-114456" y="-79050" z="-11443" heading="30111" respawnTime="60sec" />
+			<npc id="22272" x="-113845" y="-78477" z="-11443" heading="62467" respawnTime="60sec" />
+			<npc id="22271" x="-114676" y="-78345" z="-11439" heading="30937" respawnTime="60sec" />
 		</group>
 		<group name="ruipwave_1" spawnByDefault="false">
-			<npc id="22273" x="-113945" y="-76923" z="-11443" heading="30858" /> <!-- Ruip portal container-->
-			<npc id="22273" x="-114840" y="-78561" z="-11443" heading="32322" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114852" y="-77864" z="-11443" heading="13028" /> <!-- Ruip portal container-->
-			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113845" y="-78477" z="-11443" heading="62467" /> <!-- Ruip portal container-->
-			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113568" y="-78336" z="-11442" heading="28986" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113872" y="-77793" z="-11443" heading="60399" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113589" y="-78333" z="-11443" heading="30535" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113818" y="-78174" z="-11443" heading="55979" /> <!-- Ruip portal container -->
-		</group>
-		<group name="ruipwave_2" spawnByDefault="false">
-			<npc id="22273" x="-113622" y="-78398" z="-11443" heading="28616" /> <!-- Ruip portal container-->
-			<npc id="22273" x="-113622" y="-78398" z="-11443" heading="28616" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114323" y="-78914" z="-11443" heading="13828" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114840" y="-78561" z="-11443" heading="32322" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114785" y="-76841" z="-11443" heading="55942" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114554" y="-78998" z="-11443" heading="8750" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114841" y="-78428" z="-11443" heading="63813" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114840" y="-78561" z="-11443" heading="32322" /> <!-- Ruip portal container -->
-		</group>
-		<group name="portalearth" spawnByDefault="false">
-			<npc id="15971" x="-113516" y="-77521" z="-11419" heading="8750" />
-		</group>
-		<group name="portalwind" spawnByDefault="false">
-			<npc id="15969" x="-114554" y="-78998" z="-11443" heading="8750" />
-		</group>
-		<group name="portalfire" spawnByDefault="false">
-			<npc id="15970" x="-114554" y="-78998" z="-11443" heading="8750" />
-		</group>
-		<group name="portalwater" spawnByDefault="false">
-			<npc id="15972" x="-114554" y="-78998" z="-11443" heading="8750" />
+			<npc id="22273" x="-113945" y="-76923" z="-11443" heading="30858" respawnTime="60sec" />
+			<npc id="22273" x="-114840" y="-78561" z="-11443" heading="32322" respawnTime="60sec" />
+			<npc id="22273" x="-114852" y="-77864" z="-11443" heading="13028" respawnTime="60sec" />
+			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" respawnTime="60sec" />
+			<npc id="22273" x="-113845" y="-78477" z="-11443" heading="62467" respawnTime="60sec" />
+			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" respawnTime="60sec" />
+			<npc id="22273" x="-113568" y="-78336" z="-11442" heading="28986" respawnTime="60sec" />
+			<npc id="22273" x="-113872" y="-77793" z="-11443" heading="60399" respawnTime="60sec" />
+			<npc id="22273" x="-113589" y="-78333" z="-11443" heading="30535" respawnTime="60sec" />
+			<npc id="22273" x="-113818" y="-78174" z="-11443" heading="55979" respawnTime="60sec" />
 		</group>
 	</spawnlist>
 </instance>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/multisell/custom/600016.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/multisell/custom/600016.xml
index 15f5a77492..b1bbf39e7a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/multisell/custom/600016.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/multisell/custom/600016.xml
@@ -5,19 +5,19 @@
 	</npcs>
 	<item>
 		<!-- Adena -->
-		<ingredient count="20119720" id="57" />
+		<ingredient count="2119720" id="57" />
 		<!-- Zubei's Helmet -->
 		<production count="1" id="503" />
 	</item>
 	<item>
 		<!-- Adena -->
-		<ingredient count="4319200" id="57" />
+		<ingredient count="2319200" id="57" />
 		<!-- Zubei's Breastplate -->
 		<production count="1" id="357" />
 	</item>
 	<item>
 		<!-- Adena -->
-		<ingredient count="20199540" id="57" />
+		<ingredient count="2199540" id="57" />
 		<!-- Zubei's Gaiters -->
 		<production count="1" id="383" />
 	</item>
@@ -35,13 +35,13 @@
 	</item>
 	<item>
 		<!-- Adena -->
-		<ingredient count="3239400" id="57" />
+		<ingredient count="2410000" id="57" />
 		<!-- Tunic of Zubei -->
 		<production count="1" id="2397" />
 	</item>
 	<item>
 		<!-- Adena -->
-		<ingredient count="2149660" id="57" />
+		<ingredient count="2995400" id="57" />
 		<!-- Stockings of Zubei -->
 		<production count="1" id="2402" />
 	</item>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/34414.htm b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/34414.htm
new file mode 100644
index 0000000000..51ace5fb0f
--- /dev/null
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/34414.htm
@@ -0,0 +1,7 @@
+<html><body>Siben:<br>
+<br>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AztacanArea The_Midway_Gate">The Midway Gate (Lv. 70-87) - 100,000 adena</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AztacanArea The_Eastern_Gate">The Eastern Gate (Lv. 88+) - 100,000 adena</button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AztacanArea The_Western_Gate">The Western Gate (Lv. 88) - 100,000 adena</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AztacanArea Mineral_shop">Buy supplies and minerals</button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
new file mode 100644
index 0000000000..6606e36f7e
--- /dev/null
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
@@ -0,0 +1,190 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.DwellingOfSpiritsResidence;
+
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.SkillHolder;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.SkillCaster;
+
+import ai.AbstractNpcAI;
+
+/**
+ * @author RobikBobik
+ */
+public class ResidenceOfKingIgnis extends AbstractNpcAI
+{
+	// NPCs
+	private static final int IGNIS = 29105;
+	// Skills
+	private static final SkillHolder FIRE_RAG_1 = new SkillHolder(50050, 1);
+	private static final SkillHolder FIRE_RAG_2 = new SkillHolder(50050, 2);
+	private static final SkillHolder FIRE_RAG_3 = new SkillHolder(50050, 3);
+	private static final SkillHolder FIRE_RAG_4 = new SkillHolder(50050, 4);
+	private static final SkillHolder FIRE_RAG_5 = new SkillHolder(50050, 5);
+	private static final SkillHolder FIRE_RAG_6 = new SkillHolder(50050, 6);
+	private static final SkillHolder FIRE_RAG_7 = new SkillHolder(50050, 7);
+	private static final SkillHolder FIRE_RAG_8 = new SkillHolder(50050, 8);
+	private static final SkillHolder FIRE_RAG_9 = new SkillHolder(50050, 9);
+	private static final SkillHolder FIRE_RAG_10 = new SkillHolder(50050, 10);
+	
+	public ResidenceOfKingIgnis()
+	{
+		addAttackId(IGNIS);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "CAST_FIRE_RAGE_1":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_1.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_1.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_2":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_2.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_2.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_3":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_3.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_3.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_4":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_4.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_4.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_5":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_5.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_5.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_6":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_6.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_6.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_7":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_7.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_7.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_8":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_8.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_8.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_9":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_9.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_9.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_10":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_10.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_10.getSkill());
+				}
+				break;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
+	{
+		if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.99)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.70)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_1", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.70)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.50)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_2", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.50)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.40)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_3", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.40)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.25)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_4", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.25)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.15)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_5", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.15)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.10)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_6", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.10)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.7)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_7", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.7)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.5)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_8", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.5)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.3)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_9", 1000, npc, null);
+		}
+		else if (npc.getCurrentHp() < (npc.getMaxHp() * 0.3))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_10", 1000, npc, null);
+		}
+		return super.onAttack(npc, attacker, damage, isSummon, skill);
+	}
+	
+	public static void main(String[] args)
+	{
+		new ResidenceOfKingIgnis();
+	}
+}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
new file mode 100644
index 0000000000..0bb5893075
--- /dev/null
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
@@ -0,0 +1,309 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.DwellingOfSpiritsResidence;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.l2jmobius.gameserver.enums.ChatType;
+import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.SkillHolder;
+import org.l2jmobius.gameserver.model.instancezone.Instance;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.model.skill.Skill;
+
+import ai.AbstractNpcAI;
+
+public class ResidenceOfKingPetram extends AbstractNpcAI
+{
+	// NPCs
+	private static final int PETRAM = 29108;
+	private static final int PETRAM_PIECE = 29116;
+	private static final int PETRAM_FRAGMENT = 29117;
+	// Skills
+	private static final SkillHolder EARTH_ENERGY = new SkillHolder(50066, 1);
+	private static final SkillHolder EARTH_FURY = new SkillHolder(50059, 1);
+	private static final SkillHolder TEST = new SkillHolder(5712, 1);
+	
+	public ResidenceOfKingPetram()
+	{
+		addKillId(PETRAM_PIECE, PETRAM_FRAGMENT);
+		addAttackId(PETRAM);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "SPAWN_MINION":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if (world != null)
+				{
+					final Npc petram = world.getNpc(PETRAM);
+					petram.doCast(EARTH_ENERGY.getSkill());
+					
+					petram.setInvul(true);
+					petram.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.EARTH_KING_BARRIER2_AVE);
+					petram.updateAbnormalVisualEffects();
+					petram.broadcastSay(ChatType.NPC_SHOUT, "HaHa, fighters lets kill them. Now Im invul!!!");
+					
+					final int stage = getHigherStage(world);
+					for (int minionIndex = 0; minionIndex < StageData.getMinionsStageData(stage).length; minionIndex++)
+					{
+						final MinionData minionData = StageData.getMinionsStageData(stage)[minionIndex];
+						final Location minionLocation = minionData.getMinionLocation();
+						world.setParameter("minion" + minionIndex, addSpawn(npc, minionData.getMinionId(), minionLocation.getX(), minionLocation.getY(), minionLocation.getZ(), minionLocation.getHeading(), false, -1, true, npc.getInstanceId()));
+					}
+					
+					startQuestTimer("SUPPORT_PETRAM", 200, npc, null);
+				}
+				break;
+			}
+			case "SUPPORT_PETRAM":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if ((world != null) && (world.getNpc(PETRAM) != null) && !world.getNpc(PETRAM).isDead())
+				{
+					final int stage = getHigherStage(world);
+					for (int minionIndex = 0; minionIndex < StageData.getMinionsStageData(stage).length; minionIndex++)
+					{
+						world.getParameters().getObject("minion" + minionIndex, Npc.class).setTarget(world.getNpc(PETRAM));
+						world.getParameters().getObject("minion" + minionIndex, Npc.class).doCast(TEST.getSkill());
+					}
+					startQuestTimer("SUPPORT_PETRAM", 10100, npc, null);
+				}
+				break;
+			}
+			case "REMOVE_INVUL":
+			{
+				if (npc != null)
+				{
+					final Instance world = npc.getInstanceWorld();
+					if (world != null)
+					{
+						final Npc petram = world.getNpc(PETRAM);
+						if (petram != null)
+						{
+							petram.doCast(EARTH_FURY.getSkill());
+							petram.setInvul(false);
+							petram.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.EARTH_KING_BARRIER2_AVE);
+							petram.updateAbnormalVisualEffects();
+							petram.broadcastSay(ChatType.NPC_SHOUT, "Nooooo... Nooooo...");
+						}
+						
+						for (int i = 0; i < 12; i++)
+						{
+							final Npc minion = world.getParameters().getObject("minion" + i, Npc.class);
+							if (minion != null)
+							{
+								minion.deleteMe();
+							}
+						}
+					}
+				}
+				break;
+			}
+		}
+		
+		return null;
+	}
+	
+	private int getHigherStage(Instance world)
+	{
+		for (int stage = StageData.getMinionsStageData().size() - 1; stage >= 0; stage--)
+		{
+			if (world.getParameters().getBoolean("stage" + stage, false))
+			{
+				return stage;
+			}
+		}
+		
+		return 0;
+	}
+	
+	@Override
+	public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
+	{
+		final Instance world = npc.getInstanceWorld();
+		synchronized (this)
+		{
+			for (int stage = 0; stage < StageData.getMinionsStageData().size(); stage++)
+			{
+				if ((npc.getCurrentHpPercent() < StageData.getHpPercents()[stage]) && !world.getParameters().getBoolean("stage" + stage, false))
+				{
+					world.setParameter("stage" + stage, true);
+					startQuestTimer("SPAWN_MINION", 100, npc, null);
+				}
+			}
+		}
+		
+		return super.onAttack(npc, attacker, damage, isSummon, skill);
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player player, boolean isSummon)
+	{
+		final Instance world = npc.getInstanceWorld();
+		if (world == null)
+		{
+			return null;
+		}
+		
+		final int stage = getHigherStage(world);
+		int aliveMinionsCount = 0;
+		for (int minionIndex = 0; minionIndex < StageData.getMinionsStageData(stage).length; minionIndex++)
+		{
+			if ((world.getParameters().getObject("minion" + minionIndex, Npc.class) != null) && !world.getParameters().getObject("minion" + minionIndex, Npc.class).isDead())
+			{
+				aliveMinionsCount++;
+			}
+		}
+		
+		boolean breakInvul = false;
+		switch (stage)
+		{
+			case 0:
+			{
+				if (aliveMinionsCount == 0)
+				{
+					breakInvul = true;
+				}
+				break;
+			}
+			case 1:
+			{
+				if (aliveMinionsCount <= 4)
+				{
+					breakInvul = true;
+				}
+				break;
+			}
+			case 2:
+			{
+				if (aliveMinionsCount <= 6)
+				{
+					breakInvul = true;
+				}
+				break;
+			}
+		}
+		
+		if (breakInvul)
+		{
+			startQuestTimer("REMOVE_INVUL", 500, world.getNpc(PETRAM), null);
+		}
+		
+		return super.onKill(npc, player, isSummon);
+	}
+	
+	private static class StageData
+	{
+		private static final int[] _hpPercents = new int[]
+		{
+			75,
+			50,
+			10
+		};
+		private static final Map<Integer, MinionData[]> _minionsStageData = new HashMap<>();
+		static
+		{
+			// Stage 1
+			_minionsStageData.put(0, new MinionData[]
+			{
+				new MinionData(PETRAM_FRAGMENT, new Location(221543, 191530, -15486, 1131)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222069, 192019, -15486, 49364)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222595, 191479, -15486, 34013)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222077, 191017, -15486, 16383))
+			});
+			
+			// Stage 2
+			_minionsStageData.put(1, new MinionData[]
+			{
+				new MinionData(PETRAM_FRAGMENT, new Location(221069, 191544, -15486, 2280)),
+				new MinionData(PETRAM_FRAGMENT, new Location(221366, 192223, -15486, 56731)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222067, 192508, -15486, 50632)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222765, 192216, -15486, 39607)),
+				new MinionData(PETRAM_FRAGMENT, new Location(223057, 191472, -15486, 33154)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222773, 190814, -15486, 25376)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222063, 190516, -15486, 16383)),
+				new MinionData(PETRAM_FRAGMENT, new Location(221342, 190800, -15486, 10837))
+			});
+			// Stage 3
+			_minionsStageData.put(2, new MinionData[]
+			{
+				new MinionData(PETRAM_PIECE, new Location(221543, 191530, -15486, 1131)),
+				new MinionData(PETRAM_PIECE, new Location(222069, 192019, -15486, 49364)),
+				new MinionData(PETRAM_PIECE, new Location(222595, 191479, -15486, 34013)),
+				new MinionData(PETRAM_PIECE, new Location(222077, 191017, -15486, 16383)),
+				new MinionData(PETRAM_PIECE, new Location(221069, 191544, -15486, 2280)),
+				new MinionData(PETRAM_PIECE, new Location(221366, 192223, -15486, 56731)),
+				new MinionData(PETRAM_PIECE, new Location(222067, 192508, -15486, 50632)),
+				new MinionData(PETRAM_PIECE, new Location(222765, 192216, -15486, 39607)),
+				new MinionData(PETRAM_PIECE, new Location(223057, 191472, -15486, 33154)),
+				new MinionData(PETRAM_PIECE, new Location(222773, 190814, -15486, 25376)),
+				new MinionData(PETRAM_PIECE, new Location(222063, 190516, -15486, 16383)),
+				new MinionData(PETRAM_PIECE, new Location(221342, 190800, -15486, 10837))
+			});
+		}
+		
+		public static int[] getHpPercents()
+		{
+			return _hpPercents;
+		}
+		
+		public static Map<Integer, MinionData[]> getMinionsStageData()
+		{
+			return _minionsStageData;
+		}
+		
+		public static MinionData[] getMinionsStageData(int stage)
+		{
+			return _minionsStageData.get(stage);
+		}
+	}
+	
+	private static class MinionData
+	{
+		final int _minionId;
+		final Location _minionLocation;
+		
+		private MinionData(int minionId, Location minionLocation)
+		{
+			_minionId = minionId;
+			_minionLocation = minionLocation;
+		}
+		
+		public int getMinionId()
+		{
+			return _minionId;
+		}
+		
+		public Location getMinionLocation()
+		{
+			return _minionLocation;
+		}
+	}
+	
+	public static void main(String[] args)
+	{
+		new ResidenceOfKingPetram();
+	}
+}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
new file mode 100644
index 0000000000..d89d396c32
--- /dev/null
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
@@ -0,0 +1,179 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.DwellingOfSpiritsResidence;
+
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.SkillHolder;
+import org.l2jmobius.gameserver.model.instancezone.Instance;
+import org.l2jmobius.gameserver.model.skill.SkillCaster;
+
+import ai.AbstractNpcAI;
+
+/**
+ * @author RobikBobik, Mobius
+ */
+public class ResidenceOfKingProcella extends AbstractNpcAI
+{
+	// NPCs
+	private static final int PROCELLA = 29107;
+	private static final int PROCELLA_GUARDIAN_1 = 29112;
+	private static final int PROCELLA_GUARDIAN_2 = 29113;
+	private static final int PROCELLA_GUARDIAN_3 = 29114;
+	private static final int PROCELLA_STORM = 29115;
+	// Skills
+	private static final SkillHolder HURRICANE_SUMMON = new SkillHolder(50042, 1);
+	private static final int HURRICANE_BOLT = 50043;
+	private static final SkillHolder HURRICANE_BOLT_LV_1 = new SkillHolder(50043, 1);
+	// Misc
+	private static final int STORM_MAX_COUNT = 16;
+	
+	public ResidenceOfKingProcella()
+	{
+		addKillId(PROCELLA, PROCELLA_GUARDIAN_1, PROCELLA_GUARDIAN_2, PROCELLA_GUARDIAN_3);
+		addSpawnId(PROCELLA);
+	}
+	
+	@Override
+	public String onSpawn(Npc npc)
+	{
+		final Instance world = npc.getInstanceWorld();
+		if (world != null)
+		{
+			startQuestTimer("SPAWN_MINION", 300000 + getRandom(-15000, 15000), npc, null);
+			startQuestTimer("SPAWN_STORM", 5000, npc, null);
+			world.setParameter("stormCount", 0);
+		}
+		return null;
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "SPAWN_MINION":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if ((world != null) && (npc.getId() == PROCELLA))
+				{
+					world.setParameter("minion1", addSpawn(PROCELLA_GUARDIAN_1, 212663, 179421, -15486, 31011, true, 0, true, npc.getInstanceId()));
+					world.setParameter("minion2", addSpawn(PROCELLA_GUARDIAN_2, 213258, 179822, -15486, 12001, true, 0, true, npc.getInstanceId()));
+					world.setParameter("minion3", addSpawn(PROCELLA_GUARDIAN_3, 212558, 179974, -15486, 12311, true, 0, true, npc.getInstanceId()));
+					startQuestTimer("HIDE_PROCELLA", 1000, world.getNpc(PROCELLA), null);
+				}
+				break;
+			}
+			case "SPAWN_STORM":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if ((world != null) && (world.getParameters().getInt("stormCount", 0) < STORM_MAX_COUNT))
+				{
+					world.getNpc(PROCELLA).doCast(HURRICANE_SUMMON.getSkill());
+					final Npc procellaStorm = addSpawn(PROCELLA_STORM, world.getNpc(PROCELLA).getX() + getRandom(-500, 500), world.getNpc(PROCELLA).getY() + getRandom(-500, 500), world.getNpc(PROCELLA).getZ(), 31011, true, 0, true, npc.getInstanceId());
+					procellaStorm.setRandomWalking(true);
+					world.getParameters().increaseInt("stormCount", 1);
+					startQuestTimer("SPAWN_STORM", 60000, world.getNpc(PROCELLA), null);
+					startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", 100, procellaStorm, player);
+				}
+				break;
+			}
+			case "HIDE_PROCELLA":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if (world != null)
+				{
+					if (world.getNpc(PROCELLA).isInvisible())
+					{
+						world.getNpc(PROCELLA).setInvisible(false);
+					}
+					else
+					{
+						world.getNpc(PROCELLA).setInvisible(true);
+						startQuestTimer("SPAWN_MINION", 300000 + getRandom(-15000, 15000), world.getNpc(PROCELLA), player);
+					}
+				}
+				break;
+			}
+			case "CHECK_CHAR_INSIDE_RADIUS_NPC":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if (world != null)
+				{
+					final Player plr = world.getPlayers().stream().findAny().orElse(null); // Usamos orElse(null) para evitar el Optional vac��β€��’Β­o
+					if ((plr != null) && (plr.isInsideRadius3D(npc, 100)))
+					{
+						npc.abortAttack();
+						npc.abortCast();
+						npc.setTarget(plr);
+						
+						if (plr.getKnownSkill(HURRICANE_BOLT) != null) // Verificamos si el jugador tiene la habilidad
+						{
+							if (plr.getAffectedSkillLevel(HURRICANE_BOLT) == 1)
+							{
+								npc.abortCast();
+								startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", 100, npc, player);
+							}
+							else
+							{
+								if (SkillCaster.checkUseConditions(npc, HURRICANE_BOLT_LV_1.getSkill()))
+								{
+									npc.doCast(HURRICANE_BOLT_LV_1.getSkill());
+								}
+							}
+						}
+						startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", 100, npc, player);
+					}
+					else
+					{
+						startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", 100, npc, player);
+					}
+				}
+				break;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player player, boolean isSummon)
+	{
+		final Instance world = npc.getInstanceWorld();
+		if (world == null)
+		{
+			return null;
+		}
+		
+		if (npc.getId() == PROCELLA)
+		{
+			cancelQuestTimer("SPAWN_MINION", npc, player.getActingPlayer());
+			cancelQuestTimer("SPAWN_STORM", npc, player.getActingPlayer());
+			cancelQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", npc, player.getActingPlayer());
+		}
+		else if ((world.getParameters().getObject("minion1", Npc.class).isDead()) && (world.getParameters().getObject("minion2", Npc.class).isDead()) && (world.getParameters().getObject("minion3", Npc.class).isDead()))
+		{
+			startQuestTimer("HIDE_PROCELLA", 1000, world.getNpc(PROCELLA), null);
+		}
+		
+		return super.onKill(npc, player, isSummon);
+	}
+	
+	public static void main(String[] args)
+	{
+		new ResidenceOfKingProcella();
+	}
+}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
new file mode 100644
index 0000000000..9c3c7ea37b
--- /dev/null
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
@@ -0,0 +1,209 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.DwellingOfSpiritsResidence;
+
+import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.SkillHolder;
+import org.l2jmobius.gameserver.model.instancezone.Instance;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.SkillCaster;
+
+import ai.AbstractNpcAI;
+
+/**
+ * @author RobikBobik
+ */
+public class ResidenceOfQueenNebula extends AbstractNpcAI
+{
+	// NPCs
+	private static final int NEBULA = 29106;
+	private static final int WATER_SLIME = 29111;
+	// Skills
+	private static final int AQUA_RAGE = 50036;
+	private static final SkillHolder AQUA_RAGE_1 = new SkillHolder(AQUA_RAGE, 1);
+	private static final SkillHolder AQUA_RAGE_2 = new SkillHolder(AQUA_RAGE, 2);
+	private static final SkillHolder AQUA_RAGE_3 = new SkillHolder(AQUA_RAGE, 3);
+	private static final SkillHolder AQUA_RAGE_4 = new SkillHolder(AQUA_RAGE, 4);
+	private static final SkillHolder AQUA_RAGE_5 = new SkillHolder(AQUA_RAGE, 5);
+	private static final SkillHolder AQUA_SUMMON = new SkillHolder(50037, 1);
+	
+	public ResidenceOfQueenNebula()
+	{
+		addKillId(NEBULA, WATER_SLIME);
+		addAttackId(NEBULA);
+		addSpawnId(NEBULA);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "SPAWN_WATER_SLIME":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if (world != null)
+				{
+					final Player plr = world.getPlayers().stream().findAny().get();
+					startQuestTimer("CAST_AQUA_RAGE", 60000 + getRandom(-15000, 15000), npc, plr);
+					if (npc.getId() == NEBULA)
+					{
+						npc.doCast(AQUA_SUMMON.getSkill());
+						for (int i = 0; i < getRandom(4, 6); i++)
+						{
+							addSpawn(npc, WATER_SLIME, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, -1, true, npc.getInstanceId());
+							startQuestTimer("SPAWN_WATER_SLIME", 300000, npc, null);
+						}
+					}
+				}
+				break;
+			}
+			case "PLAYER_PARA":
+			{
+				if (player.getAffectedSkillLevel(AQUA_RAGE) == 5)
+				{
+					player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.FROZEN_PILLAR);
+					player.setImmobilized(true);
+					startQuestTimer("PLAYER_UNPARA", 5000, npc, player);
+				}
+				break;
+			}
+			case "PLAYER_UNPARA":
+			{
+				player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, AQUA_RAGE_5.getSkill());
+				player.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.FROZEN_PILLAR);
+				player.setImmobilized(false);
+				break;
+			}
+			case "CAST_AQUA_RAGE":
+			{
+				startQuestTimer("CAST_AQUA_RAGE", 5000, npc, player);
+				if ((player.isInsideRadius3D(npc, 1000)))
+				{
+					if (player.getAffectedSkillLevel(AQUA_RAGE) == 1)
+					{
+						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_2.getSkill()))
+						{
+							npc.doCast(AQUA_RAGE_2.getSkill());
+						}
+					}
+					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 2)
+					{
+						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_3.getSkill()))
+						{
+							npc.doCast(AQUA_RAGE_3.getSkill());
+						}
+					}
+					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 3)
+					{
+						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_4.getSkill()))
+						{
+							npc.doCast(AQUA_RAGE_4.getSkill());
+						}
+					}
+					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 4)
+					{
+						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_5.getSkill()))
+						{
+							npc.doCast(AQUA_RAGE_5.getSkill());
+							startQuestTimer("PLAYER_PARA", 100, npc, player);
+						}
+					}
+					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 5)
+					{
+						npc.abortCast();
+					}
+					else if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_1.getSkill()))
+					{
+						npc.doCast(AQUA_RAGE_1.getSkill());
+					}
+				}
+				break;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public String onSpawn(Npc npc)
+	{
+		startQuestTimer("SPAWN_WATER_SLIME", 300000, npc, null);
+		return super.onSpawn(npc);
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player player, boolean isSummon)
+	{
+		switch (npc.getId())
+		{
+			case NEBULA:
+			{
+				cancelQuestTimer("CAST_AQUA_RAGE", npc, player);
+				cancelQuestTimer("SPAWN_WATER_SLIME", npc, player);
+				break;
+			}
+			case WATER_SLIME:
+			{
+				if (player.getAffectedSkillLevel(AQUA_RAGE) == 1)
+				{
+					if (getRandomBoolean())
+					{
+						player.stopSkillEffects(AQUA_RAGE_1.getSkill());
+					}
+				}
+				else if (player.getAffectedSkillLevel(AQUA_RAGE) == 2)
+				{
+					if (getRandomBoolean())
+					{
+						player.stopSkillEffects(AQUA_RAGE_2.getSkill());
+						final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 1);
+						skill.applyEffects(player, player);
+					}
+				}
+				else if (player.getAffectedSkillLevel(AQUA_RAGE) == 3)
+				{
+					if (getRandomBoolean())
+					{
+						player.stopSkillEffects(AQUA_RAGE_3.getSkill());
+						final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 2);
+						skill.applyEffects(player, player);
+					}
+				}
+				else if (player.getAffectedSkillLevel(AQUA_RAGE) == 4)
+				{
+					if (getRandomBoolean())
+					{
+						player.stopSkillEffects(AQUA_RAGE_4.getSkill());
+						final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 3);
+						skill.applyEffects(player, player);
+					}
+				}
+				break;
+			}
+		}
+		return super.onKill(npc, player, isSummon);
+	}
+	
+	public static void main(String[] args)
+	{
+		new ResidenceOfQueenNebula();
+	}
+}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 5b501b1f1b..bcc74a8afe 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -254,6 +255,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/LetterCollector/config.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/LetterCollector/config.xml
index c4c5f44366..79a6098a7c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/LetterCollector/config.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/LetterCollector/config.xml
@@ -4,15 +4,15 @@
 		<add item="3875" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's A -->
 		<add item="3877" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's E -->
 		<add item="3879" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's G -->
+		<add item="3880" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's H -->
 		<add item="3881" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's I -->
 		<add item="3882" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's L -->
 		<add item="3883" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's N -->
 		<add item="3885" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's R -->
-		<add item="34956" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's M -->
 		<add item="3886" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's S -->
-		<add item="3886" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's T -->
-		<add item="3880" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's H -->
+		<add item="3887" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's T -->
 		<add item="3888" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's II -->
+		<add item="34956" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's M -->
 		<add item="92021" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's D -->
 		<add item="93412" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's K -->
 		<add item="93413" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's U -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/LetterCollector/rewards.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/LetterCollector/rewards.xml
index d6234162c4..d647b5069d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/LetterCollector/rewards.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/LetterCollector/rewards.xml
@@ -9,15 +9,15 @@
 		<item name="A" id="3875" />
 		<item name="E" id="3877" />
 		<item name="G" id="3879" />
+		<item name="H" id="3880" />
 		<item name="I" id="3881" />
 		<item name="L" id="3882" />
 		<item name="N" id="3883" />
 		<item name="R" id="3885" />
-		<item name="M" id="34956" />
 		<item name="S" id="3886" />
-		<item name="T" id="3886" />
-		<item name="H" id="3880" />
+		<item name="T" id="3887" />
 		<item name="II" id="3888" />
+		<item name="M" id="34956" />
 		<item name="D" id="92021" />
 		<item name="K" id="93412" />
 		<item name="U" id="93413" />
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 9297b4ce79..fde0c97c17 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -43,6 +43,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AgathionSlot", AgathionSlot::new);
@@ -171,6 +173,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("GiveExpAndSp", GiveExpAndSp::new);
 		EffectHandler.getInstance().registerHandler("GiveFame", GiveFame::new);
 		EffectHandler.getInstance().registerHandler("GiveItemByExp", GiveItemByExp::new);
+		EffectHandler.getInstance().registerHandler("GivePetXp", GivePetXp::new);
 		EffectHandler.getInstance().registerHandler("GiveRecommendation", GiveRecommendation::new);
 		EffectHandler.getInstance().registerHandler("GiveSp", GiveSp::new);
 		EffectHandler.getInstance().registerHandler("GiveXp", GiveXp::new);
@@ -194,6 +197,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("HpRegen", HpRegen::new);
 		EffectHandler.getInstance().registerHandler("HpToOwner", HpToOwner::new);
 		EffectHandler.getInstance().registerHandler("IgnoreDeath", IgnoreDeath::new);
+		EffectHandler.getInstance().registerHandler("IgnoreReduceDamage", IgnoreReduceDamage::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageBonus", ImmobileDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageResist", ImmobileDamageResist::new);
 		EffectHandler.getInstance().registerHandler("ImmobilePetBuff", ImmobilePetBuff::new);
@@ -235,7 +239,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtkByPAtk", MAtkByPAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyCraftPoints", ModifyCraftPoints::new);
 		EffectHandler.getInstance().registerHandler("ModifyDeathPoints", ModifyDeathPoints::new);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/MasterHandler.java
index 80cd97dfc1..074681ef62 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/MasterHandler.java
@@ -148,6 +148,7 @@ import handlers.bypasshandlers.Link;
 import handlers.bypasshandlers.Multisell;
 import handlers.bypasshandlers.NpcViewMod;
 import handlers.bypasshandlers.Observation;
+import handlers.bypasshandlers.PetExtractWindow;
 import handlers.bypasshandlers.PlayerHelp;
 import handlers.bypasshandlers.PrivateWarehouse;
 import handlers.bypasshandlers.QuestLink;
@@ -467,6 +468,7 @@ public class MasterHandler
 			Multisell.class,
 			NpcViewMod.class,
 			Observation.class,
+			PetExtractWindow.class,
 			QuestLink.class,
 			PlayerHelp.class,
 			PrivateWarehouse.class,
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/PetExtractWindow.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/PetExtractWindow.java
new file mode 100644
index 0000000000..446334c464
--- /dev/null
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/PetExtractWindow.java
@@ -0,0 +1,56 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.bypasshandlers;
+
+import org.l2jmobius.gameserver.handler.IBypassHandler;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.network.serverpackets.pet.ShowPetExtractSystem;
+
+/**
+ * @author Geremy
+ */
+public class PetExtractWindow implements IBypassHandler
+{
+	private static final String[] COMMANDS =
+	{
+		"pet_extract_window",
+	};
+	
+	@Override
+	public boolean useBypass(String command, Player player, Creature target)
+	{
+		if (!target.isNpc())
+		{
+			return false;
+		}
+		
+		if (command.toLowerCase().startsWith(COMMANDS[0]))
+		{
+			player.sendPacket(ShowPetExtractSystem.STATIC_PACKET);
+			return true;
+		}
+		
+		return false;
+	}
+	
+	@Override
+	public String[] getBypassList()
+	{
+		return COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GivePetXp.java
similarity index 55%
rename from L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
rename to L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GivePetXp.java
index c99b060259..c9801b6d42 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GivePetXp.java
@@ -1,31 +1,53 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.skill.Skill;
+
+/**
+ * @author Geremy
+ */
+public class GivePetXp extends AbstractEffect
+{
+	private final int _xp;
+	
+	public GivePetXp(StatSet params)
+	{
+		_xp = params.getInt("xp", 0);
+	}
+	
+	@Override
+	public boolean isInstant()
+	{
+		return true;
+	}
+	
+	@Override
+	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		if (!effector.hasPet())
+		{
+			return;
+		}
+		
+		effected.getActingPlayer().getPet().addExpAndSp(_xp, 0);
+	}
+}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
new file mode 100644
index 0000000000..5405ccd4be
--- /dev/null
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class IgnoreReduceDamage extends AbstractStatEffect
+{
+	public IgnoreReduceDamage(StatSet params)
+	{
+		super(params, Stat.IGNORE_REDUCE_DAMAGE);
+	}
+}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
index 951002a2c2..35bfbcb6bc 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.enums.StatModifierType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener;
 import org.l2jmobius.gameserver.model.events.returns.DamageReturn;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author Sdw
@@ -32,10 +34,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 public class ReduceDamage extends AbstractEffect
 {
 	private final double _amount;
+	private final StatModifierType _mode;
 	
 	public ReduceDamage(StatSet params)
 	{
 		_amount = params.getDouble("amount");
+		_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
 	}
 	
 	private DamageReturn onDamageReceivedEvent(OnCreatureDamageReceived event)
@@ -46,7 +50,15 @@ public class ReduceDamage extends AbstractEffect
 			return null;
 		}
 		
-		final double newDamage = event.getDamage() * (_amount / 100);
+		final double newDamage;
+		if (_mode == StatModifierType.PER)
+		{
+			newDamage = event.getDamage() - (event.getDamage() * (_amount / 100));
+		}
+		else // DIFF
+		{
+			newDamage = event.getDamage() - Math.max((_amount - event.getAttacker().getStat().getAdd(Stat.IGNORE_REDUCE_DAMAGE)), 0.0);
+		}
 		
 		return new DamageReturn(false, true, false, newDamage);
 	}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index 7e02e79abc..bff5a1734b 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -210,6 +210,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()) || _renewDuration)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
index 70789354f3..fd41f09a9a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
@@ -17,7 +17,13 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author Sero
@@ -28,4 +34,46 @@ public class WeaponBonusMAtk extends AbstractStatAddEffect
 	{
 		super(params, Stat.WEAPON_BONUS_MAGIC_ATTACK);
 	}
+	
+	@Override
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
index df05ef8607..b36b10a92e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
@@ -17,7 +17,13 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author Sero
@@ -28,4 +34,46 @@ public class WeaponBonusPAtk extends AbstractStatAddEffect
 	{
 		super(params, Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
 	}
+	
+	@Override
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index fa90ba401d..4c76932c3e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,61 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetHold.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetHold.java
index 04649bf332..72ad8a2b4e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetHold.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetHold.java
@@ -52,4 +52,10 @@ public class PetHold implements IPlayerActionHandler
 			((SummonAI) pet.getAI()).notifyFollowStatusChange();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetMove.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetMove.java
index edddbab322..817593d9a2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetMove.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetMove.java
@@ -53,4 +53,10 @@ public class PetMove implements IPlayerActionHandler
 			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, player.getTarget().getLocation());
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
index eaa7bca994..858083f36a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
@@ -77,4 +77,10 @@ public class PetSkillUse implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetStop.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetStop.java
index efd4e36b0b..8b8cabc337 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetStop.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetStop.java
@@ -51,4 +51,10 @@ public class PetStop implements IPlayerActionHandler
 			pet.cancelAction();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 71d72e95b5..3e0acb89bd 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,52 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorHold.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
index 7b0ec565e4..41ecb77132 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
@@ -48,4 +48,10 @@ public class ServitorHold implements IPlayerActionHandler
 			((SummonAI) s.getAI()).notifyFollowStatusChange();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorMode.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
index be6205b0f9..2b5a8f1e82 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
@@ -68,4 +68,10 @@ public class ServitorMode implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorMove.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
index d119886221..6254d3db05 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
@@ -56,4 +56,10 @@ public class ServitorMove implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
index 36aa372909..7fa7f0a45c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
@@ -62,4 +62,10 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			}
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorStop.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
index 41b3dd19f2..4f91147611 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
@@ -47,4 +47,10 @@ public class ServitorStop implements IPlayerActionHandler
 			s.cancelAction();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
index fb269e325a..cf0218f87f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
@@ -62,4 +62,10 @@ public class UnsummonPet implements IPlayerActionHandler
 			pet.unSummon(player);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
index a408928a04..f305fd2787 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
@@ -69,4 +69,10 @@ public class UnsummonServitor implements IPlayerActionHandler
 			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
index 4c6398780f..d1698bbf65 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
@@ -20,20 +20,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.l2jmobius.gameserver.data.xml.SkillData;
-import org.l2jmobius.gameserver.enums.ChatType;
-import org.l2jmobius.gameserver.enums.SkillFinishType;
+import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
-import org.l2jmobius.gameserver.instancemanager.ZoneManager;
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.model.skill.Skill;
-import org.l2jmobius.gameserver.model.skill.SkillCaster;
 import org.l2jmobius.gameserver.model.zone.ZoneType;
 import org.l2jmobius.gameserver.network.NpcStringId;
 import org.l2jmobius.gameserver.network.serverpackets.ExSendUIEvent;
@@ -47,8 +42,12 @@ import instances.AbstractInstance;
  */
 public class DwellingOfSpirits extends AbstractInstance
 {
+	private static final int PORTAL_OPEN_CHANCE = 40;
+	
 	// CRITICAL NPCs
 	private static final int RUIP = 22273;
+	private static final int FAIRY_C1 = 22271;
+	private static final int FAIRY_C2 = 22272;
 	private static final int SEALSTONE = 34178;
 	private static final int ANIMAEL = 34176;
 	private static final int PORTAL_EVENT_FIRE = 15969;
@@ -56,46 +55,10 @@ public class DwellingOfSpirits extends AbstractInstance
 	private static final int PORTAL_EVENT_EARTH = 15972;
 	private static final int PORTAL_EVENT_WIND = 15971;
 	
-	// PROCELLA BOSS WIND
 	private static final int KING_PROCELLA = 29107;
-	private static final int PROCELLA_GUARDIAN_1 = 29112;
-	private static final int PROCELLA_STORM = 29115;
-	
-	private static final SkillHolder HURRICANE_SUMMON = new SkillHolder(50042, 1);
-	private static final int HURRICANE_BOLT = 50043;
-	private static final SkillHolder HURRICANE_BOLT_LV_1 = new SkillHolder(50043, 1);
-	private static final int STORM_MAX_COUNT = 20; //
-	
-	// PETRAM BOSS EARTH
 	private static final int KING_PETRAM = 29108;
-	private static final int PETRAM_PIECE = 29116;
-	private static final int PETRAM_FRAGMENT = 29117;
-	// Skills
-	private static final SkillHolder EARTH_ENERGY = new SkillHolder(50066, 1);
-	private static final SkillHolder EARTH_FURY = new SkillHolder(50059, 1);
-	private static final SkillHolder TEST = new SkillHolder(5712, 1);
-	
-	// IGNIS BOSS FIRE
-	// NPCs
 	private static final int KING_IGNIS = 29105;
-	// Skills
-	private static final SkillHolder FIRE_RAG_2 = new SkillHolder(50050, 2);
-	private static final SkillHolder FIRE_RAG_4 = new SkillHolder(50050, 4);
-	private static final SkillHolder FIRE_RAG_6 = new SkillHolder(50050, 6);
-	private static final SkillHolder FIRE_RAG_8 = new SkillHolder(50050, 8);
-	
-	// NEBULA BOSS WATER
-	// NPCs
 	private static final int KING_NEBULA = 29106;
-	private static final int WATER_SLIME = 29111;
-	// Skills
-	private static final int AQUA_RAGE = 50036;
-	private static final SkillHolder AQUA_RAGE_1 = new SkillHolder(AQUA_RAGE, 1);
-	private static final SkillHolder AQUA_RAGE_2 = new SkillHolder(AQUA_RAGE, 2);
-	private static final SkillHolder AQUA_RAGE_3 = new SkillHolder(AQUA_RAGE, 3);
-	private static final SkillHolder AQUA_RAGE_4 = new SkillHolder(AQUA_RAGE, 4);
-	private static final SkillHolder AQUA_RAGE_5 = new SkillHolder(AQUA_RAGE, 5);
-	private static final SkillHolder AQUA_SUMMON = new SkillHolder(50037, 1);
 	
 	// Entrace Portal Triggers
 	private static final int WIND_FIRST_TRIGGER_1 = 16158880;
@@ -107,38 +70,86 @@ public class DwellingOfSpirits extends AbstractInstance
 	private static final int WATER_FIRST_TRIGGER_1 = 16157770;
 	private static final int WATER_FIRST_TRIGGER_2 = 16157772;
 	
-	// Statue Kill Indicator Triggers
-	private static final int KILL_INDICATOR_TRIGGER_1 = 16159990;
-	private static final int KILL_INDICATOR_TRIGGER_2 = 16159994;
-	private static final int KILL_INDICATOR_TRIGGER_3 = 16159996;
-	private static final int KILL_INDICATOR_TRIGGER_4 = 16159998;
-	private static final int KILL_INDICATOR_TRIGGER_5 = 16159992;
+	// @formatter:off
+	private static final int[][] PORTAL_TRIGGER_IDS = 
+	{
+	    { 16158880, 16158882 },
+	    { 16156660, 16156662 },
+	    { 16155550, 16155552 },
+	    { 16157770, 16157772 }
+	};
+	
+	private static final Location IGNIS_FIRE_L = new Location(202374, 168153, -15485);
+	private static final Location PETRAM_EARTH_L = new Location(222081, 190538, -15485);
+	private static final Location NEBULA_WATER_L = new Location(222149, 168087, -15485);
+	private static final Location PROCELLA_WIN_L = new Location(212884, 178847, -15485);
+	
+	private static final Location PETRAM_EARTH_RETURN_L = new Location(-114321, -77262, -11445);
+	private static final Location IGNIS_FIRE_RETURN_L = new Location(-114322, -77262, -11445);
+	private static final Location NEBULA_WATER_RETURN_L = new Location(-114323, -77262, -11445);
+	private static final Location PROCELLA_WIN_RETURN_L = new Location(-114324, -77262, -11445);
+	
+	private static final int[][][] portalConfigs = 
+	{
+	    {{EARTH_FIRST_TRIGGER_1, EARTH_FIRST_TRIGGER_2, KING_PETRAM}},
+	    {{FIRE_FIRST_TRIGGER_1, FIRE_FIRST_TRIGGER_2, KING_IGNIS}},
+	    {{WATER_FIRST_TRIGGER_1, WATER_FIRST_TRIGGER_2, KING_NEBULA}},
+	    {{WIND_FIRST_TRIGGER_1, WIND_FIRST_TRIGGER_2, KING_PROCELLA}}
+	};
+
+	private static final int[][] portalSpawnCoordinates = 
+	{
+	    {222063, 191514, -15486, 50142},  
+	    {202350, 169121, -15484, 48103},  
+	    {222127, 169057, -15486, 48730},  
+	    {212862, 179828, -15489, 48103}   
+	};
+	// @formatter:on
 	
 	private static final int TEMPLATE_ID = 214;
 	
 	private static final Map<Integer, NpcStringId> PORTAL_MSG = new HashMap<>();
 	static
 	{
-		PORTAL_MSG.put(1, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_EARTH_IS_OPEN);
+		PORTAL_MSG.put(0, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_EARTH_IS_OPEN);
+		PORTAL_MSG.put(1, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_FIRE_IS_OPEN);
 		PORTAL_MSG.put(2, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_WATER_IS_OPEN);
 		PORTAL_MSG.put(3, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_WIND_IS_OPEN);
-		PORTAL_MSG.put(4, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_FIRE_IS_OPEN);
-		PORTAL_MSG.put(5, NpcStringId.SEAL_STONE_DISAPPEARS_AFTER_RESONATING_WITH_THE_STATUE);
+		PORTAL_MSG.put(4, NpcStringId.SEAL_STONE_DISAPPEARS_AFTER_RESONATING_WITH_THE_STATUE);
 	}
 	
+	// Zone
+	private static final int DWELLING_CENTRAL = 21400000;
+	
+	private static final int IGNIS_PORTAL_ENTER_ID = 202201;
+	private static final int PETRAM_PORTAL_ENTER_ID = 202202;
+	private static final int NEBULA_PORTAL_ENTER_ID = 202203;
+	private static final int PROCELLA_PORTAL_ENTER_ID = 202204;
+	
+	// Portals return IDs
+	private static final int IGNIS_PORTAL_RETURN_ID = 202205;
+	private static final int PETRAM_PORTAL_RETURN_ID = 202206;
+	private static final int NEBULA_PORTAL_RETURN_ID = 202207;
+	private static final int PROCELLA_PORTAL_RETURN_ID = 202208;
+	
 	public DwellingOfSpirits()
 	{
 		super(TEMPLATE_ID);
 		addKillId(KING_PETRAM, KING_NEBULA, KING_PROCELLA, KING_IGNIS);
-		addKillId(PROCELLA_GUARDIAN_1);
-		addKillId(PETRAM_PIECE, PETRAM_FRAGMENT);
-		addKillId(WATER_SLIME);
+		addKillId(FAIRY_C1, FAIRY_C2, RUIP);
 		addAttackId(KING_PETRAM, KING_NEBULA, KING_PROCELLA, KING_IGNIS);
 		addSpawnId(KING_NEBULA);
 		addFirstTalkId(ANIMAEL, SEALSTONE);
 		addTalkId(ANIMAEL);
 		addStartNpc(SEALSTONE);
-		addCreatureSeeId(RUIP, ANIMAEL);
+		addCreatureSeeId(ANIMAEL);
+		addEnterZoneId(DWELLING_CENTRAL);
+		addEnterZoneId(IGNIS_PORTAL_ENTER_ID, IGNIS_PORTAL_RETURN_ID);
+		addEnterZoneId(PETRAM_PORTAL_ENTER_ID, PETRAM_PORTAL_RETURN_ID);
+		addEnterZoneId(NEBULA_PORTAL_ENTER_ID, NEBULA_PORTAL_RETURN_ID);
+		addEnterZoneId(PROCELLA_PORTAL_ENTER_ID, PROCELLA_PORTAL_RETURN_ID);
+		addInstanceEnterId(TEMPLATE_ID);
+		addInstanceLeaveId(TEMPLATE_ID);
 	}
 	
 	@Override
@@ -180,779 +191,106 @@ public class DwellingOfSpirits extends AbstractInstance
 			
 			case "TELEPORT":
 			{
-				player.teleToLocation(TeleportWhereType.TOWN, null);
-				return null;
-			}
-			//////////////// BOSS PROCELLA WIND ACTION /////////////
-			case "SPAWN_MINION_PROCELLA":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if ((world != null) && (npc.getId() == KING_PROCELLA))
+				final Instance instance = player.getInstanceWorld();
+				if (instance != null)
 				{
-					world.setParameter("minion1", addSpawn(PROCELLA_GUARDIAN_1, 212663, 179421, -15486, 31011, true, 0, true, npc.getInstanceId()));
-					world.setParameter("minion2", addSpawn(PROCELLA_GUARDIAN_1, 213258, 179822, -15486, 12001, true, 0, true, npc.getInstanceId()));
-					world.setParameter("minion3", addSpawn(PROCELLA_GUARDIAN_1, 212558, 179974, -15486, 12311, true, 0, true, npc.getInstanceId()));
-					startQuestTimer("HIDE_PROCELLA", 1000, world.getNpc(KING_PROCELLA), player);
+					instance.finishInstance();
+					player.teleToLocation(TeleportWhereType.TOWN, null);
 				}
-				break;
-			}
-			case "SPAWN_STORM_PROCELLA":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if ((world != null) && (world.getParameters().getInt("stormCount", 0) < STORM_MAX_COUNT))
-				{
-					world.getNpc(KING_PROCELLA).doCast(HURRICANE_SUMMON.getSkill());
-					final Npc procellaStorm = addSpawn(PROCELLA_STORM, world.getNpc(KING_PROCELLA).getX() + getRandom(-500, 500), world.getNpc(KING_PROCELLA).getY() + getRandom(-500, 500), world.getNpc(KING_PROCELLA).getZ(), 31011, true, 0, true, npc.getInstanceId());
-					procellaStorm.setRandomWalking(true);
-					world.getParameters().increaseInt("stormCount", 1);
-					startQuestTimer("SPAWN_STORM_PROCELLA", 30000, world.getNpc(KING_PROCELLA), player);
-					startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA", 100, procellaStorm, player);
-				}
-				break;
-			}
-			case "HIDE_PROCELLA":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world.getAliveNpcCount(PROCELLA_GUARDIAN_1) >= 1)
-				{
-					world.getNpc(KING_PROCELLA).setInvisible(true);
-				}
-				else if (world.getAliveNpcCount(PROCELLA_GUARDIAN_1) == 0)
-				{
-					world.getNpc(KING_PROCELLA).setInvisible(false);
-					startQuestTimer("SPAWN_MINION_PROCELLA", 90000 + getRandom(-15000, 11000), world.getNpc(KING_PROCELLA), player);
-				}
-				break;
-			}
-			case "CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world != null)
-				{
-					final Player plr = world.getPlayers().stream().findAny().orElse(null);
-					if ((plr != null) && (plr.isInsideRadius3D(npc, 200)))
-					{
-						npc.abortAttack();
-						npc.abortCast();
-						npc.setTarget(plr);
-						if (plr.getAffectedSkillLevel(HURRICANE_BOLT) == 1)
-						{
-							npc.abortCast();
-							startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA", 100, npc, player);
-						}
-						else
-						{
-							if (SkillCaster.checkUseConditions(npc, HURRICANE_BOLT_LV_1.getSkill()))
-							{
-								npc.doCast(HURRICANE_BOLT_LV_1.getSkill());
-							}
-						}
-						startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA", 100, npc, player);
-					}
-					else
-					{
-						startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA", 100, npc, player);
-					}
-				}
-				break;
-			}
-			//////////////// BOSS PETRAM EARTH ACTION /////////////
-			case "SPAWN_MINION":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world.getAliveNpcCount(PETRAM_FRAGMENT) == 0)
-				{
-					npc.doCast(EARTH_ENERGY.getSkill());
-					
-					if (!world.getParameters().getBoolean("spawnedMinions", false))
-					{
-						world.getParameters().set("spawnedMinions", true);
-						
-						final int stage = world.getParameters().getInt("stage", 0);
-						world.getParameters().set("stage", stage + 1);
-						
-						world.setParameter("minionpetram1", addSpawn(npc, PETRAM_FRAGMENT, 221543, 191530, -15486, 1131, false, -1, true, npc.getInstanceId()));
-						world.setParameter("minionpetram2", addSpawn(npc, PETRAM_FRAGMENT, 222069, 192019, -15486, 49364, false, -1, true, npc.getInstanceId()));
-						world.setParameter("minionpetram3", addSpawn(npc, PETRAM_FRAGMENT, 222595, 191479, -15486, 34013, false, -1, true, npc.getInstanceId()));
-						world.setParameter("minionpetram4", addSpawn(npc, PETRAM_FRAGMENT, 222077, 191017, -15486, 16383, false, -1, true, npc.getInstanceId()));
-						
-						npc.setInvul(true);
-						npc.broadcastSay(ChatType.NPC_SHOUT, "HaHahaha, fighters lets kill them. Now Im invul!!!");
-					}
-					
-					startQuestTimer("SUPPORT_PETRAM", 3000, npc, player);
-				}
-				break;
-			}
-			case "UNSPAWN_MINION":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world.getAliveNpcCount(PETRAM_FRAGMENT) == 0)
-				{
-					world.getParameters().set("spawnedMinions", false);
-					
-					npc.setInvul(false);
-					npc.broadcastSay(ChatType.NPC_SHOUT, "Nooooo... Nooooo...");
-				}
-				break;
-			}
-			case "SUPPORT_PETRAM":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world != null)
-				{
-					final Npc m1 = world.getParameters().getObject("minionpetram1", Npc.class);
-					final Npc m2 = world.getParameters().getObject("minionpetram2", Npc.class);
-					final Npc m3 = world.getParameters().getObject("minionpetram3", Npc.class);
-					final Npc m4 = world.getParameters().getObject("minionpetram4", Npc.class);
-					if (!m1.isDead())
-					{
-						m1.setTarget(world.getNpc(KING_PETRAM));
-						m1.doCast(TEST.getSkill());
-					}
-					if (!m2.isDead())
-					{
-						m2.setTarget(world.getNpc(KING_PETRAM));
-						m2.doCast(TEST.getSkill());
-					}
-					if (!m3.isDead())
-					{
-						m3.setTarget(world.getNpc(KING_PETRAM));
-						m3.doCast(TEST.getSkill());
-					}
-					if (!m4.isDead())
-					{
-						m4.setTarget(world.getNpc(KING_PETRAM));
-						m4.doCast(TEST.getSkill());
-					}
-					
-					startQuestTimer("SUPPORT_PETRAM", 10100, npc, player);
-				}
-				break;
-			}
-			case "EARTH_FURY":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world != null)
-				{
-					npc.doCast(EARTH_FURY.getSkill());
-				}
-				break;
-			}
-			//////////////// BOSS IGNIS ACTION /////////////
-			case "CAST_FIRE_RAGE_1":
-			{
-				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_2.getSkill()))
-				{
-					npc.doCast(FIRE_RAG_2.getSkill());
-				}
-				break;
-			}
-			case "CAST_FIRE_RAGE_2":
-			{
-				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_4.getSkill()))
-				{
-					npc.doCast(FIRE_RAG_4.getSkill());
-				}
-				break;
-			}
-			case "CAST_FIRE_RAGE_3":
-			{
-				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_6.getSkill()))
-				{
-					npc.doCast(FIRE_RAG_6.getSkill());
-				}
-				break;
-			}
-			case "CAST_FIRE_RAGE_4":
-			{
-				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_8.getSkill()))
-				{
-					npc.doCast(FIRE_RAG_8.getSkill());
-				}
-				break;
-			}
-			//////////////// BOSS NEBULA ACTION /////////////
-			case "SPAWN_WATER_SLIME":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world != null)
-				{
-					final Player plr = world.getPlayers().stream().findAny().get();
-					if (plr != null)
-					{
-						startQuestTimer("CAST_AQUA_RAGE", 30000 + getRandom(-15000, 15000), npc, plr);
-					}
-					if (npc.getId() == KING_NEBULA)
-					{
-						npc.doCast(AQUA_SUMMON.getSkill());
-						for (int i = 0; i < getRandom(4, 6); i++)
-						{
-							addSpawn(npc, WATER_SLIME, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, -1, true, npc.getInstanceId());
-							startQuestTimer("SPAWN_WATER_SLIME", 80000, npc, null);
-						}
-					}
-				}
-				break;
-			}
-			case "PLAYER_PARA":
-			{
-				if (player.getAffectedSkillLevel(AQUA_RAGE) == 5)
-				{
-					player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.FROZEN_PILLAR);
-					player.setImmobilized(true);
-					startQuestTimer("PLAYER_UNPARA", 5000, npc, player);
-				}
-				break;
-			}
-			case "PLAYER_UNPARA":
-			{
-				player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, AQUA_RAGE_5.getSkill());
-				player.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.FROZEN_PILLAR);
-				player.setImmobilized(false);
-				break;
-			}
-			case "CAST_AQUA_RAGE":
-			{
-				startQuestTimer("CAST_AQUA_RAGE", 5000, npc, player);
-				if ((player.isInsideRadius3D(npc, 1000)))
-				{
-					if (player.getAffectedSkillLevel(AQUA_RAGE) == 1)
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_2.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_2.getSkill());
-						}
-					}
-					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 2)
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_3.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_3.getSkill());
-						}
-					}
-					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 3)
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_4.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_4.getSkill());
-						}
-					}
-					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 4)
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_5.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_5.getSkill());
-							startQuestTimer("PLAYER_PARA", 100, npc, player);
-						}
-					}
-					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 5)
-					{
-						npc.abortCast();
-					}
-					else
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_1.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_1.getSkill());
-						}
-					}
-				}
-				break;
-			}
-			case "check_status":
-			{
-				final Instance world = player.getInstanceWorld();
-				if (!isInInstance(world))
-				{
-					return null;
-				}
-				
-				switch (world.getStatus())
-				{
-					case 0:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(1);
-							world.despawnGroup("sealstone");
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 1:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(2);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_1, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 2:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(3);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_2, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_3, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 3:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(4);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_4, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_5, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 4:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(5);
-							player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(3), null));
-							addSpawn(KING_PROCELLA, 212862, 179828, -15489, 48103, false, 0, false, world.getId());
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 5: // Dummy stage pause, u need defeat boss to continue.
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 6:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(7);
-							world.spawnGroup("ruipwave_1");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_1, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 7:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(8);
-							world.spawnGroup("NormalMobs");
-							world.spawnGroup("ruipwave_1");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_2, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_3, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 8:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(9);
-							world.spawnGroup("NormalMobs");
-							world.spawnGroup("ruipwave_2");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_4, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_5, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 9:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(10);
-							player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(1), null));
-							addSpawn(KING_PETRAM, 222063, 191514, -15486, 50142, false, 0, false, world.getId());
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 10: // Dummy stage pause, u need defeat boss to continue.
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 11:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 1)
-						{
-							world.setStatus(12);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_1, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 12:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 1)
-						{
-							world.setStatus(13);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_2, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_3, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 13:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 1)
-						{
-							world.setStatus(14);
-							world.spawnGroup("ruipwave_2");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_4, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_5, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 14:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 1)
-						{
-							world.setStatus(15);
-							player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(4), null));
-							addSpawn(KING_IGNIS, 202350, 169121, -15484, 48103, false, 0, false, world.getId());
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 15: // Dummy stage pause, u need defeat boss for continue.
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 16:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(17);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_1, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 17:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(18);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_2, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_3, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 18:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(19);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_4, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_5, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 19: // need defeat boss for finish.
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						
-						{
-							world.setStatus(20);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(2), null));
-							addSpawn(KING_NEBULA, 222127, 169057, -15486, 48730, false, 0, false, world.getId());
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 20:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.getParameters().set("DwellingOfSpiritsFinished", true);
-							world.setStatus(21);
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-				}
-				
-				return null;
 			}
 		}
 		
 		return super.onAdvEvent(event, npc, player);
-		
-	}
-	
-	@Override
-	public String onSpawn(Npc npc)
-	{
-		startQuestTimer("SPAWN_WATER_SLIME", 40000, npc, null);
-		return super.onSpawn(npc);
-	}
-	
-	@Override
-	public String onAttack(Npc npc, Player player, int damage, boolean isSummon, Skill skill)
-	{
-		final Instance world = npc.getInstanceWorld();
-		if (world == null)
-		{
-			return null;
-		}
-		
-		switch (npc.getId())
-		{
-			case KING_PROCELLA:
-			{
-				if (npc.getCurrentHp() < (npc.getMaxHp() * 0.90))
-				{
-					startQuestTimer("SPAWN_MINION_PROCELLA", 80000 + getRandom(-15000, 15000), npc, player);
-					startQuestTimer("SPAWN_STORM_PROCELLA", 4000, npc, player);
-					world.setParameter("stormCount", 0);
-				}
-				break;
-			}
-			case KING_PETRAM:
-			{
-				if (npc.getCurrentHp() < (npc.getMaxHp() * 0.80))
-				{
-					startQuestTimer("EARTH_FURY", 1000, npc, player);
-					if ((world.getParameters().getInt("stage", 0) == 0) || (npc.getCurrentHp() < (npc.getMaxHp() * 0.50)))
-					{
-						startQuestTimer("SPAWN_MINION", 1000, npc, player);
-					}
-				}
-				break;
-			}
-			case KING_IGNIS:
-			{
-				if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.90)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.70)))
-				{
-					startQuestTimer("CAST_FIRE_RAGE_1", 1000, npc, null);
-				}
-				else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.70)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.50)))
-				{
-					startQuestTimer("CAST_FIRE_RAGE_2", 1000, npc, null);
-				}
-				else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.50)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.40)))
-				{
-					startQuestTimer("CAST_FIRE_RAGE_3", 1000, npc, null);
-				}
-				else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.40)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.25)))
-				{
-					startQuestTimer("CAST_FIRE_RAGE_4", 1000, npc, null);
-				}
-				break;
-			}
-		}
-		
-		return null;
-	}
-	
-	@Override
-	public String onCreatureSee(Npc npc, Creature creature)
-	{
-		if (creature.isPlayer())
-		{
-			final Instance world = creature.getInstanceWorld();
-			if (world.getStatus() >= 5)
-			{
-				enableZoneWind();
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(WIND_FIRST_TRIGGER_1, true));
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(WIND_FIRST_TRIGGER_2, true));
-			}
-			else if (world.getStatus() >= 10)
-			{
-				enableZoneEarth();
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(EARTH_FIRST_TRIGGER_1, true));
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(EARTH_FIRST_TRIGGER_2, true));
-			}
-			else if (world.getStatus() >= 15)
-			{
-				enableZoneFire();
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(FIRE_FIRST_TRIGGER_1, true));
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(FIRE_FIRST_TRIGGER_2, true));
-			}
-			else if (world.getStatus() >= 20)
-			{
-				enableZoneWater();
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(WATER_FIRST_TRIGGER_1, true));
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(WATER_FIRST_TRIGGER_2, true));
-			}
-			else if (world.getStatus() >= 21)
-			{
-				world.despawnGroup("ruipwave_1");
-				world.despawnGroup("ruipwave_2");
-				world.despawnGroup("NormalMobs");
-				world.finishInstance();
-			}
-		}
-		
-		return super.onCreatureSee(npc, creature);
 	}
 	
 	@Override
 	public String onKill(Npc npc, Player player, boolean isSummon)
 	{
 		final Instance instance = npc.getInstanceWorld();
+		final StatSet worldParameters = instance.getParameters();
+		
+		int totalBossDefeatCount = worldParameters.getInt("totalBossDefeatCount", 0);
 		
 		switch (npc.getId())
 		{
-			case KING_PETRAM:
+			case RUIP:
+			case FAIRY_C1:
+			case FAIRY_C2:
 			{
-				final Npc portal = addSpawn(PORTAL_EVENT_EARTH, 222065, 192767, -15488, 16384, false, 0, false, instance.getId());
-				portal.setDisplayEffect(1); // set the portal visible
-				player.getVariables().set("DSIGNIS", 1);
-				setActive(true);
-				enableZoneEarthExit();
-				cancelQuestTimer("SPAWN_MINION", npc, player);
-				instance.setStatus(12);
-				final Instance world = npc.getInstanceWorld();
-				for (Npc spawn : world.getNpcs(PETRAM_FRAGMENT))
+				if (Rnd.get(100) <= PORTAL_OPEN_CHANCE)
 				{
-					spawn.deleteMe();
-				}
-				break;
-			}
-			case KING_NEBULA:
-			{
-				final Npc portal = addSpawn(PORTAL_EVENT_WATER, 222127, 170488, -15488, 16384, false, 0, false, instance.getId());
-				portal.setDisplayEffect(1);
-				player.getVariables().set("DSIGNIS", 1);
-				player.sendPacket(new ExSendUIEvent(player, false, false, 0, 0, NpcStringId.TIME_LEFT));
-				setActive(true);
-				enableZoneWindExit();
-				instance.setStatus(21);
-				instance.spawnGroup("animael");
-				break;
-			}
-			case KING_IGNIS:
-			{
-				final Npc portal = addSpawn(PORTAL_EVENT_FIRE, 202349, 170533, -15488, 16384, false, 0, false, instance.getId());
-				portal.setDisplayEffect(1);
-				player.getVariables().set("DSIGNIS", 1);
-				setActive(true);
-				enableZoneFireExit();
-				instance.setStatus(17);
-				break;
-			}
-			case KING_PROCELLA:
-			{
-				final Npc portal = addSpawn(PORTAL_EVENT_WIND, 212863, 181090, -15487, 16384, false, 0, false, instance.getId());
-				portal.setDisplayEffect(1);
-				player.getVariables().set("DSIGNIS", 1);
-				setActive(true);
-				enableZoneWaterExit();
-				instance.setStatus(7);
-				final Instance world = npc.getInstanceWorld();
-				for (Npc spawn : world.getNpcs(PROCELLA_GUARDIAN_1))
-				{
-					spawn.deleteMe();
-				}
-				break;
-			}
-			case PETRAM_FRAGMENT:
-			{
-				startQuestTimer("UNSPAWN_MINION", 1000, instance.getNpc(KING_PETRAM), player);
-				break;
-			}
-			case PROCELLA_GUARDIAN_1:
-			{
-				
-				startQuestTimer("HIDE_PROCELLA", 1000, instance.getNpc(KING_PROCELLA), player);
-				break;
-			}
-			case WATER_SLIME:
-			{
-				if (getRandomBoolean())
-				{
-					switch (player.getAffectedSkillLevel(AQUA_RAGE))
+					int portalId = Rnd.get(4);
+					boolean isPortalOpened = worldParameters.getBoolean("portal" + portalId + "Opened", false);
+					
+					if (!isPortalOpened)
 					{
-						case 1:
+						if (instance.getStatus() > totalBossDefeatCount)
 						{
-							player.stopSkillEffects(AQUA_RAGE_1.getSkill());
-							break;
-						}
-						case 2:
-						{
-							player.stopSkillEffects(AQUA_RAGE_2.getSkill());
-							final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 1);
-							skill.applyEffects(player, player);
-							break;
-						}
-						case 3:
-						{
-							player.stopSkillEffects(AQUA_RAGE_3.getSkill());
-							final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 2);
-							skill.applyEffects(player, player);
-							break;
-						}
-						case 4:
-						{
-							player.stopSkillEffects(AQUA_RAGE_4.getSkill());
-							final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 3);
-							skill.applyEffects(player, player);
-							break;
+							return super.onKill(npc, player, isSummon);
 						}
+						instance.setStatus(instance.getStatus() + 1);
+						openPortal(player, portalId, instance);
+						worldParameters.set("portal" + portalId + "Opened", true);
 					}
 				}
 				break;
 			}
+			
+			case KING_PETRAM:
+			case KING_PROCELLA:
+			case KING_IGNIS:
+			case KING_NEBULA:
+			{
+				spawnExitPortal(instance, player, npc.getId());
+				CheckGeneralResidenceStages(npc, instance);
+				
+				break;
+			}
 		}
 		
 		return super.onKill(npc, player, isSummon);
 	}
 	
+	@Override
+	public String onEnterZone(Creature creature, ZoneType zone)
+	{
+		Instance instance = creature.getInstanceWorld();
+		if ((instance != null) && creature.isPlayer())
+		{
+			
+			final StatSet worldParameters = instance.getParameters();
+			
+			if (zone.getId() == DWELLING_CENTRAL)
+			{
+				worldParameters.set("InsideResidence", true);
+				handleCentralZone(instance, worldParameters);
+			}
+			
+			int portalId = getPortalIdByZone(zone.getId());
+			Location[] locations = getLocationsForPortal(portalId);
+			
+			if ((portalId >= 0) && (locations[0] != null))
+			{
+				boolean isPortalOpened = worldParameters.getBoolean("portal" + portalId + "Opened", false);
+				boolean isPortalExitOpened = worldParameters.getBoolean("portalExit" + portalId, false);
+				boolean InsideResidence = worldParameters.getBoolean("InsideResidence", false);
+				
+				if (isPortalOpened && (InsideResidence))
+				{
+					creature.teleToLocation(locations[0], instance);
+					worldParameters.set("InsideResidence", false);
+				}
+				
+				if (isPortalExitOpened && (!InsideResidence))
+				{
+					creature.teleToLocation(locations[1], instance);
+				}
+			}
+			
+		}
+		return null;
+	}
+	
 	@Override
 	public String onFirstTalk(Npc npc, Player player)
 	{
@@ -971,87 +309,251 @@ public class DwellingOfSpirits extends AbstractInstance
 		return super.onFirstTalk(npc, player);
 	}
 	
-	// PORTALS
-	private void enableZoneWind()
+	private void openPortal(Player player, int id, Instance instance)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("dwelling_portal_wind");
-		if (zone != null)
+		
+		if ((id >= 0) && (id < portalSpawnCoordinates.length))
 		{
-			zone.setEnabled(true);
+			int[] coordinates = portalSpawnCoordinates[id];
+			int trigger1 = portalConfigs[id][0][0];
+			int trigger2 = portalConfigs[id][0][1];
+			int kingId = portalConfigs[id][0][2];
+			
+			if ((id >= 0) && (id < PORTAL_MSG.size()))
+			{
+				NpcStringId portalMessage = PORTAL_MSG.get(id);
+				player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, portalMessage, null));
+			}
+			addSpawn(kingId, coordinates[0], coordinates[1], coordinates[2], coordinates[3], false, 0, false, instance.getId());
+			
+			instance.setParameter("TRIGGER_1_" + id, trigger1);
+			instance.setParameter("TRIGGER_2_" + id, trigger2);
+			
+			instance.broadcastPacket(new OnEventTrigger(trigger1, true));
+			instance.broadcastPacket(new OnEventTrigger(trigger2, true));
+			
 		}
 	}
 	
-	private void enableZoneEarth()
+	private void spawnExitPortal(Instance instance, Player player, int bossId)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("dwelling_portal_earth");
-		if (zone != null)
+		Npc portal;
+		int portalId;
+		Location portalLocation;
+		
+		final StatSet worldParameters = instance.getParameters();
+		worldParameters.set("portalExit" + getPortalByBossId(bossId), true);
+		
+		switch (bossId)
 		{
-			zone.setEnabled(true);
+			case KING_PROCELLA:
+			{
+				portalId = PORTAL_EVENT_WIND;
+				portalLocation = new Location(212863, 181090, -15487);
+				break;
+			}
+			case KING_PETRAM:
+			{
+				portalId = PORTAL_EVENT_EARTH;
+				portalLocation = new Location(222065, 192767, -15488);
+				break;
+			}
+			case KING_IGNIS:
+			{
+				portalId = PORTAL_EVENT_FIRE;
+				portalLocation = new Location(202349, 170533, -15488);
+				break;
+			}
+			case KING_NEBULA:
+			{
+				portalId = PORTAL_EVENT_WATER;
+				portalLocation = new Location(222127, 170488, -15488);
+				break;
+			}
+			default:
+			{
+				return;
+			}
+		}
+		portal = addSpawn(portalId, portalLocation, false, 0, false, instance.getId());
+		
+		if (portal != null)
+		{
+			portal.setDisplayEffect(1);
+		}
+		
+	}
+	
+	private int getPortalByBossId(int bossId)
+	{
+		switch (bossId)
+		{
+			case KING_PETRAM:
+			{
+				return 0;
+			}
+			case KING_IGNIS:
+			{
+				return 1;
+			}
+			case KING_NEBULA:
+			{
+				return 2;
+			}
+			case KING_PROCELLA:
+			{
+				return 3;
+			}
+			default:
+				return -1;
 		}
 	}
 	
-	private void enableZoneFire()
+	private int getPortalIdByZone(int zoneId)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("dwelling_portal_fire");
-		if (zone != null)
+		switch (zoneId)
 		{
-			zone.setEnabled(true);
+			case PETRAM_PORTAL_ENTER_ID:
+			case PETRAM_PORTAL_RETURN_ID:
+			{
+				return 0;
+			}
+			case IGNIS_PORTAL_ENTER_ID:
+			case IGNIS_PORTAL_RETURN_ID:
+			{
+				return 1;
+			}
+			case NEBULA_PORTAL_ENTER_ID:
+			case NEBULA_PORTAL_RETURN_ID:
+			{
+				return 2;
+			}
+			case PROCELLA_PORTAL_ENTER_ID:
+			case PROCELLA_PORTAL_RETURN_ID:
+			{
+				return 3;
+			}
+			default:
+			{
+				return -1;
+			}
 		}
 	}
 	
-	private void enableZoneWater()
+	private Location[] getLocationsForPortal(int portalId)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("dwelling_portal_water");
-		if (zone != null)
+		Location[] locations = new Location[2];
+		
+		switch (portalId)
 		{
-			zone.setEnabled(true);
+			case 0:
+			{
+				locations[0] = PETRAM_EARTH_L;
+				locations[1] = PETRAM_EARTH_RETURN_L;
+				break;
+			}
+			case 1:
+			{
+				locations[0] = IGNIS_FIRE_L;
+				locations[1] = IGNIS_FIRE_RETURN_L;
+				break;
+			}
+			case 2:
+			{
+				locations[0] = NEBULA_WATER_L;
+				locations[1] = NEBULA_WATER_RETURN_L;
+				break;
+			}
+			case 3:
+			{
+				locations[0] = PROCELLA_WIN_L;
+				locations[1] = PROCELLA_WIN_RETURN_L;
+				break;
+			}
+		}
+		
+		return locations;
+	}
+	
+	private void CheckGeneralResidenceStages(Npc npc, Instance instance)
+	{
+		final StatSet worldParameters = instance.getParameters();
+		
+		int portalId = getPortalByBossId(npc.getId());
+		
+		if ((portalId >= 0) && (portalId < portalConfigs.length))
+		{
+			String bossDefeatCountKey = "bossOfPortal_" + portalId + "_defeat_count";
+			int currentDefeatCount = worldParameters.getInt(bossDefeatCountKey, 0);
+			int newDefeatCount = currentDefeatCount + 1;
+			
+			worldParameters.set(bossDefeatCountKey, newDefeatCount);
+		}
+		
+		int totalBossDefeatCount = 0;
+		
+		for (int i = 0; i < portalConfigs.length; i++)
+		{
+			String bossDefeatCountKey = "bossOfPortal_" + i + "_defeat_count";
+			totalBossDefeatCount += worldParameters.getInt(bossDefeatCountKey, 0);
+		}
+		
+		worldParameters.set("totalBossDefeatCount", totalBossDefeatCount);
+		
+		if (totalBossDefeatCount >= 4)
+		{
+			instance.spawnGroup("animael");
+			instance.despawnGroup("ruipwave_1");
+			instance.despawnGroup("NormalMobs");
 		}
 	}
 	
-	private void enableZoneWindExit()
+	private void handleCentralZone(Instance instance, StatSet worldParameters)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("return_portal_procella");
-		if (zone != null)
+		for (int id = 0; id < PORTAL_TRIGGER_IDS.length; id++)
 		{
-			zone.setEnabled(true);
-		}
-	}
-	
-	private void enableZoneEarthExit()
-	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("return_portal_petram");
-		if (zone != null)
-		{
-			zone.setEnabled(true);
-		}
-	}
-	
-	private void enableZoneFireExit()
-	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("return_portal_ignis");
-		if (zone != null)
-		{
-			zone.setEnabled(true);
-		}
-	}
-	
-	private void enableZoneWaterExit()
-	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("return_portal_nebula");
-		if (zone != null)
-		{
-			zone.setEnabled(true);
+			int trigger1 = worldParameters.getInt("TRIGGER_1_" + id, -1);
+			int trigger2 = worldParameters.getInt("TRIGGER_2_" + id, -1);
+			
+			if ((trigger1 != -1) && (trigger2 != -1))
+			{
+				instance.broadcastPacket(new OnEventTrigger(trigger1, true));
+				instance.broadcastPacket(new OnEventTrigger(trigger2, true));
+			}
 		}
 	}
 	
 	private void startEvent(Npc npc, Player player)
 	{
-		if (!player.getInstanceWorld().getParameters().getBoolean("DwellingOfSpiritsFinished", false))
+		final Instance instance = player.getInstanceWorld();
+		instance.setParameter("Running", true);
+		player.getInstanceWorld().broadcastPacket(new ExSendUIEvent(player, false, false, (int) (instance.getRemainingTime() / 1000), 0, NpcStringId.TIME_LEFT));
+		player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(4), null));
+		instance.spawnGroup("ruipwave_1");
+		instance.spawnGroup("NormalMobs");
+		
+		if (npc.getId() == SEALSTONE)
 		{
-			player.sendPacket(new ExSendUIEvent(player, false, false, 1800, 2, NpcStringId.TIME_LEFT));
-			player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(5), null));
-			startQuestTimer("check_status", 1000, null, player);
+			instance.despawnGroup("sealstone");
 		}
+		
+	}
+	
+	@Override
+	public void onInstanceEnter(Player player, Instance instance)
+	{
+		boolean Running = instance.getParameters().getBoolean("Running", false);
+		if ((instance.getRemainingTime() > 0) && Running)
+		{
+			player.sendPacket(new ExSendUIEvent(player, false, false, (int) (instance.getRemainingTime() / 1000), 0, NpcStringId.TIME_LEFT));
+		}
+	}
+	
+	@Override
+	public void onInstanceLeave(Player player, Instance instance)
+	{
+		
+		player.sendPacket(new ExSendUIEvent(player, false, false, 0, 0, NpcStringId.TIME_LEFT));
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
index ff278fe85c..3465ec2a61 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.ai.AttackableAI;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.instancemanager.InstanceManager;
@@ -59,6 +60,8 @@ public class TimedHunting extends AbstractInstance
 	private static final int PANJI = 34125;
 	// Skill
 	private static final int BUFF = 45197;
+	private static final int BUFF_FOR_KAMAEL = 45198;
+	
 	// Misc
 	private static final int[] TEMPLATES =
 	{
@@ -187,7 +190,14 @@ public class TimedHunting extends AbstractInstance
 		}
 		
 		npc.setTarget(player);
-		if (!player.getEffectList().isAffectedBySkill(BUFF))
+		if (player.getRace() == Race.KAMAEL)
+		{
+			if (!player.getEffectList().isAffectedBySkill(BUFF_FOR_KAMAEL))
+			{
+				npc.doCast(new SkillHolder(BUFF_FOR_KAMAEL, 1).getSkill());
+			}
+		}
+		else if (!player.getEffectList().isAffectedBySkill(BUFF))
 		{
 			npc.doCast(new SkillHolder(BUFF, 1).getSkill());
 		}
@@ -257,6 +267,7 @@ public class TimedHunting extends AbstractInstance
 		player.sendPacket(new TimedHuntingZoneExit(108)); // Training Zone id.
 		
 		player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, BUFF);
+		player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, BUFF_FOR_KAMAEL);
 		instance.setParameter("PlayerIsOut", true);
 		
 		// Restore normal skills.
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/augmentation/options/50100-50199.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/augmentation/options/50100-50199.xml
index a8ca1f4868..d51c973aeb 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/augmentation/options/50100-50199.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/augmentation/options/50100-50199.xml
@@ -675,38 +675,38 @@
 	</option>
 	<option id="50188" name="o_s_cl_deliverance">
 		<!-- <Arcane Deliverance>\nWhen triggered: Recovers 6000 HP, 1000 MP and 3000 CP when HP is lower than 20%. -->
-		<passive_skill id="39325" level="2" /> <!-- unknown skill -->
+		<passive_skill id="39325" level="1" /> <!-- Arcane Deliverance -->
 	</option>
 	<option id="50189" name="o_s_cl_speed">
 		<!-- <Arcane Speed>\nWhen triggered: Atk. Spd. +100, Casting Spd. +150, Speed +10. -->
-		<passive_skill id="39326" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39326" level="1" /> <!-- Arcane Speed -->
 	</option>
 	<option id="50190" name="o_s_cl_barrier">
 		<!-- <Arcane Barrier>\nWhen triggered: Absorbs 4000 damage. -->
-		<passive_skill id="39327" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39327" level="1" /> <!-- Arcane Barrier -->
 	</option>
 	<option id="50191" name="o_s_cl_immunity">
 		<!-- <Arcane Immunity>\nWhen triggered: Grants immunity to debuffs. -->
-		<passive_skill id="39328" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39328" level="1" /> <!-- Arcane Immunity -->
 	</option>
 	<option id="50192" name="o_s_cl_protection">
 		<!-- <Arcane Protection>\nWhen triggered: P. Def. +3000, M. Def. +2100. -->
-		<passive_skill id="39329" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39329" level="1" /> <!-- Arcane Protection -->
 	</option>
 	<option id="50193" name="o_s_cl_paralysis">
 		<!-- <Arcane Paralysis>\nWhen triggered: Paralyzes the target. -->
-		<passive_skill id="39330" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39330" level="1" /> <!-- Arcane Paralysis -->
 	</option>
 	<option id="50194" name="o_s_cl_silence">
 		<!-- <Arcane Silence>\nWhen triggered: Inflicts Silence on the target. -->
-		<passive_skill id="39331" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39331" level="1" /> <!-- Arcane Silence -->
 	</option>
 	<option id="50195" name="o_s_cl_sense">
 		<!-- <Arcane Critical Sense>\nAll Critical Rate +3%, All Critical Damage +150 -->
-		<passive_skill id="39332" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39332" level="1" /> <!-- Arcane Critical Sense -->
 	</option>
 	<option id="50196" name="o_s_cl_power">
 		<!-- <Arcane Power>\nP. Atk. +350, M. Atk. +500 -->
-		<passive_skill id="39333" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39333" level="1" /> <!-- Arcane Power -->
 	</option>
 </list>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/49400-49499.xml
index a61f30a273..a5da445f5b 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/49400-49499.xml
@@ -1430,13 +1430,23 @@
 	<item id="49489" name="Parts of Enchantment Scrolls Chest" type="EtcItem">
 		<!-- Double-click to obtain an Enchantment Scroll's Part. Note!. Сannot be exchanged, dropped, or sold. -->
 		<set name="icon" val="icon.etc_treasure_box_i08" />
-		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="default_action" val="PEEL" />
 		<set name="material" val="FISH" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="49474" min="1" max="1" chance="20" /> <!-- Scroll Part: Enchant Weapon -->
+			<item id="49475" min="1" max="1" chance="50" /> <!-- Scroll Part: Enchant Armor -->
+			<item id="49476" min="1" max="1" chance="2" /> <!-- Refined Scroll Part: Enchant Weapon -->
+			<item id="49478" min="1" max="1" chance="13" /> <!-- Refined Scroll Part: Enchant Armor -->
+			<item id="49479" min="1" max="1" chance="2" /> <!-- Solid Scroll Part: Enchant Weapon -->
+			<item id="49480" min="1" max="1" chance="13" /> <!-- Solid Scroll Part: Enchant Armor -->
+		</capsuled_items>
 	</item>
 	<item id="49490" name="Fishing kit" type="EtcItem">
 		<!-- Double-click to obtain specified items. -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/49500-49599.xml
index f8466f8d5f..8b8796b7da 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/49500-49599.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/49500-49599.xml
@@ -424,6 +424,8 @@
 		<!-- Restores 500 HP. The remaining points are used to restore CP. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="LIQUID" />
 		<set name="weight" val="1" />
 		<set name="is_tradable" val="false" />
@@ -431,6 +433,12 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="is_event_restricted" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<skills>
+			<skill id="39103" level="1" /> <!-- Quick Hero Healing Potion -->
+		</skills>
 	</item>
 	<item id="49534" name="Hero Cube" additionalName="7-day" type="EtcItem">
 		<!-- Available for 7 days. Required level: 20. Double-click to obtain Soulshot Ticket, Buff Scroll Chest, Hero's Top-grade HP Replenishing Potion, Hero's HP Recovery Potion, Angel Cat's Blessing, Improved Scroll of Resurrection, Chest of Enchant Scroll's Parts, Fishing Kit, Box of Scroll of Escape to Base, Blade Spirit, Spellbook Chest. Can be used only once a day. -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/49800-49899.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/49800-49899.xml
index 4a83408216..36dffbd7a7 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/49800-49899.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/49800-49899.xml
@@ -772,6 +772,10 @@
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="time" val="10080" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39199" level="1" /> <!-- Hero's Wondrous Cubic -->
+		</skills>
 	</item>
 	<item id="49861" name="Life Stone - Tester" additionalName="Tester" type="EtcItem">
 		<!-- Test -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/71900-71999.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/71900-71999.xml
index 05e0eee6c0..0836b9f0f3 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/71900-71999.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/71900-71999.xml
@@ -468,7 +468,7 @@
 		<set name="handler" val="ExtractableItems" />
 		<set name="extractableCountMin" val="1" />
 		<set name="extractableCountMax" val="1" />
-		<capsuled_items>‬
+		<capsuled_items>
 			<item id="49674" min="2" max="2" chance="10.0" /> <!-- XP Growth Scroll -->
 			<item id="90907" min="10" max="10" chance="10.0" /> <!-- Soulshot Ticket -->
 			<item id="91031" min="1" max="1" chance="6.147" /> <!-- Water Spirit Evolution Stone -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94100-94199.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94100-94199.xml
index a811a3bb9d..3037b7860d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94100-94199.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94100-94199.xml
@@ -292,6 +292,16 @@
 		<cond msgId="113" addName="1">
 			<player level="60" />
 		</cond>
+		<skills>
+			<skill id="35020" level="1" type="ON_EQUIP" /> <!-- Equip Talisman - Baium -->
+			<skill id="35021" level="1" type="ON_UNEQUIP" /> <!-- Unequip Talisman - Baium -->
+			<skill id="35017" level="7" /> <!-- Equip Talisman - Baium -->
+			<skill id="50191" level="1" type="ON_ENCHANT" type_value="1" /> <!-- Enchant Effect: +1 Talisman of Baium -->
+			<skill id="50191" level="2" type="ON_ENCHANT" type_value="2" /> <!-- Enchant Effect: +2 Talisman of Baium -->
+			<skill id="50191" level="3" type="ON_ENCHANT" type_value="3" /> <!-- Enchant Effect: +3 Talisman of Baium -->
+			<skill id="50191" level="4" type="ON_ENCHANT" type_value="4" /> <!-- Enchant Effect: +4 Talisman of Baium -->
+			<skill id="50191" level="5" type="ON_ENCHANT" type_value="5" /> <!-- Enchant Effect: +5 Talisman of Baium -->
+		</skills>
 	</item>
 	<item id="94120" name="Package: Talisman of Baium" additionalName="Sealed" type="EtcItem">
 		<!-- Double-click to obtain specified items. -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94400-94499.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94400-94499.xml
index f58fcf1048..1dc2c3e069 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94400-94499.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94400-94499.xml
@@ -1232,7 +1232,10 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="40238" level="1" /> <!-- XP +100,000,000 -->
+		</skills>
 	</item>
 	<item id="94481" name="Clan XP" type="EtcItem">
 		<!-- Clan XP is granted as a reward. -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94500-94599.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94500-94599.xml
index 55a6db9c24..caeeeaccec 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94500-94599.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94500-94599.xml
@@ -190,7 +190,10 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="40241" level="1" />
+		</skills>
 	</item>
 	<item id="94518" name="Amber" additionalName="Lv. 5" type="Armor">
 		<!-- <Active skill>. Interrupts a skill used by the target. <PvP effect>. Ignores CP and deals 2000 fixed damage. Effects of two identical jewels do not stack, the higher-level jewel takes precedence. -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94600-94699.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94600-94699.xml
index 5b422a21bd..5728bd34fd 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94600-94699.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/items/94600-94699.xml
@@ -604,7 +604,10 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="40250" level="1" /> <!-- XP +100,000,000 -->
+		</skills>
 	</item>
 	<item id="94636" name="Pet XP Growth Scroll" type="EtcItem">
 		<!-- Applies a buff when used. <Buff effect>. Pet's acquired XP +30%. Duration: 20 min. Cooldown: 1 min. The effect disappears after death or unsummoning. -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/pets/16079_BuffaloCalt.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/pets/16079_BuffaloCalf.xml
similarity index 97%
rename from L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/pets/16079_BuffaloCalt.xml
rename to L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/pets/16079_BuffaloCalf.xml
index d4c7fa3288..b0f4576405 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/pets/16079_BuffaloCalt.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/pets/16079_BuffaloCalf.xml
@@ -1,1721 +1,1721 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/PetData.xsd">
-	<pet id="16079" itemId="93961" index="10" evolveLevel="None" type="13">
-		<set name="food" val="93966" />
-		<set name="hungry_limit" val="50" />
-		<set name="load" val="45540" />
-		<skills>
-			<skill minLevel="1" skillId="6618" skillLevel="1" />
-			<skill minLevel="60" skillId="6618" skillLevel="2" />
-			<skill minLevel="65" skillId="6618" skillLevel="3" />
-			<skill minLevel="70" skillId="6618" skillLevel="4" />
-			<skill minLevel="75" skillId="6618" skillLevel="5" />
-			<skill minLevel="80" skillId="6618" skillLevel="6" />
-			<skill minLevel="85" skillId="6618" skillLevel="7" />
-			<skill minLevel="60" skillId="6681" skillLevel="1" />
-			<skill minLevel="60" skillId="6683" skillLevel="1" />
-		</skills>
-		<stats>
-			<stat level="1">
-				<set name="max_meal" val="3000" />
-				<set name="exp" val="0" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="12" />
-				<set name="consume_meal_in_normal" val="2" />
-				<set name="org_pattack" val="167.83" />
-				<set name="org_pdefend" val="81" />
-				<set name="org_mattack" val="109.93" />
-				<set name="org_mdefend" val="36" />
-				<set name="org_hp" val="94" />
-				<set name="org_mp" val="30" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="2">
-				<set name="max_meal" val="3090" />
-				<set name="exp" val="68" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="12" />
-				<set name="consume_meal_in_normal" val="2" />
-				<set name="org_pattack" val="169.7" />
-				<set name="org_pdefend" val="81.9" />
-				<set name="org_mattack" val="111.15" />
-				<set name="org_mdefend" val="36.4" />
-				<set name="org_hp" val="107.65" />
-				<set name="org_mp" val="35.46" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="3">
-				<set name="max_meal" val="3183" />
-				<set name="exp" val="364" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="13" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="171.56" />
-				<set name="org_pdefend" val="82.8" />
-				<set name="org_mattack" val="112.37" />
-				<set name="org_mdefend" val="36.8" />
-				<set name="org_hp" val="121.45" />
-				<set name="org_mp" val="40.98" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="4">
-				<set name="max_meal" val="3278" />
-				<set name="exp" val="1169" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="13" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="173.43" />
-				<set name="org_pdefend" val="83.7" />
-				<set name="org_mattack" val="113.59" />
-				<set name="org_mdefend" val="37.2" />
-				<set name="org_hp" val="135.4" />
-				<set name="org_mp" val="46.56" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="5">
-				<set name="max_meal" val="3376" />
-				<set name="exp" val="2885" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="14" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="175.29" />
-				<set name="org_pdefend" val="84.6" />
-				<set name="org_mattack" val="114.82" />
-				<set name="org_mdefend" val="37.6" />
-				<set name="org_hp" val="149.5" />
-				<set name="org_mp" val="52.2" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="6">
-				<set name="max_meal" val="3477" />
-				<set name="exp" val="6039" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="15" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="177.16" />
-				<set name="org_pdefend" val="85.5" />
-				<set name="org_mattack" val="116.04" />
-				<set name="org_mdefend" val="38" />
-				<set name="org_hp" val="163.75" />
-				<set name="org_mp" val="57.9" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="7">
-				<set name="max_meal" val="3581" />
-				<set name="exp" val="11288" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="15" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="179.02" />
-				<set name="org_pdefend" val="86.4" />
-				<set name="org_mattack" val="117.26" />
-				<set name="org_mdefend" val="38.4" />
-				<set name="org_hp" val="178.15" />
-				<set name="org_mp" val="63.66" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="8">
-				<set name="max_meal" val="3688" />
-				<set name="exp" val="19424" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="16" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="180.89" />
-				<set name="org_pdefend" val="87.3" />
-				<set name="org_mattack" val="118.48" />
-				<set name="org_mdefend" val="38.8" />
-				<set name="org_hp" val="192.7" />
-				<set name="org_mp" val="69.48" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="9">
-				<set name="max_meal" val="3799" />
-				<set name="exp" val="31379" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="16" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="182.75" />
-				<set name="org_pdefend" val="88.2" />
-				<set name="org_mattack" val="119.7" />
-				<set name="org_mdefend" val="39.2" />
-				<set name="org_hp" val="207.4" />
-				<set name="org_mp" val="75.36" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="10">
-				<set name="max_meal" val="3913" />
-				<set name="exp" val="48230" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="17" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="184.62" />
-				<set name="org_pdefend" val="89.1" />
-				<set name="org_mattack" val="120.92" />
-				<set name="org_mdefend" val="39.6" />
-				<set name="org_hp" val="222.25" />
-				<set name="org_mp" val="81.3" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="11">
-				<set name="max_meal" val="4030" />
-				<set name="exp" val="71203" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="18" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="186.48" />
-				<set name="org_pdefend" val="90" />
-				<set name="org_mattack" val="122.14" />
-				<set name="org_mdefend" val="40" />
-				<set name="org_hp" val="237.25" />
-				<set name="org_mp" val="87.3" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="12">
-				<set name="max_meal" val="4151" />
-				<set name="exp" val="101678" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="18" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="188.34" />
-				<set name="org_pdefend" val="90.9" />
-				<set name="org_mattack" val="123.37" />
-				<set name="org_mdefend" val="40.4" />
-				<set name="org_hp" val="252.4" />
-				<set name="org_mp" val="93.36" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="13">
-				<set name="max_meal" val="4276" />
-				<set name="exp" val="141194" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="19" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="190.21" />
-				<set name="org_pdefend" val="91.8" />
-				<set name="org_mattack" val="124.59" />
-				<set name="org_mdefend" val="40.8" />
-				<set name="org_hp" val="267.7" />
-				<set name="org_mp" val="99.48" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="14">
-				<set name="max_meal" val="4404" />
-				<set name="exp" val="191455" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="20" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="192.07" />
-				<set name="org_pdefend" val="92.7" />
-				<set name="org_mattack" val="125.81" />
-				<set name="org_mdefend" val="41.2" />
-				<set name="org_hp" val="283.15" />
-				<set name="org_mp" val="105.66" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="15">
-				<set name="max_meal" val="4536" />
-				<set name="exp" val="254331" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="21" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="193.94" />
-				<set name="org_pdefend" val="93.6" />
-				<set name="org_mattack" val="127.03" />
-				<set name="org_mdefend" val="41.6" />
-				<set name="org_hp" val="298.75" />
-				<set name="org_mp" val="111.9" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="16">
-				<set name="max_meal" val="4672" />
-				<set name="exp" val="331868" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="22" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="195.8" />
-				<set name="org_pdefend" val="94.5" />
-				<set name="org_mattack" val="128.25" />
-				<set name="org_mdefend" val="42" />
-				<set name="org_hp" val="314.5" />
-				<set name="org_mp" val="118.2" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="17">
-				<set name="max_meal" val="4812" />
-				<set name="exp" val="426289" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="22" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="197.67" />
-				<set name="org_pdefend" val="95.4" />
-				<set name="org_mattack" val="129.47" />
-				<set name="org_mdefend" val="42.4" />
-				<set name="org_hp" val="330.4" />
-				<set name="org_mp" val="124.56" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="18">
-				<set name="max_meal" val="4956" />
-				<set name="exp" val="540001" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="23" />
-				<set name="consume_meal_in_normal" val="5" />
-				<set name="org_pattack" val="199.53" />
-				<set name="org_pdefend" val="96.3" />
-				<set name="org_mattack" val="130.69" />
-				<set name="org_mdefend" val="42.8" />
-				<set name="org_hp" val="346.45" />
-				<set name="org_mp" val="130.98" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="19">
-				<set name="max_meal" val="5105" />
-				<set name="exp" val="675597" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="24" />
-				<set name="consume_meal_in_normal" val="5" />
-				<set name="org_pattack" val="201.4" />
-				<set name="org_pdefend" val="97.2" />
-				<set name="org_mattack" val="131.92" />
-				<set name="org_mdefend" val="43.2" />
-				<set name="org_hp" val="362.65" />
-				<set name="org_mp" val="137.46" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="20">
-				<set name="max_meal" val="5258" />
-				<set name="exp" val="835864" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="25" />
-				<set name="consume_meal_in_normal" val="5" />
-				<set name="org_pattack" val="203.26" />
-				<set name="org_pdefend" val="98.1" />
-				<set name="org_mattack" val="133.14" />
-				<set name="org_mdefend" val="43.6" />
-				<set name="org_hp" val="379" />
-				<set name="org_mp" val="144" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="21">
-				<set name="max_meal" val="5416" />
-				<set name="exp" val="1020171" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="26" />
-				<set name="consume_meal_in_normal" val="5" />
-				<set name="org_pattack" val="205.13" />
-				<set name="org_pdefend" val="99" />
-				<set name="org_mattack" val="134.36" />
-				<set name="org_mdefend" val="44" />
-				<set name="org_hp" val="414.2" />
-				<set name="org_mp" val="153.9" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="22">
-				<set name="max_meal" val="5578" />
-				<set name="exp" val="1232124" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="27" />
-				<set name="consume_meal_in_normal" val="5" />
-				<set name="org_pattack" val="206.99" />
-				<set name="org_pdefend" val="99.9" />
-				<set name="org_mattack" val="135.58" />
-				<set name="org_mdefend" val="44.4" />
-				<set name="org_hp" val="449.72" />
-				<set name="org_mp" val="163.89" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="23">
-				<set name="max_meal" val="5745" />
-				<set name="exp" val="1475870" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="28" />
-				<set name="consume_meal_in_normal" val="6" />
-				<set name="org_pattack" val="208.86" />
-				<set name="org_pdefend" val="100.8" />
-				<set name="org_mattack" val="136.8" />
-				<set name="org_mdefend" val="44.8" />
-				<set name="org_hp" val="485.56" />
-				<set name="org_mp" val="173.97" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="24">
-				<set name="max_meal" val="5917" />
-				<set name="exp" val="1756178" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="30" />
-				<set name="consume_meal_in_normal" val="6" />
-				<set name="org_pattack" val="210.72" />
-				<set name="org_pdefend" val="101.7" />
-				<set name="org_mattack" val="138.02" />
-				<set name="org_mdefend" val="45.2" />
-				<set name="org_hp" val="521.72" />
-				<set name="org_mp" val="184.14" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="25">
-				<set name="max_meal" val="6095" />
-				<set name="exp" val="2078532" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="31" />
-				<set name="consume_meal_in_normal" val="6" />
-				<set name="org_pattack" val="212.59" />
-				<set name="org_pdefend" val="102.6" />
-				<set name="org_mattack" val="139.24" />
-				<set name="org_mdefend" val="45.6" />
-				<set name="org_hp" val="558.2" />
-				<set name="org_mp" val="194.4" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="26">
-				<set name="max_meal" val="6278" />
-				<set name="exp" val="2452463" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="32" />
-				<set name="consume_meal_in_normal" val="6" />
-				<set name="org_pattack" val="214.45" />
-				<set name="org_pdefend" val="103.5" />
-				<set name="org_mattack" val="140.47" />
-				<set name="org_mdefend" val="46" />
-				<set name="org_hp" val="595" />
-				<set name="org_mp" val="204.75" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="27">
-				<set name="max_meal" val="6466" />
-				<set name="exp" val="2886223" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="33" />
-				<set name="consume_meal_in_normal" val="7" />
-				<set name="org_pattack" val="216.32" />
-				<set name="org_pdefend" val="104.4" />
-				<set name="org_mattack" val="141.69" />
-				<set name="org_mdefend" val="46.4" />
-				<set name="org_hp" val="632.12" />
-				<set name="org_mp" val="215.19" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="28">
-				<set name="max_meal" val="6660" />
-				<set name="exp" val="3389384" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="35" />
-				<set name="consume_meal_in_normal" val="7" />
-				<set name="org_pattack" val="218.18" />
-				<set name="org_pdefend" val="105.3" />
-				<set name="org_mattack" val="142.91" />
-				<set name="org_mdefend" val="46.8" />
-				<set name="org_hp" val="669.56" />
-				<set name="org_mp" val="225.72" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="29">
-				<set name="max_meal" val="6860" />
-				<set name="exp" val="3973052" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="36" />
-				<set name="consume_meal_in_normal" val="7" />
-				<set name="org_pattack" val="220.05" />
-				<set name="org_pdefend" val="106.2" />
-				<set name="org_mattack" val="144.13" />
-				<set name="org_mdefend" val="47.2" />
-				<set name="org_hp" val="707.32" />
-				<set name="org_mp" val="236.34" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="30">
-				<set name="max_meal" val="7066" />
-				<set name="exp" val="4650105" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="37" />
-				<set name="consume_meal_in_normal" val="7" />
-				<set name="org_pattack" val="221.91" />
-				<set name="org_pdefend" val="107.1" />
-				<set name="org_mattack" val="145.35" />
-				<set name="org_mdefend" val="47.6" />
-				<set name="org_hp" val="745.4" />
-				<set name="org_mp" val="247.05" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="31">
-				<set name="max_meal" val="7278" />
-				<set name="exp" val="5442259" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="39" />
-				<set name="consume_meal_in_normal" val="8" />
-				<set name="org_pattack" val="223.78" />
-				<set name="org_pdefend" val="108" />
-				<set name="org_mattack" val="146.57" />
-				<set name="org_mdefend" val="48" />
-				<set name="org_hp" val="783.8" />
-				<set name="org_mp" val="257.85" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="32">
-				<set name="max_meal" val="7496" />
-				<set name="exp" val="6369078" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="40" />
-				<set name="consume_meal_in_normal" val="8" />
-				<set name="org_pattack" val="225.64" />
-				<set name="org_pdefend" val="108.9" />
-				<set name="org_mattack" val="147.79" />
-				<set name="org_mdefend" val="48.4" />
-				<set name="org_hp" val="822.52" />
-				<set name="org_mp" val="268.74" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="33">
-				<set name="max_meal" val="7721" />
-				<set name="exp" val="7453456" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="42" />
-				<set name="consume_meal_in_normal" val="8" />
-				<set name="org_pattack" val="227.51" />
-				<set name="org_pdefend" val="109.8" />
-				<set name="org_mattack" val="149.02" />
-				<set name="org_mdefend" val="48.8" />
-				<set name="org_hp" val="861.56" />
-				<set name="org_mp" val="279.72" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="34">
-				<set name="max_meal" val="7953" />
-				<set name="exp" val="8722179" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="44" />
-				<set name="consume_meal_in_normal" val="9" />
-				<set name="org_pattack" val="229.37" />
-				<set name="org_pdefend" val="110.7" />
-				<set name="org_mattack" val="150.24" />
-				<set name="org_mdefend" val="49.2" />
-				<set name="org_hp" val="900.92" />
-				<set name="org_mp" val="290.79" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="35">
-				<set name="max_meal" val="8192" />
-				<set name="exp" val="10206584" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="46" />
-				<set name="consume_meal_in_normal" val="9" />
-				<set name="org_pattack" val="231.24" />
-				<set name="org_pdefend" val="111.6" />
-				<set name="org_mattack" val="151.46" />
-				<set name="org_mdefend" val="49.6" />
-				<set name="org_hp" val="940.6" />
-				<set name="org_mp" val="301.95" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="36">
-				<set name="max_meal" val="8438" />
-				<set name="exp" val="11958183" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="47" />
-				<set name="consume_meal_in_normal" val="9" />
-				<set name="org_pattack" val="233.1" />
-				<set name="org_pdefend" val="112.5" />
-				<set name="org_mattack" val="152.68" />
-				<set name="org_mdefend" val="50" />
-				<set name="org_hp" val="980.6" />
-				<set name="org_mp" val="313.2" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="37">
-				<set name="max_meal" val="8691" />
-				<set name="exp" val="14025069" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="49" />
-				<set name="consume_meal_in_normal" val="10" />
-				<set name="org_pattack" val="234.96" />
-				<set name="org_pdefend" val="113.4" />
-				<set name="org_mattack" val="153.9" />
-				<set name="org_mdefend" val="50.4" />
-				<set name="org_hp" val="1020.92" />
-				<set name="org_mp" val="324.54" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="38">
-				<set name="max_meal" val="8952" />
-				<set name="exp" val="16463995" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="51" />
-				<set name="consume_meal_in_normal" val="10" />
-				<set name="org_pattack" val="236.83" />
-				<set name="org_pdefend" val="114.3" />
-				<set name="org_mattack" val="155.12" />
-				<set name="org_mdefend" val="50.8" />
-				<set name="org_hp" val="1061.56" />
-				<set name="org_mp" val="335.97" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="39">
-				<set name="max_meal" val="9221" />
-				<set name="exp" val="19341927" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="53" />
-				<set name="consume_meal_in_normal" val="11" />
-				<set name="org_pattack" val="238.69" />
-				<set name="org_pdefend" val="115.2" />
-				<set name="org_mattack" val="156.34" />
-				<set name="org_mdefend" val="51.2" />
-				<set name="org_hp" val="1102.52" />
-				<set name="org_mp" val="347.49" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="40">
-				<set name="max_meal" val="9498" />
-				<set name="exp" val="22737888" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="55" />
-				<set name="consume_meal_in_normal" val="11" />
-				<set name="org_pattack" val="240.56" />
-				<set name="org_pdefend" val="116.1" />
-				<set name="org_mattack" val="157.57" />
-				<set name="org_mdefend" val="51.6" />
-				<set name="org_hp" val="1143.8" />
-				<set name="org_mp" val="359.1" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="41">
-				<set name="max_meal" val="9783" />
-				<set name="exp" val="26779080" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="58" />
-				<set name="consume_meal_in_normal" val="12" />
-				<set name="org_pattack" val="242.42" />
-				<set name="org_pdefend" val="117" />
-				<set name="org_mattack" val="158.79" />
-				<set name="org_mdefend" val="52" />
-				<set name="org_hp" val="1198.4" />
-				<set name="org_mp" val="378.6" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="42">
-				<set name="max_meal" val="10076" />
-				<set name="exp" val="31588100" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="60" />
-				<set name="consume_meal_in_normal" val="12" />
-				<set name="org_pattack" val="244.29" />
-				<set name="org_pdefend" val="117.9" />
-				<set name="org_mattack" val="160.01" />
-				<set name="org_mdefend" val="52.4" />
-				<set name="org_hp" val="1253.42" />
-				<set name="org_mp" val="398.25" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="43">
-				<set name="max_meal" val="10378" />
-				<set name="exp" val="37310833" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="62" />
-				<set name="consume_meal_in_normal" val="12" />
-				<set name="org_pattack" val="246.15" />
-				<set name="org_pdefend" val="118.8" />
-				<set name="org_mattack" val="161.23" />
-				<set name="org_mdefend" val="52.8" />
-				<set name="org_hp" val="1308.86" />
-				<set name="org_mp" val="418.05" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="44">
-				<set name="max_meal" val="10689" />
-				<set name="exp" val="44120885" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="65" />
-				<set name="consume_meal_in_normal" val="13" />
-				<set name="org_pattack" val="248.02" />
-				<set name="org_pdefend" val="119.7" />
-				<set name="org_mattack" val="162.45" />
-				<set name="org_mdefend" val="53.2" />
-				<set name="org_hp" val="1364.72" />
-				<set name="org_mp" val="438" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="45">
-				<set name="max_meal" val="11010" />
-				<set name="exp" val="52224847" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="67" />
-				<set name="consume_meal_in_normal" val="13" />
-				<set name="org_pattack" val="249.88" />
-				<set name="org_pdefend" val="120.6" />
-				<set name="org_mattack" val="163.67" />
-				<set name="org_mdefend" val="53.6" />
-				<set name="org_hp" val="1421" />
-				<set name="org_mp" val="458.1" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="46">
-				<set name="max_meal" val="11340" />
-				<set name="exp" val="61949602" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="70" />
-				<set name="consume_meal_in_normal" val="14" />
-				<set name="org_pattack" val="251.75" />
-				<set name="org_pdefend" val="121.5" />
-				<set name="org_mattack" val="164.89" />
-				<set name="org_mdefend" val="54" />
-				<set name="org_hp" val="1477.7" />
-				<set name="org_mp" val="478.35" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="47">
-				<set name="max_meal" val="11680" />
-				<set name="exp" val="73619307" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="73" />
-				<set name="consume_meal_in_normal" val="15" />
-				<set name="org_pattack" val="253.61" />
-				<set name="org_pdefend" val="122.4" />
-				<set name="org_mattack" val="166.12" />
-				<set name="org_mdefend" val="54.4" />
-				<set name="org_hp" val="1534.82" />
-				<set name="org_mp" val="498.75" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="48">
-				<set name="max_meal" val="12030" />
-				<set name="exp" val="87622954" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="76" />
-				<set name="consume_meal_in_normal" val="15" />
-				<set name="org_pattack" val="255.48" />
-				<set name="org_pdefend" val="123.3" />
-				<set name="org_mattack" val="167.34" />
-				<set name="org_mdefend" val="54.8" />
-				<set name="org_hp" val="1592.36" />
-				<set name="org_mp" val="519.3" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="49">
-				<set name="max_meal" val="12391" />
-				<set name="exp" val="104427330" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="79" />
-				<set name="consume_meal_in_normal" val="16" />
-				<set name="org_pattack" val="257.34" />
-				<set name="org_pdefend" val="124.2" />
-				<set name="org_mattack" val="168.56" />
-				<set name="org_mdefend" val="55.2" />
-				<set name="org_hp" val="1650.32" />
-				<set name="org_mp" val="540" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="50">
-				<set name="max_meal" val="12763" />
-				<set name="exp" val="124592581" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="82" />
-				<set name="consume_meal_in_normal" val="16" />
-				<set name="org_pattack" val="259.21" />
-				<set name="org_pdefend" val="125.1" />
-				<set name="org_mattack" val="169.78" />
-				<set name="org_mdefend" val="55.6" />
-				<set name="org_hp" val="1708.7" />
-				<set name="org_mp" val="560.85" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="51">
-				<set name="max_meal" val="13146" />
-				<set name="exp" val="148790883" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="85" />
-				<set name="consume_meal_in_normal" val="17" />
-				<set name="org_pattack" val="261.07" />
-				<set name="org_pdefend" val="126" />
-				<set name="org_mattack" val="171" />
-				<set name="org_mdefend" val="56" />
-				<set name="org_hp" val="1767.5" />
-				<set name="org_mp" val="581.85" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="52">
-				<set name="max_meal" val="13540" />
-				<set name="exp" val="177828845" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="89" />
-				<set name="consume_meal_in_normal" val="18" />
-				<set name="org_pattack" val="262.94" />
-				<set name="org_pdefend" val="126.9" />
-				<set name="org_mattack" val="172.22" />
-				<set name="org_mdefend" val="56.4" />
-				<set name="org_hp" val="1826.72" />
-				<set name="org_mp" val="603" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="53">
-				<set name="max_meal" val="13946" />
-				<set name="exp" val="212674399" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="92" />
-				<set name="consume_meal_in_normal" val="18" />
-				<set name="org_pattack" val="264.8" />
-				<set name="org_pdefend" val="127.8" />
-				<set name="org_mattack" val="173.44" />
-				<set name="org_mdefend" val="56.8" />
-				<set name="org_hp" val="1886.36" />
-				<set name="org_mp" val="624.3" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="54">
-				<set name="max_meal" val="14364" />
-				<set name="exp" val="254489064" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="96" />
-				<set name="consume_meal_in_normal" val="19" />
-				<set name="org_pattack" val="266.67" />
-				<set name="org_pdefend" val="128.7" />
-				<set name="org_mattack" val="174.67" />
-				<set name="org_mdefend" val="57.2" />
-				<set name="org_hp" val="1946.42" />
-				<set name="org_mp" val="645.75" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="55">
-				<set name="max_meal" val="14795" />
-				<set name="exp" val="304666662" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="100" />
-				<set name="consume_meal_in_normal" val="20" />
-				<set name="org_pattack" val="268.53" />
-				<set name="org_pdefend" val="129.6" />
-				<set name="org_mattack" val="175.89" />
-				<set name="org_mdefend" val="57.6" />
-				<set name="org_hp" val="2006.9" />
-				<set name="org_mp" val="667.35" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="56">
-				<set name="max_meal" val="15239" />
-				<set name="exp" val="364879780" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="104" />
-				<set name="consume_meal_in_normal" val="21" />
-				<set name="org_pattack" val="270.4" />
-				<set name="org_pdefend" val="130.5" />
-				<set name="org_mattack" val="177.11" />
-				<set name="org_mdefend" val="58" />
-				<set name="org_hp" val="2067.8" />
-				<set name="org_mp" val="689.1" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="57">
-				<set name="max_meal" val="15696" />
-				<set name="exp" val="437135521" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="108" />
-				<set name="consume_meal_in_normal" val="22" />
-				<set name="org_pattack" val="272.26" />
-				<set name="org_pdefend" val="131.4" />
-				<set name="org_mattack" val="178.33" />
-				<set name="org_mdefend" val="58.4" />
-				<set name="org_hp" val="2129.12" />
-				<set name="org_mp" val="711" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="58">
-				<set name="max_meal" val="16167" />
-				<set name="exp" val="523842410" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="112" />
-				<set name="consume_meal_in_normal" val="22" />
-				<set name="org_pattack" val="274.13" />
-				<set name="org_pdefend" val="132.3" />
-				<set name="org_mattack" val="179.55" />
-				<set name="org_mdefend" val="58.8" />
-				<set name="org_hp" val="2190.86" />
-				<set name="org_mp" val="733.05" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="59">
-				<set name="max_meal" val="16652" />
-				<set name="exp" val="627890678" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="117" />
-				<set name="consume_meal_in_normal" val="23" />
-				<set name="org_pattack" val="275.99" />
-				<set name="org_pdefend" val="133.2" />
-				<set name="org_mattack" val="180.77" />
-				<set name="org_mdefend" val="59.2" />
-				<set name="org_hp" val="2253.02" />
-				<set name="org_mp" val="755.25" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="60">
-				<set name="max_meal" val="17152" />
-				<set name="exp" val="752748598" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="121" />
-				<set name="consume_meal_in_normal" val="24" />
-				<set name="org_pattack" val="277.86" />
-				<set name="org_pdefend" val="134.1" />
-				<set name="org_mattack" val="182" />
-				<set name="org_mdefend" val="59.6" />
-				<set name="org_hp" val="2315.6" />
-				<set name="org_mp" val="777.6" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="61">
-				<set name="max_meal" val="17667" />
-				<set name="exp" val="902578103" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="126" />
-				<set name="consume_meal_in_normal" val="25" />
-				<set name="org_pattack" val="279.72" />
-				<set name="org_pdefend" val="135" />
-				<set name="org_mattack" val="183.22" />
-				<set name="org_mdefend" val="60" />
-				<set name="org_hp" val="2378.6" />
-				<set name="org_mp" val="800.1" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="62">
-				<set name="max_meal" val="18197" />
-				<set name="exp" val="1082373509" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="131" />
-				<set name="consume_meal_in_normal" val="26" />
-				<set name="org_pattack" val="281.58" />
-				<set name="org_pdefend" val="135.9" />
-				<set name="org_mattack" val="184.44" />
-				<set name="org_mdefend" val="60.4" />
-				<set name="org_hp" val="2442.02" />
-				<set name="org_mp" val="822.75" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="63">
-				<set name="max_meal" val="18743" />
-				<set name="exp" val="1298127996" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="137" />
-				<set name="consume_meal_in_normal" val="27" />
-				<set name="org_pattack" val="283.45" />
-				<set name="org_pdefend" val="136.8" />
-				<set name="org_mattack" val="185.66" />
-				<set name="org_mdefend" val="60.8" />
-				<set name="org_hp" val="2505.86" />
-				<set name="org_mp" val="845.55" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="64">
-				<set name="max_meal" val="19305" />
-				<set name="exp" val="1557033381" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="142" />
-				<set name="consume_meal_in_normal" val="28" />
-				<set name="org_pattack" val="285.31" />
-				<set name="org_pdefend" val="137.7" />
-				<set name="org_mattack" val="186.88" />
-				<set name="org_mdefend" val="61.2" />
-				<set name="org_hp" val="2570.12" />
-				<set name="org_mp" val="868.5" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="65">
-				<set name="max_meal" val="19884" />
-				<set name="exp" val="1867719842" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="148" />
-				<set name="consume_meal_in_normal" val="30" />
-				<set name="org_pattack" val="287.18" />
-				<set name="org_pdefend" val="138.6" />
-				<set name="org_mattack" val="188.1" />
-				<set name="org_mdefend" val="61.6" />
-				<set name="org_hp" val="2634.8" />
-				<set name="org_mp" val="891.6" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="66">
-				<set name="max_meal" val="20481" />
-				<set name="exp" val="2240543596" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="154" />
-				<set name="consume_meal_in_normal" val="31" />
-				<set name="org_pattack" val="289.04" />
-				<set name="org_pdefend" val="139.5" />
-				<set name="org_mattack" val="189.32" />
-				<set name="org_mdefend" val="62" />
-				<set name="org_hp" val="2699.9" />
-				<set name="org_mp" val="914.85" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="67">
-				<set name="max_meal" val="21095" />
-				<set name="exp" val="2687932100" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="160" />
-				<set name="consume_meal_in_normal" val="32" />
-				<set name="org_pattack" val="290.91" />
-				<set name="org_pdefend" val="140.4" />
-				<set name="org_mattack" val="190.55" />
-				<set name="org_mdefend" val="62.4" />
-				<set name="org_hp" val="2765.42" />
-				<set name="org_mp" val="938.25" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="68">
-				<set name="max_meal" val="21728" />
-				<set name="exp" val="3229272190" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="166" />
-				<set name="consume_meal_in_normal" val="33" />
-				<set name="org_pattack" val="292.77" />
-				<set name="org_pdefend" val="141.3" />
-				<set name="org_mattack" val="191.77" />
-				<set name="org_mdefend" val="62.8" />
-				<set name="org_hp" val="2831.36" />
-				<set name="org_mp" val="961.8" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="69">
-				<set name="max_meal" val="22380" />
-				<set name="exp" val="3884293700" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="173" />
-				<set name="consume_meal_in_normal" val="35" />
-				<set name="org_pattack" val="294.64" />
-				<set name="org_pdefend" val="142.2" />
-				<set name="org_mattack" val="192.99" />
-				<set name="org_mdefend" val="63.2" />
-				<set name="org_hp" val="2897.72" />
-				<set name="org_mp" val="985.5" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="70">
-				<set name="max_meal" val="23051" />
-				<set name="exp" val="4683419941" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="180" />
-				<set name="consume_meal_in_normal" val="36" />
-				<set name="org_pattack" val="296.5" />
-				<set name="org_pdefend" val="143.1" />
-				<set name="org_mattack" val="194.21" />
-				<set name="org_mdefend" val="63.6" />
-				<set name="org_hp" val="2964.5" />
-				<set name="org_mp" val="1009.35" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="71">
-				<set name="max_meal" val="23743" />
-				<set name="exp" val="5666345218" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="187" />
-				<set name="consume_meal_in_normal" val="37" />
-				<set name="org_pattack" val="298.37" />
-				<set name="org_pdefend" val="144" />
-				<set name="org_mattack" val="195.43" />
-				<set name="org_mdefend" val="64" />
-				<set name="org_hp" val="3031.7" />
-				<set name="org_mp" val="1033.35" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="72">
-				<set name="max_meal" val="24455" />
-				<set name="exp" val="6885172561" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="194" />
-				<set name="consume_meal_in_normal" val="39" />
-				<set name="org_pattack" val="300.23" />
-				<set name="org_pdefend" val="144.9" />
-				<set name="org_mattack" val="196.65" />
-				<set name="org_mdefend" val="64.4" />
-				<set name="org_hp" val="3099.32" />
-				<set name="org_mp" val="1057.5" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="73">
-				<set name="max_meal" val="25189" />
-				<set name="exp" val="8408706740" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="202" />
-				<set name="consume_meal_in_normal" val="40" />
-				<set name="org_pattack" val="302.1" />
-				<set name="org_pdefend" val="145.8" />
-				<set name="org_mattack" val="197.87" />
-				<set name="org_mdefend" val="64.8" />
-				<set name="org_hp" val="3167.36" />
-				<set name="org_mp" val="1081.8" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="74">
-				<set name="max_meal" val="25945" />
-				<set name="exp" val="10328359805" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="210" />
-				<set name="consume_meal_in_normal" val="42" />
-				<set name="org_pattack" val="303.96" />
-				<set name="org_pdefend" val="146.7" />
-				<set name="org_mattack" val="199.1" />
-				<set name="org_mdefend" val="65.2" />
-				<set name="org_hp" val="3235.82" />
-				<set name="org_mp" val="1106.25" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="75">
-				<set name="max_meal" val="26723" />
-				<set name="exp" val="12766319199" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="219" />
-				<set name="consume_meal_in_normal" val="44" />
-				<set name="org_pattack" val="305.83" />
-				<set name="org_pdefend" val="147.6" />
-				<set name="org_mattack" val="200.32" />
-				<set name="org_mdefend" val="65.6" />
-				<set name="org_hp" val="3304.7" />
-				<set name="org_mp" val="1130.85" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="76">
-				<set name="max_meal" val="27257" />
-				<set name="exp" val="15886907222" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="227" />
-				<set name="consume_meal_in_normal" val="45" />
-				<set name="org_pattack" val="307.69" />
-				<set name="org_pdefend" val="148.5" />
-				<set name="org_mattack" val="201.54" />
-				<set name="org_mdefend" val="66" />
-				<set name="org_hp" val="3387.31" />
-				<set name="org_mp" val="1159.12" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="77">
-				<set name="max_meal" val="27802" />
-				<set name="exp" val="19943671652" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="232" />
-				<set name="consume_meal_in_normal" val="46" />
-				<set name="org_pattack" val="309.56" />
-				<set name="org_pdefend" val="149.4" />
-				<set name="org_mattack" val="202.76" />
-				<set name="org_mdefend" val="66.4" />
-				<set name="org_hp" val="3471.99" />
-				<set name="org_mp" val="1188.09" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="78">
-				<set name="max_meal" val="28358" />
-				<set name="exp" val="25420303633" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="237" />
-				<set name="consume_meal_in_normal" val="47" />
-				<set name="org_pattack" val="311.42" />
-				<set name="org_pdefend" val="150.3" />
-				<set name="org_mattack" val="203.98" />
-				<set name="org_mdefend" val="66.8" />
-				<set name="org_hp" val="3558.78" />
-				<set name="org_mp" val="1217.79" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="79">
-				<set name="max_meal" val="28925" />
-				<set name="exp" val="33087588407" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="241" />
-				<set name="consume_meal_in_normal" val="48" />
-				<set name="org_pattack" val="313.29" />
-				<set name="org_pdefend" val="151.2" />
-				<set name="org_mattack" val="205.2" />
-				<set name="org_mdefend" val="67.2" />
-				<set name="org_hp" val="3647.74" />
-				<set name="org_mp" val="1248.23" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="80">
-				<set name="max_meal" val="29504" />
-				<set name="exp" val="44588515567" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="246" />
-				<set name="consume_meal_in_normal" val="49" />
-				<set name="org_pattack" val="315.15" />
-				<set name="org_pdefend" val="152.1" />
-				<set name="org_mattack" val="206.42" />
-				<set name="org_mdefend" val="67.6" />
-				<set name="org_hp" val="3738.93" />
-				<set name="org_mp" val="1279.43" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="81">
-				<set name="max_meal" val="30094" />
-				<set name="exp" val="61839906307" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="251" />
-				<set name="consume_meal_in_normal" val="50" />
-				<set name="org_pattack" val="317.02" />
-				<set name="org_pdefend" val="153" />
-				<set name="org_mattack" val="207.65" />
-				<set name="org_mdefend" val="68" />
-				<set name="org_hp" val="3851.09" />
-				<set name="org_mp" val="1317.81" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="82">
-				<set name="max_meal" val="30696" />
-				<set name="exp" val="87716992417" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="256" />
-				<set name="consume_meal_in_normal" val="51" />
-				<set name="org_pattack" val="318.88" />
-				<set name="org_pdefend" val="153.9" />
-				<set name="org_mattack" val="208.87" />
-				<set name="org_mdefend" val="68.4" />
-				<set name="org_hp" val="3966.62" />
-				<set name="org_mp" val="1357.34" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="83">
-				<set name="max_meal" val="31310" />
-				<set name="exp" val="126532621582" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="261" />
-				<set name="consume_meal_in_normal" val="52" />
-				<set name="org_pattack" val="320.75" />
-				<set name="org_pdefend" val="154.8" />
-				<set name="org_mattack" val="210.09" />
-				<set name="org_mdefend" val="68.8" />
-				<set name="org_hp" val="4085.61" />
-				<set name="org_mp" val="1398.06" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="84">
-				<set name="max_meal" val="31936" />
-				<set name="exp" val="184756065330" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="266" />
-				<set name="consume_meal_in_normal" val="53" />
-				<set name="org_pattack" val="322.61" />
-				<set name="org_pdefend" val="155.7" />
-				<set name="org_mattack" val="211.31" />
-				<set name="org_mdefend" val="69.2" />
-				<set name="org_hp" val="4208.17" />
-				<set name="org_mp" val="1440" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="85">
-				<set name="max_meal" val="32575" />
-				<set name="exp" val="272091230951" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="272" />
-				<set name="consume_meal_in_normal" val="54" />
-				<set name="org_pattack" val="324.48" />
-				<set name="org_pdefend" val="156.6" />
-				<set name="org_mattack" val="212.53" />
-				<set name="org_mdefend" val="69.6" />
-				<set name="org_hp" val="4334.41" />
-				<set name="org_mp" val="1483.2" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="86">
-				<set name="max_meal" val="33227" />
-				<set name="exp" val="403093979383" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="277" />
-				<set name="consume_meal_in_normal" val="55" />
-				<set name="org_pattack" val="326.34" />
-				<set name="org_pdefend" val="157.5" />
-				<set name="org_mattack" val="213.75" />
-				<set name="org_mdefend" val="70" />
-				<set name="org_hp" val="4464.44" />
-				<set name="org_mp" val="1527.69" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="87">
-				<set name="max_meal" val="33892" />
-				<set name="exp" val="599598102032" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="283" />
-				<set name="consume_meal_in_normal" val="57" />
-				<set name="org_pattack" val="328.2" />
-				<set name="org_pdefend" val="158.4" />
-				<set name="org_mattack" val="214.97" />
-				<set name="org_mdefend" val="70.4" />
-				<set name="org_hp" val="4598.37" />
-				<set name="org_mp" val="1573.52" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="88">
-				<set name="max_meal" val="34570" />
-				<set name="exp" val="953305522799" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="288" />
-				<set name="consume_meal_in_normal" val="58" />
-				<set name="org_pattack" val="330.07" />
-				<set name="org_pdefend" val="159.3" />
-				<set name="org_mattack" val="216.2" />
-				<set name="org_mdefend" val="70.8" />
-				<set name="org_hp" val="4736.32" />
-				<set name="org_mp" val="1620.72" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="89">
-				<set name="max_meal" val="35261" />
-				<set name="exp" val="1660720364334" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="294" />
-				<set name="consume_meal_in_normal" val="59" />
-				<set name="org_pattack" val="331.93" />
-				<set name="org_pdefend" val="160.2" />
-				<set name="org_mattack" val="217.42" />
-				<set name="org_mdefend" val="71.2" />
-				<set name="org_hp" val="4878.4" />
-				<set name="org_mp" val="1669.34" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="90">
-				<set name="max_meal" val="35966" />
-				<set name="exp" val="3775890740522" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="300" />
-				<set name="consume_meal_in_normal" val="60" />
-				<set name="org_pattack" val="333.8" />
-				<set name="org_pdefend" val="161.1" />
-				<set name="org_mattack" val="218.64" />
-				<set name="org_mdefend" val="71.6" />
-				<set name="org_hp" val="5024.75" />
-				<set name="org_mp" val="1719.42" />
-				<set name="org_hp_regen" val="7" />
-				<set name="org_mp_regen" val="3.6" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="91">
-				<set name="max_meal" val="36685" />
-				<set name="exp" val="14351742621463" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="306" />
-				<set name="consume_meal_in_normal" val="61" />
-				<set name="org_pattack" val="335.66" />
-				<set name="org_pdefend" val="162" />
-				<set name="org_mattack" val="219.86" />
-				<set name="org_mdefend" val="72" />
-				<set name="org_hp" val="5175.49" />
-				<set name="org_mp" val="1771" />
-				<set name="org_hp_regen" val="7.1" />
-				<set name="org_mp_regen" val="3.63" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="92">
-				<set name="max_meal" val="37419" />
-				<set name="exp" val="60885490897603" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="312" />
-				<set name="consume_meal_in_normal" val="62" />
-				<set name="org_pattack" val="337.53" />
-				<set name="org_pdefend" val="162.9" />
-				<set name="org_mattack" val="221.08" />
-				<set name="org_mdefend" val="72.4" />
-				<set name="org_hp" val="5330.75" />
-				<set name="org_mp" val="1824.13" />
-				<set name="org_hp_regen" val="7.2" />
-				<set name="org_mp_regen" val="3.66" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="93">
-				<set name="max_meal" val="38167" />
-				<set name="exp" val="265633983312619" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="318" />
-				<set name="consume_meal_in_normal" val="64" />
-				<set name="org_pattack" val="339.39" />
-				<set name="org_pdefend" val="163.8" />
-				<set name="org_mattack" val="222.3" />
-				<set name="org_mdefend" val="72.8" />
-				<set name="org_hp" val="5490.67" />
-				<set name="org_mp" val="1878.85" />
-				<set name="org_hp_regen" val="7.3" />
-				<set name="org_mp_regen" val="3.69" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="94">
-				<set name="max_meal" val="38930" />
-				<set name="exp" val="1166527349938690" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="325" />
-				<set name="consume_meal_in_normal" val="65" />
-				<set name="org_pattack" val="341.26" />
-				<set name="org_pdefend" val="164.7" />
-				<set name="org_mattack" val="223.52" />
-				<set name="org_mdefend" val="73.2" />
-				<set name="org_hp" val="5655.39" />
-				<set name="org_mp" val="1935.21" />
-				<set name="org_hp_regen" val="7.4" />
-				<set name="org_mp_regen" val="3.72" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="95">
-				<set name="max_meal" val="39709" />
-				<set name="exp" val="5130458163093410" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="331" />
-				<set name="consume_meal_in_normal" val="66" />
-				<set name="org_pattack" val="343.12" />
-				<set name="org_pdefend" val="165.6" />
-				<set name="org_mattack" val="224.75" />
-				<set name="org_mdefend" val="73.6" />
-				<set name="org_hp" val="5825.05" />
-				<set name="org_mp" val="1993.26" />
-				<set name="org_hp_regen" val="7.5" />
-				<set name="org_mp_regen" val="3.75" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="96">
-				<set name="max_meal" val="40503" />
-				<set name="exp" val="28914043042021700" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="338" />
-				<set name="consume_meal_in_normal" val="68" />
-				<set name="org_pattack" val="344.99" />
-				<set name="org_pdefend" val="166.5" />
-				<set name="org_mattack" val="225.97" />
-				<set name="org_mdefend" val="74" />
-				<set name="org_hp" val="5999.8" />
-				<set name="org_mp" val="2053.05" />
-				<set name="org_hp_regen" val="7.6" />
-				<set name="org_mp_regen" val="3.78" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="97">
-				<set name="max_meal" val="41313" />
-				<set name="exp" val="143075250460878000" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="345" />
-				<set name="consume_meal_in_normal" val="69" />
-				<set name="org_pattack" val="346.85" />
-				<set name="org_pdefend" val="167.4" />
-				<set name="org_mattack" val="227.19" />
-				<set name="org_mdefend" val="74.4" />
-				<set name="org_hp" val="6179.79" />
-				<set name="org_mp" val="2114.64" />
-				<set name="org_hp_regen" val="7.7" />
-				<set name="org_mp_regen" val="3.81" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="98">
-				<set name="max_meal" val="42139" />
-				<set name="exp" val="691049046071386000" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="351" />
-				<set name="consume_meal_in_normal" val="70" />
-				<set name="org_pattack" val="348.72" />
-				<set name="org_pdefend" val="168.3" />
-				<set name="org_mattack" val="228.41" />
-				<set name="org_mdefend" val="74.8" />
-				<set name="org_hp" val="6365.18" />
-				<set name="org_mp" val="2178.07" />
-				<set name="org_hp_regen" val="7.8" />
-				<set name="org_mp_regen" val="3.84" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="99">
-				<set name="max_meal" val="42982" />
-				<set name="exp" val="3321323265001830000" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="358" />
-				<set name="consume_meal_in_normal" val="72" />
-				<set name="org_pattack" val="350.58" />
-				<set name="org_pdefend" val="169.2" />
-				<set name="org_mattack" val="229.63" />
-				<set name="org_mdefend" val="75.2" />
-				<set name="org_hp" val="6556.13" />
-				<set name="org_mp" val="2243.41" />
-				<set name="org_hp_regen" val="7.9" />
-				<set name="org_mp_regen" val="3.87" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="100">
-				<set name="max_meal" val="43842" />
-				<set name="exp" val="3321323265001870000" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="366" />
-				<set name="consume_meal_in_normal" val="73" />
-				<set name="org_pattack" val="500" />
-				<set name="org_pdefend" val="500" />
-				<set name="org_mattack" val="500" />
-				<set name="org_mdefend" val="500" />
-				<set name="org_hp" val="6752.81" />
-				<set name="org_mp" val="2310.71" />
-				<set name="org_hp_regen" val="8.5" />
-				<set name="org_mp_regen" val="4" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-		</stats>
-	</pet>
-</pets>
+<?xml version="1.0" encoding="UTF-8"?>
+<pets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/PetData.xsd">
+	<pet id="16079" itemId="93961" index="10" evolveLevel="None" type="13">
+		<set name="food" val="93966" />
+		<set name="hungry_limit" val="50" />
+		<set name="load" val="45540" />
+		<skills>
+			<skill minLevel="1" skillId="6618" skillLevel="1" />
+			<skill minLevel="60" skillId="6618" skillLevel="2" />
+			<skill minLevel="65" skillId="6618" skillLevel="3" />
+			<skill minLevel="70" skillId="6618" skillLevel="4" />
+			<skill minLevel="75" skillId="6618" skillLevel="5" />
+			<skill minLevel="80" skillId="6618" skillLevel="6" />
+			<skill minLevel="85" skillId="6618" skillLevel="7" />
+			<skill minLevel="60" skillId="6681" skillLevel="1" />
+			<skill minLevel="60" skillId="6683" skillLevel="1" />
+		</skills>
+		<stats>
+			<stat level="1">
+				<set name="max_meal" val="3000" />
+				<set name="exp" val="0" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="12" />
+				<set name="consume_meal_in_normal" val="2" />
+				<set name="org_pattack" val="167.83" />
+				<set name="org_pdefend" val="81" />
+				<set name="org_mattack" val="109.93" />
+				<set name="org_mdefend" val="36" />
+				<set name="org_hp" val="94" />
+				<set name="org_mp" val="30" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="2">
+				<set name="max_meal" val="3090" />
+				<set name="exp" val="68" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="12" />
+				<set name="consume_meal_in_normal" val="2" />
+				<set name="org_pattack" val="169.7" />
+				<set name="org_pdefend" val="81.9" />
+				<set name="org_mattack" val="111.15" />
+				<set name="org_mdefend" val="36.4" />
+				<set name="org_hp" val="107.65" />
+				<set name="org_mp" val="35.46" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="3">
+				<set name="max_meal" val="3183" />
+				<set name="exp" val="364" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="13" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="171.56" />
+				<set name="org_pdefend" val="82.8" />
+				<set name="org_mattack" val="112.37" />
+				<set name="org_mdefend" val="36.8" />
+				<set name="org_hp" val="121.45" />
+				<set name="org_mp" val="40.98" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="4">
+				<set name="max_meal" val="3278" />
+				<set name="exp" val="1169" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="13" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="173.43" />
+				<set name="org_pdefend" val="83.7" />
+				<set name="org_mattack" val="113.59" />
+				<set name="org_mdefend" val="37.2" />
+				<set name="org_hp" val="135.4" />
+				<set name="org_mp" val="46.56" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="5">
+				<set name="max_meal" val="3376" />
+				<set name="exp" val="2885" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="14" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="175.29" />
+				<set name="org_pdefend" val="84.6" />
+				<set name="org_mattack" val="114.82" />
+				<set name="org_mdefend" val="37.6" />
+				<set name="org_hp" val="149.5" />
+				<set name="org_mp" val="52.2" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="6">
+				<set name="max_meal" val="3477" />
+				<set name="exp" val="6039" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="15" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="177.16" />
+				<set name="org_pdefend" val="85.5" />
+				<set name="org_mattack" val="116.04" />
+				<set name="org_mdefend" val="38" />
+				<set name="org_hp" val="163.75" />
+				<set name="org_mp" val="57.9" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="7">
+				<set name="max_meal" val="3581" />
+				<set name="exp" val="11288" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="15" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="179.02" />
+				<set name="org_pdefend" val="86.4" />
+				<set name="org_mattack" val="117.26" />
+				<set name="org_mdefend" val="38.4" />
+				<set name="org_hp" val="178.15" />
+				<set name="org_mp" val="63.66" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="8">
+				<set name="max_meal" val="3688" />
+				<set name="exp" val="19424" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="16" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="180.89" />
+				<set name="org_pdefend" val="87.3" />
+				<set name="org_mattack" val="118.48" />
+				<set name="org_mdefend" val="38.8" />
+				<set name="org_hp" val="192.7" />
+				<set name="org_mp" val="69.48" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="9">
+				<set name="max_meal" val="3799" />
+				<set name="exp" val="31379" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="16" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="182.75" />
+				<set name="org_pdefend" val="88.2" />
+				<set name="org_mattack" val="119.7" />
+				<set name="org_mdefend" val="39.2" />
+				<set name="org_hp" val="207.4" />
+				<set name="org_mp" val="75.36" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="10">
+				<set name="max_meal" val="3913" />
+				<set name="exp" val="48230" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="17" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="184.62" />
+				<set name="org_pdefend" val="89.1" />
+				<set name="org_mattack" val="120.92" />
+				<set name="org_mdefend" val="39.6" />
+				<set name="org_hp" val="222.25" />
+				<set name="org_mp" val="81.3" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="11">
+				<set name="max_meal" val="4030" />
+				<set name="exp" val="71203" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="18" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="186.48" />
+				<set name="org_pdefend" val="90" />
+				<set name="org_mattack" val="122.14" />
+				<set name="org_mdefend" val="40" />
+				<set name="org_hp" val="237.25" />
+				<set name="org_mp" val="87.3" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="12">
+				<set name="max_meal" val="4151" />
+				<set name="exp" val="101678" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="18" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="188.34" />
+				<set name="org_pdefend" val="90.9" />
+				<set name="org_mattack" val="123.37" />
+				<set name="org_mdefend" val="40.4" />
+				<set name="org_hp" val="252.4" />
+				<set name="org_mp" val="93.36" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="13">
+				<set name="max_meal" val="4276" />
+				<set name="exp" val="141194" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="19" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="190.21" />
+				<set name="org_pdefend" val="91.8" />
+				<set name="org_mattack" val="124.59" />
+				<set name="org_mdefend" val="40.8" />
+				<set name="org_hp" val="267.7" />
+				<set name="org_mp" val="99.48" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="14">
+				<set name="max_meal" val="4404" />
+				<set name="exp" val="191455" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="20" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="192.07" />
+				<set name="org_pdefend" val="92.7" />
+				<set name="org_mattack" val="125.81" />
+				<set name="org_mdefend" val="41.2" />
+				<set name="org_hp" val="283.15" />
+				<set name="org_mp" val="105.66" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="15">
+				<set name="max_meal" val="4536" />
+				<set name="exp" val="254331" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="21" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="193.94" />
+				<set name="org_pdefend" val="93.6" />
+				<set name="org_mattack" val="127.03" />
+				<set name="org_mdefend" val="41.6" />
+				<set name="org_hp" val="298.75" />
+				<set name="org_mp" val="111.9" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="16">
+				<set name="max_meal" val="4672" />
+				<set name="exp" val="331868" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="22" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="195.8" />
+				<set name="org_pdefend" val="94.5" />
+				<set name="org_mattack" val="128.25" />
+				<set name="org_mdefend" val="42" />
+				<set name="org_hp" val="314.5" />
+				<set name="org_mp" val="118.2" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="17">
+				<set name="max_meal" val="4812" />
+				<set name="exp" val="426289" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="22" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="197.67" />
+				<set name="org_pdefend" val="95.4" />
+				<set name="org_mattack" val="129.47" />
+				<set name="org_mdefend" val="42.4" />
+				<set name="org_hp" val="330.4" />
+				<set name="org_mp" val="124.56" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="18">
+				<set name="max_meal" val="4956" />
+				<set name="exp" val="540001" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="23" />
+				<set name="consume_meal_in_normal" val="5" />
+				<set name="org_pattack" val="199.53" />
+				<set name="org_pdefend" val="96.3" />
+				<set name="org_mattack" val="130.69" />
+				<set name="org_mdefend" val="42.8" />
+				<set name="org_hp" val="346.45" />
+				<set name="org_mp" val="130.98" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="19">
+				<set name="max_meal" val="5105" />
+				<set name="exp" val="675597" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="24" />
+				<set name="consume_meal_in_normal" val="5" />
+				<set name="org_pattack" val="201.4" />
+				<set name="org_pdefend" val="97.2" />
+				<set name="org_mattack" val="131.92" />
+				<set name="org_mdefend" val="43.2" />
+				<set name="org_hp" val="362.65" />
+				<set name="org_mp" val="137.46" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="20">
+				<set name="max_meal" val="5258" />
+				<set name="exp" val="835864" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="25" />
+				<set name="consume_meal_in_normal" val="5" />
+				<set name="org_pattack" val="203.26" />
+				<set name="org_pdefend" val="98.1" />
+				<set name="org_mattack" val="133.14" />
+				<set name="org_mdefend" val="43.6" />
+				<set name="org_hp" val="379" />
+				<set name="org_mp" val="144" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="21">
+				<set name="max_meal" val="5416" />
+				<set name="exp" val="1020171" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="26" />
+				<set name="consume_meal_in_normal" val="5" />
+				<set name="org_pattack" val="205.13" />
+				<set name="org_pdefend" val="99" />
+				<set name="org_mattack" val="134.36" />
+				<set name="org_mdefend" val="44" />
+				<set name="org_hp" val="414.2" />
+				<set name="org_mp" val="153.9" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="22">
+				<set name="max_meal" val="5578" />
+				<set name="exp" val="1232124" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="27" />
+				<set name="consume_meal_in_normal" val="5" />
+				<set name="org_pattack" val="206.99" />
+				<set name="org_pdefend" val="99.9" />
+				<set name="org_mattack" val="135.58" />
+				<set name="org_mdefend" val="44.4" />
+				<set name="org_hp" val="449.72" />
+				<set name="org_mp" val="163.89" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="23">
+				<set name="max_meal" val="5745" />
+				<set name="exp" val="1475870" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="28" />
+				<set name="consume_meal_in_normal" val="6" />
+				<set name="org_pattack" val="208.86" />
+				<set name="org_pdefend" val="100.8" />
+				<set name="org_mattack" val="136.8" />
+				<set name="org_mdefend" val="44.8" />
+				<set name="org_hp" val="485.56" />
+				<set name="org_mp" val="173.97" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="24">
+				<set name="max_meal" val="5917" />
+				<set name="exp" val="1756178" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="30" />
+				<set name="consume_meal_in_normal" val="6" />
+				<set name="org_pattack" val="210.72" />
+				<set name="org_pdefend" val="101.7" />
+				<set name="org_mattack" val="138.02" />
+				<set name="org_mdefend" val="45.2" />
+				<set name="org_hp" val="521.72" />
+				<set name="org_mp" val="184.14" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="25">
+				<set name="max_meal" val="6095" />
+				<set name="exp" val="2078532" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="31" />
+				<set name="consume_meal_in_normal" val="6" />
+				<set name="org_pattack" val="212.59" />
+				<set name="org_pdefend" val="102.6" />
+				<set name="org_mattack" val="139.24" />
+				<set name="org_mdefend" val="45.6" />
+				<set name="org_hp" val="558.2" />
+				<set name="org_mp" val="194.4" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="26">
+				<set name="max_meal" val="6278" />
+				<set name="exp" val="2452463" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="32" />
+				<set name="consume_meal_in_normal" val="6" />
+				<set name="org_pattack" val="214.45" />
+				<set name="org_pdefend" val="103.5" />
+				<set name="org_mattack" val="140.47" />
+				<set name="org_mdefend" val="46" />
+				<set name="org_hp" val="595" />
+				<set name="org_mp" val="204.75" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="27">
+				<set name="max_meal" val="6466" />
+				<set name="exp" val="2886223" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="33" />
+				<set name="consume_meal_in_normal" val="7" />
+				<set name="org_pattack" val="216.32" />
+				<set name="org_pdefend" val="104.4" />
+				<set name="org_mattack" val="141.69" />
+				<set name="org_mdefend" val="46.4" />
+				<set name="org_hp" val="632.12" />
+				<set name="org_mp" val="215.19" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="28">
+				<set name="max_meal" val="6660" />
+				<set name="exp" val="3389384" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="35" />
+				<set name="consume_meal_in_normal" val="7" />
+				<set name="org_pattack" val="218.18" />
+				<set name="org_pdefend" val="105.3" />
+				<set name="org_mattack" val="142.91" />
+				<set name="org_mdefend" val="46.8" />
+				<set name="org_hp" val="669.56" />
+				<set name="org_mp" val="225.72" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="29">
+				<set name="max_meal" val="6860" />
+				<set name="exp" val="3973052" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="36" />
+				<set name="consume_meal_in_normal" val="7" />
+				<set name="org_pattack" val="220.05" />
+				<set name="org_pdefend" val="106.2" />
+				<set name="org_mattack" val="144.13" />
+				<set name="org_mdefend" val="47.2" />
+				<set name="org_hp" val="707.32" />
+				<set name="org_mp" val="236.34" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="30">
+				<set name="max_meal" val="7066" />
+				<set name="exp" val="4650105" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="37" />
+				<set name="consume_meal_in_normal" val="7" />
+				<set name="org_pattack" val="221.91" />
+				<set name="org_pdefend" val="107.1" />
+				<set name="org_mattack" val="145.35" />
+				<set name="org_mdefend" val="47.6" />
+				<set name="org_hp" val="745.4" />
+				<set name="org_mp" val="247.05" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="31">
+				<set name="max_meal" val="7278" />
+				<set name="exp" val="5442259" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="39" />
+				<set name="consume_meal_in_normal" val="8" />
+				<set name="org_pattack" val="223.78" />
+				<set name="org_pdefend" val="108" />
+				<set name="org_mattack" val="146.57" />
+				<set name="org_mdefend" val="48" />
+				<set name="org_hp" val="783.8" />
+				<set name="org_mp" val="257.85" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="32">
+				<set name="max_meal" val="7496" />
+				<set name="exp" val="6369078" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="40" />
+				<set name="consume_meal_in_normal" val="8" />
+				<set name="org_pattack" val="225.64" />
+				<set name="org_pdefend" val="108.9" />
+				<set name="org_mattack" val="147.79" />
+				<set name="org_mdefend" val="48.4" />
+				<set name="org_hp" val="822.52" />
+				<set name="org_mp" val="268.74" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="33">
+				<set name="max_meal" val="7721" />
+				<set name="exp" val="7453456" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="42" />
+				<set name="consume_meal_in_normal" val="8" />
+				<set name="org_pattack" val="227.51" />
+				<set name="org_pdefend" val="109.8" />
+				<set name="org_mattack" val="149.02" />
+				<set name="org_mdefend" val="48.8" />
+				<set name="org_hp" val="861.56" />
+				<set name="org_mp" val="279.72" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="34">
+				<set name="max_meal" val="7953" />
+				<set name="exp" val="8722179" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="44" />
+				<set name="consume_meal_in_normal" val="9" />
+				<set name="org_pattack" val="229.37" />
+				<set name="org_pdefend" val="110.7" />
+				<set name="org_mattack" val="150.24" />
+				<set name="org_mdefend" val="49.2" />
+				<set name="org_hp" val="900.92" />
+				<set name="org_mp" val="290.79" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="35">
+				<set name="max_meal" val="8192" />
+				<set name="exp" val="10206584" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="46" />
+				<set name="consume_meal_in_normal" val="9" />
+				<set name="org_pattack" val="231.24" />
+				<set name="org_pdefend" val="111.6" />
+				<set name="org_mattack" val="151.46" />
+				<set name="org_mdefend" val="49.6" />
+				<set name="org_hp" val="940.6" />
+				<set name="org_mp" val="301.95" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="36">
+				<set name="max_meal" val="8438" />
+				<set name="exp" val="11958183" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="47" />
+				<set name="consume_meal_in_normal" val="9" />
+				<set name="org_pattack" val="233.1" />
+				<set name="org_pdefend" val="112.5" />
+				<set name="org_mattack" val="152.68" />
+				<set name="org_mdefend" val="50" />
+				<set name="org_hp" val="980.6" />
+				<set name="org_mp" val="313.2" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="37">
+				<set name="max_meal" val="8691" />
+				<set name="exp" val="14025069" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="49" />
+				<set name="consume_meal_in_normal" val="10" />
+				<set name="org_pattack" val="234.96" />
+				<set name="org_pdefend" val="113.4" />
+				<set name="org_mattack" val="153.9" />
+				<set name="org_mdefend" val="50.4" />
+				<set name="org_hp" val="1020.92" />
+				<set name="org_mp" val="324.54" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="38">
+				<set name="max_meal" val="8952" />
+				<set name="exp" val="16463995" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="51" />
+				<set name="consume_meal_in_normal" val="10" />
+				<set name="org_pattack" val="236.83" />
+				<set name="org_pdefend" val="114.3" />
+				<set name="org_mattack" val="155.12" />
+				<set name="org_mdefend" val="50.8" />
+				<set name="org_hp" val="1061.56" />
+				<set name="org_mp" val="335.97" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="39">
+				<set name="max_meal" val="9221" />
+				<set name="exp" val="19341927" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="53" />
+				<set name="consume_meal_in_normal" val="11" />
+				<set name="org_pattack" val="238.69" />
+				<set name="org_pdefend" val="115.2" />
+				<set name="org_mattack" val="156.34" />
+				<set name="org_mdefend" val="51.2" />
+				<set name="org_hp" val="1102.52" />
+				<set name="org_mp" val="347.49" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="40">
+				<set name="max_meal" val="9498" />
+				<set name="exp" val="22737888" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="55" />
+				<set name="consume_meal_in_normal" val="11" />
+				<set name="org_pattack" val="240.56" />
+				<set name="org_pdefend" val="116.1" />
+				<set name="org_mattack" val="157.57" />
+				<set name="org_mdefend" val="51.6" />
+				<set name="org_hp" val="1143.8" />
+				<set name="org_mp" val="359.1" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="41">
+				<set name="max_meal" val="9783" />
+				<set name="exp" val="26779080" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="58" />
+				<set name="consume_meal_in_normal" val="12" />
+				<set name="org_pattack" val="242.42" />
+				<set name="org_pdefend" val="117" />
+				<set name="org_mattack" val="158.79" />
+				<set name="org_mdefend" val="52" />
+				<set name="org_hp" val="1198.4" />
+				<set name="org_mp" val="378.6" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="42">
+				<set name="max_meal" val="10076" />
+				<set name="exp" val="31588100" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="60" />
+				<set name="consume_meal_in_normal" val="12" />
+				<set name="org_pattack" val="244.29" />
+				<set name="org_pdefend" val="117.9" />
+				<set name="org_mattack" val="160.01" />
+				<set name="org_mdefend" val="52.4" />
+				<set name="org_hp" val="1253.42" />
+				<set name="org_mp" val="398.25" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="43">
+				<set name="max_meal" val="10378" />
+				<set name="exp" val="37310833" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="62" />
+				<set name="consume_meal_in_normal" val="12" />
+				<set name="org_pattack" val="246.15" />
+				<set name="org_pdefend" val="118.8" />
+				<set name="org_mattack" val="161.23" />
+				<set name="org_mdefend" val="52.8" />
+				<set name="org_hp" val="1308.86" />
+				<set name="org_mp" val="418.05" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="44">
+				<set name="max_meal" val="10689" />
+				<set name="exp" val="44120885" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="65" />
+				<set name="consume_meal_in_normal" val="13" />
+				<set name="org_pattack" val="248.02" />
+				<set name="org_pdefend" val="119.7" />
+				<set name="org_mattack" val="162.45" />
+				<set name="org_mdefend" val="53.2" />
+				<set name="org_hp" val="1364.72" />
+				<set name="org_mp" val="438" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="45">
+				<set name="max_meal" val="11010" />
+				<set name="exp" val="52224847" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="67" />
+				<set name="consume_meal_in_normal" val="13" />
+				<set name="org_pattack" val="249.88" />
+				<set name="org_pdefend" val="120.6" />
+				<set name="org_mattack" val="163.67" />
+				<set name="org_mdefend" val="53.6" />
+				<set name="org_hp" val="1421" />
+				<set name="org_mp" val="458.1" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="46">
+				<set name="max_meal" val="11340" />
+				<set name="exp" val="61949602" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="70" />
+				<set name="consume_meal_in_normal" val="14" />
+				<set name="org_pattack" val="251.75" />
+				<set name="org_pdefend" val="121.5" />
+				<set name="org_mattack" val="164.89" />
+				<set name="org_mdefend" val="54" />
+				<set name="org_hp" val="1477.7" />
+				<set name="org_mp" val="478.35" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="47">
+				<set name="max_meal" val="11680" />
+				<set name="exp" val="73619307" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="73" />
+				<set name="consume_meal_in_normal" val="15" />
+				<set name="org_pattack" val="253.61" />
+				<set name="org_pdefend" val="122.4" />
+				<set name="org_mattack" val="166.12" />
+				<set name="org_mdefend" val="54.4" />
+				<set name="org_hp" val="1534.82" />
+				<set name="org_mp" val="498.75" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="48">
+				<set name="max_meal" val="12030" />
+				<set name="exp" val="87622954" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="76" />
+				<set name="consume_meal_in_normal" val="15" />
+				<set name="org_pattack" val="255.48" />
+				<set name="org_pdefend" val="123.3" />
+				<set name="org_mattack" val="167.34" />
+				<set name="org_mdefend" val="54.8" />
+				<set name="org_hp" val="1592.36" />
+				<set name="org_mp" val="519.3" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="49">
+				<set name="max_meal" val="12391" />
+				<set name="exp" val="104427330" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="79" />
+				<set name="consume_meal_in_normal" val="16" />
+				<set name="org_pattack" val="257.34" />
+				<set name="org_pdefend" val="124.2" />
+				<set name="org_mattack" val="168.56" />
+				<set name="org_mdefend" val="55.2" />
+				<set name="org_hp" val="1650.32" />
+				<set name="org_mp" val="540" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="50">
+				<set name="max_meal" val="12763" />
+				<set name="exp" val="124592581" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="82" />
+				<set name="consume_meal_in_normal" val="16" />
+				<set name="org_pattack" val="259.21" />
+				<set name="org_pdefend" val="125.1" />
+				<set name="org_mattack" val="169.78" />
+				<set name="org_mdefend" val="55.6" />
+				<set name="org_hp" val="1708.7" />
+				<set name="org_mp" val="560.85" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="51">
+				<set name="max_meal" val="13146" />
+				<set name="exp" val="148790883" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="85" />
+				<set name="consume_meal_in_normal" val="17" />
+				<set name="org_pattack" val="261.07" />
+				<set name="org_pdefend" val="126" />
+				<set name="org_mattack" val="171" />
+				<set name="org_mdefend" val="56" />
+				<set name="org_hp" val="1767.5" />
+				<set name="org_mp" val="581.85" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="52">
+				<set name="max_meal" val="13540" />
+				<set name="exp" val="177828845" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="89" />
+				<set name="consume_meal_in_normal" val="18" />
+				<set name="org_pattack" val="262.94" />
+				<set name="org_pdefend" val="126.9" />
+				<set name="org_mattack" val="172.22" />
+				<set name="org_mdefend" val="56.4" />
+				<set name="org_hp" val="1826.72" />
+				<set name="org_mp" val="603" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="53">
+				<set name="max_meal" val="13946" />
+				<set name="exp" val="212674399" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="92" />
+				<set name="consume_meal_in_normal" val="18" />
+				<set name="org_pattack" val="264.8" />
+				<set name="org_pdefend" val="127.8" />
+				<set name="org_mattack" val="173.44" />
+				<set name="org_mdefend" val="56.8" />
+				<set name="org_hp" val="1886.36" />
+				<set name="org_mp" val="624.3" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="54">
+				<set name="max_meal" val="14364" />
+				<set name="exp" val="254489064" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="96" />
+				<set name="consume_meal_in_normal" val="19" />
+				<set name="org_pattack" val="266.67" />
+				<set name="org_pdefend" val="128.7" />
+				<set name="org_mattack" val="174.67" />
+				<set name="org_mdefend" val="57.2" />
+				<set name="org_hp" val="1946.42" />
+				<set name="org_mp" val="645.75" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="55">
+				<set name="max_meal" val="14795" />
+				<set name="exp" val="304666662" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="100" />
+				<set name="consume_meal_in_normal" val="20" />
+				<set name="org_pattack" val="268.53" />
+				<set name="org_pdefend" val="129.6" />
+				<set name="org_mattack" val="175.89" />
+				<set name="org_mdefend" val="57.6" />
+				<set name="org_hp" val="2006.9" />
+				<set name="org_mp" val="667.35" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="56">
+				<set name="max_meal" val="15239" />
+				<set name="exp" val="364879780" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="104" />
+				<set name="consume_meal_in_normal" val="21" />
+				<set name="org_pattack" val="270.4" />
+				<set name="org_pdefend" val="130.5" />
+				<set name="org_mattack" val="177.11" />
+				<set name="org_mdefend" val="58" />
+				<set name="org_hp" val="2067.8" />
+				<set name="org_mp" val="689.1" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="57">
+				<set name="max_meal" val="15696" />
+				<set name="exp" val="437135521" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="108" />
+				<set name="consume_meal_in_normal" val="22" />
+				<set name="org_pattack" val="272.26" />
+				<set name="org_pdefend" val="131.4" />
+				<set name="org_mattack" val="178.33" />
+				<set name="org_mdefend" val="58.4" />
+				<set name="org_hp" val="2129.12" />
+				<set name="org_mp" val="711" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="58">
+				<set name="max_meal" val="16167" />
+				<set name="exp" val="523842410" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="112" />
+				<set name="consume_meal_in_normal" val="22" />
+				<set name="org_pattack" val="274.13" />
+				<set name="org_pdefend" val="132.3" />
+				<set name="org_mattack" val="179.55" />
+				<set name="org_mdefend" val="58.8" />
+				<set name="org_hp" val="2190.86" />
+				<set name="org_mp" val="733.05" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="59">
+				<set name="max_meal" val="16652" />
+				<set name="exp" val="627890678" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="117" />
+				<set name="consume_meal_in_normal" val="23" />
+				<set name="org_pattack" val="275.99" />
+				<set name="org_pdefend" val="133.2" />
+				<set name="org_mattack" val="180.77" />
+				<set name="org_mdefend" val="59.2" />
+				<set name="org_hp" val="2253.02" />
+				<set name="org_mp" val="755.25" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="60">
+				<set name="max_meal" val="17152" />
+				<set name="exp" val="752748598" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="121" />
+				<set name="consume_meal_in_normal" val="24" />
+				<set name="org_pattack" val="277.86" />
+				<set name="org_pdefend" val="134.1" />
+				<set name="org_mattack" val="182" />
+				<set name="org_mdefend" val="59.6" />
+				<set name="org_hp" val="2315.6" />
+				<set name="org_mp" val="777.6" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="61">
+				<set name="max_meal" val="17667" />
+				<set name="exp" val="902578103" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="126" />
+				<set name="consume_meal_in_normal" val="25" />
+				<set name="org_pattack" val="279.72" />
+				<set name="org_pdefend" val="135" />
+				<set name="org_mattack" val="183.22" />
+				<set name="org_mdefend" val="60" />
+				<set name="org_hp" val="2378.6" />
+				<set name="org_mp" val="800.1" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="62">
+				<set name="max_meal" val="18197" />
+				<set name="exp" val="1082373509" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="131" />
+				<set name="consume_meal_in_normal" val="26" />
+				<set name="org_pattack" val="281.58" />
+				<set name="org_pdefend" val="135.9" />
+				<set name="org_mattack" val="184.44" />
+				<set name="org_mdefend" val="60.4" />
+				<set name="org_hp" val="2442.02" />
+				<set name="org_mp" val="822.75" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="63">
+				<set name="max_meal" val="18743" />
+				<set name="exp" val="1298127996" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="137" />
+				<set name="consume_meal_in_normal" val="27" />
+				<set name="org_pattack" val="283.45" />
+				<set name="org_pdefend" val="136.8" />
+				<set name="org_mattack" val="185.66" />
+				<set name="org_mdefend" val="60.8" />
+				<set name="org_hp" val="2505.86" />
+				<set name="org_mp" val="845.55" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="64">
+				<set name="max_meal" val="19305" />
+				<set name="exp" val="1557033381" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="142" />
+				<set name="consume_meal_in_normal" val="28" />
+				<set name="org_pattack" val="285.31" />
+				<set name="org_pdefend" val="137.7" />
+				<set name="org_mattack" val="186.88" />
+				<set name="org_mdefend" val="61.2" />
+				<set name="org_hp" val="2570.12" />
+				<set name="org_mp" val="868.5" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="65">
+				<set name="max_meal" val="19884" />
+				<set name="exp" val="1867719842" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="148" />
+				<set name="consume_meal_in_normal" val="30" />
+				<set name="org_pattack" val="287.18" />
+				<set name="org_pdefend" val="138.6" />
+				<set name="org_mattack" val="188.1" />
+				<set name="org_mdefend" val="61.6" />
+				<set name="org_hp" val="2634.8" />
+				<set name="org_mp" val="891.6" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="66">
+				<set name="max_meal" val="20481" />
+				<set name="exp" val="2240543596" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="154" />
+				<set name="consume_meal_in_normal" val="31" />
+				<set name="org_pattack" val="289.04" />
+				<set name="org_pdefend" val="139.5" />
+				<set name="org_mattack" val="189.32" />
+				<set name="org_mdefend" val="62" />
+				<set name="org_hp" val="2699.9" />
+				<set name="org_mp" val="914.85" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="67">
+				<set name="max_meal" val="21095" />
+				<set name="exp" val="2687932100" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="160" />
+				<set name="consume_meal_in_normal" val="32" />
+				<set name="org_pattack" val="290.91" />
+				<set name="org_pdefend" val="140.4" />
+				<set name="org_mattack" val="190.55" />
+				<set name="org_mdefend" val="62.4" />
+				<set name="org_hp" val="2765.42" />
+				<set name="org_mp" val="938.25" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="68">
+				<set name="max_meal" val="21728" />
+				<set name="exp" val="3229272190" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="166" />
+				<set name="consume_meal_in_normal" val="33" />
+				<set name="org_pattack" val="292.77" />
+				<set name="org_pdefend" val="141.3" />
+				<set name="org_mattack" val="191.77" />
+				<set name="org_mdefend" val="62.8" />
+				<set name="org_hp" val="2831.36" />
+				<set name="org_mp" val="961.8" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="69">
+				<set name="max_meal" val="22380" />
+				<set name="exp" val="3884293700" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="173" />
+				<set name="consume_meal_in_normal" val="35" />
+				<set name="org_pattack" val="294.64" />
+				<set name="org_pdefend" val="142.2" />
+				<set name="org_mattack" val="192.99" />
+				<set name="org_mdefend" val="63.2" />
+				<set name="org_hp" val="2897.72" />
+				<set name="org_mp" val="985.5" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="70">
+				<set name="max_meal" val="23051" />
+				<set name="exp" val="4683419941" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="180" />
+				<set name="consume_meal_in_normal" val="36" />
+				<set name="org_pattack" val="296.5" />
+				<set name="org_pdefend" val="143.1" />
+				<set name="org_mattack" val="194.21" />
+				<set name="org_mdefend" val="63.6" />
+				<set name="org_hp" val="2964.5" />
+				<set name="org_mp" val="1009.35" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="71">
+				<set name="max_meal" val="23743" />
+				<set name="exp" val="5666345218" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="187" />
+				<set name="consume_meal_in_normal" val="37" />
+				<set name="org_pattack" val="298.37" />
+				<set name="org_pdefend" val="144" />
+				<set name="org_mattack" val="195.43" />
+				<set name="org_mdefend" val="64" />
+				<set name="org_hp" val="3031.7" />
+				<set name="org_mp" val="1033.35" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="72">
+				<set name="max_meal" val="24455" />
+				<set name="exp" val="6885172561" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="194" />
+				<set name="consume_meal_in_normal" val="39" />
+				<set name="org_pattack" val="300.23" />
+				<set name="org_pdefend" val="144.9" />
+				<set name="org_mattack" val="196.65" />
+				<set name="org_mdefend" val="64.4" />
+				<set name="org_hp" val="3099.32" />
+				<set name="org_mp" val="1057.5" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="73">
+				<set name="max_meal" val="25189" />
+				<set name="exp" val="8408706740" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="202" />
+				<set name="consume_meal_in_normal" val="40" />
+				<set name="org_pattack" val="302.1" />
+				<set name="org_pdefend" val="145.8" />
+				<set name="org_mattack" val="197.87" />
+				<set name="org_mdefend" val="64.8" />
+				<set name="org_hp" val="3167.36" />
+				<set name="org_mp" val="1081.8" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="74">
+				<set name="max_meal" val="25945" />
+				<set name="exp" val="10328359805" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="210" />
+				<set name="consume_meal_in_normal" val="42" />
+				<set name="org_pattack" val="303.96" />
+				<set name="org_pdefend" val="146.7" />
+				<set name="org_mattack" val="199.1" />
+				<set name="org_mdefend" val="65.2" />
+				<set name="org_hp" val="3235.82" />
+				<set name="org_mp" val="1106.25" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="75">
+				<set name="max_meal" val="26723" />
+				<set name="exp" val="12766319199" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="219" />
+				<set name="consume_meal_in_normal" val="44" />
+				<set name="org_pattack" val="305.83" />
+				<set name="org_pdefend" val="147.6" />
+				<set name="org_mattack" val="200.32" />
+				<set name="org_mdefend" val="65.6" />
+				<set name="org_hp" val="3304.7" />
+				<set name="org_mp" val="1130.85" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="76">
+				<set name="max_meal" val="27257" />
+				<set name="exp" val="15886907222" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="227" />
+				<set name="consume_meal_in_normal" val="45" />
+				<set name="org_pattack" val="307.69" />
+				<set name="org_pdefend" val="148.5" />
+				<set name="org_mattack" val="201.54" />
+				<set name="org_mdefend" val="66" />
+				<set name="org_hp" val="3387.31" />
+				<set name="org_mp" val="1159.12" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="77">
+				<set name="max_meal" val="27802" />
+				<set name="exp" val="19943671652" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="232" />
+				<set name="consume_meal_in_normal" val="46" />
+				<set name="org_pattack" val="309.56" />
+				<set name="org_pdefend" val="149.4" />
+				<set name="org_mattack" val="202.76" />
+				<set name="org_mdefend" val="66.4" />
+				<set name="org_hp" val="3471.99" />
+				<set name="org_mp" val="1188.09" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="78">
+				<set name="max_meal" val="28358" />
+				<set name="exp" val="25420303633" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="237" />
+				<set name="consume_meal_in_normal" val="47" />
+				<set name="org_pattack" val="311.42" />
+				<set name="org_pdefend" val="150.3" />
+				<set name="org_mattack" val="203.98" />
+				<set name="org_mdefend" val="66.8" />
+				<set name="org_hp" val="3558.78" />
+				<set name="org_mp" val="1217.79" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="79">
+				<set name="max_meal" val="28925" />
+				<set name="exp" val="33087588407" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="241" />
+				<set name="consume_meal_in_normal" val="48" />
+				<set name="org_pattack" val="313.29" />
+				<set name="org_pdefend" val="151.2" />
+				<set name="org_mattack" val="205.2" />
+				<set name="org_mdefend" val="67.2" />
+				<set name="org_hp" val="3647.74" />
+				<set name="org_mp" val="1248.23" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="80">
+				<set name="max_meal" val="29504" />
+				<set name="exp" val="44588515567" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="246" />
+				<set name="consume_meal_in_normal" val="49" />
+				<set name="org_pattack" val="315.15" />
+				<set name="org_pdefend" val="152.1" />
+				<set name="org_mattack" val="206.42" />
+				<set name="org_mdefend" val="67.6" />
+				<set name="org_hp" val="3738.93" />
+				<set name="org_mp" val="1279.43" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="81">
+				<set name="max_meal" val="30094" />
+				<set name="exp" val="61839906307" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="251" />
+				<set name="consume_meal_in_normal" val="50" />
+				<set name="org_pattack" val="317.02" />
+				<set name="org_pdefend" val="153" />
+				<set name="org_mattack" val="207.65" />
+				<set name="org_mdefend" val="68" />
+				<set name="org_hp" val="3851.09" />
+				<set name="org_mp" val="1317.81" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="82">
+				<set name="max_meal" val="30696" />
+				<set name="exp" val="87716992417" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="256" />
+				<set name="consume_meal_in_normal" val="51" />
+				<set name="org_pattack" val="318.88" />
+				<set name="org_pdefend" val="153.9" />
+				<set name="org_mattack" val="208.87" />
+				<set name="org_mdefend" val="68.4" />
+				<set name="org_hp" val="3966.62" />
+				<set name="org_mp" val="1357.34" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="83">
+				<set name="max_meal" val="31310" />
+				<set name="exp" val="126532621582" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="261" />
+				<set name="consume_meal_in_normal" val="52" />
+				<set name="org_pattack" val="320.75" />
+				<set name="org_pdefend" val="154.8" />
+				<set name="org_mattack" val="210.09" />
+				<set name="org_mdefend" val="68.8" />
+				<set name="org_hp" val="4085.61" />
+				<set name="org_mp" val="1398.06" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="84">
+				<set name="max_meal" val="31936" />
+				<set name="exp" val="184756065330" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="266" />
+				<set name="consume_meal_in_normal" val="53" />
+				<set name="org_pattack" val="322.61" />
+				<set name="org_pdefend" val="155.7" />
+				<set name="org_mattack" val="211.31" />
+				<set name="org_mdefend" val="69.2" />
+				<set name="org_hp" val="4208.17" />
+				<set name="org_mp" val="1440" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="85">
+				<set name="max_meal" val="32575" />
+				<set name="exp" val="272091230951" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="272" />
+				<set name="consume_meal_in_normal" val="54" />
+				<set name="org_pattack" val="324.48" />
+				<set name="org_pdefend" val="156.6" />
+				<set name="org_mattack" val="212.53" />
+				<set name="org_mdefend" val="69.6" />
+				<set name="org_hp" val="4334.41" />
+				<set name="org_mp" val="1483.2" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="86">
+				<set name="max_meal" val="33227" />
+				<set name="exp" val="403093979383" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="277" />
+				<set name="consume_meal_in_normal" val="55" />
+				<set name="org_pattack" val="326.34" />
+				<set name="org_pdefend" val="157.5" />
+				<set name="org_mattack" val="213.75" />
+				<set name="org_mdefend" val="70" />
+				<set name="org_hp" val="4464.44" />
+				<set name="org_mp" val="1527.69" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="87">
+				<set name="max_meal" val="33892" />
+				<set name="exp" val="599598102032" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="283" />
+				<set name="consume_meal_in_normal" val="57" />
+				<set name="org_pattack" val="328.2" />
+				<set name="org_pdefend" val="158.4" />
+				<set name="org_mattack" val="214.97" />
+				<set name="org_mdefend" val="70.4" />
+				<set name="org_hp" val="4598.37" />
+				<set name="org_mp" val="1573.52" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="88">
+				<set name="max_meal" val="34570" />
+				<set name="exp" val="953305522799" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="288" />
+				<set name="consume_meal_in_normal" val="58" />
+				<set name="org_pattack" val="330.07" />
+				<set name="org_pdefend" val="159.3" />
+				<set name="org_mattack" val="216.2" />
+				<set name="org_mdefend" val="70.8" />
+				<set name="org_hp" val="4736.32" />
+				<set name="org_mp" val="1620.72" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="89">
+				<set name="max_meal" val="35261" />
+				<set name="exp" val="1660720364334" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="294" />
+				<set name="consume_meal_in_normal" val="59" />
+				<set name="org_pattack" val="331.93" />
+				<set name="org_pdefend" val="160.2" />
+				<set name="org_mattack" val="217.42" />
+				<set name="org_mdefend" val="71.2" />
+				<set name="org_hp" val="4878.4" />
+				<set name="org_mp" val="1669.34" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="90">
+				<set name="max_meal" val="35966" />
+				<set name="exp" val="3775890740522" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="300" />
+				<set name="consume_meal_in_normal" val="60" />
+				<set name="org_pattack" val="333.8" />
+				<set name="org_pdefend" val="161.1" />
+				<set name="org_mattack" val="218.64" />
+				<set name="org_mdefend" val="71.6" />
+				<set name="org_hp" val="5024.75" />
+				<set name="org_mp" val="1719.42" />
+				<set name="org_hp_regen" val="7" />
+				<set name="org_mp_regen" val="3.6" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="91">
+				<set name="max_meal" val="36685" />
+				<set name="exp" val="14351742621463" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="306" />
+				<set name="consume_meal_in_normal" val="61" />
+				<set name="org_pattack" val="335.66" />
+				<set name="org_pdefend" val="162" />
+				<set name="org_mattack" val="219.86" />
+				<set name="org_mdefend" val="72" />
+				<set name="org_hp" val="5175.49" />
+				<set name="org_mp" val="1771" />
+				<set name="org_hp_regen" val="7.1" />
+				<set name="org_mp_regen" val="3.63" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="92">
+				<set name="max_meal" val="37419" />
+				<set name="exp" val="60885490897603" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="312" />
+				<set name="consume_meal_in_normal" val="62" />
+				<set name="org_pattack" val="337.53" />
+				<set name="org_pdefend" val="162.9" />
+				<set name="org_mattack" val="221.08" />
+				<set name="org_mdefend" val="72.4" />
+				<set name="org_hp" val="5330.75" />
+				<set name="org_mp" val="1824.13" />
+				<set name="org_hp_regen" val="7.2" />
+				<set name="org_mp_regen" val="3.66" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="93">
+				<set name="max_meal" val="38167" />
+				<set name="exp" val="265633983312619" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="318" />
+				<set name="consume_meal_in_normal" val="64" />
+				<set name="org_pattack" val="339.39" />
+				<set name="org_pdefend" val="163.8" />
+				<set name="org_mattack" val="222.3" />
+				<set name="org_mdefend" val="72.8" />
+				<set name="org_hp" val="5490.67" />
+				<set name="org_mp" val="1878.85" />
+				<set name="org_hp_regen" val="7.3" />
+				<set name="org_mp_regen" val="3.69" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="94">
+				<set name="max_meal" val="38930" />
+				<set name="exp" val="1166527349938690" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="325" />
+				<set name="consume_meal_in_normal" val="65" />
+				<set name="org_pattack" val="341.26" />
+				<set name="org_pdefend" val="164.7" />
+				<set name="org_mattack" val="223.52" />
+				<set name="org_mdefend" val="73.2" />
+				<set name="org_hp" val="5655.39" />
+				<set name="org_mp" val="1935.21" />
+				<set name="org_hp_regen" val="7.4" />
+				<set name="org_mp_regen" val="3.72" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="95">
+				<set name="max_meal" val="39709" />
+				<set name="exp" val="5130458163093410" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="331" />
+				<set name="consume_meal_in_normal" val="66" />
+				<set name="org_pattack" val="343.12" />
+				<set name="org_pdefend" val="165.6" />
+				<set name="org_mattack" val="224.75" />
+				<set name="org_mdefend" val="73.6" />
+				<set name="org_hp" val="5825.05" />
+				<set name="org_mp" val="1993.26" />
+				<set name="org_hp_regen" val="7.5" />
+				<set name="org_mp_regen" val="3.75" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="96">
+				<set name="max_meal" val="40503" />
+				<set name="exp" val="28914043042021700" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="338" />
+				<set name="consume_meal_in_normal" val="68" />
+				<set name="org_pattack" val="344.99" />
+				<set name="org_pdefend" val="166.5" />
+				<set name="org_mattack" val="225.97" />
+				<set name="org_mdefend" val="74" />
+				<set name="org_hp" val="5999.8" />
+				<set name="org_mp" val="2053.05" />
+				<set name="org_hp_regen" val="7.6" />
+				<set name="org_mp_regen" val="3.78" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="97">
+				<set name="max_meal" val="41313" />
+				<set name="exp" val="143075250460878000" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="345" />
+				<set name="consume_meal_in_normal" val="69" />
+				<set name="org_pattack" val="346.85" />
+				<set name="org_pdefend" val="167.4" />
+				<set name="org_mattack" val="227.19" />
+				<set name="org_mdefend" val="74.4" />
+				<set name="org_hp" val="6179.79" />
+				<set name="org_mp" val="2114.64" />
+				<set name="org_hp_regen" val="7.7" />
+				<set name="org_mp_regen" val="3.81" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="98">
+				<set name="max_meal" val="42139" />
+				<set name="exp" val="691049046071386000" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="351" />
+				<set name="consume_meal_in_normal" val="70" />
+				<set name="org_pattack" val="348.72" />
+				<set name="org_pdefend" val="168.3" />
+				<set name="org_mattack" val="228.41" />
+				<set name="org_mdefend" val="74.8" />
+				<set name="org_hp" val="6365.18" />
+				<set name="org_mp" val="2178.07" />
+				<set name="org_hp_regen" val="7.8" />
+				<set name="org_mp_regen" val="3.84" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="99">
+				<set name="max_meal" val="42982" />
+				<set name="exp" val="3321323265001830000" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="358" />
+				<set name="consume_meal_in_normal" val="72" />
+				<set name="org_pattack" val="350.58" />
+				<set name="org_pdefend" val="169.2" />
+				<set name="org_mattack" val="229.63" />
+				<set name="org_mdefend" val="75.2" />
+				<set name="org_hp" val="6556.13" />
+				<set name="org_mp" val="2243.41" />
+				<set name="org_hp_regen" val="7.9" />
+				<set name="org_mp_regen" val="3.87" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="100">
+				<set name="max_meal" val="43842" />
+				<set name="exp" val="3321323265001870000" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="366" />
+				<set name="consume_meal_in_normal" val="73" />
+				<set name="org_pattack" val="500" />
+				<set name="org_pdefend" val="500" />
+				<set name="org_mattack" val="500" />
+				<set name="org_mdefend" val="500" />
+				<set name="org_hp" val="6752.81" />
+				<set name="org_mp" val="2310.71" />
+				<set name="org_hp_regen" val="8.5" />
+				<set name="org_mp_regen" val="4" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+		</stats>
+	</pet>
+</pets>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/01800-01899.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/01800-01899.xml
index c537387a10..8ac12c3e7f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/01800-01899.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/01800-01899.xml
@@ -1299,6 +1299,7 @@
 			<value level="1">1</value>
 			<value level="2">2</value>
 			<value level="3">3</value>
+			<value level="4">4</value>
 		</abnormalLevel>
 		<abnormalTime>3</abnormalTime>
 		<abnormalType>KNOCKDOWN</abnormalType>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/39100-39199.xml
index 13daef1276..a1e93ff80c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/39100-39199.xml
@@ -57,7 +57,19 @@
 	</skill>
 	<skill id="39103" toLevel="1" name="Hero's HP Recovery Potion">
 		<icon>icon.etc_reagent_white_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<amount>500</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39104" toLevel="1" name="Hero's Cube - 7 d.">
 		<icon>icon.sa_cube</icon>
@@ -2511,6 +2523,59 @@
 	</skill>
 	<skill id="39199" toLevel="1" name="Hero's Wondrous Cube - 7 d.">
 		<icon>icon.sa_cube</icon>
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<reuseDelay>-1</reuseDelay>
+		<hitTime>500</hitTime>
+		<coolTime>500</coolTime>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpEncumbered">
+				<weightPercent>20</weightPercent>
+				<slotsPercent>10</slotsPercent>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="RestorationRandom">
+				<items>
+					<item chance="16">
+						<item id="49487" count="2"/> <!-- Soulshot Ticket -->
+					</item>
+					<item chance="4">
+						<item id="49772" count="1"/> <!-- Scroll of Mood Melody -->
+					</item>
+					<item chance="16.49">
+						<item id="49488" count="5"/> <!-- Major Healing Potion -->
+					</item>
+					<item chance="20">
+						<item id="35669" count="1"/> <!-- Angel Cat's Blessing -->
+					</item>
+					<item chance="5">
+						<item id="49533" count="1"/> <!-- Quick Hero Healing Potion -->
+					</item>
+					<item chance="10">
+						<item id="49542" count="1"/> <!-- Improved Scroll of Resurrection -->
+					</item>
+					<item chance="14.5">
+						<item id="49536" count="1"/> <!-- Box of Scroll of Escape to the Base -->
+					</item>
+					<item chance="2">
+						<item id="49489" count="3"/> <!-- Parts of Enchantment Scrolls Chest -->
+					</item>
+					<item chance="10">
+						<item id="49416" count="1"/> <!-- Blade Spirit -->
+					</item>
+					<item chance="0.01">
+						<item id="49859" count="1"/> <!-- Weapon Exchange Coupon -->
+					</item>
+					<item chance="2">
+						<item id="49490" count="1"/> <!-- Fishing Kit -->
+					</item>
+				</items>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/39200-39299.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/39200-39299.xml
index 0fbc413456..4895c42819 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/39200-39299.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/39200-39299.xml
@@ -2064,7 +2064,7 @@
 		<abnormalTime>1200</abnormalTime>
 		<abnormalLevel>
 			<value level="1">1</value>
-			<value level="1">2</value>
+			<value level="2">2</value>
 		</abnormalLevel>
 		<isMagic>4</isMagic>
 		<reuseDelay>60000</reuseDelay>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/39300-39399.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/39300-39399.xml
index 1489e40b2d..7d283129c1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/39300-39399.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/39300-39399.xml
@@ -479,14 +479,14 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="39325" toLevel="3" name="Arcane Deliverance">
+	<skill id="39325" toLevel="1" name="Arcane Deliverance">
 		<!-- Recovers HP/ MP/ CP after an attack. (20% of Max HP and lower) -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
 		<hitTime>500</hitTime>
 		<reuseDelay>900000</reuseDelay>
 	</skill>
-	<skill id="39326" toLevel="3" name="Arcane Speed">
+	<skill id="39326" toLevel="1" name="Arcane Speed">
 		<!-- Increases Speed, Atk. Spd. and Casting Spd. after an attack. -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -494,7 +494,7 @@
 		<reuseDelay>900000</reuseDelay>
 		<effectPoint>100</effectPoint>
 	</skill>
-	<skill id="39327" toLevel="3" name="Arcane Barrier">
+	<skill id="39327" toLevel="1" name="Arcane Barrier">
 		<!-- Creates a barrier for a while when damage is taken. -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -502,7 +502,7 @@
 		<reuseDelay>900000</reuseDelay>
 		<effectPoint>100</effectPoint>
 	</skill>
-	<skill id="39328" toLevel="3" name="Arcane Immunity">
+	<skill id="39328" toLevel="1" name="Arcane Immunity">
 		<!-- Grants immunity to debuffs for a while when damage is taken. -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -510,7 +510,7 @@
 		<reuseDelay>600000</reuseDelay>
 		<effectPoint>100</effectPoint>
 	</skill>
-	<skill id="39329" toLevel="3" name="Arcane Protection">
+	<skill id="39329" toLevel="1" name="Arcane Protection">
 		<!-- Increases P./ M. Def for a while when damage is taken. -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -518,7 +518,7 @@
 		<reuseDelay>600000</reuseDelay>
 		<effectPoint>100</effectPoint>
 	</skill>
-	<skill id="39330" toLevel="3" name="Arcane Paralysis">
+	<skill id="39330" toLevel="1" name="Arcane Paralysis">
 		<!-- Temporarily paralyzes the enemy after an attack. -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -529,7 +529,7 @@
 		<reuseDelay>300000</reuseDelay>
 		<effectPoint>-100</effectPoint>
 	</skill>
-	<skill id="39331" toLevel="3" name="Arcane Silence">
+	<skill id="39331" toLevel="1" name="Arcane Silence">
 		<!-- Temporarily inflicts Silence on the enemy after an attack. -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -540,7 +540,7 @@
 		<reuseDelay>300000</reuseDelay>
 		<effectPoint>-100</effectPoint>
 	</skill>
-	<skill id="39332" toLevel="3" name="Arcane Critical Sense">
+	<skill id="39332" toLevel="1" name="Arcane Critical Sense">
 		<!-- All Critical Rate +3%. All Critical Damage +150 -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -551,7 +551,7 @@
 		<effectPoint>-671</effectPoint>
 		<mpConsume>43</mpConsume>
 	</skill>
-	<skill id="39333" toLevel="3" name="Arcane Power">
+	<skill id="39333" toLevel="1" name="Arcane Power">
 		<!-- P. Atk. +350. M. Atk. +500 -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/40200-40299.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/40200-40299.xml
index 4b15e8843b..cea4ce1025 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/40200-40299.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/40200-40299.xml
@@ -618,11 +618,14 @@
 		<itemConsumeCount>1</itemConsumeCount>
 		<itemConsumeId>94480</itemConsumeId>
 		<magicCriticalRate>5</magicCriticalRate>
-		<hitCancelTime>0</hitCancelTime>
-		<magicLevel>1</magicLevel>
 		<reuseDelay>5</reuseDelay>
 		<targetType>PET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="GivePetXp">
+				<xp>100000000</xp>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="40239" toLevel="1" name="Pet Buff Scroll">
 		<!-- Max HP +1000. P. Def. +300. M. Def. +300. HP Recovery Rate +10 -->
@@ -640,12 +643,14 @@
 		<operateType>A1</operateType>
 		<itemConsumeCount>1</itemConsumeCount>
 		<itemConsumeId>94517</itemConsumeId>
-		<magicCriticalRate>5</magicCriticalRate>
-		<hitCancelTime>0</hitCancelTime>
-		<magicLevel>1</magicLevel>
 		<reuseDelay>5</reuseDelay>
 		<targetType>PET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="GivePetXp">
+				<xp>2000000000</xp>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="40242" toLevel="1" name="Sayha's Blessing Scroll">
 		<icon>icon.skill0000</icon>
@@ -834,6 +839,16 @@
 		<!-- Pet XP +1,000,000. -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>94635</itemConsumeId>
+		<reuseDelay>5</reuseDelay>
+		<targetType>PET</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="GivePetXp">
+				<xp>1000000</xp>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="40251" toLevel="1" name="Pet XP Growth Scroll">
 		<!-- Pet XP +30%. Removed when your pet is dead or recalled. -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45100-45199.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45100-45199.xml
index 75f2986352..5e63cfe41d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45100-45199.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45100-45199.xml
@@ -4109,13 +4109,33 @@
 	<skill id="45198" toLevel="1" name="Grand Master's Transcendent Blessing">
 		<!-- Grand Master's power has allowed you to push the limits of your class and now you can use the main skill with increased stats. <Notice>. When blessed you can't drain light/ shadow souls. -->
 		<icon>icon.skill_kamael_shadowside</icon>
-		<operateType>A1</operateType>
-		<isMagic>1</isMagic>
-		<castRange>700</castRange>
-		<effectPoint>0</effectPoint>
-		<abnormalTime>660</abnormalTime>
+		<operateType>A2</operateType>
+		<abnormalLevel>1</abnormalLevel>
+		<abnormalTime>600</abnormalTime>
+		<abnormalType>KAMAEL_TRANSFORM</abnormalType>
+		<abnormalVisualEffect>KAMAEL_BLACK_TRANSFORM;LONG_RAPIER_BLACK_AVE;BLACK_STANCE_AVE</abnormalVisualEffect>
+		<isMagic>4</isMagic>
+		<magicLevel>
+			<value level="1">20</value>
+			<value level="2">60</value>
+		</magicLevel>
+		<operateType>A2</operateType>
+		<effectPoint>1</effectPoint>
 		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="BlockAbnormalSlot">
+				<slot>TRANSFORM</slot>
+			</effect>
+			<effect name="AdditionalPotionHp">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MpVampiricAttack">
+				<amount>3</amount>
+				<chance>50</chance>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="45199" toLevel="24" name="Transcendent Power Strike">
 		<!-- Delivers a powerful blow that strikes the target with 45 power. Requires a sword/ blunt weapon/ spear/ dual swords. Over-hit. The skill can be used only in the transcendent instance zones. -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50400-50499.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50400-50499.xml
index e65612a356..d2779345ea 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50400-50499.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/50400-50499.xml
@@ -165,8 +165,12 @@
 				<amount>80</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxPhysicalCriticalRate">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>50</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
@@ -266,8 +270,12 @@
 				<amount>150</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxPhysicalCriticalRate">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>50</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
@@ -306,8 +314,6 @@
 		<!-- All Critical Damage +200. Increases Max All Critical Rate. -->
 		<icon>icon.bless_effect_enchant</icon>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
-		<magicLevel>1</magicLevel>
 		<effects>
 			<effect name="CriticalDamage">
 				<amount>200</amount>
@@ -321,8 +327,12 @@
 				<amount>200</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxPhysicalCriticalRate">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>50</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/55200-55299.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/55200-55299.xml
index f83993fe06..7e76cd190d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/55200-55299.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/55200-55299.xml
@@ -500,7 +500,7 @@
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>ATTACK_TIME_DOWN</abnormalType>
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer’s Potion -->
+		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer's Potion -->
 		<mpConsume>75</mpConsume>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/documentation.txt
index 2637946736..ac90c9071c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/documentation.txt
@@ -12,6 +12,8 @@ AddHuntingTime: Add time for time limited hunting zones. (l2jmobius)
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -143,6 +145,7 @@ GiveClanReputation: Gives clan reputation points to a players clan. (l2jmobius)
 GiveExpAndSp: Gives a given amount of XP and SP. (l2jmobius)
 GiveFame: Gives a given amount of Fame. (l2jmobius)
 GiveItemByExp: Gives an item when a certain amount of EXP is gathered. (l2jmobius)
+GivePetXp: Gives a given amount of XP to a pet. (l2jmobius)
 GiveRecommendation: Gives recommendations to a player. Blue name.
 GiveSp: Gives a given amount of SP.
 GiveXp: Gives a given amount of XP. (l2jmobius)
@@ -162,10 +165,11 @@ HpCpHealCritical: HpCp heal effects always trigger Magic Critical Hit.
 HpCpHeal: Increases current HP by a given amount. If the given amount exceeds maximum HP, it increases current CP with the rest value as well.
 HpDrain: Magical attack that absorbs given percentage of the damage inflicted as HP.
 Hp: Increases current HP by a static value.
-HpLimit: Increase a character's max hp limit (l2jmobius)
+HpLimit: Increase a character's max hp limit. (l2jmobius)
 HpRegen: HP Regeneration stat.
 HpToOwner: DOT effect that absorbs HP over time.
 IgnoreDeath: Become undying. Hp cannot decrease below 1.
+IgnoreReduceDamage: Ignore ReduceDamage effect implementation. (l2jmobius)
 ImmobileDamageBonus: Bonus damage to immobile targets. (l2jmobius)
 ImmobileDamageResist: Resist damage while immobile. (l2jmobius)
 ImmobilePetBuff: Causes your pet to become immobilized.
@@ -206,7 +210,6 @@ MAtk: M. Atk. stat.
 MAtkByPAtk: M. Atk. bonus from P. Atk stat. (l2jmobius)
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyCraftPoints: Modifies player Craft Point count. (l2jmobius)
 ModifyDeathPoints: Modifies player Death Point count. (l2jmobius)
@@ -273,6 +276,7 @@ RearDamage: Multiplier for damage done from behind the target. (l2jmobius)
 RebalanceHP: Balances targets' current HP.
 RebalanceHPSummon: Balances targets' current HP for summons.
 RecoverVitalityInPeaceZone: Recover periodically vitality when player is in a peace zone. (l2jmobius)
+ReduceDamage: Reduce damage effect implementation.
 ReduceCancel: Magic skill casting interruption stat.
 ReduceDropPenalty: Reduces EXP lost and death penalty chance.
 ReflectMagic: Deflects magical damage back to the attacker.
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/LimitShop.xsd b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/LimitShop.xsd
index 8bc61661ac..cc614f7a31 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/LimitShop.xsd
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/LimitShop.xsd
@@ -40,6 +40,7 @@
 											<xs:attribute type="xs:long" name="count5" use="optional"/>
 											<xs:attribute type="xs:boolean" name="announce5" use="optional"/>
 											<xs:attribute type="xs:int" name="accountDailyLimit" use="optional"/>
+											<xs:attribute type="xs:int" name="accountMontlyLimit" use="optional"/>
 											<xs:attribute type="xs:int" name="accountBuyLimit" use="optional"/>
 										</xs:extension>
 									</xs:simpleContent>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/PetExtractData.xsd b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/PetExtractData.xsd
new file mode 100644
index 0000000000..e9115b614a
--- /dev/null
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/PetExtractData.xsd
@@ -0,0 +1,24 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+	<xs:element name="list">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="extraction" maxOccurs="unbounded" minOccurs="0">
+					<xs:complexType>
+						<xs:simpleContent>
+							<xs:extension base="xs:string">
+								<xs:attribute type="xs:short" name="petId" />
+								<xs:attribute type="xs:int" name="petLevel" />
+								<xs:attribute type="xs:long" name="extractExp" />
+								<xs:attribute type="xs:int" name="extractItem"/>
+								<xs:attribute type="xs:int" name="defaultCostId" />
+								<xs:attribute type="xs:long" name="defaultCostCount" />
+								<xs:attribute type="xs:int" name="extractCostId" />
+								<xs:attribute type="xs:long" name="extractCostCount" />
+							</xs:extension>
+						</xs:simpleContent>
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/zones/no_landing.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/zones/no_landing.xml
index 4b280f64a8..88b454d0db 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/zones/no_landing.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/zones/no_landing.xml
@@ -58,4 +58,41 @@
 		<node X="-98296" Y="-262136" />
 		<node X="-65544" Y="-229384" />
 	</zone>
+	
+	<!-- Dwelling of Spirits zones -->
+	<zone id="202201" name="dwelling_portal_enter_fire" type="NoLandingZone" shape="Cuboid" minZ="-12209" maxZ="-10700">
+		<node X="-115236" Y="-77408" />
+		<node X="-115617" Y="-77631" />
+	</zone>
+	<zone id="202202" name="dwelling_portal_enter_earth" type="NoLandingZone" shape="Cuboid" minZ="-12209" maxZ="-10700">
+		<node X="-113417" Y="-77633" />
+		<node X="-113032" Y="-77411" />
+	</zone>
+	<zone id="202203" name="dwelling_portal_enter_water" type="NoLandingZone" shape="NPoly" minZ="-12209" maxZ="-10700">
+		<node X="-115160" Y="-79013" />
+		<node X="-115333" Y="-79182" />
+		<node X="-115216" Y="-79282" />
+		<node X="-115053" Y="-79121" />
+	</zone>
+	<zone id="202204" name="dwelling_portal_enter_wind" type="NoLandingZone" shape="NPoly" minZ="-12209" maxZ="-10700">
+		<node X="-113596" Y="-79120" />
+		<node X="-113436" Y="-79275" />
+		<node X="-113325" Y="-79176" />
+		<node X="-113490" Y="-79012" />
+	</zone>
+	<zone id="202205" name="dwelling_portal_return_fire" type="NoLandingZone" shape="Cylinder" minZ="-15515" maxZ="-15400" rad="230">
+		<node X="202349" Y="170533" />
+	</zone>
+	<zone id="202206" name="dwelling_portal_return_earth" type="NoLandingZone" shape="Cylinder" minZ="-15515" maxZ="-15400" rad="230">
+		<node X="222065" Y="192767" />
+	</zone>
+	<zone id="202207" name="dwelling_portal_return_water" type="NoLandingZone" shape="Cylinder" minZ="-15515" maxZ="-15400" rad="230">
+		<node X="222127" Y="170488" />
+	</zone>
+	<zone id="202208" name="dwelling_portal_return_wind" type="NoLandingZone" shape="Cylinder" minZ="-15515" maxZ="-15400" rad="230">
+		<node X="212855" Y="181242" />
+	</zone>
+	<zone id="21400000" name="dwelling_central" type="NoLandingZone" shape="Cylinder" minZ="-12209" maxZ="-10700" rad="1000">
+		<node X="-114339" Y="-78005" />
+	</zone>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/zones/teleportzones.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/zones/teleportzones.xml
index b5fe1819db..69f7a9aad1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/zones/teleportzones.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/zones/teleportzones.xml
@@ -1,79 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/zones.xsd">
-	<zone name="dwelling_portal_earth" type="TeleportZone" shape="Cylinder" minZ="-11518" maxZ="-11218" rad="100">
-		<stat name="oustX" val="222086" />
-		<stat name="oustY" val="190539" />
-		<stat name="oustZ" val="-15488" />
-		<stat name="default_enabled" val="false" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="-113465" Y="-77520" />
-	</zone>
-	<zone name="dwelling_portal_wind" type="TeleportZone" shape="Cylinder" minZ="-11518" maxZ="-11218" rad="100">
-		<stat name="oustX" val="222151" />
-		<stat name="oustY" val="168077" />
-		<stat name="oustZ" val="-15488" />
-		<stat name="default_enabled" val="false" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="-115115" Y="-79080" />
-	</zone>
-	<zone name="dwelling_portal_water" type="TeleportZone" shape="Cylinder" minZ="-11518" maxZ="-11218" rad="100">
-		<stat name="oustX" val="212886" />
-		<stat name="oustY" val="178829" />
-		<stat name="oustZ" val="-15488" />
-		<stat name="instanceId" val="214" />
-		<stat name="default_enabled" val="true" /> <!-- Fixes a problem with the other portals. -->
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="-113529" Y="-79077" />
-	</zone>
-	<zone name="dwelling_portal_fire" type="TeleportZone" shape="Cylinder" minZ="-11518" maxZ="-11218" rad="100">
-		<stat name="oustX" val="202376" />
-		<stat name="oustY" val="168141" />
-		<stat name="oustZ" val="-15488" />
-		<stat name="default_enabled" val="false" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="-115202" Y="-77519" />
-	</zone>
-	<zone name="return_portal_petram" type="TeleportZone" shape="Cylinder" minZ="-15688" maxZ="-15218" rad="100">
-		<stat name="oustX" val="-114323" />
-		<stat name="oustY" val="-78292" />
-		<stat name="oustZ" val="-11433" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="222061" Y="192921" />
-	</zone>
-	<zone name="return_portal_nebula" type="TeleportZone" shape="Cylinder" minZ="-15688" maxZ="-15218" rad="100">
-		<stat name="oustX" val="-114323" />
-		<stat name="oustY" val="-78292" />
-		<stat name="oustZ" val="-11433" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="222127" Y="170488" />
-	</zone>
-	<zone name="return_portal_procella" type="TeleportZone" shape="Cylinder" minZ="-15688" maxZ="-15218" rad="100">
-		<stat name="oustX" val="-114323" />
-		<stat name="oustY" val="-78292" />
-		<stat name="oustZ" val="-11433" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="212855" Y="181242" />
-	</zone>
-	<zone name="return_portal_ignis" type="TeleportZone" shape="Cylinder" minZ="-15688" maxZ="-15218" rad="100">
-		<stat name="oustX" val="-114323" />
-		<stat name="oustY" val="-78292" />
-		<stat name="oustZ" val="-11433" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="202349" Y="170533" />
-	</zone>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java
index cdae7179ed..d396481f39 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java
@@ -639,6 +639,7 @@ public class Config
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean AUTO_PLAY_ATTACK_ACTION;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static int SHARING_LOCATION_COST;
 	public static int TELEPORT_SHARE_LOCATION_COST;
 	
@@ -1312,6 +1313,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2182,6 +2184,7 @@ public class Config
 			ENABLE_AUTO_ITEM = generalConfig.getBoolean("EnableAutoItem", true);
 			AUTO_PLAY_ATTACK_ACTION = generalConfig.getBoolean("AutoPlayAttackAction", true);
 			RESUME_AUTO_PLAY = generalConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = generalConfig.getBoolean("AssistLeader", false);
 			SHARING_LOCATION_COST = generalConfig.getInt("ShareLocationLcoinCost", 50);
 			TELEPORT_SHARE_LOCATION_COST = generalConfig.getInt("TeleportShareLocationLcoinCost", 400);
 			
@@ -3325,6 +3328,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/GameServer.java
index 0456971ac0..da4a3f2e90 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/GameServer.java
@@ -92,6 +92,7 @@ import org.l2jmobius.gameserver.data.xml.NpcNameLocalisationData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
 import org.l2jmobius.gameserver.data.xml.PetAcquireList;
 import org.l2jmobius.gameserver.data.xml.PetDataTable;
+import org.l2jmobius.gameserver.data.xml.PetExtractData;
 import org.l2jmobius.gameserver.data.xml.PetSkillData;
 import org.l2jmobius.gameserver.data.xml.PetTypeData;
 import org.l2jmobius.gameserver.data.xml.PlayerTemplateData;
@@ -321,6 +322,8 @@ public class GameServer
 		CharInfoTable.getInstance();
 		AdminData.getInstance();
 		PetDataTable.getInstance();
+		PetTypeData.getInstance();
+		PetExtractData.getInstance();
 		CubicData.getInstance();
 		CharSummonTable.getInstance().init();
 		BeautyShopData.getInstance();
@@ -370,7 +373,6 @@ public class GameServer
 		CrestTable.getInstance();
 		TeleportListData.getInstance();
 		SharedTeleportManager.getInstance();
-		PetTypeData.getInstance();
 		TeleporterData.getInstance();
 		TimedHuntingZoneData.getInstance();
 		MatchingRoomManager.getInstance();
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index f82b67b3d5..7633d726c4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java
index 239f963e0f..209a675ec0 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java
@@ -121,6 +121,7 @@ public class LimitShopCraftData implements IXmlReader
 							boolean announce4 = false;
 							boolean announce5 = false;
 							int accountDailyLimit = 0;
+							int accountMontlyLimit = 0;
 							int accountBuyLimit = 0;
 							for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling())
 							{
@@ -203,6 +204,7 @@ public class LimitShopCraftData implements IXmlReader
 									count5 = parseLong(attrs, "count5", 1L);
 									announce5 = parseBoolean(attrs, "announce5", false);
 									accountDailyLimit = parseInteger(attrs, "accountDailyLimit", 0);
+									accountMontlyLimit = parseInteger(attrs, "accountMontlyLimit", 0);
 									accountBuyLimit = parseInteger(attrs, "accountBuyLimit", 0);
 									
 									final ItemTemplate item = ItemTable.getInstance().getTemplate(productionId);
@@ -214,7 +216,7 @@ public class LimitShopCraftData implements IXmlReader
 								}
 							}
 							
-							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, count, chance, announce, productionId2, count2, chance2, announce2, productionId3, count3, chance3, announce3, productionId4, count4, chance4, announce4, productionId5, count5, announce5, accountDailyLimit, accountBuyLimit));
+							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, count, chance, announce, productionId2, count2, chance2, announce2, productionId3, count3, chance3, announce3, productionId4, count4, chance4, announce4, productionId5, count5, announce5, accountDailyLimit, accountMontlyLimit, accountBuyLimit));
 						}
 					}
 				}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
index 5cb3a5f531..907ad3a619 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
@@ -103,6 +103,7 @@ public class LimitShopData implements IXmlReader
 							ingredientEnchants[2] = 0;
 							int productionId = 0;
 							int accountDailyLimit = 0;
+							int accountMontlyLimit = 0;
 							int accountBuyLimit = 0;
 							for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling())
 							{
@@ -167,6 +168,7 @@ public class LimitShopData implements IXmlReader
 								{
 									productionId = parseInteger(attrs, "id");
 									accountDailyLimit = parseInteger(attrs, "accountDailyLimit", 0);
+									accountMontlyLimit = parseInteger(attrs, "accountMontlyLimit", 0);
 									accountBuyLimit = parseInteger(attrs, "accountBuyLimit", 0);
 									
 									final ItemTemplate item = ItemTable.getInstance().getTemplate(productionId);
@@ -178,7 +180,7 @@ public class LimitShopData implements IXmlReader
 								}
 							}
 							
-							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, 1, 100, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, false, accountDailyLimit, accountBuyLimit));
+							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, 1, 100, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, false, accountDailyLimit, accountMontlyLimit, accountBuyLimit));
 						}
 					}
 				}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/PetExtractData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/PetExtractData.java
new file mode 100644
index 0000000000..e53f5ca3cd
--- /dev/null
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/PetExtractData.java
@@ -0,0 +1,107 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.data.xml;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.gameserver.model.holders.ItemHolder;
+import org.l2jmobius.gameserver.model.holders.PetExtractionHolder;
+
+/**
+ * @author Geremy
+ */
+public class PetExtractData implements IXmlReader
+{
+	private static final Logger LOGGER = Logger.getLogger(PetExtractData.class.getName());
+	// <Pet_Id, <Pet_Level, Cost>>
+	private final Map<Integer, Map<Integer, PetExtractionHolder>> _extractionData = new HashMap<>();
+	
+	protected PetExtractData()
+	{
+		load();
+	}
+	
+	@Override
+	public void load()
+	{
+		_extractionData.clear();
+		parseDatapackFile("data/PetExtractData.xml");
+		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extractionData.size() + " pet extraction data.");
+	}
+	
+	@Override
+	public void parseDocument(Document doc, File f)
+	{
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling())
+		{
+			if ("list".equalsIgnoreCase(n.getNodeName()))
+			{
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
+				{
+					if ("extraction".equalsIgnoreCase(d.getNodeName()))
+					{
+						final NamedNodeMap attrs = d.getAttributes();
+						final int petId = parseInteger(attrs, "petId");
+						final int petLevel = parseInteger(attrs, "petLevel");
+						final long extractExp = parseLong(attrs, "extractExp");
+						final int extractItem = parseInteger(attrs, "extractItem");
+						final int defaultCostId = parseInteger(attrs, "defaultCostId");
+						final int defaultCostCount = parseInteger(attrs, "defaultCostCount");
+						final int extractCostId = parseInteger(attrs, "extractCostId");
+						final int extractCostCount = parseInteger(attrs, "extractCostCount");
+						Map<Integer, PetExtractionHolder> data = _extractionData.get(petId);
+						if (data == null)
+						{
+							data = new HashMap<>();
+							_extractionData.put(petId, data);
+						}
+						data.put(petLevel, new PetExtractionHolder(petId, petLevel, extractExp, extractItem, new ItemHolder(defaultCostId, defaultCostCount), new ItemHolder(extractCostId, extractCostCount)));
+					}
+				}
+			}
+		}
+	}
+	
+	public PetExtractionHolder getExtraction(int petId, int petLevel)
+	{
+		final Map<Integer, PetExtractionHolder> map = _extractionData.get(petId);
+		if (map == null)
+		{
+			LOGGER.warning(getClass().getSimpleName() + ": Missing pet extraction data: [PetId: " + petId + "] [PetLevel: " + petLevel + "]");
+			return null;
+		}
+		return map.get(petLevel);
+	}
+	
+	public static PetExtractData getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final PetExtractData INSTANCE = new PetExtractData();
+	}
+}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index 7da7b6a28d..60e1308527 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -548,9 +548,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/CategoryType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/CategoryType.java
index 8e43b7b669..9c0f2eb564 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/CategoryType.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/CategoryType.java
@@ -36,6 +36,7 @@ public enum CategoryType
 	STRIDER,
 	WOLF_GROUP,
 	WYVERN_GROUP,
+	PET_GROUP,
 	SUBJOB_GROUP_KNIGHT,
 	HUMAN_FALL_CLASS,
 	HUMAN_MALL_CLASS,
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index b277446b93..7bf956bdc5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
index 40b4ea1c3d..ae43e8d744 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
@@ -25,4 +25,9 @@ import org.l2jmobius.gameserver.model.actor.Player;
 public interface IPlayerActionHandler
 {
 	void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed);
+	
+	default boolean isPetAction()
+	{
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index cc140152c0..d89180bf13 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -65,7 +65,7 @@ public class DailyTaskManager
 	private static final Set<Integer> RESET_SKILLS = new HashSet<>();
 	static
 	{
-		// No known skills.
+		RESET_SKILLS.add(39199); // Hero's Wondrous Cubic
 	}
 	public static final Set<Integer> RESET_ITEMS = new HashSet<>();
 	static
@@ -112,7 +112,8 @@ public class DailyTaskManager
 		GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis());
 		
 		// Wednesday weekly tasks.
-		if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY)
+		final Calendar calendar = Calendar.getInstance();
+		if (calendar.get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY)
 		{
 			clanLeaderApply();
 			resetMonsterArenaWeekly();
@@ -124,6 +125,11 @@ public class DailyTaskManager
 			resetVitalityDaily();
 		}
 		
+		if (calendar.get(Calendar.DAY_OF_MONTH) == 1)
+		{
+			resetMontlyLimitShopData();
+		}
+		
 		// Daily tasks.
 		resetClanBonus();
 		resetDailySkills();
@@ -635,6 +641,31 @@ public class DailyTaskManager
 		LOGGER.info("LimitShopData has been resetted.");
 	}
 	
+	private void resetMontlyLimitShopData()
+	{
+		for (LimitShopProductHolder holder : LimitShopData.getInstance().getProducts())
+		{
+			// Update data for offline players.
+			try (Connection con = DatabaseFactory.getConnection();
+				PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?"))
+			{
+				ps.setString(1, AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + holder.getProductionId());
+				ps.executeUpdate();
+			}
+			catch (Exception e)
+			{
+				LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset LimitShopData: " + e);
+			}
+			// Update data for online players.
+			for (Player player : World.getInstance().getPlayers())
+			{
+				player.getAccountVariables().remove(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + holder.getProductionId());
+				player.getAccountVariables().storeMe();
+			}
+		}
+		LOGGER.info("LimitShopData has been resetted.");
+	}
+	
 	public static DailyTaskManager getInstance()
 	{
 		return SingletonHolder.INSTANCE;
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
index 93bfd8b78c..bd50169bc8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
@@ -100,6 +100,7 @@ public class IdManager
 				cleanCount += statement.executeUpdate("DELETE FROM character_shortcuts WHERE character_shortcuts.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_skills WHERE character_skills.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_skills_save WHERE character_skills_save.charId NOT IN (SELECT charId FROM characters);");
+				cleanCount += statement.executeUpdate("DELETE FROM character_spirits WHERE character_spirits.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_subclasses WHERE character_subclasses.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_instance_time WHERE character_instance_time.charId NOT IN (SELECT charId FROM characters);");
 				
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 0c2f5d59de..0b7ad4e019 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -215,7 +215,7 @@ public class ShortCuts implements IRestorable
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
 				newsc.setAutoUse(sc.isAutoUse());
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 938adc783b..08d37c3f0c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1289,7 +1289,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2817,7 +2817,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2830,189 +2830,151 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
-								case ELEMENTAL_SPIRIT_EARTH_ATTACK:
-								case ELEMENTAL_SPIRIT_EARTH_DEFENSE:
-								case ELEMENTAL_SPIRIT_FIRE_ATTACK:
-								case ELEMENTAL_SPIRIT_FIRE_DEFENSE:
-								case ELEMENTAL_SPIRIT_WATER_ATTACK:
-								case ELEMENTAL_SPIRIT_WATER_DEFENSE:
-								case ELEMENTAL_SPIRIT_WIND_ATTACK:
-								case ELEMENTAL_SPIRIT_WIND_DEFENSE:
-								{
-									info.addComponentType(UserInfoType.ATT_SPIRITS);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
+							}
+							case ELEMENTAL_SPIRIT_EARTH_ATTACK:
+							case ELEMENTAL_SPIRIT_EARTH_DEFENSE:
+							case ELEMENTAL_SPIRIT_FIRE_ATTACK:
+							case ELEMENTAL_SPIRIT_FIRE_DEFENSE:
+							case ELEMENTAL_SPIRIT_WATER_ATTACK:
+							case ELEMENTAL_SPIRIT_WATER_DEFENSE:
+							case ELEMENTAL_SPIRIT_WIND_ATTACK:
+							case ELEMENTAL_SPIRIT_WIND_DEFENSE:
+							{
+								info.addComponentType(UserInfoType.ATT_SPIRITS);
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						sendPacket(info);
+					}
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
index de3652656b..9b1ecb292b 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -371,7 +371,7 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 import org.l2jmobius.gameserver.network.serverpackets.elementalspirits.ElementalSpiritInfo;
 import org.l2jmobius.gameserver.network.serverpackets.friend.FriendStatus;
 import org.l2jmobius.gameserver.network.serverpackets.limitshop.ExBloodyCoinCount;
-import org.l2jmobius.gameserver.network.serverpackets.pet.PetInfo;
+import org.l2jmobius.gameserver.network.serverpackets.pet.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipInfo;
 import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
 import org.l2jmobius.gameserver.taskmanager.AutoPlayTaskManager;
@@ -4557,7 +4557,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -8379,9 +8379,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
@@ -10610,7 +10614,7 @@ public class Player extends Playable
 			_pet.setFollowStatus(true);
 			_pet.setInstance(getInstanceWorld());
 			_pet.updateAndBroadcastStatus(0);
-			sendPacket(new PetInfo(_pet, 0));
+			sendPacket(new PetSummonInfo(_pet, 0));
 		}
 		
 		getServitors().values().forEach(s ->
@@ -10621,7 +10625,7 @@ public class Player extends Playable
 			s.setFollowStatus(true);
 			s.setInstance(getInstanceWorld());
 			s.updateAndBroadcastStatus(0);
-			sendPacket(new PetInfo(s, 0));
+			sendPacket(new PetSummonInfo(s, 0));
 		});
 		
 		// Show movie if available.
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Summon.java
index b6c9b57d75..c0b4d1e9d2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -74,10 +74,10 @@ import org.l2jmobius.gameserver.network.serverpackets.TeleportToLocation;
 import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetSkillList;
 import org.l2jmobius.gameserver.network.serverpackets.pet.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.pet.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.pet.PetInventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.pet.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.pet.PetSummonInfo;
 import org.l2jmobius.gameserver.taskmanager.DecayTaskManager;
 
 public abstract class Summon extends Playable
@@ -134,7 +134,7 @@ public abstract class Summon extends Playable
 		{
 			if (isPet())
 			{
-				sendPacket(new PetInfo(this, 1));
+				sendPacket(new PetSummonInfo(this, 1));
 				sendPacket(new ExPetSkillList(true, (Pet) this));
 				if (getInventory() != null)
 				{
@@ -228,7 +228,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -392,7 +392,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		super.onDecay();
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -879,7 +879,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -900,7 +900,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -925,7 +932,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -933,7 +940,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -979,7 +993,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
@@ -1166,7 +1180,7 @@ public abstract class Summon extends Playable
 			{
 				owner.sendPacket(new PetItemList(getInventory().getItems()));
 			}
-			owner.sendPacket(new PetInfo(this, 1));
+			owner.sendPacket(new PetSummonInfo(this, 1));
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index f4cc079630..f7e71e5136 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -873,15 +872,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -892,8 +889,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -902,7 +903,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -975,33 +976,6 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
@@ -1011,9 +985,17 @@ public class CreatureStat
 		// Notify recalculation to child classes.
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index accbff9373..697ec47e4f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
index 97397f753f..9d5faa0c61 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
@@ -57,7 +57,10 @@ public enum CommissionItemType
 	NECKLACE(31),
 	BELT(32),
 	BRACELET(33),
+	AGATHION(62),
 	HAIR_ACCESSORY(34),
+	BROOCH_JEWEL(63),
+	ARTIFACT(64),
 	// Supplies
 	POTION(35),
 	SCROLL_ENCHANT_WEAPON(36),
@@ -65,6 +68,7 @@ public enum CommissionItemType
 	SCROLL_OTHER(38),
 	SOULSHOT(39),
 	SPIRITSHOT(40),
+	OTHER_SUPPLIES(41),
 	// Pet Goods
 	PET_EQUIPMENT(42),
 	PET_SUPPLIES(43),
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
index eb10918430..3a194d1660 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
@@ -47,8 +47,8 @@ public enum CommissionTreeType
 		CommissionItemType.SPEAR,
 		CommissionItemType.OTHER_WEAPON),
 	ARMOR(1, CommissionItemType.HELMET, CommissionItemType.ARMOR_TOP, CommissionItemType.ARMOR_PANTS, CommissionItemType.FULL_BODY, CommissionItemType.GLOVES, CommissionItemType.FEET, CommissionItemType.SHIELD, CommissionItemType.SIGIL, CommissionItemType.UNDERWEAR, CommissionItemType.CLOAK),
-	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.HAIR_ACCESSORY),
-	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT),
+	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.AGATHION, CommissionItemType.HAIR_ACCESSORY, CommissionItemType.BROOCH_JEWEL, CommissionItemType.ARTIFACT),
+	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT, CommissionItemType.OTHER_SUPPLIES),
 	PET_GOODS(4, CommissionItemType.PET_EQUIPMENT, CommissionItemType.PET_SUPPLIES),
 	MISC(
 		5,
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index b7759d1586..1bb8c01d65 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2216,6 +2216,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java
index f72c9ddc4d..7beb8a1d2d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java
@@ -48,9 +48,10 @@ public class LimitShopProductHolder
 	private final long _count5;
 	private final boolean _announce5;
 	private final int _accountDailyLimit;
+	private final int _accountMontlyLimit;
 	private final int _accountBuyLimit;
 	
-	public LimitShopProductHolder(int id, int category, int minLevel, int maxLevel, int[] ingredientIds, long[] ingredientQuantities, int[] ingredientEnchants, int productionId, long count, float chance, boolean announce, int productionId2, long count2, float chance2, boolean announce2, int productionId3, long count3, float chance3, boolean announce3, int productionId4, long count4, float chance4, boolean announce4, int productionId5, long count5, boolean announce5, int accountDailyLimit, int accountBuyLimit)
+	public LimitShopProductHolder(int id, int category, int minLevel, int maxLevel, int[] ingredientIds, long[] ingredientQuantities, int[] ingredientEnchants, int productionId, long count, float chance, boolean announce, int productionId2, long count2, float chance2, boolean announce2, int productionId3, long count3, float chance3, boolean announce3, int productionId4, long count4, float chance4, boolean announce4, int productionId5, long count5, boolean announce5, int accountDailyLimit, int accountMontlyLimit, int accountBuyLimit)
 	{
 		_id = id;
 		_category = category;
@@ -79,6 +80,7 @@ public class LimitShopProductHolder
 		_count5 = count5;
 		_announce5 = announce5;
 		_accountDailyLimit = accountDailyLimit;
+		_accountMontlyLimit = accountMontlyLimit;
 		_accountBuyLimit = accountBuyLimit;
 	}
 	
@@ -217,6 +219,11 @@ public class LimitShopProductHolder
 		return _accountDailyLimit;
 	}
 	
+	public int getAccountMontlyLimit()
+	{
+		return _accountMontlyLimit;
+	}
+	
 	public int getAccountBuyLimit()
 	{
 		return _accountBuyLimit;
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/PetExtractionHolder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/PetExtractionHolder.java
new file mode 100644
index 0000000000..bc54fd0c63
--- /dev/null
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/PetExtractionHolder.java
@@ -0,0 +1,70 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.model.holders;
+
+/**
+ * @author Geremy
+ */
+public class PetExtractionHolder
+{
+	private final int _petId;
+	private final int _petLevel;
+	private final long _extractExp;
+	private final int _extractItem;
+	private final ItemHolder _defaultCost;
+	private final ItemHolder _extractCost;
+	
+	public PetExtractionHolder(int petId, int petLevel, long extractExp, int extractItem, ItemHolder defaultCost, ItemHolder extractCost)
+	{
+		_petId = petId;
+		_petLevel = petLevel;
+		_extractExp = extractExp;
+		_extractItem = extractItem;
+		_defaultCost = defaultCost;
+		_extractCost = extractCost;
+	}
+	
+	public int getPetId()
+	{
+		return _petId;
+	}
+	
+	public int getPetLevel()
+	{
+		return _petLevel;
+	}
+	
+	public long getExtractExp()
+	{
+		return _extractExp;
+	}
+	
+	public int getExtractItem()
+	{
+		return _extractItem;
+	}
+	
+	public ItemHolder getDefaultCost()
+	{
+		return _defaultCost;
+	}
+	
+	public ItemHolder getExtractCost()
+	{
+		return _extractCost;
+	}
+}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index 7b0aafd404..dfdc849b47 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -39,6 +39,7 @@ import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AgathionData;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -52,6 +53,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -71,12 +73,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPi
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
 import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -91,6 +95,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1640,7 +1645,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2560,6 +2567,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2584,6 +2596,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2609,6 +2623,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 398e061d4c..dbdf13cc99 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -889,7 +889,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(playable, item, Item::getVisualId))
 				{
 					update = true;
@@ -1041,7 +1042,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(playable, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/FortSiege.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/FortSiege.java
index c128c12ecf..c16afcf700 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/FortSiege.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/FortSiege.java
@@ -268,7 +268,7 @@ public class FortSiege extends ListenersContainer implements Siegable
 					}
 					
 					ThreadPool.schedule(new ScheduleStartSiegeTask(nextTask), _initialDelayInMilliseconds - (nextTask * 1000)); // Prepare task for @nextTask minutes left.
-					LOGGER.info("scheduling " + nextTask + " in " + ((_initialDelayInMilliseconds / 1000) - nextTask) + " sec");
+					// LOGGER.info("scheduling " + nextTask + " in " + ((_initialDelayInMilliseconds / 1000) - nextTask) + " sec");
 				}
 				else if ((_time == 3600) && (_fortInst.getResidenceId() != FortManager.ORC_FORTRESS)) // 1hr remains
 				
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 334df610e5..925a265dd8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -659,7 +659,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -682,7 +682,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -717,7 +717,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Stat.java
index e3032a1cf1..2cbe107cc4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -95,6 +95,7 @@ public enum Stat
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
 	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
+	IGNORE_REDUCE_DAMAGE("ignoreReduceDamage"),
 	
 	// ELEMENTAL SPIRITS
 	ELEMENTAL_SPIRIT_FIRE_ATTACK("elementalSpiritFireAttack"),
@@ -148,7 +149,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	MAGIC_CRITICAL_RATE_BY_CRITICAL_RATE("mCritRateByRCrit", Stat::defaultValue, MathUtil::add, MathUtil::mul, 0, 0),
 	BLOW_RATE("blowRate"),
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index 647873dac0..6cc98e9690 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -44,7 +44,18 @@ public class MCritRateFinalizer implements IStatFunction
 		
 		final double physicalBonus = (creature.getStat().getMul(Stat.MAGIC_CRITICAL_RATE_BY_CRITICAL_RATE, 1) - 1) * creature.getStat().getCriticalHit();
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, (baseValue * witBonus * 10) + physicalBonus), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, (baseValue * witBonus * 10) + physicalBonus), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index c305987ba6..c29c9ba398 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -93,6 +93,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index c5257ff589..1aff35bfd5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java
index fc8fc5e8e6..cb7a29e736 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java
@@ -46,6 +46,7 @@ public class AccountVariables extends AbstractVariables
 	public static final String PRIME_SHOP_PRODUCT_DAILY_COUNT = "PSPDailyCount";
 	public static final String LCOIN_SHOP_PRODUCT_COUNT = "LCSCount";
 	public static final String LCOIN_SHOP_PRODUCT_DAILY_COUNT = "LCSDailyCount";
+	public static final String LCOIN_SHOP_PRODUCT_MONTLY_COUNT = "LCSMontlyCount";
 	public static final String VIP_POINTS = "VipPoints";
 	public static final String VIP_TIER = "VipTier";
 	public static final String VIP_EXPIRATION = "VipExpiration";
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/ExClientPackets.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/ExClientPackets.java
index 78ab6fea76..2b99b4df5a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/ExClientPackets.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/ExClientPackets.java
@@ -101,6 +101,7 @@ import org.l2jmobius.gameserver.network.clientpackets.mentoring.RequestMentorLis
 import org.l2jmobius.gameserver.network.clientpackets.pet.ExEvolvePet;
 import org.l2jmobius.gameserver.network.clientpackets.pet.ExPetEquipItem;
 import org.l2jmobius.gameserver.network.clientpackets.pet.ExPetUnequipItem;
+import org.l2jmobius.gameserver.network.clientpackets.pet.ExTryPetExtractSystem;
 import org.l2jmobius.gameserver.network.clientpackets.pet.RequestExAcquirePetSkill;
 import org.l2jmobius.gameserver.network.clientpackets.pledgeV3.RequestExPledgeEnemyDelete;
 import org.l2jmobius.gameserver.network.clientpackets.pledgeV3.RequestExPledgeEnemyInfoList;
@@ -624,7 +625,7 @@ public enum ExClientPackets
 	EX_PLEDGE_ENEMY_DELETE(0x1C8, RequestExPledgeEnemyDelete::new, ConnectionState.IN_GAME),
 	EX_PK_PENALTY_LIST(0x1C9, null, ConnectionState.IN_GAME),
 	EX_PK_PENALTY_LIST_ONLY_LOC(0x1CA, null, ConnectionState.IN_GAME),
-	EX_TRY_PET_EXTRACT_SYSTEM(0x1CB, null, ConnectionState.IN_GAME),
+	EX_TRY_PET_EXTRACT_SYSTEM(0x1CB, ExTryPetExtractSystem::new, ConnectionState.IN_GAME),
 	EX_PLEDGE_V3_SET_ANNOUNCE(0x1CC, RequestExPledgeV3SetAnnounce::new, ConnectionState.IN_GAME),
 	EX_MAX(0x1CD, null, ConnectionState.IN_GAME);
 	
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 78c7e62be5..0464b99085 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -108,6 +108,11 @@ public class RequestAcquireSkill implements ClientPacket
 		
 		final int skillId = player.getReplacementSkill(_id);
 		final Skill existingSkill = player.getKnownSkill(skillId); // Mobius: Keep existing sublevel.
+		if ((_level > 65536000) && (existingSkill != null) && (existingSkill.getSubLevel() > 1000))
+		{
+			_level -= existingSkill.getSubLevel() * 65536;
+		}
+		
 		final Skill skill = SkillData.getInstance().getSkill(skillId, _level, existingSkill == null ? 0 : existingSkill.getSubLevel());
 		if (skill == null)
 		{
@@ -644,7 +649,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList();
 		player.updateShortCuts(_id, skill.getLevel(), skill.getSubLevel());
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 14c84055da..63f5c4a527 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -87,7 +87,7 @@ public class RequestShortCutReg implements ClientPacket
 		else if (_page == 23)
 		{
 			final Item item = player.getInventory().getItemByObjectId(_id);
-			if ((item != null) && !item.isPotion())
+			if (((item != null) && !item.isPotion()) || (_type == ShortcutType.ACTION))
 			{
 				return;
 			}
@@ -148,7 +148,7 @@ public class RequestShortCutReg implements ClientPacket
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		sc.setAutoUse(_active);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 		player.sendPacket(new ExActivateAutoShortcut(sc, _active));
 		
 		// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 23a2f8aa16..23a90780ed 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -222,7 +222,7 @@ public class UseItem implements ClientPacket
 			}
 			
 			// Prevent Death Knight players to equip other weapons.
-			if (item.isWeapon() && (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, player.getClassId().getId())) && ((item.getWeaponItem().getItemType() != WeaponType.SWORD) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND)))
+			if (item.isWeapon() && CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, player.getClassId().getId()) && (item.getWeaponItem().getItemType() != WeaponType.FISHINGROD) && ((item.getWeaponItem().getItemType() != WeaponType.SWORD) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND)))
 			{
 				player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
 				return;
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
index 0a1a9ac519..b552fb029e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
@@ -143,6 +143,25 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 				return;
 			}
 		}
+		else if (_product.getAccountMontlyLimit() > 0)
+		{
+			final long amount = _product.getAccountMontlyLimit() * _amount;
+			if (amount < 1)
+			{
+				player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+				player.removeRequest(PrimeShopRequest.class);
+				player.sendPacket(new ExPurchaseLimitShopItemResult(false, _shopIndex, _productId, 0, Collections.emptyList()));
+				return;
+			}
+			if (player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + _product.getProductionId(), 0) >= amount)
+			{
+				player.sendMessage("You have reached your montly limit.");
+				player.removeRequest(PrimeShopRequest.class);
+				player.sendPacket(new ExPurchaseLimitShopItemResult(false, _shopIndex, _productId, 0, Collections.emptyList()));
+				return;
+			}
+			
+		}
 		else if (_product.getAccountBuyLimit() > 0) // Count limit.
 		{
 			final long amount = _product.getAccountBuyLimit() * _amount;
@@ -164,7 +183,7 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 		}
 		
 		// Check existing items.
-		final int remainingInfo = Math.max(0, Math.max(_product.getAccountBuyLimit(), _product.getAccountDailyLimit()));
+		final int remainingInfo = Math.max(0, Math.max(_product.getAccountBuyLimit(), Math.max(_product.getAccountDailyLimit(), _product.getAccountMontlyLimit())));
 		for (int i = 0; i < _product.getIngredientIds().length; i++)
 		{
 			if (_product.getIngredientIds()[i] == 0)
@@ -326,6 +345,10 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 		{
 			player.getAccountVariables().set(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + _product.getProductionId(), player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + _product.getProductionId(), 0) + _amount);
 		}
+		if (_product.getAccountMontlyLimit() > 0)
+		{
+			player.getAccountVariables().set(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + _product.getProductionId(), player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + _product.getProductionId(), 0) + _amount);
+		}
 		else if (_product.getAccountBuyLimit() > 0)
 		{
 			player.getAccountVariables().set(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + _product.getProductionId(), player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + _product.getProductionId(), 0) + _amount);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
index 5b243ca0fb..4433741d07 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
@@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetSkillList;
-import org.l2jmobius.gameserver.network.serverpackets.pet.PetInfo;
+import org.l2jmobius.gameserver.network.serverpackets.pet.PetSummonInfo;
 
 /**
  * @author Berezkin Nikolay
@@ -230,7 +230,7 @@ public class ExPetEquipItem implements ClientPacket
 	private void sendInfos(Pet pet, Player player)
 	{
 		pet.getStat().recalculateStats(true);
-		player.sendPacket(new PetInfo(pet, 1));
+		player.sendPacket(new PetSummonInfo(pet, 1));
 		player.sendPacket(new ExPetSkillList(false, pet));
 	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
index c31d8d343f..3891440cd4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
@@ -17,7 +17,7 @@ import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetSkillList;
-import org.l2jmobius.gameserver.network.serverpackets.pet.PetInfo;
+import org.l2jmobius.gameserver.network.serverpackets.pet.PetSummonInfo;
 
 /**
  * @author Berezkin Nikolay
@@ -183,7 +183,7 @@ public class ExPetUnequipItem implements ClientPacket
 	private void sendInfos(Pet pet, Player player)
 	{
 		pet.getStat().recalculateStats(true);
-		player.sendPacket(new PetInfo(pet, 1));
+		player.sendPacket(new PetSummonInfo(pet, 1));
 		player.sendPacket(new ExPetSkillList(false, pet));
 	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExTryPetExtractSystem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExTryPetExtractSystem.java
new file mode 100644
index 0000000000..6bb1753d14
--- /dev/null
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExTryPetExtractSystem.java
@@ -0,0 +1,115 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.clientpackets.pet;
+
+import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.gameserver.data.xml.NpcData;
+import org.l2jmobius.gameserver.data.xml.PetDataTable;
+import org.l2jmobius.gameserver.data.xml.PetExtractData;
+import org.l2jmobius.gameserver.model.PetData;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
+import org.l2jmobius.gameserver.model.holders.PetExtractionHolder;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.PetInventory;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
+import org.l2jmobius.gameserver.network.GameClient;
+import org.l2jmobius.gameserver.network.SystemMessageId;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
+import org.l2jmobius.gameserver.network.serverpackets.pet.ResultPetExtractSystem;
+
+/**
+ * @author Geremy
+ */
+public class ExTryPetExtractSystem implements ClientPacket
+{
+	private int _itemObjId;
+	
+	@Override
+	public void read(ReadablePacket packet)
+	{
+		_itemObjId = packet.readInt();
+	}
+	
+	@Override
+	public void run(GameClient client)
+	{
+		final Player player = client.getPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item petItem = player.getInventory().getItemByObjectId(_itemObjId);
+		if ((petItem == null) || ((player.getPet() != null) && (player.getPet().getControlItem() == petItem)))
+		{
+			player.sendPacket(new ResultPetExtractSystem(false));
+			return;
+		}
+		
+		final PetData petData = PetDataTable.getInstance().getPetDataByItemId(petItem.getId());
+		final NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(petData.getNpcId());
+		final Pet pet = new Pet(npcTemplate, player, petItem);
+		final PetInventory petInventory = pet.getInventory();
+		final PlayerInventory playerInventory = player.getInventory();
+		if ((petInventory == null) || (playerInventory == null))
+		{
+			player.sendPacket(new ResultPetExtractSystem(false));
+			return;
+		}
+		
+		if (!playerInventory.validateWeight(petInventory.getTotalWeight()) || !playerInventory.validateCapacity(petInventory.getSize()))
+		{
+			player.sendPacket(SystemMessageId.THERE_ARE_ITEMS_IN_THE_PET_S_INVENTORY_TAKE_THEM_OUT_FIRST);
+			player.sendPacket(new ResultPetExtractSystem(false));
+			return;
+		}
+		
+		petInventory.transferItemsToOwner();
+		
+		final Pet petInfo = Pet.restore(petItem, NpcData.getInstance().getTemplate(petData.getNpcId()), player);
+		final int petId = PetDataTable.getInstance().getPetDataByItemId(petItem.getId()).getType();
+		final int petLevel = petInfo.getLevel();
+		final PetExtractionHolder holder = PetExtractData.getInstance().getExtraction(petId, petLevel);
+		if (holder != null)
+		{
+			final int extractItemId = holder.getExtractItem();
+			final int extractItemCount = (int) (petInfo.getStat().getExp() / holder.getExtractExp());
+			final int extractCostId = holder.getExtractCost().getId();
+			final long extractCostCount = holder.getExtractCost().getCount() * extractItemCount;
+			final int defaultCostId = holder.getDefaultCost().getId();
+			final long defaultCostCount = holder.getDefaultCost().getCount();
+			if ((player.getInventory().getInventoryItemCount(extractCostId, -1) >= extractCostCount) && (player.getInventory().getInventoryItemCount(defaultCostId, -1) >= defaultCostCount))
+			{
+				if (player.destroyItemByItemId("Pet Extraction", extractCostId, extractCostCount, player, true) && player.destroyItemByItemId("Pet Extraction", defaultCostId, defaultCostCount, player, true) && player.destroyItem("Pet Extraction", petItem, player, true))
+				{
+					player.addItem("Pet Extraction", extractItemId, extractItemCount, player, true);
+					player.sendPacket(new ResultPetExtractSystem(true));
+				}
+			}
+			else
+			{
+				player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT);
+				player.sendPacket(new ResultPetExtractSystem(false));
+			}
+			return;
+		}
+		
+		player.sendPacket(new ResultPetExtractSystem(false));
+	}
+}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java
index 2cf1ef176b..0266b0eff5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java
@@ -46,7 +46,7 @@ public class ExRequestRandomCraftExtract implements ClientPacket
 		{
 			final int objId = packet.readInt();
 			final long count = packet.readLong();
-			if (count > 1)
+			if (count > 0)
 			{
 				_items.put(objId, count);
 			}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index 9540e799e2..07ed7641a9 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,129 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 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, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 92, 93,
-		94, 96, 97, 99,
-		1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
index 8e396d93c9..a72d906550 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
@@ -167,7 +167,7 @@ public class FakePlayerInfo extends ServerPacket
 		writeByte(_npc.getTeam().getId());
 		writeInt(_clan != null ? _clan.getCrestLargeId() : 0);
 		writeByte(_fpcHolder.getNobleLevel());
-		writeByte(_fpcHolder.isHero());
+		writeByte(_fpcHolder.isHero() ? 2 : 0); // 152 - Value for enabled changed to 2
 		writeByte(_fpcHolder.isFishing());
 		writeInt(_fpcHolder.getBaitLocationX());
 		writeInt(_fpcHolder.getBaitLocationY());
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index 47076d56c4..61bfe70039 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 05aaedf2c5..46c9ccb5a9 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,20 +19,21 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
+		player.restoreAutoShortcutVisual();
 	}
 	
 	@Override
@@ -54,8 +55,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 9c1fbbcab8..851b53dc09 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -43,13 +49,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -60,8 +69,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 679c26e073..06711fb502 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
index 00f16e304b..4b6f4f1728 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
@@ -71,6 +71,17 @@ public class ExPurchaseLimitShopItemListNew extends ServerPacket
 					writeInt(product.getAccountDailyLimit() - _player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + product.getProductionId(), 0));
 				}
 			}
+			else if (product.getAccountMontlyLimit() > 0)
+			{
+				if (_player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + product.getProductionId(), 0) >= product.getAccountMontlyLimit())
+				{
+					writeInt(0);
+				}
+				else
+				{
+					writeInt(product.getAccountMontlyLimit() - _player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + product.getProductionId(), 0));
+				}
+			}
 			else if (product.getAccountBuyLimit() > 0) // Count limit.
 			{
 				if (_player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + product.getProductionId(), 0) >= product.getAccountBuyLimit())
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java
index e2a7e8cb46..e4a2d8308e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java
@@ -68,7 +68,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -142,7 +142,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetSummonInfo.java
similarity index 96%
rename from L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java
rename to L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetSummonInfo.java
index fdc110c324..2b6b70cd0a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetSummonInfo.java
@@ -1,194 +1,194 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets.pet;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.enums.EvolveLevel;
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-/**
- * 12 - wolf, 13 - buffalo, 14 - tiger, 15-kukkabara, 17 - hawk, 16 - dragon
- */
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isDead() ? 0 : _summon.isShowSummonAnimation() ? 2 : _value);
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeShort(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		// 0% absolute value
-		writeLong(Math.min(_summon.getExpForThisLevel(), _summon.getStat().getExp())); // 0% absolute value
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(-1);
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(0); // Used Summon Points
-		writeByte(0); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-		if (_summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			writeInt(pet.getPetData().getType());
-			writeInt(pet.getEvolveLevel());
-			writeInt(pet.getEvolveLevel() == 0 ? -1 : pet.getId());
-		}
-		else
-		{
-			writeInt(0);
-			writeInt(EvolveLevel.None.ordinal());
-			writeInt(0);
-		}
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets.pet;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.enums.EvolveLevel;
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+/**
+ * 12 - wolf, 13 - buffalo, 14 - tiger, 15-kukkabara, 17 - hawk, 16 - dragon
+ */
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isDead() ? 0 : _summon.isShowSummonAnimation() ? 2 : _value);
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeShort(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		// 0% absolute value
+		writeLong(Math.min(_summon.getExpForThisLevel(), _summon.getStat().getExp())); // 0% absolute value
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(-1);
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(0); // Used Summon Points
+		writeByte(0); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+		if (_summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			writeInt(pet.getPetData().getType());
+			writeInt(pet.getEvolveLevel());
+			writeInt(pet.getEvolveLevel() == 0 ? -1 : pet.getId());
+		}
+		else
+		{
+			writeInt(0);
+			writeInt(EvolveLevel.None.ordinal());
+			writeInt(0);
+		}
+	}
+}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ResultPetExtractSystem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ResultPetExtractSystem.java
new file mode 100644
index 0000000000..0deca5b570
--- /dev/null
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ResultPetExtractSystem.java
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets.pet;
+
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
+
+/**
+ * @author Geremy
+ */
+public class ResultPetExtractSystem extends ServerPacket
+{
+	private final boolean _success;
+	
+	public ResultPetExtractSystem(boolean success)
+	{
+		_success = success;
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.EX_RESULT_PET_EXTRACT_SYSTEM.writeId(this);
+		writeInt(_success);
+	}
+}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/not_done/Q10904_JourneyToTheConquestWorld.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ShowPetExtractSystem.java
similarity index 61%
rename from L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/not_done/Q10904_JourneyToTheConquestWorld.java
rename to L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ShowPetExtractSystem.java
index 69ed271e41..29683dc5a5 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/not_done/Q10904_JourneyToTheConquestWorld.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ShowPetExtractSystem.java
@@ -1,36 +1,35 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package quests.not_done;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.model.quest.Quest;
-
-/**
- * @author Mobius
- */
-public class Q10904_JourneyToTheConquestWorld extends Quest
-{
-	private static final int START_NPC = 34600;
-	
-	public Q10904_JourneyToTheConquestWorld()
-	{
-		super(10904);
-		addStartNpc(START_NPC);
-		addTalkId(START_NPC);
-		addCondMinLevel(Config.PLAYER_MAXIMUM_LEVEL, getNoQuestMsg(null));
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets.pet;
+
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
+
+/**
+ * @author Geremy
+ */
+public class ShowPetExtractSystem extends ServerPacket
+{
+	public static final ShowPetExtractSystem STATIC_PACKET = new ShowPetExtractSystem();
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.EX_SHOW_PET_EXTRACT_SYSTEM.writeId(this);
+		writeInt(0);
+	}
+}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index 8be4d29aa5..0a858b928c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -25,11 +26,13 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
@@ -42,9 +45,12 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
+	private static final Integer PET_ATTACK_ACTION = 16;
+	private static final Integer SUMMON_ATTACK_ACTION = 22;
 	
 	protected AutoPlayTaskManager()
 	{
@@ -94,6 +100,25 @@ public class AutoPlayTaskManager
 					}
 					else if ((creature.getTarget() == player) || (creature.getTarget() == null))
 					{
+						// Pet Attack.
+						final Pet pet = player.getPet();
+						if ((pet != null) && player.getAutoUseSettings().getAutoActions().contains(PET_ATTACK_ACTION) && pet.hasAI() && !pet.isMoving() && !pet.isDisabled() && (pet.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (pet.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+						{
+							pet.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+						}
+						
+						// Summon Attack.
+						if (player.hasSummon() && player.getAutoUseSettings().getAutoActions().contains(SUMMON_ATTACK_ACTION))
+						{
+							for (Summon summon : player.getServitors().values())
+							{
+								if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+								{
+									summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+								}
+							}
+						}
+						
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
@@ -122,23 +147,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -146,6 +180,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -180,32 +217,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -311,6 +371,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 574af07cdd..473fcb12a6 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -36,7 +36,9 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.effects.EffectType;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemUse;
@@ -47,12 +49,12 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.EffectScope;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -429,8 +431,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
@@ -442,7 +445,24 @@ public class AutoUseTaskManager
 							final IPlayerActionHandler actionHandler = PlayerActionHandler.getInstance().getHandler(actionHolder.getHandler());
 							if (actionHandler != null)
 							{
-								actionHandler.useAction(player, actionHolder, false, false);
+								if (!actionHandler.isPetAction())
+								{
+									actionHandler.useAction(player, actionHolder, false, false);
+								}
+								else
+								{
+									final Summon summon = player.getAnyServitor();
+									if ((summon != null) && !summon.isAlikeDead())
+									{
+										final Skill skill = summon.getKnownSkill(actionHolder.getOptionId());
+										if ((skill != null) && !canSummonCastSkill(player, summon, skill))
+										{
+											continue ACTIONS;
+										}
+										
+										actionHandler.useAction(player, actionHolder, false, false);
+									}
+								}
 							}
 						}
 					}
@@ -525,6 +545,59 @@ public class AutoUseTaskManager
 			
 			return !player.isSkillDisabled(skill) && skill.checkCondition(player, target, false);
 		}
+		
+		private boolean canSummonCastSkill(Player player, Summon summon, Skill skill)
+		{
+			if (skill.isBad() && (player.getTarget() == null))
+			{
+				return false;
+			}
+			
+			final int mpConsume = skill.getMpConsume() + skill.getMpInitialConsume();
+			if ((((mpConsume != 0) && (mpConsume > (int) Math.floor(summon.getCurrentMp()))) || ((skill.getHpConsume() != 0) && (skill.getHpConsume() > (int) Math.floor(summon.getCurrentHp())))))
+			{
+				return false;
+			}
+			
+			if (summon.isSkillDisabled(skill))
+			{
+				return false;
+			}
+			
+			if (((player.getTarget() != null) && !skill.checkCondition(summon, player.getTarget(), false)) || ((player.getTarget() == null) && !skill.checkCondition(summon, player, false)))
+			{
+				return false;
+			}
+			
+			if ((skill.getItemConsumeCount() > 0) && (summon.getInventory().getInventoryItemCount(skill.getItemConsumeId(), -1) < skill.getItemConsumeCount()))
+			{
+				return false;
+			}
+			
+			if (skill.getTargetType().equals(TargetType.SELF) || skill.getTargetType().equals(TargetType.SUMMON))
+			{
+				final BuffInfo summonInfo = summon.getEffectList().getBuffInfoBySkillId(skill.getId());
+				return (summonInfo != null) && (summonInfo.getTime() >= REUSE_MARGIN_TIME);
+			}
+			
+			if ((skill.getEffects(EffectScope.GENERAL) != null) && skill.getEffects(EffectScope.GENERAL).stream().anyMatch(a -> a.getEffectType().equals(EffectType.MANAHEAL_BY_LEVEL)) && (player.getCurrentMpPercent() > 80))
+			{
+				return false;
+			}
+			
+			final BuffInfo buffInfo = player.getEffectList().getBuffInfoBySkillId(skill.getId());
+			final BuffInfo abnormalBuffInfo = player.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
+			if (abnormalBuffInfo != null)
+			{
+				if (buffInfo != null)
+				{
+					return (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()));
+				}
+				return (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel()) || abnormalBuffInfo.isAbnormalType(AbnormalType.NONE);
+			}
+			
+			return true;
+		}
 	}
 	
 	public synchronized void startAutoUseTask(Player player)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/readme.txt b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/readme.txt
index 13f53f3e02..82b2fcdba6 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/readme.txt
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/readme.txt
@@ -127,6 +127,8 @@ Fluffy Reinforcement: https://eu.4game.com/patchnotes/lineage2essence/204/
 
 Dwelling of Spirits: https://eu.4game.com/patchnotes/lineage2essence/261/
 -Transcendent hunting zones
+-Pet extraction system
+
 
 Customs:
 -Newbie Helper NPC location info
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/achievement_box.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/achievement_box.sql
index a6750eef4c..64c5b1e4e8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/achievement_box.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/achievement_box.sql
@@ -15,4 +15,4 @@ CREATE TABLE IF NOT EXISTS `achievement_box` (
 `box_state_slot_4` INT NOT NULL DEFAULT 0,
 `boxtype_slot_4` INT NOT NULL DEFAULT 0,
 PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/buffer_schemes.sql
index 1784421092..bd964c8cc2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/buffer_schemes.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL,
     PRIMARY KEY (`object_id`,`scheme_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle.sql
index c7b5613401..9fb7fea4e6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 -- (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_macroses.sql
index 7062388d7a..b23a056e24 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(500) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_purge.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_purge.sql
index d50a902ce1..9c08f111be 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_purge.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_purge.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_purge` (
   `keys` int(10) UNSIGNED NOT NULL DEFAULT 0,
   `remainingKeys` int(10) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`category`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_random_craft.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_random_craft.sql
index 977113bbe3..c83402513c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_random_craft.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_random_craft.sql
@@ -25,4 +25,4 @@ CREATE TABLE IF NOT EXISTS `character_random_craft` (
   `item_5_locked` TINYINT NOT NULL DEFAULT 0,
   `item_5_lock_left` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_ranking_history.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_ranking_history.sql
index 3f938ba850..d2da345dec 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_ranking_history.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_ranking_history.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_ranking_history` (
   `ranking` int(20) NOT NULL,
   `exp` bigint(20) NOT NULL,
   PRIMARY KEY (`charId`,`day`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_revenge_history.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_revenge_history.sql
index 5be9d849cf..717d779932 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_revenge_history.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_revenge_history.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `character_revenge_history` (
   `shared_teleport_remaining` int NOT NULL DEFAULT 0,
   `kill_time` BIGINT(10) UNSIGNED NOT NULL,
   `share_time` BIGINT(10) UNSIGNED NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_spirits.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_spirits.sql
index ac73d8dbe3..bb4044039f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_spirits.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_spirits.sql
@@ -11,6 +11,5 @@ CREATE TABLE `character_spirits`
     `crit_rate_points`   TINYINT      NOT NULL DEFAULT 0,
     `crit_damage_points` TINYINT      NOT NULL DEFAULT 0,
     `in_use`             BOOLEAN      NOT NULL DEFAULT FALSE,
-    PRIMARY KEY (`charId`, `type`),
-    FOREIGN KEY FK_CHARACTER_SPIRITS (`charId`) REFERENCES characters (`charId`) ON DELETE CASCADE
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+    PRIMARY KEY (`charId`, `type`)
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_surveillances.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_surveillances.sql
index 49b3fdaa3d..734b714c5e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_surveillances.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_surveillances.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_surveillances` (
   `charId` INT UNSIGNED NOT NULL,
   `targetId` INT UNSIGNED NOT NULL,
   PRIMARY KEY (`charId`,`targetId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/characters.sql
index 4df7d3f88c..f39a66c2db 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/characters.sql
@@ -62,4 +62,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_data.sql
index f8b64d99db..49f88c0122 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_data.sql
@@ -24,4 +24,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/collection_favorites.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/collection_favorites.sql
index 7571da448f..49758d7815 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/collection_favorites.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/collection_favorites.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `collection_favorites` (
   `accountName` VARCHAR(45) NOT NULL DEFAULT '',
   `collectionId` int(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`accountName`,`collectionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/collections.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/collections.sql
index 8c0fafc9fd..1ff9772ad3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/collections.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/collections.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `collections` (
   `collectionId` int(3) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`accountName`,`collectionId`,`index`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort.sql
index bb4f761682..caf1e50e76 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 -- (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort_siege_guards.sql
index 19df57a3b9..43763210b4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort_spawnlist.sql
index 22303a9b09..144979acd9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,4 +11,4 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/grandboss_data.sql
index b4a1f552fd..7cf6d2865d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, 93069, 8925, -3904, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/heroes.sql
index ae59eb8ba1..f2ee5692a8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/heroes.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/items.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/olympiad_fights.sql
index ccd4ac94ec..f25cc4c1fa 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(4) NOT NULL DEFAULT 0,
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/pet_evolves.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/pet_evolves.sql
index e825631c85..51fcd5eba8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/pet_evolves.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/pet_evolves.sql
@@ -5,4 +5,4 @@ CREATE TABLE `pet_evolves` (
 	`level` int NOT NULL DEFAULT '0',
 	PRIMARY KEY  (`itemObjId`, `index`, `level`),
     UNIQUE KEY `pet_evolves` (`itemObjId`, `index`, `level`)
-) ENGINE=MyISAM;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/pet_skills.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/pet_skills.sql
index 2b502c7738..b680f21972 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/pet_skills.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/pet_skills.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `pet_skills` (
   `skillId` INT NOT NULL DEFAULT 0,
   `skillLevel` INT(3) NOT NULL DEFAULT 1,
   PRIMARY KEY (`petObjItemId`,`skillId`,`skillLevel`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/pets.sql
index 58b188bbcd..b7e9d545db 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/General.ini b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/General.ini
index fabb1dfec3..4cf7d1b7de 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/General.ini
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/General.ini
@@ -430,8 +430,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
@@ -640,6 +640,11 @@ AutoPlayAttackAction = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 
 # ---------------------------------------------------------------------------
 # Purge Settings
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/ActionData.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/ActionData.xml
index 677c57eb99..526d7eed2a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/ActionData.xml
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
+	<action id="0" handler="SitStand" /> <!-- Sit / Stand -->
+	<action id="1" handler="RunWalk" /> <!-- Walk / Run -->
+	<action id="2" handler="None" /> <!-- Attack -->
+	<action id="3" handler="None" /> <!-- Trade -->
+	<action id="4" handler="None" /> <!-- Next Target (Melee) -->
+	<action id="5" handler="None" /> <!-- Pick Up -->
+	<action id="6" handler="None" /> <!-- Assist -->
+	<action id="7" handler="None" /> <!-- Invite -->
+	<action id="8" handler="None" /> <!-- Leave Party -->
+	<action id="9" handler="None" /> <!-- Dismiss Party Member -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store - Sell -->
 	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
+	<action id="16" handler="PetAttack" /> <!-- Pet's attack -->
+	<action id="17" handler="PetStop" /> <!-- Stop Pet -->
+	<action id="19" handler="UnsummonPet" /> <!-- Recall a pet -->
+	<action id="20" handler="None" /> <!-- Special skill -->
+	<action id="21" handler="ServitorHold" /> <!-- Change Servitor's Movement Mode -->
+	<action id="22" handler="ServitorAttack" /> <!-- Servitor's attack -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop Servitor -->
 	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
+	<action id="27" handler="None" /> <!-- Special skill -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store - Buy -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Switch Mode -->
 	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Toxic Smoke -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Workshop -->
+	<action id="38" handler="Ride" /> <!-- Mount/Dismount -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Parasite Burst -->
+	<action id="40" handler="None" /> <!-- Recommend -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Cannon -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Personal Damage Shield -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Hydro Screw -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Booming Attack -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Master Recharge -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mega Storm Strike -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Steal Blood -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanical Cannon -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Wield Temper -->
+	<action id="50" handler="None" /> <!-- Change Party Leader -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Unsummon -->
+	<action id="53" handler="ServitorMove" /> <!-- Move -->
+	<action id="56" handler="None" /> <!-- Command Channel Invite -->
+	<action id="64" handler="TeleportBookmark" /> <!-- My Teleport -->
 	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
 	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
 	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
@@ -50,169 +50,200 @@
 	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
 	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
 	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
 	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
 	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="50094" /> <!-- Nightshade - Shadow's Despair -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off -->
+	<action id="93" handler="None" /> <!-- Next Target (Range) -->
+	<action id="96" handler="None" /> <!-- Strike Back -->
+	<action id="97" handler="None" /> <!-- Combat Mode -->
+	<action id="98" handler="None" /> <!-- Disapproval -->
+	<action id="99" handler="None" /> <!-- Share location -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Hammer -->
+	<action id="1001" handler="None" /> <!-- Ultimate Bombastic Buster -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Hostile Feeling -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wild Stun -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wild Defense -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Bright Burst -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Bright Heal -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Blessing of Queen -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Gift of Queen -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cure of Queen -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Blessing of Seraphim -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Gift of Seraphim -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Cure of Seraphim -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Curse of Shade -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Mass Curse of Shade -->
+	<action id="1015" handler="ServitorSkillUse" option="50094" /> <!-- Shadow's Despair -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Blow -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Strike -->
+	
+	<!-- TODO: Find skill ids. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- HP Draining Curse -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Kat the Cat Skill 2 -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Mew the Cat's Skill 2 -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Kai the Cat's Skill 2 -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Boxer the Unicorn's Skill 2 -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Mirage the Unicorn Skill 2 -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Merrow the Unicorn's Skill 2 -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Shadow Skill 1 -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Shadow Skill 2 -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Silhouette Skill 2 -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Reanimated Man Skill 1 -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Reanimated Man Skill 2 -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Corrupted Man Skill 2 -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Slash -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Spin Slash -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Grip of the Cat -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Whiplash -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Tidal Wave -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Corpse Burst -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Dicing Death -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Dark Curse -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Cannon Fodder -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Big Bang -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Bite Attack -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Maul -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Wolf Cry -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awakening -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Wolf Howl -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider Roar -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast's Bite -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast's Stun Attack -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast's Fire Breath -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast's Roar -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Blessed Body -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Blessed Soul -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Haste -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Acumen -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Clarity -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Empower -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Wild Magic -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Death Whisper -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Focus -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Guidance -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Death Blow -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Double Attack -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Spin Attack -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Meteor Shower -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakening -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Thunder Bolt -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Blaze -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Lightning Wave -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Flare -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Buff Control -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Power Strike -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Piercing Attack -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Whirlwind -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Spear Smash -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Battle Cry -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Power Smash -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Energy Burst -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Shock Wave -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Howl -->
 	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
 	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
 	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
 	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch Tactics -->
+	<action id="1085" handler="ServitorSkillUse" option="4707" /> <!-- Shade Sacrifice -->
 	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
 	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
 	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Tail Strike -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Strider Bite -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Strider Fear -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Strider Dash -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen Strike -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen Wind Walk -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Maguen Power Strike -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen Wind Walk -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen Return -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Maguen Party Return -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Servitor's attack -->
+	<action id="1100" handler="ServitorMove" /> <!-- Servitor Move -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop Servitor -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Cancel Summon -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Passive -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Key Security -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Bear Claw -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Bear Tumbling -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Cougar Bite -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Cougar Pounce -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Reaper Touch -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Reaper Power -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Lion Roar -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Lion Claw -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Lion Dash -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Lion Flame -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Flight -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Purity -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Feather -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Sharp Claw -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Blessing of Life -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Punch -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Feline Aggression -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Feline Stun -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Feline Bite -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Feline Pounce -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Feline Touch -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Feline Power -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Unicorn's Aggression -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Unicorn's Stun -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Unicorn's Bite -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Unicorn's Pounce -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Unicorn's Touch -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Unicorn's Power -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Phantom Aggression -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Phantom Stun -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Phantom Bite -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Phantom Pounce -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Phantom Touch -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Phantom Power -->
+	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Panther Roar -->
+	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Panther Rush -->
+	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Magic Missile -->
+	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Entrenching -->
+	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Chain Block -->
+	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Blocked Target Change -->
+	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Breaking Blaster -->
+	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Blinking Attack -->
+	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Beast Within -->
+	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Hide -->
+	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Strong Bite -->
+	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dire Claw -->
+	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Leap Attack -->
+	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Last Dire Claw -->
+	<action id="1156" handler="ServitorSkillUse" option="49032" /> <!-- Horn Thrust -->
+	<action id="1157" handler="ServitorSkillUse" option="49033" /> <!-- Rump Stun -->
+	<action id="1158" handler="ServitorSkillUse" option="49034" /> <!-- Pulling Body -->
+	<action id="1159" handler="ServitorSkillUse" option="49035" /> <!-- Breath of Hurricane -->
+	<action id="1160" handler="ServitorSkillUse" option="49042" /> <!-- Arrow Feather -->
+	<action id="1161" handler="ServitorSkillUse" option="49043" /> <!-- Quick Jump -->
+	
+	<!-- TODO: Find skill ids. -->
+	<action id="1162" handler="ServitorSkillUse" option="0" /> <!-- Feather Trap -->
+	<action id="1163" handler="ServitorSkillUse" option="0" /> <!-- Trap Explosion -->
+	
+	<action id="1164" handler="ServitorSkillUse" option="49044" /> <!-- Scout's Strike -->
+	<action id="1165" handler="ServitorSkillUse" option="49052" /> <!-- Crippling Bite -->
+	<action id="1166" handler="ServitorSkillUse" option="49054" /> <!-- Rushing Assault -->
+	<action id="1167" handler="ServitorSkillUse" option="49055" /> <!-- Back Explosion -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Hand of Warmth -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Rosy Seduction -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Art of Seduction -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Thunder Bolt -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Blaze -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Lightning Wave -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Buff Control -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Piercing Attack -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Spin Attack -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impale -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Battle Cry -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Power Smash -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Energy Burst -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Shock Wave -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Burst -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switch Tactics -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Cat the Ranger Boost -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/CategoryData.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/CategoryData.xml
index b25fcae27d..4facbe6d73 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/CategoryData.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/CategoryData.xml
@@ -375,6 +375,38 @@
 	<category name="WYVERN_GROUP">
 		<id>15955</id> <!-- wyvern -->
 	</category>
+	<category name="PET_GROUP">
+		<id>16079</id> <!-- Buffalo Calf -->
+		<id>16080</id> <!-- Black Buffalo -->
+		<id>16081</id> <!-- White Buffalo -->
+		<id>16082</id> <!-- Black Combat Buffalo -->
+		<id>16083</id> <!-- White Combat Buffalo -->
+		<id>16084</id> <!-- Tiger Cub -->
+		<id>16085</id> <!-- White Tiger -->
+		<id>16086</id> <!-- Tiger -->
+		<id>16087</id> <!-- White Sharp clawed Tiger -->
+		<id>16088</id> <!-- Steel Sharp clawed Tiger -->
+		<id>16089</id> <!-- Kookaburra Chick -->
+		<id>16090</id> <!-- Red Kookaburra -->
+		<id>16091</id> <!-- Blue Kookaburra -->
+		<id>16092</id> <!-- Red Combat Kookaburra -->
+		<id>16093</id> <!-- Blue Combat Kookaburra -->
+		<id>16094</id> <!-- Dragon Hatchling -->
+		<id>16095</id> <!-- Green Dragon -->
+		<id>16096</id> <!-- Red Dragon -->
+		<id>16097</id> <!-- Earth Dragon -->
+		<id>16098</id> <!-- Fire Dragon -->
+		<id>16099</id> <!-- Hawk Hatchling -->
+		<id>16100</id> <!-- Red Hawk -->
+		<id>16101</id> <!-- Blue Hawk -->
+		<id>16102</id> <!-- Red Combat Hawk -->
+		<id>16103</id> <!-- Blue Combat Hawk -->
+		<id>16104</id> <!-- Wolf Cub -->
+		<id>16105</id> <!-- Black Wolf -->
+		<id>16106</id> <!-- While Wolf -->
+		<id>16107</id> <!-- Black Steel Wolf -->
+		<id>16108</id> <!-- White Steel Wolf -->
+	</category>
 	<category name="SUBJOB_GROUP_KNIGHT">
 		<id>5</id> <!-- paladin -->
 		<id>6</id> <!-- dark_avenger -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/PetExtractData.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/PetExtractData.xml
new file mode 100644
index 0000000000..db6643827e
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/PetExtractData.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/PetExtractData.xsd">
+	<extraction petLevel="50" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+</list>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30731.htm b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30731.htm
index 7d5bb217c7..daf4f90fc3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30731.htm
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30731.htm
@@ -9,7 +9,7 @@ The Pet Manager Association is always happy to assist you and your pet.<br>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/exchange.htm">"Here is a Pet Coupon. Give me a pet."</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30827.htm b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30827.htm
index 830447a916..1a6e7f97c6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30827.htm
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30827.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30828.htm b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30828.htm
index 0a7f19fda4..81b47f5ca8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30828.htm
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30828.htm
@@ -10,7 +10,7 @@ Pet Manager Waters:<br>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30829.htm b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30829.htm
index 61e46bf654..67f60c6f2e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30829.htm
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30829.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30830.htm b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30830.htm
index 6b1860ae08..26536da2b6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30830.htm
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30830.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30831.htm b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30831.htm
index b707cd690d..04d1428ac0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30831.htm
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/30831.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/31067.htm b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/31067.htm
index 9ff970708b..5963bbead2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/31067.htm
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/31067.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/31265.htm b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/31265.htm
index 5de92941aa..acd3d39c17 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/31265.htm
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/31265.htm
@@ -10,7 +10,7 @@ Perhaps I should write a book, eh? "The Impact of Striders on the History of the
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/31309.htm b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/31309.htm
index 9487647c8a..3d6ff06a25 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/31309.htm
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/31309.htm
@@ -10,7 +10,7 @@ Oh, hello. Ah, you noticed my pure-bred black-striped Alpine Cougar, eh? It is n
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/31954.htm b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/31954.htm
index c8025dde3e..e0218b5231 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/31954.htm
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/31954.htm
@@ -10,7 +10,7 @@ As the number of people who interested in raising pets increases these days, the
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/33579.htm b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/33579.htm
index c67cae00f5..cafc07db04 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/33579.htm
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/petmanager/33579.htm
@@ -7,7 +7,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">"I want to evolve a pet."</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/exchange.htm">"Here is a Pet Coupon. Give me a pet."</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/instances/DwellingOfSpirits.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/instances/DwellingOfSpirits.xml
index 24a5c3b457..c5467892ab 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/instances/DwellingOfSpirits.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/instances/DwellingOfSpirits.xml
@@ -35,13 +35,6 @@
 		<reset day="SUNDAY" hour="6" minute="30" />
 	</reenter>
 	<spawnlist>
-		<group name="ExitPortal" spawnByDefault="false">
-			<npc id="15970" x="-114343" y="-77747" z="-11442" heading="46786" /> <!-- Exit Portal -->
-			<npc id="15971" x="-114343" y="-77747" z="-11442" heading="46786" /> <!-- Exit Portal -->
-			<npc id="15972" x="-114343" y="-77720" z="-11442" heading="46786" /> <!-- Exit Portal -->
-			<npc id="15973" x="-114343" y="-77733" z="-11442" heading="46786" /> <!-- Exit Portal -->
-			<npc id="15974" x="-114343" y="-77755" z="-11442" heading="46786" /> <!-- Exit Portal -->
-		</group>
 		<group name="sealstone" spawnByDefault="true">
 			<npc id="34178" x="-114324" y="-78273" z="-11433" heading="15825" /> <!-- Seal Stone -->
 		</group>
@@ -49,77 +42,53 @@
 			<npc id="34176" x="-114324" y="-78273" z="-11433" heading="15474" /> <!-- Animael -->
 		</group>
 		<group name="NormalMobs" spawnByDefault="false">
-			<npc id="22272" x="-114091" y="-77461" z="-11443" heading="16383" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114048" y="-77429" z="-11443" heading="6673" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114045" y="-77406" z="-11443" heading="24645" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113837" y="-76943" z="-11443" heading="8327" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113945" y="-76923" z="-11443" heading="30858" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114859" y="-76897" z="-11443" heading="58120" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114785" y="-76841" z="-11443" heading="55942" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114711" y="-76987" z="-11443" heading="61107" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114699" y="-77113" z="-11443" heading="16383" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114723" y="-77045" z="-11443" heading="57831" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114852" y="-78363" z="-11443" heading="657" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114984" y="-78475" z="-11443" heading="1141" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114916" y="-78442" z="-11443" heading="65129" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114841" y="-78428" z="-11443" heading="63813" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114938" y="-78411" z="-11443" heading="9120" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113616" y="-78459" z="-11443" heading="30680" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113622" y="-78398" z="-11443" heading="28616" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113591" y="-78301" z="-11442" heading="37105" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113604" y="-78239" z="-11443" heading="35386" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113693" y="-78249" z="-11443" heading="29763" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113568" y="-78336" z="-11442" heading="28986" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113818" y="-78174" z="-11443" heading="55979" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-114618" y="-77313" z="-11443" heading="22097" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-113589" y="-78333" z="-11443" heading="30535" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-114840" y="-78561" z="-11443" heading="32322" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113933" y="-77703" z="-11443" heading="1785" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113872" y="-77793" z="-11443" heading="60399" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114852" y="-77864" z="-11443" heading="13028" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114822" y="-77925" z="-11443" heading="17015" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-114554" y="-78998" z="-11443" heading="8750" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114193" y="-78871" z="-11441" heading="32032" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114105" y="-79053" z="-11443" heading="2811" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114456" y="-79050" z="-11443" heading="30111" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-113845" y="-78477" z="-11443" heading="62467" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Corrupted Fairy -->
+			<npc id="22272" x="-114091" y="-77461" z="-11443" heading="16383" respawnTime="60sec" />
+			<npc id="22271" x="-114048" y="-77429" z="-11443" heading="6673" respawnTime="60sec" />
+			<npc id="22271" x="-114045" y="-77406" z="-11443" heading="24645" respawnTime="60sec" />
+			<npc id="22271" x="-113837" y="-76943" z="-11443" heading="8327" respawnTime="60sec" />
+			<npc id="22271" x="-113945" y="-76923" z="-11443" heading="30858" respawnTime="60sec" />
+			<npc id="22271" x="-114859" y="-76897" z="-11443" heading="58120" respawnTime="60sec" />
+			<npc id="22271" x="-114785" y="-76841" z="-11443" heading="55942" respawnTime="60sec" />
+			<npc id="22271" x="-114711" y="-76987" z="-11443" heading="61107" respawnTime="60sec" />
+			<npc id="22271" x="-114699" y="-77113" z="-11443" heading="16383" respawnTime="60sec" />
+			<npc id="22271" x="-114723" y="-77045" z="-11443" heading="57831" respawnTime="60sec" />
+			<npc id="22271" x="-114852" y="-78363" z="-11443" heading="657" respawnTime="60sec" />
+			<npc id="22271" x="-114984" y="-78475" z="-11443" heading="1141" respawnTime="60sec" />
+			<npc id="22271" x="-114916" y="-78442" z="-11443" heading="65129" respawnTime="60sec" />
+			<npc id="22271" x="-114841" y="-78428" z="-11443" heading="63813" respawnTime="60sec" />
+			<npc id="22271" x="-114938" y="-78411" z="-11443" heading="9120" respawnTime="60sec" />
+			<npc id="22271" x="-113616" y="-78459" z="-11443" heading="30680" respawnTime="60sec" />
+			<npc id="22271" x="-113622" y="-78398" z="-11443" heading="28616" respawnTime="60sec" />
+			<npc id="22271" x="-113591" y="-78301" z="-11442" heading="37105" respawnTime="60sec" />
+			<npc id="22271" x="-113604" y="-78239" z="-11443" heading="35386" respawnTime="60sec" />
+			<npc id="22271" x="-113693" y="-78249" z="-11443" heading="29763" respawnTime="60sec" />
+			<npc id="22271" x="-113568" y="-78336" z="-11442" heading="28986" respawnTime="60sec" />
+			<npc id="22271" x="-113818" y="-78174" z="-11443" heading="55979" respawnTime="60sec" />
+			<npc id="22272" x="-114618" y="-77313" z="-11443" heading="22097" respawnTime="60sec" />
+			<npc id="22272" x="-113589" y="-78333" z="-11443" heading="30535" respawnTime="60sec" />
+			<npc id="22272" x="-114840" y="-78561" z="-11443" heading="32322" respawnTime="60sec" />
+			<npc id="22271" x="-113933" y="-77703" z="-11443" heading="1785" respawnTime="60sec" />
+			<npc id="22271" x="-113872" y="-77793" z="-11443" heading="60399" respawnTime="60sec" />
+			<npc id="22271" x="-114852" y="-77864" z="-11443" heading="13028" respawnTime="60sec" />
+			<npc id="22271" x="-114822" y="-77925" z="-11443" heading="17015" respawnTime="60sec" />
+			<npc id="22272" x="-114554" y="-78998" z="-11443" heading="8750" respawnTime="60sec" />
+			<npc id="22271" x="-114193" y="-78871" z="-11441" heading="32032" respawnTime="60sec" />
+			<npc id="22271" x="-114105" y="-79053" z="-11443" heading="2811" respawnTime="60sec" />
+			<npc id="22271" x="-114456" y="-79050" z="-11443" heading="30111" respawnTime="60sec" />
+			<npc id="22272" x="-113845" y="-78477" z="-11443" heading="62467" respawnTime="60sec" />
+			<npc id="22271" x="-114676" y="-78345" z="-11439" heading="30937" respawnTime="60sec" />
 		</group>
 		<group name="ruipwave_1" spawnByDefault="false">
-			<npc id="22273" x="-113945" y="-76923" z="-11443" heading="30858" /> <!-- Ruip portal container-->
-			<npc id="22273" x="-114840" y="-78561" z="-11443" heading="32322" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114852" y="-77864" z="-11443" heading="13028" /> <!-- Ruip portal container-->
-			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113845" y="-78477" z="-11443" heading="62467" /> <!-- Ruip portal container-->
-			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113568" y="-78336" z="-11442" heading="28986" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113872" y="-77793" z="-11443" heading="60399" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113589" y="-78333" z="-11443" heading="30535" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113818" y="-78174" z="-11443" heading="55979" /> <!-- Ruip portal container -->
-		</group>
-		<group name="ruipwave_2" spawnByDefault="false">
-			<npc id="22273" x="-113622" y="-78398" z="-11443" heading="28616" /> <!-- Ruip portal container-->
-			<npc id="22273" x="-113622" y="-78398" z="-11443" heading="28616" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114323" y="-78914" z="-11443" heading="13828" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114840" y="-78561" z="-11443" heading="32322" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114785" y="-76841" z="-11443" heading="55942" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114554" y="-78998" z="-11443" heading="8750" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114841" y="-78428" z="-11443" heading="63813" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114840" y="-78561" z="-11443" heading="32322" /> <!-- Ruip portal container -->
-		</group>
-		<group name="portalearth" spawnByDefault="false">
-			<npc id="15971" x="-113516" y="-77521" z="-11419" heading="8750" />
-		</group>
-		<group name="portalwind" spawnByDefault="false">
-			<npc id="15969" x="-114554" y="-78998" z="-11443" heading="8750" />
-		</group>
-		<group name="portalfire" spawnByDefault="false">
-			<npc id="15970" x="-114554" y="-78998" z="-11443" heading="8750" />
-		</group>
-		<group name="portalwater" spawnByDefault="false">
-			<npc id="15972" x="-114554" y="-78998" z="-11443" heading="8750" />
+			<npc id="22273" x="-113945" y="-76923" z="-11443" heading="30858" respawnTime="60sec" />
+			<npc id="22273" x="-114840" y="-78561" z="-11443" heading="32322" respawnTime="60sec" />
+			<npc id="22273" x="-114852" y="-77864" z="-11443" heading="13028" respawnTime="60sec" />
+			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" respawnTime="60sec" />
+			<npc id="22273" x="-113845" y="-78477" z="-11443" heading="62467" respawnTime="60sec" />
+			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" respawnTime="60sec" />
+			<npc id="22273" x="-113568" y="-78336" z="-11442" heading="28986" respawnTime="60sec" />
+			<npc id="22273" x="-113872" y="-77793" z="-11443" heading="60399" respawnTime="60sec" />
+			<npc id="22273" x="-113589" y="-78333" z="-11443" heading="30535" respawnTime="60sec" />
+			<npc id="22273" x="-113818" y="-78174" z="-11443" heading="55979" respawnTime="60sec" />
 		</group>
 	</spawnlist>
 </instance>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/multisell/custom/600016.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/multisell/custom/600016.xml
index 15f5a77492..b1bbf39e7a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/multisell/custom/600016.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/multisell/custom/600016.xml
@@ -5,19 +5,19 @@
 	</npcs>
 	<item>
 		<!-- Adena -->
-		<ingredient count="20119720" id="57" />
+		<ingredient count="2119720" id="57" />
 		<!-- Zubei's Helmet -->
 		<production count="1" id="503" />
 	</item>
 	<item>
 		<!-- Adena -->
-		<ingredient count="4319200" id="57" />
+		<ingredient count="2319200" id="57" />
 		<!-- Zubei's Breastplate -->
 		<production count="1" id="357" />
 	</item>
 	<item>
 		<!-- Adena -->
-		<ingredient count="20199540" id="57" />
+		<ingredient count="2199540" id="57" />
 		<!-- Zubei's Gaiters -->
 		<production count="1" id="383" />
 	</item>
@@ -35,13 +35,13 @@
 	</item>
 	<item>
 		<!-- Adena -->
-		<ingredient count="3239400" id="57" />
+		<ingredient count="2410000" id="57" />
 		<!-- Tunic of Zubei -->
 		<production count="1" id="2397" />
 	</item>
 	<item>
 		<!-- Adena -->
-		<ingredient count="2149660" id="57" />
+		<ingredient count="2995400" id="57" />
 		<!-- Stockings of Zubei -->
 		<production count="1" id="2402" />
 	</item>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/34414.htm b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/34414.htm
new file mode 100644
index 0000000000..51ace5fb0f
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/34414.htm
@@ -0,0 +1,7 @@
+<html><body>Siben:<br>
+<br>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AztacanArea The_Midway_Gate">The Midway Gate (Lv. 70-87) - 100,000 adena</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AztacanArea The_Eastern_Gate">The Eastern Gate (Lv. 88+) - 100,000 adena</button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AztacanArea The_Western_Gate">The Western Gate (Lv. 88) - 100,000 adena</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AztacanArea Mineral_shop">Buy supplies and minerals</button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
new file mode 100644
index 0000000000..6606e36f7e
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
@@ -0,0 +1,190 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.DwellingOfSpiritsResidence;
+
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.SkillHolder;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.SkillCaster;
+
+import ai.AbstractNpcAI;
+
+/**
+ * @author RobikBobik
+ */
+public class ResidenceOfKingIgnis extends AbstractNpcAI
+{
+	// NPCs
+	private static final int IGNIS = 29105;
+	// Skills
+	private static final SkillHolder FIRE_RAG_1 = new SkillHolder(50050, 1);
+	private static final SkillHolder FIRE_RAG_2 = new SkillHolder(50050, 2);
+	private static final SkillHolder FIRE_RAG_3 = new SkillHolder(50050, 3);
+	private static final SkillHolder FIRE_RAG_4 = new SkillHolder(50050, 4);
+	private static final SkillHolder FIRE_RAG_5 = new SkillHolder(50050, 5);
+	private static final SkillHolder FIRE_RAG_6 = new SkillHolder(50050, 6);
+	private static final SkillHolder FIRE_RAG_7 = new SkillHolder(50050, 7);
+	private static final SkillHolder FIRE_RAG_8 = new SkillHolder(50050, 8);
+	private static final SkillHolder FIRE_RAG_9 = new SkillHolder(50050, 9);
+	private static final SkillHolder FIRE_RAG_10 = new SkillHolder(50050, 10);
+	
+	public ResidenceOfKingIgnis()
+	{
+		addAttackId(IGNIS);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "CAST_FIRE_RAGE_1":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_1.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_1.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_2":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_2.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_2.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_3":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_3.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_3.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_4":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_4.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_4.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_5":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_5.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_5.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_6":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_6.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_6.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_7":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_7.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_7.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_8":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_8.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_8.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_9":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_9.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_9.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_10":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_10.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_10.getSkill());
+				}
+				break;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
+	{
+		if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.99)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.70)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_1", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.70)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.50)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_2", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.50)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.40)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_3", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.40)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.25)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_4", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.25)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.15)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_5", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.15)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.10)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_6", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.10)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.7)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_7", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.7)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.5)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_8", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.5)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.3)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_9", 1000, npc, null);
+		}
+		else if (npc.getCurrentHp() < (npc.getMaxHp() * 0.3))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_10", 1000, npc, null);
+		}
+		return super.onAttack(npc, attacker, damage, isSummon, skill);
+	}
+	
+	public static void main(String[] args)
+	{
+		new ResidenceOfKingIgnis();
+	}
+}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
new file mode 100644
index 0000000000..0bb5893075
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
@@ -0,0 +1,309 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.DwellingOfSpiritsResidence;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.l2jmobius.gameserver.enums.ChatType;
+import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.SkillHolder;
+import org.l2jmobius.gameserver.model.instancezone.Instance;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.model.skill.Skill;
+
+import ai.AbstractNpcAI;
+
+public class ResidenceOfKingPetram extends AbstractNpcAI
+{
+	// NPCs
+	private static final int PETRAM = 29108;
+	private static final int PETRAM_PIECE = 29116;
+	private static final int PETRAM_FRAGMENT = 29117;
+	// Skills
+	private static final SkillHolder EARTH_ENERGY = new SkillHolder(50066, 1);
+	private static final SkillHolder EARTH_FURY = new SkillHolder(50059, 1);
+	private static final SkillHolder TEST = new SkillHolder(5712, 1);
+	
+	public ResidenceOfKingPetram()
+	{
+		addKillId(PETRAM_PIECE, PETRAM_FRAGMENT);
+		addAttackId(PETRAM);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "SPAWN_MINION":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if (world != null)
+				{
+					final Npc petram = world.getNpc(PETRAM);
+					petram.doCast(EARTH_ENERGY.getSkill());
+					
+					petram.setInvul(true);
+					petram.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.EARTH_KING_BARRIER2_AVE);
+					petram.updateAbnormalVisualEffects();
+					petram.broadcastSay(ChatType.NPC_SHOUT, "HaHa, fighters lets kill them. Now Im invul!!!");
+					
+					final int stage = getHigherStage(world);
+					for (int minionIndex = 0; minionIndex < StageData.getMinionsStageData(stage).length; minionIndex++)
+					{
+						final MinionData minionData = StageData.getMinionsStageData(stage)[minionIndex];
+						final Location minionLocation = minionData.getMinionLocation();
+						world.setParameter("minion" + minionIndex, addSpawn(npc, minionData.getMinionId(), minionLocation.getX(), minionLocation.getY(), minionLocation.getZ(), minionLocation.getHeading(), false, -1, true, npc.getInstanceId()));
+					}
+					
+					startQuestTimer("SUPPORT_PETRAM", 200, npc, null);
+				}
+				break;
+			}
+			case "SUPPORT_PETRAM":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if ((world != null) && (world.getNpc(PETRAM) != null) && !world.getNpc(PETRAM).isDead())
+				{
+					final int stage = getHigherStage(world);
+					for (int minionIndex = 0; minionIndex < StageData.getMinionsStageData(stage).length; minionIndex++)
+					{
+						world.getParameters().getObject("minion" + minionIndex, Npc.class).setTarget(world.getNpc(PETRAM));
+						world.getParameters().getObject("minion" + minionIndex, Npc.class).doCast(TEST.getSkill());
+					}
+					startQuestTimer("SUPPORT_PETRAM", 10100, npc, null);
+				}
+				break;
+			}
+			case "REMOVE_INVUL":
+			{
+				if (npc != null)
+				{
+					final Instance world = npc.getInstanceWorld();
+					if (world != null)
+					{
+						final Npc petram = world.getNpc(PETRAM);
+						if (petram != null)
+						{
+							petram.doCast(EARTH_FURY.getSkill());
+							petram.setInvul(false);
+							petram.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.EARTH_KING_BARRIER2_AVE);
+							petram.updateAbnormalVisualEffects();
+							petram.broadcastSay(ChatType.NPC_SHOUT, "Nooooo... Nooooo...");
+						}
+						
+						for (int i = 0; i < 12; i++)
+						{
+							final Npc minion = world.getParameters().getObject("minion" + i, Npc.class);
+							if (minion != null)
+							{
+								minion.deleteMe();
+							}
+						}
+					}
+				}
+				break;
+			}
+		}
+		
+		return null;
+	}
+	
+	private int getHigherStage(Instance world)
+	{
+		for (int stage = StageData.getMinionsStageData().size() - 1; stage >= 0; stage--)
+		{
+			if (world.getParameters().getBoolean("stage" + stage, false))
+			{
+				return stage;
+			}
+		}
+		
+		return 0;
+	}
+	
+	@Override
+	public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
+	{
+		final Instance world = npc.getInstanceWorld();
+		synchronized (this)
+		{
+			for (int stage = 0; stage < StageData.getMinionsStageData().size(); stage++)
+			{
+				if ((npc.getCurrentHpPercent() < StageData.getHpPercents()[stage]) && !world.getParameters().getBoolean("stage" + stage, false))
+				{
+					world.setParameter("stage" + stage, true);
+					startQuestTimer("SPAWN_MINION", 100, npc, null);
+				}
+			}
+		}
+		
+		return super.onAttack(npc, attacker, damage, isSummon, skill);
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player player, boolean isSummon)
+	{
+		final Instance world = npc.getInstanceWorld();
+		if (world == null)
+		{
+			return null;
+		}
+		
+		final int stage = getHigherStage(world);
+		int aliveMinionsCount = 0;
+		for (int minionIndex = 0; minionIndex < StageData.getMinionsStageData(stage).length; minionIndex++)
+		{
+			if ((world.getParameters().getObject("minion" + minionIndex, Npc.class) != null) && !world.getParameters().getObject("minion" + minionIndex, Npc.class).isDead())
+			{
+				aliveMinionsCount++;
+			}
+		}
+		
+		boolean breakInvul = false;
+		switch (stage)
+		{
+			case 0:
+			{
+				if (aliveMinionsCount == 0)
+				{
+					breakInvul = true;
+				}
+				break;
+			}
+			case 1:
+			{
+				if (aliveMinionsCount <= 4)
+				{
+					breakInvul = true;
+				}
+				break;
+			}
+			case 2:
+			{
+				if (aliveMinionsCount <= 6)
+				{
+					breakInvul = true;
+				}
+				break;
+			}
+		}
+		
+		if (breakInvul)
+		{
+			startQuestTimer("REMOVE_INVUL", 500, world.getNpc(PETRAM), null);
+		}
+		
+		return super.onKill(npc, player, isSummon);
+	}
+	
+	private static class StageData
+	{
+		private static final int[] _hpPercents = new int[]
+		{
+			75,
+			50,
+			10
+		};
+		private static final Map<Integer, MinionData[]> _minionsStageData = new HashMap<>();
+		static
+		{
+			// Stage 1
+			_minionsStageData.put(0, new MinionData[]
+			{
+				new MinionData(PETRAM_FRAGMENT, new Location(221543, 191530, -15486, 1131)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222069, 192019, -15486, 49364)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222595, 191479, -15486, 34013)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222077, 191017, -15486, 16383))
+			});
+			
+			// Stage 2
+			_minionsStageData.put(1, new MinionData[]
+			{
+				new MinionData(PETRAM_FRAGMENT, new Location(221069, 191544, -15486, 2280)),
+				new MinionData(PETRAM_FRAGMENT, new Location(221366, 192223, -15486, 56731)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222067, 192508, -15486, 50632)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222765, 192216, -15486, 39607)),
+				new MinionData(PETRAM_FRAGMENT, new Location(223057, 191472, -15486, 33154)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222773, 190814, -15486, 25376)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222063, 190516, -15486, 16383)),
+				new MinionData(PETRAM_FRAGMENT, new Location(221342, 190800, -15486, 10837))
+			});
+			// Stage 3
+			_minionsStageData.put(2, new MinionData[]
+			{
+				new MinionData(PETRAM_PIECE, new Location(221543, 191530, -15486, 1131)),
+				new MinionData(PETRAM_PIECE, new Location(222069, 192019, -15486, 49364)),
+				new MinionData(PETRAM_PIECE, new Location(222595, 191479, -15486, 34013)),
+				new MinionData(PETRAM_PIECE, new Location(222077, 191017, -15486, 16383)),
+				new MinionData(PETRAM_PIECE, new Location(221069, 191544, -15486, 2280)),
+				new MinionData(PETRAM_PIECE, new Location(221366, 192223, -15486, 56731)),
+				new MinionData(PETRAM_PIECE, new Location(222067, 192508, -15486, 50632)),
+				new MinionData(PETRAM_PIECE, new Location(222765, 192216, -15486, 39607)),
+				new MinionData(PETRAM_PIECE, new Location(223057, 191472, -15486, 33154)),
+				new MinionData(PETRAM_PIECE, new Location(222773, 190814, -15486, 25376)),
+				new MinionData(PETRAM_PIECE, new Location(222063, 190516, -15486, 16383)),
+				new MinionData(PETRAM_PIECE, new Location(221342, 190800, -15486, 10837))
+			});
+		}
+		
+		public static int[] getHpPercents()
+		{
+			return _hpPercents;
+		}
+		
+		public static Map<Integer, MinionData[]> getMinionsStageData()
+		{
+			return _minionsStageData;
+		}
+		
+		public static MinionData[] getMinionsStageData(int stage)
+		{
+			return _minionsStageData.get(stage);
+		}
+	}
+	
+	private static class MinionData
+	{
+		final int _minionId;
+		final Location _minionLocation;
+		
+		private MinionData(int minionId, Location minionLocation)
+		{
+			_minionId = minionId;
+			_minionLocation = minionLocation;
+		}
+		
+		public int getMinionId()
+		{
+			return _minionId;
+		}
+		
+		public Location getMinionLocation()
+		{
+			return _minionLocation;
+		}
+	}
+	
+	public static void main(String[] args)
+	{
+		new ResidenceOfKingPetram();
+	}
+}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
new file mode 100644
index 0000000000..e16c7850fa
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
@@ -0,0 +1,179 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.DwellingOfSpiritsResidence;
+
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.SkillHolder;
+import org.l2jmobius.gameserver.model.instancezone.Instance;
+import org.l2jmobius.gameserver.model.skill.SkillCaster;
+
+import ai.AbstractNpcAI;
+
+/**
+ * @author RobikBobik, Mobius
+ */
+public class ResidenceOfKingProcella extends AbstractNpcAI
+{
+	// NPCs
+	private static final int PROCELLA = 29107;
+	private static final int PROCELLA_GUARDIAN_1 = 29112;
+	private static final int PROCELLA_GUARDIAN_2 = 29113;
+	private static final int PROCELLA_GUARDIAN_3 = 29114;
+	private static final int PROCELLA_STORM = 29115;
+	// Skills
+	private static final SkillHolder HURRICANE_SUMMON = new SkillHolder(50042, 1);
+	private static final int HURRICANE_BOLT = 50043;
+	private static final SkillHolder HURRICANE_BOLT_LV_1 = new SkillHolder(50043, 1);
+	// Misc
+	private static final int STORM_MAX_COUNT = 16;
+	
+	public ResidenceOfKingProcella()
+	{
+		addKillId(PROCELLA, PROCELLA_GUARDIAN_1, PROCELLA_GUARDIAN_2, PROCELLA_GUARDIAN_3);
+		addSpawnId(PROCELLA);
+	}
+	
+	@Override
+	public String onSpawn(Npc npc)
+	{
+		final Instance world = npc.getInstanceWorld();
+		if (world != null)
+		{
+			startQuestTimer("SPAWN_MINION", 300000 + getRandom(-15000, 15000), npc, null);
+			startQuestTimer("SPAWN_STORM", 5000, npc, null);
+			world.setParameter("stormCount", 0);
+		}
+		return null;
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "SPAWN_MINION":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if ((world != null) && (npc.getId() == PROCELLA))
+				{
+					world.setParameter("minion1", addSpawn(PROCELLA_GUARDIAN_1, 212663, 179421, -15486, 31011, true, 0, true, npc.getInstanceId()));
+					world.setParameter("minion2", addSpawn(PROCELLA_GUARDIAN_2, 213258, 179822, -15486, 12001, true, 0, true, npc.getInstanceId()));
+					world.setParameter("minion3", addSpawn(PROCELLA_GUARDIAN_3, 212558, 179974, -15486, 12311, true, 0, true, npc.getInstanceId()));
+					startQuestTimer("HIDE_PROCELLA", 1000, world.getNpc(PROCELLA), null);
+				}
+				break;
+			}
+			case "SPAWN_STORM":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if ((world != null) && (world.getParameters().getInt("stormCount", 0) < STORM_MAX_COUNT))
+				{
+					world.getNpc(PROCELLA).doCast(HURRICANE_SUMMON.getSkill());
+					final Npc procellaStorm = addSpawn(PROCELLA_STORM, world.getNpc(PROCELLA).getX() + getRandom(-500, 500), world.getNpc(PROCELLA).getY() + getRandom(-500, 500), world.getNpc(PROCELLA).getZ(), 31011, true, 0, true, npc.getInstanceId());
+					procellaStorm.setRandomWalking(true);
+					world.getParameters().increaseInt("stormCount", 1);
+					startQuestTimer("SPAWN_STORM", 60000, world.getNpc(PROCELLA), null);
+					startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", 100, procellaStorm, player);
+				}
+				break;
+			}
+			case "HIDE_PROCELLA":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if (world != null)
+				{
+					if (world.getNpc(PROCELLA).isInvisible())
+					{
+						world.getNpc(PROCELLA).setInvisible(false);
+					}
+					else
+					{
+						world.getNpc(PROCELLA).setInvisible(true);
+						startQuestTimer("SPAWN_MINION", 300000 + getRandom(-15000, 15000), world.getNpc(PROCELLA), player);
+					}
+				}
+				break;
+			}
+			case "CHECK_CHAR_INSIDE_RADIUS_NPC":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if (world != null)
+				{
+					final Player plr = world.getPlayers().stream().findAny().orElse(null); // Usamos orElse(null) para evitar el Optional vac��­o
+					if ((plr != null) && (plr.isInsideRadius3D(npc, 100)))
+					{
+						npc.abortAttack();
+						npc.abortCast();
+						npc.setTarget(plr);
+						
+						if (plr.getKnownSkill(HURRICANE_BOLT) != null) // Verificamos si el jugador tiene la habilidad
+						{
+							if (plr.getAffectedSkillLevel(HURRICANE_BOLT) == 1)
+							{
+								npc.abortCast();
+								startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", 100, npc, player);
+							}
+							else
+							{
+								if (SkillCaster.checkUseConditions(npc, HURRICANE_BOLT_LV_1.getSkill()))
+								{
+									npc.doCast(HURRICANE_BOLT_LV_1.getSkill());
+								}
+							}
+						}
+						startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", 100, npc, player);
+					}
+					else
+					{
+						startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", 100, npc, player);
+					}
+				}
+				break;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player player, boolean isSummon)
+	{
+		final Instance world = npc.getInstanceWorld();
+		if (world == null)
+		{
+			return null;
+		}
+		
+		if (npc.getId() == PROCELLA)
+		{
+			cancelQuestTimer("SPAWN_MINION", npc, player.getActingPlayer());
+			cancelQuestTimer("SPAWN_STORM", npc, player.getActingPlayer());
+			cancelQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", npc, player.getActingPlayer());
+		}
+		else if ((world.getParameters().getObject("minion1", Npc.class).isDead()) && (world.getParameters().getObject("minion2", Npc.class).isDead()) && (world.getParameters().getObject("minion3", Npc.class).isDead()))
+		{
+			startQuestTimer("HIDE_PROCELLA", 1000, world.getNpc(PROCELLA), null);
+		}
+		
+		return super.onKill(npc, player, isSummon);
+	}
+	
+	public static void main(String[] args)
+	{
+		new ResidenceOfKingProcella();
+	}
+}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
new file mode 100644
index 0000000000..9c3c7ea37b
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
@@ -0,0 +1,209 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.DwellingOfSpiritsResidence;
+
+import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.SkillHolder;
+import org.l2jmobius.gameserver.model.instancezone.Instance;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.SkillCaster;
+
+import ai.AbstractNpcAI;
+
+/**
+ * @author RobikBobik
+ */
+public class ResidenceOfQueenNebula extends AbstractNpcAI
+{
+	// NPCs
+	private static final int NEBULA = 29106;
+	private static final int WATER_SLIME = 29111;
+	// Skills
+	private static final int AQUA_RAGE = 50036;
+	private static final SkillHolder AQUA_RAGE_1 = new SkillHolder(AQUA_RAGE, 1);
+	private static final SkillHolder AQUA_RAGE_2 = new SkillHolder(AQUA_RAGE, 2);
+	private static final SkillHolder AQUA_RAGE_3 = new SkillHolder(AQUA_RAGE, 3);
+	private static final SkillHolder AQUA_RAGE_4 = new SkillHolder(AQUA_RAGE, 4);
+	private static final SkillHolder AQUA_RAGE_5 = new SkillHolder(AQUA_RAGE, 5);
+	private static final SkillHolder AQUA_SUMMON = new SkillHolder(50037, 1);
+	
+	public ResidenceOfQueenNebula()
+	{
+		addKillId(NEBULA, WATER_SLIME);
+		addAttackId(NEBULA);
+		addSpawnId(NEBULA);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "SPAWN_WATER_SLIME":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if (world != null)
+				{
+					final Player plr = world.getPlayers().stream().findAny().get();
+					startQuestTimer("CAST_AQUA_RAGE", 60000 + getRandom(-15000, 15000), npc, plr);
+					if (npc.getId() == NEBULA)
+					{
+						npc.doCast(AQUA_SUMMON.getSkill());
+						for (int i = 0; i < getRandom(4, 6); i++)
+						{
+							addSpawn(npc, WATER_SLIME, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, -1, true, npc.getInstanceId());
+							startQuestTimer("SPAWN_WATER_SLIME", 300000, npc, null);
+						}
+					}
+				}
+				break;
+			}
+			case "PLAYER_PARA":
+			{
+				if (player.getAffectedSkillLevel(AQUA_RAGE) == 5)
+				{
+					player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.FROZEN_PILLAR);
+					player.setImmobilized(true);
+					startQuestTimer("PLAYER_UNPARA", 5000, npc, player);
+				}
+				break;
+			}
+			case "PLAYER_UNPARA":
+			{
+				player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, AQUA_RAGE_5.getSkill());
+				player.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.FROZEN_PILLAR);
+				player.setImmobilized(false);
+				break;
+			}
+			case "CAST_AQUA_RAGE":
+			{
+				startQuestTimer("CAST_AQUA_RAGE", 5000, npc, player);
+				if ((player.isInsideRadius3D(npc, 1000)))
+				{
+					if (player.getAffectedSkillLevel(AQUA_RAGE) == 1)
+					{
+						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_2.getSkill()))
+						{
+							npc.doCast(AQUA_RAGE_2.getSkill());
+						}
+					}
+					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 2)
+					{
+						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_3.getSkill()))
+						{
+							npc.doCast(AQUA_RAGE_3.getSkill());
+						}
+					}
+					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 3)
+					{
+						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_4.getSkill()))
+						{
+							npc.doCast(AQUA_RAGE_4.getSkill());
+						}
+					}
+					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 4)
+					{
+						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_5.getSkill()))
+						{
+							npc.doCast(AQUA_RAGE_5.getSkill());
+							startQuestTimer("PLAYER_PARA", 100, npc, player);
+						}
+					}
+					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 5)
+					{
+						npc.abortCast();
+					}
+					else if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_1.getSkill()))
+					{
+						npc.doCast(AQUA_RAGE_1.getSkill());
+					}
+				}
+				break;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public String onSpawn(Npc npc)
+	{
+		startQuestTimer("SPAWN_WATER_SLIME", 300000, npc, null);
+		return super.onSpawn(npc);
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player player, boolean isSummon)
+	{
+		switch (npc.getId())
+		{
+			case NEBULA:
+			{
+				cancelQuestTimer("CAST_AQUA_RAGE", npc, player);
+				cancelQuestTimer("SPAWN_WATER_SLIME", npc, player);
+				break;
+			}
+			case WATER_SLIME:
+			{
+				if (player.getAffectedSkillLevel(AQUA_RAGE) == 1)
+				{
+					if (getRandomBoolean())
+					{
+						player.stopSkillEffects(AQUA_RAGE_1.getSkill());
+					}
+				}
+				else if (player.getAffectedSkillLevel(AQUA_RAGE) == 2)
+				{
+					if (getRandomBoolean())
+					{
+						player.stopSkillEffects(AQUA_RAGE_2.getSkill());
+						final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 1);
+						skill.applyEffects(player, player);
+					}
+				}
+				else if (player.getAffectedSkillLevel(AQUA_RAGE) == 3)
+				{
+					if (getRandomBoolean())
+					{
+						player.stopSkillEffects(AQUA_RAGE_3.getSkill());
+						final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 2);
+						skill.applyEffects(player, player);
+					}
+				}
+				else if (player.getAffectedSkillLevel(AQUA_RAGE) == 4)
+				{
+					if (getRandomBoolean())
+					{
+						player.stopSkillEffects(AQUA_RAGE_4.getSkill());
+						final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 3);
+						skill.applyEffects(player, player);
+					}
+				}
+				break;
+			}
+		}
+		return super.onKill(npc, player, isSummon);
+	}
+	
+	public static void main(String[] args)
+	{
+		new ResidenceOfQueenNebula();
+	}
+}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
index 6a2a5bc73a..f90a79e431 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
@@ -53,12 +53,12 @@ public class FrostLordCastleZone extends AbstractNpcAI
 	private static final AtomicReference<SpawnTemplate> SPAWN_BATTLE_MOBS = new AtomicReference<>();
 	private static final AtomicReference<SpawnTemplate> SPAWN_ENCHANCED_MOBS = new AtomicReference<>();
 	
-	public static final int[] REGGIESYS_GLAKIAS =
+	protected static final int[] REGGIESYS_GLAKIAS =
 	{
 		29136,
 		29137
 	};
-	public static final int[] SLICING_GLAKIAS =
+	protected static final int[] SLICING_GLAKIAS =
 	{
 		29138,
 		29139
@@ -71,21 +71,20 @@ public class FrostLordCastleZone extends AbstractNpcAI
 	private static final Location GLAKIAS_SPAWN_LOC = new Location(114713, -114799, -11209, 33289);
 	
 	// Teleports
-	private static final Location The_north_eastern_entrance = new Location(-56255, 13537, -3336);
-	private static final Location The_south_eastern_entrance = new Location(-49550, 17189, -3016);
-	private static final Location The_north_western_entrance = new Location(-52849, 5272, -240);
-	private static final Location The_south_western_entrance = new Location(-52849, 5272, -240);
+	private static final Location NORTH_EASTERN_ENTRANCE = new Location(-56255, 13537, -3336);
+	private static final Location SOUTH_EASTERN_ENTRANCE = new Location(-49550, 17189, -3016);
+	private static final Location NORTH_WESTERN_ENTRANCE = new Location(-52849, 5272, -240);
+	private static final Location SOUTH_WESTERN_ENTRANCE = new Location(-52849, 5272, -240);
 	
-	private static final Location Crossroad = new Location(145598, 144091, -11789);
-	private static final Location Northern_Secret_Passage = new Location(149478, 147145, -12339);
+	private static final Location CROSSROAD = new Location(145598, 144091, -11789);
+	private static final Location NOTHERN_SECRET_PASSAGE = new Location(149478, 147145, -12339);
 	
-	private static final Location Glakias_House = new Location(113479, -114804, -11076);
+	private static final Location GLAKIAS_RESIDENCE = new Location(113479, -114804, -11076);
 	
 	public static final int UNDERCOVER_AGENT = 34230; // Teleport npc
 	public static final int CRYSTAL_ENERGY = 34232; // Teleport npc
 	
 	// Zones
-	
 	private static final ZoneType[] ZONES =
 	{
 		ZoneManager.getInstance().getZoneByName("frost_castle_zone"),
@@ -93,7 +92,6 @@ public class FrostLordCastleZone extends AbstractNpcAI
 	};
 	
 	// Timings
-	
 	private static final int[] DAYS_OF_WEEK =
 	{
 		Calendar.TUESDAY,
@@ -112,7 +110,7 @@ public class FrostLordCastleZone extends AbstractNpcAI
 	
 	private static final long DESPAWN_DELAY = 16 * 60 * 60 * 1000;
 	
-	private static Npc _TeleportchargedCrystal = null;
+	private static Npc _teleportchargedCrystal = null;
 	
 	private static final String SCRIPT_BYPASS = "Quest FrostLordCastleZone ";
 	
@@ -137,148 +135,73 @@ public class FrostLordCastleZone extends AbstractNpcAI
 		{
 			case "Crossroad":
 			{
-				TeleportCheck(player, 1);
+				teleportCheck(player, 1);
 				break;
 			}
-			
 			case "Northern_Secret_Passage":
 			{
-				TeleportCheck(player, 2);
+				teleportCheck(player, 2);
 				break;
 			}
-			
 			case "The_north_eastern_entrance":
 			{
-				TeleportCheck(player, 3);
+				teleportCheck(player, 3);
 				break;
 			}
-			
 			case "The_south_eastern_entrance":
 			{
-				TeleportCheck(player, 4);
+				teleportCheck(player, 4);
 				break;
 			}
-			
 			case "The_north_western_entrance":
 			{
-				TeleportCheck(player, 5);
+				teleportCheck(player, 5);
 				break;
 			}
-			
 			case "The_south_western_entrance":
 			{
-				TeleportCheck(player, 6);
+				teleportCheck(player, 6);
 				break;
 			}
-			
 			case "Crystal_Energy_Teleport":
 			{
-				player.teleToLocation(Glakias_House);
+				player.teleToLocation(GLAKIAS_RESIDENCE);
 				break;
 			}
-			
 			case "FIRST_RAID_SPAWN":
 			{
 				int id = Rnd.get(100) < 7 ? SLICING : REGGIESYS;
 				addSpawn(id, REGGIESYS_SLICING_SPAWN_LOC, false, DESPAWN_DELAY);
 				break;
 			}
-			
 			case "SECOND_RAID_SPAWN":
 			{
 				addSpawn(TIRON, TIRON_SPAWN_LOC, false, DESPAWN_DELAY);
 				break;
 			}
-			
-			default:
-			{
-				break;
-			}
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
 	
-	private void scheduleFirstRaid()
-	{
-		long time = Long.MAX_VALUE;
-		
-		for (int day : DAYS_OF_WEEK)
-		{
-			long nextDateMillis = getNextDateMilis(day, FIRST_RAID_TIME[0], FIRST_RAID_TIME[1]);
-			if (nextDateMillis < time)
-			{
-				time = nextDateMillis;
-			}
-		}
-		
-		startQuestTimer("FIRST_RAID_SPAWN", time - System.currentTimeMillis(), null, null);
-	}
-	
-	private void scheduleSecondRaid()
-	{
-		long time = Long.MAX_VALUE;
-		for (int day : DAYS_OF_WEEK)
-		{
-			long temp = getNextDateMilis(day, SECOND_RAID_TIME[0], SECOND_RAID_TIME[1]);
-			if (temp < time)
-			{
-				time = temp;
-			}
-		}
-		startQuestTimer("SECOND_RAID_SPAWN", time - System.currentTimeMillis(), null, null);
-		
-	}
-	
-	private long getNextDateMilis(int dayOfWeek, int hour, int minute)
-	{
-		Calendar c = Calendar.getInstance();
-		c.set(Calendar.HOUR_OF_DAY, hour);
-		c.set(Calendar.MINUTE, minute);
-		c.set(Calendar.SECOND, 0);
-		for (int i = 0; i < 7; i++)
-		{
-			if ((c.get(Calendar.DAY_OF_WEEK) == dayOfWeek) && (c.getTimeInMillis() > System.currentTimeMillis()))
-			{
-				return c.getTimeInMillis();
-			}
-			c.add(Calendar.DAY_OF_WEEK, 1);
-		}
-		return c.getTimeInMillis();
-	}
-	
 	@Override
-	public String onKill(Npc npc, Player killer, boolean isSummon)
+	public String onFirstTalk(Npc npc, Player player)
 	{
-		switch (npc.getId())
+		if (npc.getId() == CRYSTAL_ENERGY)
 		{
-			case REGGIESYS:
-			{
-				addSpawn(REGGIESYS_GLAKIAS[Rnd.get(0, REGGIESYS_GLAKIAS.length - 1)], GLAKIAS_SPAWN_LOC, false, DESPAWN_DELAY);
-				
-				SPAWN_BATTLE_MOBS.set(SpawnData.getInstance().getSpawnByName("glakias_mobs_pretorian"));
-				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::despawnAll);
-				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::spawnAll);
-				
-				break;
-			}
-			case SLICING:
-			{
-				addSpawn(SLICING_GLAKIAS[Rnd.get(0, SLICING_GLAKIAS.length - 1)], GLAKIAS_SPAWN_LOC, false, DESPAWN_DELAY);
-				
-				SPAWN_BATTLE_MOBS.set(SpawnData.getInstance().getSpawnByName("glakias_mobs_pretorian"));
-				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::despawnAll);
-				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::spawnAll);
-				
-				break;
-			}
-			case TIRON:
-			{
-				_TeleportchargedCrystal = addSpawn(CHARGED_CRYSTAL, CHARGED_CRYSTAL_SPAWN_LOC, false, DESPAWN_DELAY);
-				break;
-			}
+			return getHtm(player, "34232.htm");
 		}
-		DeleteGlakiasSpawns(npc);
-		return super.onKill(npc, killer, false);
+		
+		if (npc.getId() == UNDERCOVER_AGENT)
+		{
+			if ((_teleportchargedCrystal != null) && _teleportchargedCrystal.isSpawned())
+			{
+				return getHtm(player, "34230-full.htm");
+			}
+			
+			return getHtm(player, "34230.htm");
+		}
+		
+		return null;
 	}
 	
 	@Override
@@ -324,47 +247,133 @@ public class FrostLordCastleZone extends AbstractNpcAI
 		}
 	}
 	
-	public void TeleportCheck(Player player, int locNum)
+	@Override
+	public String onKill(Npc npc, Player killer, boolean isSummon)
+	{
+		switch (npc.getId())
+		{
+			case REGGIESYS:
+			{
+				addSpawn(REGGIESYS_GLAKIAS[Rnd.get(0, REGGIESYS_GLAKIAS.length - 1)], GLAKIAS_SPAWN_LOC, false, DESPAWN_DELAY);
+				SPAWN_BATTLE_MOBS.set(SpawnData.getInstance().getSpawnByName("glakias_mobs_pretorian"));
+				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::despawnAll);
+				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::spawnAll);
+				break;
+			}
+			case SLICING:
+			{
+				addSpawn(SLICING_GLAKIAS[Rnd.get(0, SLICING_GLAKIAS.length - 1)], GLAKIAS_SPAWN_LOC, false, DESPAWN_DELAY);
+				SPAWN_BATTLE_MOBS.set(SpawnData.getInstance().getSpawnByName("glakias_mobs_pretorian"));
+				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::despawnAll);
+				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::spawnAll);
+				break;
+			}
+			case TIRON:
+			{
+				_teleportchargedCrystal = addSpawn(CHARGED_CRYSTAL, CHARGED_CRYSTAL_SPAWN_LOC, false, DESPAWN_DELAY);
+				break;
+			}
+		}
+		deleteGlakiasSpawns(npc);
+		return super.onKill(npc, killer, false);
+	}
+	
+	@RegisterEvent(EventType.ON_PLAYER_BYPASS)
+	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
+	public void onPlayerBypass(OnPlayerBypass event)
+	{
+		final Player player = event.getPlayer();
+		if (event.getCommand().startsWith(SCRIPT_BYPASS))
+		{
+			notifyEvent(event.getCommand().replace(SCRIPT_BYPASS, ""), null, player);
+		}
+	}
+	
+	private void scheduleFirstRaid()
+	{
+		long time = Long.MAX_VALUE;
+		for (int day : DAYS_OF_WEEK)
+		{
+			final long nextDateMillis = getNextDateMilis(day, FIRST_RAID_TIME[0], FIRST_RAID_TIME[1]);
+			if (nextDateMillis < time)
+			{
+				time = nextDateMillis;
+			}
+		}
+		startQuestTimer("FIRST_RAID_SPAWN", time - System.currentTimeMillis(), null, null);
+	}
+	
+	private void scheduleSecondRaid()
+	{
+		long time = Long.MAX_VALUE;
+		for (int day : DAYS_OF_WEEK)
+		{
+			final long nextDateMillis = getNextDateMilis(day, SECOND_RAID_TIME[0], SECOND_RAID_TIME[1]);
+			if (nextDateMillis < time)
+			{
+				time = nextDateMillis;
+			}
+		}
+		startQuestTimer("SECOND_RAID_SPAWN", time - System.currentTimeMillis(), null, null);
+	}
+	
+	private long getNextDateMilis(int dayOfWeek, int hour, int minute)
+	{
+		final Calendar calendar = Calendar.getInstance();
+		calendar.set(Calendar.HOUR_OF_DAY, hour);
+		calendar.set(Calendar.MINUTE, minute);
+		calendar.set(Calendar.SECOND, 0);
+		for (int i = 0; i < 7; i++)
+		{
+			if ((calendar.get(Calendar.DAY_OF_WEEK) == dayOfWeek) && (calendar.getTimeInMillis() > System.currentTimeMillis()))
+			{
+				return calendar.getTimeInMillis();
+			}
+			calendar.add(Calendar.DAY_OF_WEEK, 1);
+		}
+		return calendar.getTimeInMillis();
+	}
+	
+	public void teleportCheck(Player player, int locationId)
 	{
 		int requiredMoney = 0;
 		Location teleportLocation = null;
-		
-		switch (locNum)
+		switch (locationId)
 		{
 			case 1:
 			{
 				requiredMoney = 100000;
-				teleportLocation = Crossroad;
+				teleportLocation = CROSSROAD;
 				break;
 			}
 			case 2:
 			{
 				requiredMoney = 100000;
-				teleportLocation = Northern_Secret_Passage;
+				teleportLocation = NOTHERN_SECRET_PASSAGE;
 				break;
 			}
 			case 3:
 			{
 				requiredMoney = 500000;
-				teleportLocation = The_north_eastern_entrance;
+				teleportLocation = NORTH_EASTERN_ENTRANCE;
 				break;
 			}
 			case 4:
 			{
 				requiredMoney = 500000;
-				teleportLocation = The_south_eastern_entrance;
+				teleportLocation = SOUTH_EASTERN_ENTRANCE;
 				break;
 			}
 			case 5:
 			{
 				requiredMoney = 500000;
-				teleportLocation = The_north_western_entrance;
+				teleportLocation = NORTH_WESTERN_ENTRANCE;
 				break;
 			}
 			case 6:
 			{
 				requiredMoney = 500000;
-				teleportLocation = The_south_western_entrance;
+				teleportLocation = SOUTH_WESTERN_ENTRANCE;
 				break;
 			}
 			default:
@@ -382,33 +391,7 @@ public class FrostLordCastleZone extends AbstractNpcAI
 		player.teleToLocation(teleportLocation);
 	}
 	
-	@Override
-	public String onFirstTalk(Npc npc, Player player)
-	{
-		String html;
-		if (npc.getId() == CRYSTAL_ENERGY)
-		{
-			html = getHtm(player, "34232.htm");
-			return html;
-		}
-		
-		if (npc.getId() == UNDERCOVER_AGENT)
-		{
-			if ((_TeleportchargedCrystal != null) && _TeleportchargedCrystal.isSpawned())
-			{
-				html = getHtm(player, "34230-full.htm");
-			}
-			else
-			{
-				html = getHtm(player, "34230.htm");
-			}
-			
-			return html;
-		}
-		return null;
-	}
-	
-	private void DeleteGlakiasSpawns(Npc npc)
+	private void deleteGlakiasSpawns(Npc npc)
 	{
 		int npcId = npc.getId();
 		if ((npcId == REGGIESYS_GLAKIAS[0]) || (npcId == REGGIESYS_GLAKIAS[1]) || (npcId == SLICING_GLAKIAS[0]) || (npcId == SLICING_GLAKIAS[1]))
@@ -417,19 +400,8 @@ public class FrostLordCastleZone extends AbstractNpcAI
 		}
 	}
 	
-	@RegisterEvent(EventType.ON_PLAYER_BYPASS)
-	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void onPlayerBypass(OnPlayerBypass event)
-	{
-		final Player player = event.getPlayer();
-		if (event.getCommand().startsWith(SCRIPT_BYPASS))
-		{
-			notifyEvent(event.getCommand().replace(SCRIPT_BYPASS, ""), null, player);
-		}
-	}
-	
 	public static void main(String[] args)
 	{
 		new FrostLordCastleZone();
 	}
-}
\ No newline at end of file
+}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 5b501b1f1b..bcc74a8afe 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -254,6 +255,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/LetterCollector/config.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/LetterCollector/config.xml
index be41235de7..d1a01d9195 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/LetterCollector/config.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/LetterCollector/config.xml
@@ -4,15 +4,15 @@
 		<add item="3875" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's A -->
 		<add item="3877" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's E -->
 		<add item="3879" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's G -->
+		<add item="3880" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's H -->
 		<add item="3881" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's I -->
 		<add item="3882" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's L -->
 		<add item="3883" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's N -->
 		<add item="3885" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's R -->
-		<add item="34956" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's M -->
 		<add item="3886" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's S -->
-		<add item="3886" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's T -->
-		<add item="3880" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's H -->
+		<add item="3887" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's T -->
 		<add item="3888" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's II -->
+		<add item="34956" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's M -->
 		<add item="92021" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's D -->
 		<add item="93412" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's K -->
 		<add item="93413" min="1" max="1" chance="1%" minLevel="5" /> <!-- Letter Collector's U -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/LetterCollector/rewards.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/LetterCollector/rewards.xml
index d6234162c4..d647b5069d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/LetterCollector/rewards.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/LetterCollector/rewards.xml
@@ -9,15 +9,15 @@
 		<item name="A" id="3875" />
 		<item name="E" id="3877" />
 		<item name="G" id="3879" />
+		<item name="H" id="3880" />
 		<item name="I" id="3881" />
 		<item name="L" id="3882" />
 		<item name="N" id="3883" />
 		<item name="R" id="3885" />
-		<item name="M" id="34956" />
 		<item name="S" id="3886" />
-		<item name="T" id="3886" />
-		<item name="H" id="3880" />
+		<item name="T" id="3887" />
 		<item name="II" id="3888" />
+		<item name="M" id="34956" />
 		<item name="D" id="92021" />
 		<item name="K" id="93412" />
 		<item name="U" id="93413" />
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/EffectMasterHandler.java
index b3da341f77..1059dd2ac3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -43,6 +43,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AgathionSlot", AgathionSlot::new);
@@ -173,6 +175,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("GiveFame", GiveFame::new);
 		EffectHandler.getInstance().registerHandler("GiveHonorCoins", GiveHonorCoins::new);
 		EffectHandler.getInstance().registerHandler("GiveItemByExp", GiveItemByExp::new);
+		EffectHandler.getInstance().registerHandler("GivePetXp", GivePetXp::new);
 		EffectHandler.getInstance().registerHandler("GiveRecommendation", GiveRecommendation::new);
 		EffectHandler.getInstance().registerHandler("GiveSp", GiveSp::new);
 		EffectHandler.getInstance().registerHandler("GiveXp", GiveXp::new);
@@ -196,6 +199,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("HpRegen", HpRegen::new);
 		EffectHandler.getInstance().registerHandler("HpToOwner", HpToOwner::new);
 		EffectHandler.getInstance().registerHandler("IgnoreDeath", IgnoreDeath::new);
+		EffectHandler.getInstance().registerHandler("IgnoreReduceDamage", IgnoreReduceDamage::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageBonus", ImmobileDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageResist", ImmobileDamageResist::new);
 		EffectHandler.getInstance().registerHandler("ImmobilePetBuff", ImmobilePetBuff::new);
@@ -237,7 +241,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtkByPAtk", MAtkByPAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyCraftPoints", ModifyCraftPoints::new);
 		EffectHandler.getInstance().registerHandler("ModifyDeathPoints", ModifyDeathPoints::new);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/MasterHandler.java
index 80cd97dfc1..074681ef62 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/MasterHandler.java
@@ -148,6 +148,7 @@ import handlers.bypasshandlers.Link;
 import handlers.bypasshandlers.Multisell;
 import handlers.bypasshandlers.NpcViewMod;
 import handlers.bypasshandlers.Observation;
+import handlers.bypasshandlers.PetExtractWindow;
 import handlers.bypasshandlers.PlayerHelp;
 import handlers.bypasshandlers.PrivateWarehouse;
 import handlers.bypasshandlers.QuestLink;
@@ -467,6 +468,7 @@ public class MasterHandler
 			Multisell.class,
 			NpcViewMod.class,
 			Observation.class,
+			PetExtractWindow.class,
 			QuestLink.class,
 			PlayerHelp.class,
 			PrivateWarehouse.class,
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/PetExtractWindow.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/PetExtractWindow.java
new file mode 100644
index 0000000000..446334c464
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/PetExtractWindow.java
@@ -0,0 +1,56 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.bypasshandlers;
+
+import org.l2jmobius.gameserver.handler.IBypassHandler;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.network.serverpackets.pet.ShowPetExtractSystem;
+
+/**
+ * @author Geremy
+ */
+public class PetExtractWindow implements IBypassHandler
+{
+	private static final String[] COMMANDS =
+	{
+		"pet_extract_window",
+	};
+	
+	@Override
+	public boolean useBypass(String command, Player player, Creature target)
+	{
+		if (!target.isNpc())
+		{
+			return false;
+		}
+		
+		if (command.toLowerCase().startsWith(COMMANDS[0]))
+		{
+			player.sendPacket(ShowPetExtractSystem.STATIC_PACKET);
+			return true;
+		}
+		
+		return false;
+	}
+	
+	@Override
+	public String[] getBypassList()
+	{
+		return COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GivePetXp.java
similarity index 55%
rename from L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
rename to L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GivePetXp.java
index c99b060259..c9801b6d42 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GivePetXp.java
@@ -1,31 +1,53 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.skill.Skill;
+
+/**
+ * @author Geremy
+ */
+public class GivePetXp extends AbstractEffect
+{
+	private final int _xp;
+	
+	public GivePetXp(StatSet params)
+	{
+		_xp = params.getInt("xp", 0);
+	}
+	
+	@Override
+	public boolean isInstant()
+	{
+		return true;
+	}
+	
+	@Override
+	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		if (!effector.hasPet())
+		{
+			return;
+		}
+		
+		effected.getActingPlayer().getPet().addExpAndSp(_xp, 0);
+	}
+}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
new file mode 100644
index 0000000000..5405ccd4be
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class IgnoreReduceDamage extends AbstractStatEffect
+{
+	public IgnoreReduceDamage(StatSet params)
+	{
+		super(params, Stat.IGNORE_REDUCE_DAMAGE);
+	}
+}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
index 951002a2c2..35bfbcb6bc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.enums.StatModifierType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener;
 import org.l2jmobius.gameserver.model.events.returns.DamageReturn;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author Sdw
@@ -32,10 +34,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 public class ReduceDamage extends AbstractEffect
 {
 	private final double _amount;
+	private final StatModifierType _mode;
 	
 	public ReduceDamage(StatSet params)
 	{
 		_amount = params.getDouble("amount");
+		_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
 	}
 	
 	private DamageReturn onDamageReceivedEvent(OnCreatureDamageReceived event)
@@ -46,7 +50,15 @@ public class ReduceDamage extends AbstractEffect
 			return null;
 		}
 		
-		final double newDamage = event.getDamage() * (_amount / 100);
+		final double newDamage;
+		if (_mode == StatModifierType.PER)
+		{
+			newDamage = event.getDamage() - (event.getDamage() * (_amount / 100));
+		}
+		else // DIFF
+		{
+			newDamage = event.getDamage() - Math.max((_amount - event.getAttacker().getStat().getAdd(Stat.IGNORE_REDUCE_DAMAGE)), 0.0);
+		}
 		
 		return new DamageReturn(false, true, false, newDamage);
 	}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index 7e02e79abc..bff5a1734b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -210,6 +210,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()) || _renewDuration)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
index 70789354f3..fd41f09a9a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
@@ -17,7 +17,13 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author Sero
@@ -28,4 +34,46 @@ public class WeaponBonusMAtk extends AbstractStatAddEffect
 	{
 		super(params, Stat.WEAPON_BONUS_MAGIC_ATTACK);
 	}
+	
+	@Override
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
index df05ef8607..b36b10a92e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
@@ -17,7 +17,13 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author Sero
@@ -28,4 +34,46 @@ public class WeaponBonusPAtk extends AbstractStatAddEffect
 	{
 		super(params, Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
 	}
+	
+	@Override
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index fa90ba401d..4c76932c3e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,61 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetHold.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetHold.java
index 04649bf332..72ad8a2b4e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetHold.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetHold.java
@@ -52,4 +52,10 @@ public class PetHold implements IPlayerActionHandler
 			((SummonAI) pet.getAI()).notifyFollowStatusChange();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetMove.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetMove.java
index edddbab322..817593d9a2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetMove.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetMove.java
@@ -53,4 +53,10 @@ public class PetMove implements IPlayerActionHandler
 			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, player.getTarget().getLocation());
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
index eaa7bca994..858083f36a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
@@ -77,4 +77,10 @@ public class PetSkillUse implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetStop.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetStop.java
index efd4e36b0b..8b8cabc337 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetStop.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetStop.java
@@ -51,4 +51,10 @@ public class PetStop implements IPlayerActionHandler
 			pet.cancelAction();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 71d72e95b5..3e0acb89bd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,52 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorHold.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
index 7b0ec565e4..41ecb77132 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
@@ -48,4 +48,10 @@ public class ServitorHold implements IPlayerActionHandler
 			((SummonAI) s.getAI()).notifyFollowStatusChange();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorMode.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
index be6205b0f9..2b5a8f1e82 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
@@ -68,4 +68,10 @@ public class ServitorMode implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorMove.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
index d119886221..6254d3db05 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
@@ -56,4 +56,10 @@ public class ServitorMove implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
index 36aa372909..7fa7f0a45c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
@@ -62,4 +62,10 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			}
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorStop.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
index 41b3dd19f2..4f91147611 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
@@ -47,4 +47,10 @@ public class ServitorStop implements IPlayerActionHandler
 			s.cancelAction();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
index fb269e325a..cf0218f87f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
@@ -62,4 +62,10 @@ public class UnsummonPet implements IPlayerActionHandler
 			pet.unSummon(player);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
index a408928a04..f305fd2787 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
@@ -69,4 +69,10 @@ public class UnsummonServitor implements IPlayerActionHandler
 			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
index 4c6398780f..d1698bbf65 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
@@ -20,20 +20,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.l2jmobius.gameserver.data.xml.SkillData;
-import org.l2jmobius.gameserver.enums.ChatType;
-import org.l2jmobius.gameserver.enums.SkillFinishType;
+import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
-import org.l2jmobius.gameserver.instancemanager.ZoneManager;
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.model.skill.Skill;
-import org.l2jmobius.gameserver.model.skill.SkillCaster;
 import org.l2jmobius.gameserver.model.zone.ZoneType;
 import org.l2jmobius.gameserver.network.NpcStringId;
 import org.l2jmobius.gameserver.network.serverpackets.ExSendUIEvent;
@@ -47,8 +42,12 @@ import instances.AbstractInstance;
  */
 public class DwellingOfSpirits extends AbstractInstance
 {
+	private static final int PORTAL_OPEN_CHANCE = 40;
+	
 	// CRITICAL NPCs
 	private static final int RUIP = 22273;
+	private static final int FAIRY_C1 = 22271;
+	private static final int FAIRY_C2 = 22272;
 	private static final int SEALSTONE = 34178;
 	private static final int ANIMAEL = 34176;
 	private static final int PORTAL_EVENT_FIRE = 15969;
@@ -56,46 +55,10 @@ public class DwellingOfSpirits extends AbstractInstance
 	private static final int PORTAL_EVENT_EARTH = 15972;
 	private static final int PORTAL_EVENT_WIND = 15971;
 	
-	// PROCELLA BOSS WIND
 	private static final int KING_PROCELLA = 29107;
-	private static final int PROCELLA_GUARDIAN_1 = 29112;
-	private static final int PROCELLA_STORM = 29115;
-	
-	private static final SkillHolder HURRICANE_SUMMON = new SkillHolder(50042, 1);
-	private static final int HURRICANE_BOLT = 50043;
-	private static final SkillHolder HURRICANE_BOLT_LV_1 = new SkillHolder(50043, 1);
-	private static final int STORM_MAX_COUNT = 20; //
-	
-	// PETRAM BOSS EARTH
 	private static final int KING_PETRAM = 29108;
-	private static final int PETRAM_PIECE = 29116;
-	private static final int PETRAM_FRAGMENT = 29117;
-	// Skills
-	private static final SkillHolder EARTH_ENERGY = new SkillHolder(50066, 1);
-	private static final SkillHolder EARTH_FURY = new SkillHolder(50059, 1);
-	private static final SkillHolder TEST = new SkillHolder(5712, 1);
-	
-	// IGNIS BOSS FIRE
-	// NPCs
 	private static final int KING_IGNIS = 29105;
-	// Skills
-	private static final SkillHolder FIRE_RAG_2 = new SkillHolder(50050, 2);
-	private static final SkillHolder FIRE_RAG_4 = new SkillHolder(50050, 4);
-	private static final SkillHolder FIRE_RAG_6 = new SkillHolder(50050, 6);
-	private static final SkillHolder FIRE_RAG_8 = new SkillHolder(50050, 8);
-	
-	// NEBULA BOSS WATER
-	// NPCs
 	private static final int KING_NEBULA = 29106;
-	private static final int WATER_SLIME = 29111;
-	// Skills
-	private static final int AQUA_RAGE = 50036;
-	private static final SkillHolder AQUA_RAGE_1 = new SkillHolder(AQUA_RAGE, 1);
-	private static final SkillHolder AQUA_RAGE_2 = new SkillHolder(AQUA_RAGE, 2);
-	private static final SkillHolder AQUA_RAGE_3 = new SkillHolder(AQUA_RAGE, 3);
-	private static final SkillHolder AQUA_RAGE_4 = new SkillHolder(AQUA_RAGE, 4);
-	private static final SkillHolder AQUA_RAGE_5 = new SkillHolder(AQUA_RAGE, 5);
-	private static final SkillHolder AQUA_SUMMON = new SkillHolder(50037, 1);
 	
 	// Entrace Portal Triggers
 	private static final int WIND_FIRST_TRIGGER_1 = 16158880;
@@ -107,38 +70,86 @@ public class DwellingOfSpirits extends AbstractInstance
 	private static final int WATER_FIRST_TRIGGER_1 = 16157770;
 	private static final int WATER_FIRST_TRIGGER_2 = 16157772;
 	
-	// Statue Kill Indicator Triggers
-	private static final int KILL_INDICATOR_TRIGGER_1 = 16159990;
-	private static final int KILL_INDICATOR_TRIGGER_2 = 16159994;
-	private static final int KILL_INDICATOR_TRIGGER_3 = 16159996;
-	private static final int KILL_INDICATOR_TRIGGER_4 = 16159998;
-	private static final int KILL_INDICATOR_TRIGGER_5 = 16159992;
+	// @formatter:off
+	private static final int[][] PORTAL_TRIGGER_IDS = 
+	{
+	    { 16158880, 16158882 },
+	    { 16156660, 16156662 },
+	    { 16155550, 16155552 },
+	    { 16157770, 16157772 }
+	};
+	
+	private static final Location IGNIS_FIRE_L = new Location(202374, 168153, -15485);
+	private static final Location PETRAM_EARTH_L = new Location(222081, 190538, -15485);
+	private static final Location NEBULA_WATER_L = new Location(222149, 168087, -15485);
+	private static final Location PROCELLA_WIN_L = new Location(212884, 178847, -15485);
+	
+	private static final Location PETRAM_EARTH_RETURN_L = new Location(-114321, -77262, -11445);
+	private static final Location IGNIS_FIRE_RETURN_L = new Location(-114322, -77262, -11445);
+	private static final Location NEBULA_WATER_RETURN_L = new Location(-114323, -77262, -11445);
+	private static final Location PROCELLA_WIN_RETURN_L = new Location(-114324, -77262, -11445);
+	
+	private static final int[][][] portalConfigs = 
+	{
+	    {{EARTH_FIRST_TRIGGER_1, EARTH_FIRST_TRIGGER_2, KING_PETRAM}},
+	    {{FIRE_FIRST_TRIGGER_1, FIRE_FIRST_TRIGGER_2, KING_IGNIS}},
+	    {{WATER_FIRST_TRIGGER_1, WATER_FIRST_TRIGGER_2, KING_NEBULA}},
+	    {{WIND_FIRST_TRIGGER_1, WIND_FIRST_TRIGGER_2, KING_PROCELLA}}
+	};
+
+	private static final int[][] portalSpawnCoordinates = 
+	{
+	    {222063, 191514, -15486, 50142},  
+	    {202350, 169121, -15484, 48103},  
+	    {222127, 169057, -15486, 48730},  
+	    {212862, 179828, -15489, 48103}   
+	};
+	// @formatter:on
 	
 	private static final int TEMPLATE_ID = 214;
 	
 	private static final Map<Integer, NpcStringId> PORTAL_MSG = new HashMap<>();
 	static
 	{
-		PORTAL_MSG.put(1, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_EARTH_IS_OPEN);
+		PORTAL_MSG.put(0, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_EARTH_IS_OPEN);
+		PORTAL_MSG.put(1, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_FIRE_IS_OPEN);
 		PORTAL_MSG.put(2, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_WATER_IS_OPEN);
 		PORTAL_MSG.put(3, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_WIND_IS_OPEN);
-		PORTAL_MSG.put(4, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_FIRE_IS_OPEN);
-		PORTAL_MSG.put(5, NpcStringId.SEAL_STONE_DISAPPEARS_AFTER_RESONATING_WITH_THE_STATUE);
+		PORTAL_MSG.put(4, NpcStringId.SEAL_STONE_DISAPPEARS_AFTER_RESONATING_WITH_THE_STATUE);
 	}
 	
+	// Zone
+	private static final int DWELLING_CENTRAL = 21400000;
+	
+	private static final int IGNIS_PORTAL_ENTER_ID = 202201;
+	private static final int PETRAM_PORTAL_ENTER_ID = 202202;
+	private static final int NEBULA_PORTAL_ENTER_ID = 202203;
+	private static final int PROCELLA_PORTAL_ENTER_ID = 202204;
+	
+	// Portals return IDs
+	private static final int IGNIS_PORTAL_RETURN_ID = 202205;
+	private static final int PETRAM_PORTAL_RETURN_ID = 202206;
+	private static final int NEBULA_PORTAL_RETURN_ID = 202207;
+	private static final int PROCELLA_PORTAL_RETURN_ID = 202208;
+	
 	public DwellingOfSpirits()
 	{
 		super(TEMPLATE_ID);
 		addKillId(KING_PETRAM, KING_NEBULA, KING_PROCELLA, KING_IGNIS);
-		addKillId(PROCELLA_GUARDIAN_1);
-		addKillId(PETRAM_PIECE, PETRAM_FRAGMENT);
-		addKillId(WATER_SLIME);
+		addKillId(FAIRY_C1, FAIRY_C2, RUIP);
 		addAttackId(KING_PETRAM, KING_NEBULA, KING_PROCELLA, KING_IGNIS);
 		addSpawnId(KING_NEBULA);
 		addFirstTalkId(ANIMAEL, SEALSTONE);
 		addTalkId(ANIMAEL);
 		addStartNpc(SEALSTONE);
-		addCreatureSeeId(RUIP, ANIMAEL);
+		addCreatureSeeId(ANIMAEL);
+		addEnterZoneId(DWELLING_CENTRAL);
+		addEnterZoneId(IGNIS_PORTAL_ENTER_ID, IGNIS_PORTAL_RETURN_ID);
+		addEnterZoneId(PETRAM_PORTAL_ENTER_ID, PETRAM_PORTAL_RETURN_ID);
+		addEnterZoneId(NEBULA_PORTAL_ENTER_ID, NEBULA_PORTAL_RETURN_ID);
+		addEnterZoneId(PROCELLA_PORTAL_ENTER_ID, PROCELLA_PORTAL_RETURN_ID);
+		addInstanceEnterId(TEMPLATE_ID);
+		addInstanceLeaveId(TEMPLATE_ID);
 	}
 	
 	@Override
@@ -180,779 +191,106 @@ public class DwellingOfSpirits extends AbstractInstance
 			
 			case "TELEPORT":
 			{
-				player.teleToLocation(TeleportWhereType.TOWN, null);
-				return null;
-			}
-			//////////////// BOSS PROCELLA WIND ACTION /////////////
-			case "SPAWN_MINION_PROCELLA":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if ((world != null) && (npc.getId() == KING_PROCELLA))
+				final Instance instance = player.getInstanceWorld();
+				if (instance != null)
 				{
-					world.setParameter("minion1", addSpawn(PROCELLA_GUARDIAN_1, 212663, 179421, -15486, 31011, true, 0, true, npc.getInstanceId()));
-					world.setParameter("minion2", addSpawn(PROCELLA_GUARDIAN_1, 213258, 179822, -15486, 12001, true, 0, true, npc.getInstanceId()));
-					world.setParameter("minion3", addSpawn(PROCELLA_GUARDIAN_1, 212558, 179974, -15486, 12311, true, 0, true, npc.getInstanceId()));
-					startQuestTimer("HIDE_PROCELLA", 1000, world.getNpc(KING_PROCELLA), player);
+					instance.finishInstance();
+					player.teleToLocation(TeleportWhereType.TOWN, null);
 				}
-				break;
-			}
-			case "SPAWN_STORM_PROCELLA":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if ((world != null) && (world.getParameters().getInt("stormCount", 0) < STORM_MAX_COUNT))
-				{
-					world.getNpc(KING_PROCELLA).doCast(HURRICANE_SUMMON.getSkill());
-					final Npc procellaStorm = addSpawn(PROCELLA_STORM, world.getNpc(KING_PROCELLA).getX() + getRandom(-500, 500), world.getNpc(KING_PROCELLA).getY() + getRandom(-500, 500), world.getNpc(KING_PROCELLA).getZ(), 31011, true, 0, true, npc.getInstanceId());
-					procellaStorm.setRandomWalking(true);
-					world.getParameters().increaseInt("stormCount", 1);
-					startQuestTimer("SPAWN_STORM_PROCELLA", 30000, world.getNpc(KING_PROCELLA), player);
-					startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA", 100, procellaStorm, player);
-				}
-				break;
-			}
-			case "HIDE_PROCELLA":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world.getAliveNpcCount(PROCELLA_GUARDIAN_1) >= 1)
-				{
-					world.getNpc(KING_PROCELLA).setInvisible(true);
-				}
-				else if (world.getAliveNpcCount(PROCELLA_GUARDIAN_1) == 0)
-				{
-					world.getNpc(KING_PROCELLA).setInvisible(false);
-					startQuestTimer("SPAWN_MINION_PROCELLA", 90000 + getRandom(-15000, 11000), world.getNpc(KING_PROCELLA), player);
-				}
-				break;
-			}
-			case "CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world != null)
-				{
-					final Player plr = world.getPlayers().stream().findAny().orElse(null);
-					if ((plr != null) && (plr.isInsideRadius3D(npc, 200)))
-					{
-						npc.abortAttack();
-						npc.abortCast();
-						npc.setTarget(plr);
-						if (plr.getAffectedSkillLevel(HURRICANE_BOLT) == 1)
-						{
-							npc.abortCast();
-							startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA", 100, npc, player);
-						}
-						else
-						{
-							if (SkillCaster.checkUseConditions(npc, HURRICANE_BOLT_LV_1.getSkill()))
-							{
-								npc.doCast(HURRICANE_BOLT_LV_1.getSkill());
-							}
-						}
-						startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA", 100, npc, player);
-					}
-					else
-					{
-						startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA", 100, npc, player);
-					}
-				}
-				break;
-			}
-			//////////////// BOSS PETRAM EARTH ACTION /////////////
-			case "SPAWN_MINION":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world.getAliveNpcCount(PETRAM_FRAGMENT) == 0)
-				{
-					npc.doCast(EARTH_ENERGY.getSkill());
-					
-					if (!world.getParameters().getBoolean("spawnedMinions", false))
-					{
-						world.getParameters().set("spawnedMinions", true);
-						
-						final int stage = world.getParameters().getInt("stage", 0);
-						world.getParameters().set("stage", stage + 1);
-						
-						world.setParameter("minionpetram1", addSpawn(npc, PETRAM_FRAGMENT, 221543, 191530, -15486, 1131, false, -1, true, npc.getInstanceId()));
-						world.setParameter("minionpetram2", addSpawn(npc, PETRAM_FRAGMENT, 222069, 192019, -15486, 49364, false, -1, true, npc.getInstanceId()));
-						world.setParameter("minionpetram3", addSpawn(npc, PETRAM_FRAGMENT, 222595, 191479, -15486, 34013, false, -1, true, npc.getInstanceId()));
-						world.setParameter("minionpetram4", addSpawn(npc, PETRAM_FRAGMENT, 222077, 191017, -15486, 16383, false, -1, true, npc.getInstanceId()));
-						
-						npc.setInvul(true);
-						npc.broadcastSay(ChatType.NPC_SHOUT, "HaHahaha, fighters lets kill them. Now Im invul!!!");
-					}
-					
-					startQuestTimer("SUPPORT_PETRAM", 3000, npc, player);
-				}
-				break;
-			}
-			case "UNSPAWN_MINION":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world.getAliveNpcCount(PETRAM_FRAGMENT) == 0)
-				{
-					world.getParameters().set("spawnedMinions", false);
-					
-					npc.setInvul(false);
-					npc.broadcastSay(ChatType.NPC_SHOUT, "Nooooo... Nooooo...");
-				}
-				break;
-			}
-			case "SUPPORT_PETRAM":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world != null)
-				{
-					final Npc m1 = world.getParameters().getObject("minionpetram1", Npc.class);
-					final Npc m2 = world.getParameters().getObject("minionpetram2", Npc.class);
-					final Npc m3 = world.getParameters().getObject("minionpetram3", Npc.class);
-					final Npc m4 = world.getParameters().getObject("minionpetram4", Npc.class);
-					if (!m1.isDead())
-					{
-						m1.setTarget(world.getNpc(KING_PETRAM));
-						m1.doCast(TEST.getSkill());
-					}
-					if (!m2.isDead())
-					{
-						m2.setTarget(world.getNpc(KING_PETRAM));
-						m2.doCast(TEST.getSkill());
-					}
-					if (!m3.isDead())
-					{
-						m3.setTarget(world.getNpc(KING_PETRAM));
-						m3.doCast(TEST.getSkill());
-					}
-					if (!m4.isDead())
-					{
-						m4.setTarget(world.getNpc(KING_PETRAM));
-						m4.doCast(TEST.getSkill());
-					}
-					
-					startQuestTimer("SUPPORT_PETRAM", 10100, npc, player);
-				}
-				break;
-			}
-			case "EARTH_FURY":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world != null)
-				{
-					npc.doCast(EARTH_FURY.getSkill());
-				}
-				break;
-			}
-			//////////////// BOSS IGNIS ACTION /////////////
-			case "CAST_FIRE_RAGE_1":
-			{
-				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_2.getSkill()))
-				{
-					npc.doCast(FIRE_RAG_2.getSkill());
-				}
-				break;
-			}
-			case "CAST_FIRE_RAGE_2":
-			{
-				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_4.getSkill()))
-				{
-					npc.doCast(FIRE_RAG_4.getSkill());
-				}
-				break;
-			}
-			case "CAST_FIRE_RAGE_3":
-			{
-				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_6.getSkill()))
-				{
-					npc.doCast(FIRE_RAG_6.getSkill());
-				}
-				break;
-			}
-			case "CAST_FIRE_RAGE_4":
-			{
-				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_8.getSkill()))
-				{
-					npc.doCast(FIRE_RAG_8.getSkill());
-				}
-				break;
-			}
-			//////////////// BOSS NEBULA ACTION /////////////
-			case "SPAWN_WATER_SLIME":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world != null)
-				{
-					final Player plr = world.getPlayers().stream().findAny().get();
-					if (plr != null)
-					{
-						startQuestTimer("CAST_AQUA_RAGE", 30000 + getRandom(-15000, 15000), npc, plr);
-					}
-					if (npc.getId() == KING_NEBULA)
-					{
-						npc.doCast(AQUA_SUMMON.getSkill());
-						for (int i = 0; i < getRandom(4, 6); i++)
-						{
-							addSpawn(npc, WATER_SLIME, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, -1, true, npc.getInstanceId());
-							startQuestTimer("SPAWN_WATER_SLIME", 80000, npc, null);
-						}
-					}
-				}
-				break;
-			}
-			case "PLAYER_PARA":
-			{
-				if (player.getAffectedSkillLevel(AQUA_RAGE) == 5)
-				{
-					player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.FROZEN_PILLAR);
-					player.setImmobilized(true);
-					startQuestTimer("PLAYER_UNPARA", 5000, npc, player);
-				}
-				break;
-			}
-			case "PLAYER_UNPARA":
-			{
-				player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, AQUA_RAGE_5.getSkill());
-				player.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.FROZEN_PILLAR);
-				player.setImmobilized(false);
-				break;
-			}
-			case "CAST_AQUA_RAGE":
-			{
-				startQuestTimer("CAST_AQUA_RAGE", 5000, npc, player);
-				if ((player.isInsideRadius3D(npc, 1000)))
-				{
-					if (player.getAffectedSkillLevel(AQUA_RAGE) == 1)
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_2.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_2.getSkill());
-						}
-					}
-					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 2)
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_3.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_3.getSkill());
-						}
-					}
-					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 3)
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_4.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_4.getSkill());
-						}
-					}
-					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 4)
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_5.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_5.getSkill());
-							startQuestTimer("PLAYER_PARA", 100, npc, player);
-						}
-					}
-					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 5)
-					{
-						npc.abortCast();
-					}
-					else
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_1.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_1.getSkill());
-						}
-					}
-				}
-				break;
-			}
-			case "check_status":
-			{
-				final Instance world = player.getInstanceWorld();
-				if (!isInInstance(world))
-				{
-					return null;
-				}
-				
-				switch (world.getStatus())
-				{
-					case 0:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(1);
-							world.despawnGroup("sealstone");
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 1:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(2);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_1, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 2:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(3);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_2, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_3, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 3:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(4);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_4, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_5, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 4:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(5);
-							player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(3), null));
-							addSpawn(KING_PROCELLA, 212862, 179828, -15489, 48103, false, 0, false, world.getId());
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 5: // Dummy stage pause, u need defeat boss to continue.
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 6:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(7);
-							world.spawnGroup("ruipwave_1");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_1, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 7:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(8);
-							world.spawnGroup("NormalMobs");
-							world.spawnGroup("ruipwave_1");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_2, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_3, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 8:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(9);
-							world.spawnGroup("NormalMobs");
-							world.spawnGroup("ruipwave_2");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_4, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_5, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 9:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(10);
-							player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(1), null));
-							addSpawn(KING_PETRAM, 222063, 191514, -15486, 50142, false, 0, false, world.getId());
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 10: // Dummy stage pause, u need defeat boss to continue.
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 11:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 1)
-						{
-							world.setStatus(12);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_1, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 12:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 1)
-						{
-							world.setStatus(13);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_2, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_3, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 13:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 1)
-						{
-							world.setStatus(14);
-							world.spawnGroup("ruipwave_2");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_4, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_5, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 14:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 1)
-						{
-							world.setStatus(15);
-							player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(4), null));
-							addSpawn(KING_IGNIS, 202350, 169121, -15484, 48103, false, 0, false, world.getId());
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 15: // Dummy stage pause, u need defeat boss for continue.
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 16:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(17);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_1, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 17:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(18);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_2, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_3, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 18:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(19);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_4, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_5, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 19: // need defeat boss for finish.
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						
-						{
-							world.setStatus(20);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(2), null));
-							addSpawn(KING_NEBULA, 222127, 169057, -15486, 48730, false, 0, false, world.getId());
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 20:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.getParameters().set("DwellingOfSpiritsFinished", true);
-							world.setStatus(21);
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-				}
-				
-				return null;
 			}
 		}
 		
 		return super.onAdvEvent(event, npc, player);
-		
-	}
-	
-	@Override
-	public String onSpawn(Npc npc)
-	{
-		startQuestTimer("SPAWN_WATER_SLIME", 40000, npc, null);
-		return super.onSpawn(npc);
-	}
-	
-	@Override
-	public String onAttack(Npc npc, Player player, int damage, boolean isSummon, Skill skill)
-	{
-		final Instance world = npc.getInstanceWorld();
-		if (world == null)
-		{
-			return null;
-		}
-		
-		switch (npc.getId())
-		{
-			case KING_PROCELLA:
-			{
-				if (npc.getCurrentHp() < (npc.getMaxHp() * 0.90))
-				{
-					startQuestTimer("SPAWN_MINION_PROCELLA", 80000 + getRandom(-15000, 15000), npc, player);
-					startQuestTimer("SPAWN_STORM_PROCELLA", 4000, npc, player);
-					world.setParameter("stormCount", 0);
-				}
-				break;
-			}
-			case KING_PETRAM:
-			{
-				if (npc.getCurrentHp() < (npc.getMaxHp() * 0.80))
-				{
-					startQuestTimer("EARTH_FURY", 1000, npc, player);
-					if ((world.getParameters().getInt("stage", 0) == 0) || (npc.getCurrentHp() < (npc.getMaxHp() * 0.50)))
-					{
-						startQuestTimer("SPAWN_MINION", 1000, npc, player);
-					}
-				}
-				break;
-			}
-			case KING_IGNIS:
-			{
-				if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.90)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.70)))
-				{
-					startQuestTimer("CAST_FIRE_RAGE_1", 1000, npc, null);
-				}
-				else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.70)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.50)))
-				{
-					startQuestTimer("CAST_FIRE_RAGE_2", 1000, npc, null);
-				}
-				else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.50)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.40)))
-				{
-					startQuestTimer("CAST_FIRE_RAGE_3", 1000, npc, null);
-				}
-				else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.40)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.25)))
-				{
-					startQuestTimer("CAST_FIRE_RAGE_4", 1000, npc, null);
-				}
-				break;
-			}
-		}
-		
-		return null;
-	}
-	
-	@Override
-	public String onCreatureSee(Npc npc, Creature creature)
-	{
-		if (creature.isPlayer())
-		{
-			final Instance world = creature.getInstanceWorld();
-			if (world.getStatus() >= 5)
-			{
-				enableZoneWind();
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(WIND_FIRST_TRIGGER_1, true));
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(WIND_FIRST_TRIGGER_2, true));
-			}
-			else if (world.getStatus() >= 10)
-			{
-				enableZoneEarth();
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(EARTH_FIRST_TRIGGER_1, true));
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(EARTH_FIRST_TRIGGER_2, true));
-			}
-			else if (world.getStatus() >= 15)
-			{
-				enableZoneFire();
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(FIRE_FIRST_TRIGGER_1, true));
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(FIRE_FIRST_TRIGGER_2, true));
-			}
-			else if (world.getStatus() >= 20)
-			{
-				enableZoneWater();
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(WATER_FIRST_TRIGGER_1, true));
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(WATER_FIRST_TRIGGER_2, true));
-			}
-			else if (world.getStatus() >= 21)
-			{
-				world.despawnGroup("ruipwave_1");
-				world.despawnGroup("ruipwave_2");
-				world.despawnGroup("NormalMobs");
-				world.finishInstance();
-			}
-		}
-		
-		return super.onCreatureSee(npc, creature);
 	}
 	
 	@Override
 	public String onKill(Npc npc, Player player, boolean isSummon)
 	{
 		final Instance instance = npc.getInstanceWorld();
+		final StatSet worldParameters = instance.getParameters();
+		
+		int totalBossDefeatCount = worldParameters.getInt("totalBossDefeatCount", 0);
 		
 		switch (npc.getId())
 		{
-			case KING_PETRAM:
+			case RUIP:
+			case FAIRY_C1:
+			case FAIRY_C2:
 			{
-				final Npc portal = addSpawn(PORTAL_EVENT_EARTH, 222065, 192767, -15488, 16384, false, 0, false, instance.getId());
-				portal.setDisplayEffect(1); // set the portal visible
-				player.getVariables().set("DSIGNIS", 1);
-				setActive(true);
-				enableZoneEarthExit();
-				cancelQuestTimer("SPAWN_MINION", npc, player);
-				instance.setStatus(12);
-				final Instance world = npc.getInstanceWorld();
-				for (Npc spawn : world.getNpcs(PETRAM_FRAGMENT))
+				if (Rnd.get(100) <= PORTAL_OPEN_CHANCE)
 				{
-					spawn.deleteMe();
-				}
-				break;
-			}
-			case KING_NEBULA:
-			{
-				final Npc portal = addSpawn(PORTAL_EVENT_WATER, 222127, 170488, -15488, 16384, false, 0, false, instance.getId());
-				portal.setDisplayEffect(1);
-				player.getVariables().set("DSIGNIS", 1);
-				player.sendPacket(new ExSendUIEvent(player, false, false, 0, 0, NpcStringId.TIME_LEFT));
-				setActive(true);
-				enableZoneWindExit();
-				instance.setStatus(21);
-				instance.spawnGroup("animael");
-				break;
-			}
-			case KING_IGNIS:
-			{
-				final Npc portal = addSpawn(PORTAL_EVENT_FIRE, 202349, 170533, -15488, 16384, false, 0, false, instance.getId());
-				portal.setDisplayEffect(1);
-				player.getVariables().set("DSIGNIS", 1);
-				setActive(true);
-				enableZoneFireExit();
-				instance.setStatus(17);
-				break;
-			}
-			case KING_PROCELLA:
-			{
-				final Npc portal = addSpawn(PORTAL_EVENT_WIND, 212863, 181090, -15487, 16384, false, 0, false, instance.getId());
-				portal.setDisplayEffect(1);
-				player.getVariables().set("DSIGNIS", 1);
-				setActive(true);
-				enableZoneWaterExit();
-				instance.setStatus(7);
-				final Instance world = npc.getInstanceWorld();
-				for (Npc spawn : world.getNpcs(PROCELLA_GUARDIAN_1))
-				{
-					spawn.deleteMe();
-				}
-				break;
-			}
-			case PETRAM_FRAGMENT:
-			{
-				startQuestTimer("UNSPAWN_MINION", 1000, instance.getNpc(KING_PETRAM), player);
-				break;
-			}
-			case PROCELLA_GUARDIAN_1:
-			{
-				
-				startQuestTimer("HIDE_PROCELLA", 1000, instance.getNpc(KING_PROCELLA), player);
-				break;
-			}
-			case WATER_SLIME:
-			{
-				if (getRandomBoolean())
-				{
-					switch (player.getAffectedSkillLevel(AQUA_RAGE))
+					int portalId = Rnd.get(4);
+					boolean isPortalOpened = worldParameters.getBoolean("portal" + portalId + "Opened", false);
+					
+					if (!isPortalOpened)
 					{
-						case 1:
+						if (instance.getStatus() > totalBossDefeatCount)
 						{
-							player.stopSkillEffects(AQUA_RAGE_1.getSkill());
-							break;
-						}
-						case 2:
-						{
-							player.stopSkillEffects(AQUA_RAGE_2.getSkill());
-							final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 1);
-							skill.applyEffects(player, player);
-							break;
-						}
-						case 3:
-						{
-							player.stopSkillEffects(AQUA_RAGE_3.getSkill());
-							final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 2);
-							skill.applyEffects(player, player);
-							break;
-						}
-						case 4:
-						{
-							player.stopSkillEffects(AQUA_RAGE_4.getSkill());
-							final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 3);
-							skill.applyEffects(player, player);
-							break;
+							return super.onKill(npc, player, isSummon);
 						}
+						instance.setStatus(instance.getStatus() + 1);
+						openPortal(player, portalId, instance);
+						worldParameters.set("portal" + portalId + "Opened", true);
 					}
 				}
 				break;
 			}
+			
+			case KING_PETRAM:
+			case KING_PROCELLA:
+			case KING_IGNIS:
+			case KING_NEBULA:
+			{
+				spawnExitPortal(instance, player, npc.getId());
+				CheckGeneralResidenceStages(npc, instance);
+				
+				break;
+			}
 		}
 		
 		return super.onKill(npc, player, isSummon);
 	}
 	
+	@Override
+	public String onEnterZone(Creature creature, ZoneType zone)
+	{
+		Instance instance = creature.getInstanceWorld();
+		if ((instance != null) && creature.isPlayer())
+		{
+			
+			final StatSet worldParameters = instance.getParameters();
+			
+			if (zone.getId() == DWELLING_CENTRAL)
+			{
+				worldParameters.set("InsideResidence", true);
+				handleCentralZone(instance, worldParameters);
+			}
+			
+			int portalId = getPortalIdByZone(zone.getId());
+			Location[] locations = getLocationsForPortal(portalId);
+			
+			if ((portalId >= 0) && (locations[0] != null))
+			{
+				boolean isPortalOpened = worldParameters.getBoolean("portal" + portalId + "Opened", false);
+				boolean isPortalExitOpened = worldParameters.getBoolean("portalExit" + portalId, false);
+				boolean InsideResidence = worldParameters.getBoolean("InsideResidence", false);
+				
+				if (isPortalOpened && (InsideResidence))
+				{
+					creature.teleToLocation(locations[0], instance);
+					worldParameters.set("InsideResidence", false);
+				}
+				
+				if (isPortalExitOpened && (!InsideResidence))
+				{
+					creature.teleToLocation(locations[1], instance);
+				}
+			}
+			
+		}
+		return null;
+	}
+	
 	@Override
 	public String onFirstTalk(Npc npc, Player player)
 	{
@@ -971,87 +309,251 @@ public class DwellingOfSpirits extends AbstractInstance
 		return super.onFirstTalk(npc, player);
 	}
 	
-	// PORTALS
-	private void enableZoneWind()
+	private void openPortal(Player player, int id, Instance instance)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("dwelling_portal_wind");
-		if (zone != null)
+		
+		if ((id >= 0) && (id < portalSpawnCoordinates.length))
 		{
-			zone.setEnabled(true);
+			int[] coordinates = portalSpawnCoordinates[id];
+			int trigger1 = portalConfigs[id][0][0];
+			int trigger2 = portalConfigs[id][0][1];
+			int kingId = portalConfigs[id][0][2];
+			
+			if ((id >= 0) && (id < PORTAL_MSG.size()))
+			{
+				NpcStringId portalMessage = PORTAL_MSG.get(id);
+				player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, portalMessage, null));
+			}
+			addSpawn(kingId, coordinates[0], coordinates[1], coordinates[2], coordinates[3], false, 0, false, instance.getId());
+			
+			instance.setParameter("TRIGGER_1_" + id, trigger1);
+			instance.setParameter("TRIGGER_2_" + id, trigger2);
+			
+			instance.broadcastPacket(new OnEventTrigger(trigger1, true));
+			instance.broadcastPacket(new OnEventTrigger(trigger2, true));
+			
 		}
 	}
 	
-	private void enableZoneEarth()
+	private void spawnExitPortal(Instance instance, Player player, int bossId)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("dwelling_portal_earth");
-		if (zone != null)
+		Npc portal;
+		int portalId;
+		Location portalLocation;
+		
+		final StatSet worldParameters = instance.getParameters();
+		worldParameters.set("portalExit" + getPortalByBossId(bossId), true);
+		
+		switch (bossId)
 		{
-			zone.setEnabled(true);
+			case KING_PROCELLA:
+			{
+				portalId = PORTAL_EVENT_WIND;
+				portalLocation = new Location(212863, 181090, -15487);
+				break;
+			}
+			case KING_PETRAM:
+			{
+				portalId = PORTAL_EVENT_EARTH;
+				portalLocation = new Location(222065, 192767, -15488);
+				break;
+			}
+			case KING_IGNIS:
+			{
+				portalId = PORTAL_EVENT_FIRE;
+				portalLocation = new Location(202349, 170533, -15488);
+				break;
+			}
+			case KING_NEBULA:
+			{
+				portalId = PORTAL_EVENT_WATER;
+				portalLocation = new Location(222127, 170488, -15488);
+				break;
+			}
+			default:
+			{
+				return;
+			}
+		}
+		portal = addSpawn(portalId, portalLocation, false, 0, false, instance.getId());
+		
+		if (portal != null)
+		{
+			portal.setDisplayEffect(1);
+		}
+		
+	}
+	
+	private int getPortalByBossId(int bossId)
+	{
+		switch (bossId)
+		{
+			case KING_PETRAM:
+			{
+				return 0;
+			}
+			case KING_IGNIS:
+			{
+				return 1;
+			}
+			case KING_NEBULA:
+			{
+				return 2;
+			}
+			case KING_PROCELLA:
+			{
+				return 3;
+			}
+			default:
+				return -1;
 		}
 	}
 	
-	private void enableZoneFire()
+	private int getPortalIdByZone(int zoneId)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("dwelling_portal_fire");
-		if (zone != null)
+		switch (zoneId)
 		{
-			zone.setEnabled(true);
+			case PETRAM_PORTAL_ENTER_ID:
+			case PETRAM_PORTAL_RETURN_ID:
+			{
+				return 0;
+			}
+			case IGNIS_PORTAL_ENTER_ID:
+			case IGNIS_PORTAL_RETURN_ID:
+			{
+				return 1;
+			}
+			case NEBULA_PORTAL_ENTER_ID:
+			case NEBULA_PORTAL_RETURN_ID:
+			{
+				return 2;
+			}
+			case PROCELLA_PORTAL_ENTER_ID:
+			case PROCELLA_PORTAL_RETURN_ID:
+			{
+				return 3;
+			}
+			default:
+			{
+				return -1;
+			}
 		}
 	}
 	
-	private void enableZoneWater()
+	private Location[] getLocationsForPortal(int portalId)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("dwelling_portal_water");
-		if (zone != null)
+		Location[] locations = new Location[2];
+		
+		switch (portalId)
 		{
-			zone.setEnabled(true);
+			case 0:
+			{
+				locations[0] = PETRAM_EARTH_L;
+				locations[1] = PETRAM_EARTH_RETURN_L;
+				break;
+			}
+			case 1:
+			{
+				locations[0] = IGNIS_FIRE_L;
+				locations[1] = IGNIS_FIRE_RETURN_L;
+				break;
+			}
+			case 2:
+			{
+				locations[0] = NEBULA_WATER_L;
+				locations[1] = NEBULA_WATER_RETURN_L;
+				break;
+			}
+			case 3:
+			{
+				locations[0] = PROCELLA_WIN_L;
+				locations[1] = PROCELLA_WIN_RETURN_L;
+				break;
+			}
+		}
+		
+		return locations;
+	}
+	
+	private void CheckGeneralResidenceStages(Npc npc, Instance instance)
+	{
+		final StatSet worldParameters = instance.getParameters();
+		
+		int portalId = getPortalByBossId(npc.getId());
+		
+		if ((portalId >= 0) && (portalId < portalConfigs.length))
+		{
+			String bossDefeatCountKey = "bossOfPortal_" + portalId + "_defeat_count";
+			int currentDefeatCount = worldParameters.getInt(bossDefeatCountKey, 0);
+			int newDefeatCount = currentDefeatCount + 1;
+			
+			worldParameters.set(bossDefeatCountKey, newDefeatCount);
+		}
+		
+		int totalBossDefeatCount = 0;
+		
+		for (int i = 0; i < portalConfigs.length; i++)
+		{
+			String bossDefeatCountKey = "bossOfPortal_" + i + "_defeat_count";
+			totalBossDefeatCount += worldParameters.getInt(bossDefeatCountKey, 0);
+		}
+		
+		worldParameters.set("totalBossDefeatCount", totalBossDefeatCount);
+		
+		if (totalBossDefeatCount >= 4)
+		{
+			instance.spawnGroup("animael");
+			instance.despawnGroup("ruipwave_1");
+			instance.despawnGroup("NormalMobs");
 		}
 	}
 	
-	private void enableZoneWindExit()
+	private void handleCentralZone(Instance instance, StatSet worldParameters)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("return_portal_procella");
-		if (zone != null)
+		for (int id = 0; id < PORTAL_TRIGGER_IDS.length; id++)
 		{
-			zone.setEnabled(true);
-		}
-	}
-	
-	private void enableZoneEarthExit()
-	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("return_portal_petram");
-		if (zone != null)
-		{
-			zone.setEnabled(true);
-		}
-	}
-	
-	private void enableZoneFireExit()
-	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("return_portal_ignis");
-		if (zone != null)
-		{
-			zone.setEnabled(true);
-		}
-	}
-	
-	private void enableZoneWaterExit()
-	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("return_portal_nebula");
-		if (zone != null)
-		{
-			zone.setEnabled(true);
+			int trigger1 = worldParameters.getInt("TRIGGER_1_" + id, -1);
+			int trigger2 = worldParameters.getInt("TRIGGER_2_" + id, -1);
+			
+			if ((trigger1 != -1) && (trigger2 != -1))
+			{
+				instance.broadcastPacket(new OnEventTrigger(trigger1, true));
+				instance.broadcastPacket(new OnEventTrigger(trigger2, true));
+			}
 		}
 	}
 	
 	private void startEvent(Npc npc, Player player)
 	{
-		if (!player.getInstanceWorld().getParameters().getBoolean("DwellingOfSpiritsFinished", false))
+		final Instance instance = player.getInstanceWorld();
+		instance.setParameter("Running", true);
+		player.getInstanceWorld().broadcastPacket(new ExSendUIEvent(player, false, false, (int) (instance.getRemainingTime() / 1000), 0, NpcStringId.TIME_LEFT));
+		player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(4), null));
+		instance.spawnGroup("ruipwave_1");
+		instance.spawnGroup("NormalMobs");
+		
+		if (npc.getId() == SEALSTONE)
 		{
-			player.sendPacket(new ExSendUIEvent(player, false, false, 1800, 2, NpcStringId.TIME_LEFT));
-			player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(5), null));
-			startQuestTimer("check_status", 1000, null, player);
+			instance.despawnGroup("sealstone");
 		}
+		
+	}
+	
+	@Override
+	public void onInstanceEnter(Player player, Instance instance)
+	{
+		boolean Running = instance.getParameters().getBoolean("Running", false);
+		if ((instance.getRemainingTime() > 0) && Running)
+		{
+			player.sendPacket(new ExSendUIEvent(player, false, false, (int) (instance.getRemainingTime() / 1000), 0, NpcStringId.TIME_LEFT));
+		}
+	}
+	
+	@Override
+	public void onInstanceLeave(Player player, Instance instance)
+	{
+		
+		player.sendPacket(new ExSendUIEvent(player, false, false, 0, 0, NpcStringId.TIME_LEFT));
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
index ff278fe85c..3465ec2a61 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.ai.AttackableAI;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.instancemanager.InstanceManager;
@@ -59,6 +60,8 @@ public class TimedHunting extends AbstractInstance
 	private static final int PANJI = 34125;
 	// Skill
 	private static final int BUFF = 45197;
+	private static final int BUFF_FOR_KAMAEL = 45198;
+	
 	// Misc
 	private static final int[] TEMPLATES =
 	{
@@ -187,7 +190,14 @@ public class TimedHunting extends AbstractInstance
 		}
 		
 		npc.setTarget(player);
-		if (!player.getEffectList().isAffectedBySkill(BUFF))
+		if (player.getRace() == Race.KAMAEL)
+		{
+			if (!player.getEffectList().isAffectedBySkill(BUFF_FOR_KAMAEL))
+			{
+				npc.doCast(new SkillHolder(BUFF_FOR_KAMAEL, 1).getSkill());
+			}
+		}
+		else if (!player.getEffectList().isAffectedBySkill(BUFF))
 		{
 			npc.doCast(new SkillHolder(BUFF, 1).getSkill());
 		}
@@ -257,6 +267,7 @@ public class TimedHunting extends AbstractInstance
 		player.sendPacket(new TimedHuntingZoneExit(108)); // Training Zone id.
 		
 		player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, BUFF);
+		player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, BUFF_FOR_KAMAEL);
 		instance.setParameter("PlayerIsOut", true);
 		
 		// Restore normal skills.
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/augmentation/options/50100-50199.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/augmentation/options/50100-50199.xml
index 28a7785bff..cf92d27a6e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/augmentation/options/50100-50199.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/augmentation/options/50100-50199.xml
@@ -675,38 +675,38 @@
 	</option>
 	<option id="50188" name="o_s_cl_deliverance">
 		<!-- <Arcane Deliverance>\nWhen triggered: Recovers 6000 HP, 1000 MP and 3000 CP when HP is lower than 20%. -->
-		<passive_skill id="39325" level="2" /> <!-- unknown skill -->
+		<passive_skill id="39325" level="1" /> <!-- Arcane Deliverance -->
 	</option>
 	<option id="50189" name="o_s_cl_speed">
 		<!-- <Arcane Speed>\nWhen triggered: Atk. Spd. +100, Casting Spd. +150, Speed +10. -->
-		<passive_skill id="39326" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39326" level="1" /> <!-- Arcane Speed -->
 	</option>
 	<option id="50190" name="o_s_cl_barrier">
 		<!-- <Arcane Barrier>\nWhen triggered: Absorbs 4000 damage. -->
-		<passive_skill id="39327" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39327" level="1" /> <!-- Arcane Barrier -->
 	</option>
 	<option id="50191" name="o_s_cl_immunity">
 		<!-- <Arcane Immunity>\nWhen triggered: Grants immunity to debuffs. -->
-		<passive_skill id="39328" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39328" level="1" /> <!-- Arcane Immunity -->
 	</option>
 	<option id="50192" name="o_s_cl_protection">
 		<!-- <Arcane Protection>\nWhen triggered: P. Def. +3000, M. Def. +2100. -->
-		<passive_skill id="39329" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39329" level="1" /> <!-- Arcane Protection -->
 	</option>
 	<option id="50193" name="o_s_cl_paralysis">
 		<!-- <Arcane Paralysis>\nWhen triggered: Paralyzes the target. -->
-		<passive_skill id="39330" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39330" level="1" /> <!-- Arcane Paralysis -->
 	</option>
 	<option id="50194" name="o_s_cl_silence">
 		<!-- <Arcane Silence>\nWhen triggered: Inflicts Silence on the target. -->
-		<passive_skill id="39331" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39331" level="1" /> <!-- Arcane Silence -->
 	</option>
 	<option id="50195" name="o_s_cl_sense">
 		<!-- <Arcane Critical Sense>\nAll Critical Rate +3%, All Critical Damage +150 -->
-		<passive_skill id="39332" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39332" level="1" /> <!-- Arcane Critical Sense -->
 	</option>
 	<option id="50196" name="o_s_cl_power">
 		<!-- <Arcane Power>\nP. Atk. +350, M. Atk. +500 -->
-		<passive_skill id="39333" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39333" level="1" /> <!-- Arcane Power -->
 	</option>
 </list>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/49400-49499.xml
index a63d93c362..a092c48a74 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/49400-49499.xml
@@ -1430,13 +1430,23 @@
 	<item id="49489" name="Chest of Enchant Scroll's Parts" additionalName="Not Available" type="EtcItem">
 		<!-- The item is not available. Double-click to obtain an Enchantment Scroll's Part. Note! Сannot be exchanged, dropped, or sold. -->
 		<set name="icon" val="icon.etc_treasure_box_i08" />
-		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="default_action" val="PEEL" />
 		<set name="material" val="FISH" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="49474" min="1" max="1" chance="20" /> <!-- Scroll Part: Enchant Weapon -->
+			<item id="49475" min="1" max="1" chance="50" /> <!-- Scroll Part: Enchant Armor -->
+			<item id="49476" min="1" max="1" chance="2" /> <!-- Refined Scroll Part: Enchant Weapon -->
+			<item id="49478" min="1" max="1" chance="13" /> <!-- Refined Scroll Part: Enchant Armor -->
+			<item id="49479" min="1" max="1" chance="2" /> <!-- Solid Scroll Part: Enchant Weapon -->
+			<item id="49480" min="1" max="1" chance="13" /> <!-- Solid Scroll Part: Enchant Armor -->
+		</capsuled_items>
 	</item>
 	<item id="49490" name="Fishing Kit" additionalName="Sealed" type="EtcItem">
 		<!-- Double-click to obtain the following. -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/49500-49599.xml
index c5f3ed946e..0408ee1631 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/49500-49599.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/49500-49599.xml
@@ -424,6 +424,8 @@
 		<!-- Momentarily recovers 500 HP. If HP is full, CP is recovered. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="LIQUID" />
 		<set name="weight" val="1" />
 		<set name="is_tradable" val="false" />
@@ -431,6 +433,12 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="is_event_restricted" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<skills>
+			<skill id="39103" level="1" /> <!-- Quick Hero Healing Potion -->
+		</skills>
 	</item>
 	<item id="49534" name="Hero's Cube" additionalName="7-day" type="EtcItem">
 		<!-- Available for 7 days. Required level: 20. Double-click to obtain Soulshot Ticket, Buff Scroll Chest, Hero's Top-grade HP Replenishing Potion, Hero's HP Recovery Potion, Angel Cat's Blessing, Improved Scroll of Resurrection, Chest of Enchant Scroll's Parts, Fishing Kit, Box of Scroll of Escape to Base, Blade Spirit, Spellbook Chest. Can be used only once a day. -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/49800-49899.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/49800-49899.xml
index 70bb0106ed..060d7c9031 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/49800-49899.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/49800-49899.xml
@@ -773,6 +773,10 @@
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="time" val="10080" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39199" level="1" /> <!-- Hero's Wondrous Cubic -->
+		</skills>
 	</item>
 	<item id="49861" name="Life Stone - Tester" additionalName="Not Available" type="EtcItem">
 		<!-- The item is not available. Test. -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94100-94199.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94100-94199.xml
index 29d4a5bed0..d407b28008 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94100-94199.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94100-94199.xml
@@ -292,6 +292,16 @@
 		<cond msgId="113" addName="1">
 			<player level="60" />
 		</cond>
+		<skills>
+			<skill id="35020" level="1" type="ON_EQUIP" /> <!-- Equip Talisman - Baium -->
+			<skill id="35021" level="1" type="ON_UNEQUIP" /> <!-- Unequip Talisman - Baium -->
+			<skill id="35017" level="7" /> <!-- Equip Talisman - Baium -->
+			<skill id="50191" level="1" type="ON_ENCHANT" type_value="1" /> <!-- Enchant Effect: +1 Talisman of Baium -->
+			<skill id="50191" level="2" type="ON_ENCHANT" type_value="2" /> <!-- Enchant Effect: +2 Talisman of Baium -->
+			<skill id="50191" level="3" type="ON_ENCHANT" type_value="3" /> <!-- Enchant Effect: +3 Talisman of Baium -->
+			<skill id="50191" level="4" type="ON_ENCHANT" type_value="4" /> <!-- Enchant Effect: +4 Talisman of Baium -->
+			<skill id="50191" level="5" type="ON_ENCHANT" type_value="5" /> <!-- Enchant Effect: +5 Talisman of Baium -->
+		</skills>
 	</item>
 	<item id="94120" name="Package: Talisman of Baium" additionalName="Sealed" type="EtcItem">
 		<!-- Double-click to obtain the following. -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94400-94499.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94400-94499.xml
index 6cfc106ba4..4accf380d8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94400-94499.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94400-94499.xml
@@ -1232,7 +1232,10 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="40238" level="1" /> <!-- XP +100,000,000 -->
+		</skills>
 	</item>
 	<item id="94481" name="Clan XP" additionalName="Sealed" type="EtcItem">
 		<!-- Clan XP is granted as a reward. -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94500-94599.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94500-94599.xml
index b4d0dd3e5b..d974c2742d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94500-94599.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94500-94599.xml
@@ -190,7 +190,10 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="40241" level="1" />
+		</skills>
 	</item>
 	<item id="94518" name="Amber Lv. 5" additionalName="Sealed" type="Armor">
 		<!-- <Active skill>. Interrupts a skill used by the target. <PvP effect>. Ignores CP and deals 2000 fixed damage. Effects of two identical jewels do not stack, the higher-level jewel takes precedence. -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94600-94699.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94600-94699.xml
index a5505594dc..68c20e3f6e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94600-94699.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/94600-94699.xml
@@ -604,7 +604,10 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="40250" level="1" /> <!-- XP +100,000,000 -->
+		</skills>
 	</item>
 	<item id="94636" name="Pet's XP Growth Scroll" additionalName="Sealed" type="EtcItem">
 		<!-- Applies a buff when used. <Buff effect>. Pet's acquired XP +30%. Duration: 20 min. Cooldown: 1 min. The effect disappears when a pet dies or is recalled. -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/pets/16079_BuffaloCalt.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/pets/16079_BuffaloCalf.xml
similarity index 100%
rename from L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/pets/16079_BuffaloCalt.xml
rename to L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/pets/16079_BuffaloCalf.xml
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/01800-01899.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/01800-01899.xml
index 9ff2b17826..68464b2198 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/01800-01899.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/01800-01899.xml
@@ -1318,6 +1318,7 @@
 			<value level="1">1</value>
 			<value level="2">2</value>
 			<value level="3">3</value>
+			<value level="4">4</value>
 		</abnormalLevel>
 		<abnormalTime>3</abnormalTime>
 		<abnormalType>KNOCKDOWN</abnormalType>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/39100-39199.xml
index 486988c94b..e6e8312c96 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/39100-39199.xml
@@ -57,7 +57,19 @@
 	</skill>
 	<skill id="39103" toLevel="1" name="Hero's HP Recovery Potion">
 		<icon>icon.etc_reagent_white_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<amount>500</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39104" toLevel="1" name="Hero's Cube - 7 d.">
 		<icon>icon.sa_cube</icon>
@@ -2511,6 +2523,59 @@
 	</skill>
 	<skill id="39199" toLevel="1" name="Hero's Wondrous Cube - 7 d.">
 		<icon>icon.sa_cube</icon>
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<reuseDelay>-1</reuseDelay>
+		<hitTime>500</hitTime>
+		<coolTime>500</coolTime>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpEncumbered">
+				<weightPercent>20</weightPercent>
+				<slotsPercent>10</slotsPercent>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="RestorationRandom">
+				<items>
+					<item chance="16">
+						<item id="49487" count="2"/> <!-- Soulshot Ticket -->
+					</item>
+					<item chance="4">
+						<item id="49772" count="1"/> <!-- Scroll of Mood Melody -->
+					</item>
+					<item chance="16.49">
+						<item id="49488" count="5"/> <!-- Major Healing Potion -->
+					</item>
+					<item chance="20">
+						<item id="35669" count="1"/> <!-- Angel Cat's Blessing -->
+					</item>
+					<item chance="5">
+						<item id="49533" count="1"/> <!-- Quick Hero Healing Potion -->
+					</item>
+					<item chance="10">
+						<item id="49542" count="1"/> <!-- Improved Scroll of Resurrection -->
+					</item>
+					<item chance="14.5">
+						<item id="49536" count="1"/> <!-- Box of Scroll of Escape to the Base -->
+					</item>
+					<item chance="2">
+						<item id="49489" count="3"/> <!-- Parts of Enchantment Scrolls Chest -->
+					</item>
+					<item chance="10">
+						<item id="49416" count="1"/> <!-- Blade Spirit -->
+					</item>
+					<item chance="0.01">
+						<item id="49859" count="1"/> <!-- Weapon Exchange Coupon -->
+					</item>
+					<item chance="2">
+						<item id="49490" count="1"/> <!-- Fishing Kit -->
+					</item>
+				</items>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/39200-39299.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/39200-39299.xml
index 0a755be9b6..cc3003ffd1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/39200-39299.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/39200-39299.xml
@@ -2064,7 +2064,7 @@
 		<abnormalTime>1200</abnormalTime>
 		<abnormalLevel>
 			<value level="1">1</value>
-			<value level="1">2</value>
+			<value level="2">2</value>
 		</abnormalLevel>
 		<isMagic>4</isMagic>
 		<reuseDelay>60000</reuseDelay>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/39300-39399.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/39300-39399.xml
index a8c125ca10..2c9c81f790 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/39300-39399.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/39300-39399.xml
@@ -484,14 +484,14 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="39325" toLevel="3" name="Arcane Deliverance">
+	<skill id="39325" toLevel="1" name="Arcane Deliverance">
 		<!-- Recovers HP/ MP/ CP after an attack. (20% of Max HP and lower) -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
 		<hitTime>500</hitTime>
 		<reuseDelay>900000</reuseDelay>
 	</skill>
-	<skill id="39326" toLevel="3" name="Arcane Speed">
+	<skill id="39326" toLevel="1" name="Arcane Speed">
 		<!-- Increases Speed, Atk. Spd. and Casting Spd. after an attack. -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -499,7 +499,7 @@
 		<reuseDelay>900000</reuseDelay>
 		<effectPoint>100</effectPoint>
 	</skill>
-	<skill id="39327" toLevel="3" name="Arcane Barrier">
+	<skill id="39327" toLevel="1" name="Arcane Barrier">
 		<!-- Creates a barrier for a while when damage is taken. -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -507,7 +507,7 @@
 		<reuseDelay>900000</reuseDelay>
 		<effectPoint>100</effectPoint>
 	</skill>
-	<skill id="39328" toLevel="3" name="Arcane Immunity">
+	<skill id="39328" toLevel="1" name="Arcane Immunity">
 		<!-- Grants immunity to debuffs and anomaly states for a while when damage is taken. -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -515,7 +515,7 @@
 		<reuseDelay>600000</reuseDelay>
 		<effectPoint>100</effectPoint>
 	</skill>
-	<skill id="39329" toLevel="3" name="Arcane Protection">
+	<skill id="39329" toLevel="1" name="Arcane Protection">
 		<!-- Increases P./ M. Def for a while when damage is taken. -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -523,7 +523,7 @@
 		<reuseDelay>600000</reuseDelay>
 		<effectPoint>100</effectPoint>
 	</skill>
-	<skill id="39330" toLevel="3" name="Arcane Paralysis">
+	<skill id="39330" toLevel="1" name="Arcane Paralysis">
 		<!-- Temporarily paralyzes the enemy after an attack. -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -534,7 +534,7 @@
 		<reuseDelay>300000</reuseDelay>
 		<effectPoint>-100</effectPoint>
 	</skill>
-	<skill id="39331" toLevel="3" name="Arcane Silence">
+	<skill id="39331" toLevel="1" name="Arcane Silence">
 		<!-- Temporarily inflicts Silence on the enemy after an attack. -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -545,7 +545,7 @@
 		<reuseDelay>300000</reuseDelay>
 		<effectPoint>-100</effectPoint>
 	</skill>
-	<skill id="39332" toLevel="3" name="Arcane Critical Sense">
+	<skill id="39332" toLevel="1" name="Arcane Critical Sense">
 		<!-- All Critical Rate +3%. All Critical Damage +150 -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -556,7 +556,7 @@
 		<effectPoint>-671</effectPoint>
 		<mpConsume>43</mpConsume>
 	</skill>
-	<skill id="39333" toLevel="3" name="Arcane Power">
+	<skill id="39333" toLevel="1" name="Arcane Power">
 		<!-- P. Atk. +350. M. Atk. +500 -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/40200-40299.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/40200-40299.xml
index ce67a989f5..9a4afc46fc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/40200-40299.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/40200-40299.xml
@@ -622,11 +622,14 @@
 		<itemConsumeCount>1</itemConsumeCount>
 		<itemConsumeId>94480</itemConsumeId>
 		<magicCriticalRate>5</magicCriticalRate>
-		<hitCancelTime>0</hitCancelTime>
-		<magicLevel>1</magicLevel>
 		<reuseDelay>5</reuseDelay>
 		<targetType>PET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="GivePetXp">
+				<xp>100000000</xp>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="40239" toLevel="1" name="Pet Buff Scroll">
 		<!-- Max HP +1000. P. Def. +300. M. Def. +300. HP Recovery Rate +10 -->
@@ -644,12 +647,14 @@
 		<operateType>A1</operateType>
 		<itemConsumeCount>1</itemConsumeCount>
 		<itemConsumeId>94517</itemConsumeId>
-		<magicCriticalRate>5</magicCriticalRate>
-		<hitCancelTime>0</hitCancelTime>
-		<magicLevel>1</magicLevel>
 		<reuseDelay>5</reuseDelay>
 		<targetType>PET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="GivePetXp">
+				<xp>2000000000</xp>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="40242" toLevel="1" name="Sayha's Blessing Scroll">
 		<icon>icon.skill0000</icon>
@@ -838,6 +843,16 @@
 		<!-- Pet XP +1,000,000. -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>94635</itemConsumeId>
+		<reuseDelay>5</reuseDelay>
+		<targetType>PET</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="GivePetXp">
+				<xp>1000000</xp>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="40251" toLevel="1" name="Pet's XP Growth Scroll">
 		<!-- Pet's XP +30%. Removed when your pet is dead or recalled. -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45100-45199.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45100-45199.xml
index 6b96075260..bcc2b9676e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45100-45199.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45100-45199.xml
@@ -4251,10 +4251,11 @@
 	<skill id="45198" toLevel="1" name="Grand Master's Transcendent Blessing">
 		<!-- Grand Master's power has allowed you to push the limits of your class. Attention!. You can't consume Light Souls and Shadow Souls. -->
 		<icon>icon.skill_kamael_shadowside</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
 		<abnormalLevel>1</abnormalLevel>
 		<abnormalTime>600</abnormalTime>
-		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<abnormalType>KAMAEL_TRANSFORM</abnormalType>
+		<abnormalVisualEffect>KAMAEL_BLACK_TRANSFORM;LONG_RAPIER_BLACK_AVE;BLACK_STANCE_AVE</abnormalVisualEffect>
 		<isMagic>4</isMagic>
 		<magicLevel>
 			<value level="1">20</value>
@@ -4262,9 +4263,21 @@
 		</magicLevel>
 		<operateType>A2</operateType>
 		<effectPoint>1</effectPoint>
-		<abnormalVisualEffect>U_ER_WI_WINDHIDE_AVE</abnormalVisualEffect>
 		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="BlockAbnormalSlot">
+				<slot>TRANSFORM</slot>
+			</effect>
+			<effect name="AdditionalPotionHp">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MpVampiricAttack">
+				<amount>3</amount>
+				<chance>50</chance>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="45199" toLevel="24" name="Transcendent Power Strike">
 		<!-- The character prepares for making a destructive blow. Attacks the enemy with 45 power. The skill can be used only in the transcendent instance zones. -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/47000-47099.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/47000-47099.xml
index 0afbd78e34..0105ad6526 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/47000-47099.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/47000-47099.xml
@@ -1628,6 +1628,7 @@
 			<value level="1">1</value>
 			<value level="2">2</value>
 			<value level="3">3</value>
+			<value level="4">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalLevel>
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>CHEAP_MAGIC</abnormalType>
@@ -1639,6 +1640,7 @@
 			<value level="1">20</value>
 			<value level="2">30</value>
 			<value level="3">40</value>
+			<value level="4">40</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</magicLevel>
 		<itemConsumeCount>3</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
@@ -1654,6 +1656,7 @@
 					<value level="1">-10</value>
 					<value level="2">-15</value>
 					<value level="3">-20</value>
+					<value level="4">-20</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 				</amount>
 				<mode>PER</mode>
 				<magicType>0</magicType>
@@ -1663,6 +1666,7 @@
 					<value level="1">-4</value>
 					<value level="2">-7</value>
 					<value level="3">-10</value>
+					<value level="4">-10</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 				</amount>
 				<mode>PER</mode>
 				<magicType>1</magicType>
@@ -1672,6 +1676,7 @@
 					<value level="1">-10</value>
 					<value level="2">-15</value>
 					<value level="3">-20</value>
+					<value level="4">-20</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 				</amount>
 				<mode>PER</mode>
 				<magicType>3</magicType>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50400-50499.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50400-50499.xml
index 006f4e2efd..4f57abcb3b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50400-50499.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/50400-50499.xml
@@ -165,8 +165,12 @@
 				<amount>80</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxPhysicalCriticalRate">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>50</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
@@ -266,8 +270,12 @@
 				<amount>150</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxPhysicalCriticalRate">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>50</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
@@ -306,8 +314,6 @@
 		<!-- All Critical Damage +200. Increases Max Critical Rate. -->
 		<icon>icon.bless_effect_enchant</icon>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
-		<magicLevel>1</magicLevel>
 		<effects>
 			<effect name="CriticalDamage">
 				<amount>200</amount>
@@ -321,8 +327,12 @@
 				<amount>200</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxPhysicalCriticalRate">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>50</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/55200-55299.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/55200-55299.xml
index 2cffe2e1be..96c2ecb1d9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/55200-55299.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/55200-55299.xml
@@ -500,7 +500,7 @@
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>ATTACK_TIME_DOWN</abnormalType>
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer’s Potion -->
+		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer's Potion -->
 		<mpConsume>75</mpConsume>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/documentation.txt
index 82645059a7..969d4b3611 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/documentation.txt
@@ -12,6 +12,8 @@ AddHuntingTime: Add time for time limited hunting zones. (l2jmobius)
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -145,6 +147,7 @@ GiveExpAndSp: Gives a given amount of XP and SP. (l2jmobius)
 GiveFame: Gives a given amount of Fame. (l2jmobius)
 GiveHonorCoins: Gives a given amount of Honor Coins. (l2jmobius)
 GiveItemByExp: Gives an item when a certain amount of EXP is gathered. (l2jmobius)
+GivePetXp: Gives a given amount of XP to a pet. (l2jmobius)
 GiveRecommendation: Gives recommendations to a player. Blue name.
 GiveSp: Gives a given amount of SP.
 GiveXp: Gives a given amount of XP. (l2jmobius)
@@ -164,10 +167,11 @@ HpCpHealCritical: HpCp heal effects always trigger Magic Critical Hit.
 HpCpHeal: Increases current HP by a given amount. If the given amount exceeds maximum HP, it increases current CP with the rest value as well.
 HpDrain: Magical attack that absorbs given percentage of the damage inflicted as HP.
 Hp: Increases current HP by a static value.
-HpLimit: Increase a character's max hp limit (l2jmobius)
+HpLimit: Increase a character's max hp limit. (l2jmobius)
 HpRegen: HP Regeneration stat.
 HpToOwner: DOT effect that absorbs HP over time.
 IgnoreDeath: Become undying. Hp cannot decrease below 1.
+IgnoreReduceDamage: Ignore ReduceDamage effect implementation. (l2jmobius)
 ImmobileDamageBonus: Bonus damage to immobile targets. (l2jmobius)
 ImmobileDamageResist: Resist damage while immobile. (l2jmobius)
 ImmobilePetBuff: Causes your pet to become immobilized.
@@ -208,7 +212,6 @@ MAtk: M. Atk. stat.
 MAtkByPAtk: M. Atk. bonus from P. Atk stat. (l2jmobius)
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyCraftPoints: Modifies player Craft Point count. (l2jmobius)
 ModifyDeathPoints: Modifies player Death Point count. (l2jmobius)
@@ -275,6 +278,7 @@ RearDamage: Multiplier for damage done from behind the target. (l2jmobius)
 RebalanceHP: Balances targets' current HP.
 RebalanceHPSummon: Balances targets' current HP for summons.
 RecoverVitalityInPeaceZone: Recover periodically vitality when player is in a peace zone. (l2jmobius)
+ReduceDamage: Reduce damage effect implementation.
 ReduceCancel: Magic skill casting interruption stat.
 ReduceDropPenalty: Reduces EXP lost and death penalty chance.
 ReflectMagic: Deflects magical damage back to the attacker.
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/LimitShop.xsd b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/LimitShop.xsd
index 02d5bc1963..4b05db8578 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/LimitShop.xsd
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/LimitShop.xsd
@@ -40,6 +40,7 @@
 											<xs:attribute type="xs:long" name="count5" use="optional"/>
 											<xs:attribute type="xs:boolean" name="announce5" use="optional"/>
 											<xs:attribute type="xs:int" name="accountDailyLimit" use="optional"/>
+											<xs:attribute type="xs:int" name="accountMontlyLimit" use="optional"/>
 											<xs:attribute type="xs:int" name="accountBuyLimit" use="optional"/>
 										</xs:extension>
 									</xs:simpleContent>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/PetExtractData.xsd b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/PetExtractData.xsd
new file mode 100644
index 0000000000..e9115b614a
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/PetExtractData.xsd
@@ -0,0 +1,24 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+	<xs:element name="list">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="extraction" maxOccurs="unbounded" minOccurs="0">
+					<xs:complexType>
+						<xs:simpleContent>
+							<xs:extension base="xs:string">
+								<xs:attribute type="xs:short" name="petId" />
+								<xs:attribute type="xs:int" name="petLevel" />
+								<xs:attribute type="xs:long" name="extractExp" />
+								<xs:attribute type="xs:int" name="extractItem"/>
+								<xs:attribute type="xs:int" name="defaultCostId" />
+								<xs:attribute type="xs:long" name="defaultCostCount" />
+								<xs:attribute type="xs:int" name="extractCostId" />
+								<xs:attribute type="xs:long" name="extractCostCount" />
+							</xs:extension>
+						</xs:simpleContent>
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/zones/no_landing.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/zones/no_landing.xml
index 4b280f64a8..88b454d0db 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/zones/no_landing.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/zones/no_landing.xml
@@ -58,4 +58,41 @@
 		<node X="-98296" Y="-262136" />
 		<node X="-65544" Y="-229384" />
 	</zone>
+	
+	<!-- Dwelling of Spirits zones -->
+	<zone id="202201" name="dwelling_portal_enter_fire" type="NoLandingZone" shape="Cuboid" minZ="-12209" maxZ="-10700">
+		<node X="-115236" Y="-77408" />
+		<node X="-115617" Y="-77631" />
+	</zone>
+	<zone id="202202" name="dwelling_portal_enter_earth" type="NoLandingZone" shape="Cuboid" minZ="-12209" maxZ="-10700">
+		<node X="-113417" Y="-77633" />
+		<node X="-113032" Y="-77411" />
+	</zone>
+	<zone id="202203" name="dwelling_portal_enter_water" type="NoLandingZone" shape="NPoly" minZ="-12209" maxZ="-10700">
+		<node X="-115160" Y="-79013" />
+		<node X="-115333" Y="-79182" />
+		<node X="-115216" Y="-79282" />
+		<node X="-115053" Y="-79121" />
+	</zone>
+	<zone id="202204" name="dwelling_portal_enter_wind" type="NoLandingZone" shape="NPoly" minZ="-12209" maxZ="-10700">
+		<node X="-113596" Y="-79120" />
+		<node X="-113436" Y="-79275" />
+		<node X="-113325" Y="-79176" />
+		<node X="-113490" Y="-79012" />
+	</zone>
+	<zone id="202205" name="dwelling_portal_return_fire" type="NoLandingZone" shape="Cylinder" minZ="-15515" maxZ="-15400" rad="230">
+		<node X="202349" Y="170533" />
+	</zone>
+	<zone id="202206" name="dwelling_portal_return_earth" type="NoLandingZone" shape="Cylinder" minZ="-15515" maxZ="-15400" rad="230">
+		<node X="222065" Y="192767" />
+	</zone>
+	<zone id="202207" name="dwelling_portal_return_water" type="NoLandingZone" shape="Cylinder" minZ="-15515" maxZ="-15400" rad="230">
+		<node X="222127" Y="170488" />
+	</zone>
+	<zone id="202208" name="dwelling_portal_return_wind" type="NoLandingZone" shape="Cylinder" minZ="-15515" maxZ="-15400" rad="230">
+		<node X="212855" Y="181242" />
+	</zone>
+	<zone id="21400000" name="dwelling_central" type="NoLandingZone" shape="Cylinder" minZ="-12209" maxZ="-10700" rad="1000">
+		<node X="-114339" Y="-78005" />
+	</zone>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/zones/teleportzones.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/zones/teleportzones.xml
index 19a95e0456..d0510c8833 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/zones/teleportzones.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/zones/teleportzones.xml
@@ -1,81 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/zones.xsd">
-	<zone name="dwelling_portal_earth" type="TeleportZone" shape="Cylinder" minZ="-11518" maxZ="-11218" rad="100">
-		<stat name="oustX" val="222086" />
-		<stat name="oustY" val="190539" />
-		<stat name="oustZ" val="-15488" />
-		<stat name="default_enabled" val="false" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="-113465" Y="-77520" />
-	</zone>
-	<zone name="dwelling_portal_wind" type="TeleportZone" shape="Cylinder" minZ="-11518" maxZ="-11218" rad="100">
-		<stat name="oustX" val="222151" />
-		<stat name="oustY" val="168077" />
-		<stat name="oustZ" val="-15488" />
-		<stat name="default_enabled" val="false" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="-115115" Y="-79080" />
-	</zone>
-	<zone name="dwelling_portal_water" type="TeleportZone" shape="Cylinder" minZ="-11518" maxZ="-11218" rad="100">
-		<stat name="oustX" val="212886" />
-		<stat name="oustY" val="178829" />
-		<stat name="oustZ" val="-15488" />
-		<stat name="instanceId" val="214" />
-		<stat name="default_enabled" val="true" /> <!-- Fixes a problem with the other portals. -->
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="-113529" Y="-79077" />
-	</zone>
-	<zone name="dwelling_portal_fire" type="TeleportZone" shape="Cylinder" minZ="-11518" maxZ="-11218" rad="100">
-		<stat name="oustX" val="202376" />
-		<stat name="oustY" val="168141" />
-		<stat name="oustZ" val="-15488" />
-		<stat name="default_enabled" val="false" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="-115202" Y="-77519" />
-	</zone>
-	<zone name="return_portal_petram" type="TeleportZone" shape="Cylinder" minZ="-15688" maxZ="-15218" rad="100">
-		<stat name="oustX" val="-114323" />
-		<stat name="oustY" val="-78292" />
-		<stat name="oustZ" val="-11433" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="222061" Y="192921" />
-	</zone>
-	<zone name="return_portal_nebula" type="TeleportZone" shape="Cylinder" minZ="-15688" maxZ="-15218" rad="100">
-		<stat name="oustX" val="-114323" />
-		<stat name="oustY" val="-78292" />
-		<stat name="oustZ" val="-11433" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="222127" Y="170488" />
-	</zone>
-	<zone name="return_portal_procella" type="TeleportZone" shape="Cylinder" minZ="-15688" maxZ="-15218" rad="100">
-		<stat name="oustX" val="-114323" />
-		<stat name="oustY" val="-78292" />
-		<stat name="oustZ" val="-11433" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="212855" Y="181242" />
-	</zone>
-	<zone name="return_portal_ignis" type="TeleportZone" shape="Cylinder" minZ="-15688" maxZ="-15218" rad="100">
-		<stat name="oustX" val="-114323" />
-		<stat name="oustY" val="-78292" />
-		<stat name="oustZ" val="-11433" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="202349" Y="170533" />
-	</zone>
 	<zone name="hellbound_tp_1" type="TeleportZone" shape="Cylinder" minZ="-3600" maxZ="-3300" rad="200">
 		<stat name="oustX" val="6736" />
 		<stat name="oustY" val="251024" />
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java
index d0a8994454..7b4fb93e53 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java
@@ -642,6 +642,7 @@ public class Config
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean AUTO_PLAY_ATTACK_ACTION;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static int SHARING_LOCATION_COST;
 	public static int TELEPORT_SHARE_LOCATION_COST;
 	
@@ -1328,6 +1329,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2288,6 +2290,7 @@ public class Config
 			ENABLE_AUTO_ITEM = generalConfig.getBoolean("EnableAutoItem", true);
 			AUTO_PLAY_ATTACK_ACTION = generalConfig.getBoolean("AutoPlayAttackAction", true);
 			RESUME_AUTO_PLAY = generalConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = generalConfig.getBoolean("AssistLeader", false);
 			SUBJUGATION_TOPIC_BODY = generalConfig.getString("SubjugationTopicBody", "Reward for being in the top of the best players in clearing the lands of Aden");
 			SUBJUGATION_TOPIC_HEADER = generalConfig.getString("SubjugationTopicHeader", "Purge reward");
 			SHARING_LOCATION_COST = generalConfig.getInt("ShareLocationLcoinCost", 50);
@@ -3441,6 +3444,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/GameServer.java
index 163584b9f6..f710bbd01a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/GameServer.java
@@ -94,6 +94,7 @@ import org.l2jmobius.gameserver.data.xml.NpcNameLocalisationData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
 import org.l2jmobius.gameserver.data.xml.PetAcquireList;
 import org.l2jmobius.gameserver.data.xml.PetDataTable;
+import org.l2jmobius.gameserver.data.xml.PetExtractData;
 import org.l2jmobius.gameserver.data.xml.PetSkillData;
 import org.l2jmobius.gameserver.data.xml.PetTypeData;
 import org.l2jmobius.gameserver.data.xml.PlayerTemplateData;
@@ -333,6 +334,8 @@ public class GameServer
 		CharInfoTable.getInstance();
 		AdminData.getInstance();
 		PetDataTable.getInstance();
+		PetTypeData.getInstance();
+		PetExtractData.getInstance();
 		CubicData.getInstance();
 		CharSummonTable.getInstance().init();
 		BeautyShopData.getInstance();
@@ -382,7 +385,6 @@ public class GameServer
 		CrestTable.getInstance();
 		TeleportListData.getInstance();
 		SharedTeleportManager.getInstance();
-		PetTypeData.getInstance();
 		TeleporterData.getInstance();
 		TimedHuntingZoneData.getInstance();
 		MatchingRoomManager.getInstance();
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index f82b67b3d5..7633d726c4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopClanData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopClanData.java
index 251a0d3cbe..49a0e7a291 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopClanData.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopClanData.java
@@ -107,6 +107,7 @@ public class LimitShopClanData implements IXmlReader
 							ingredientEnchants[4] = 0;
 							int productionId = 0;
 							int accountDailyLimit = 0;
+							int accountMontlyLimit = 0;
 							int accountBuyLimit = 0;
 							for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling())
 							{
@@ -185,11 +186,12 @@ public class LimitShopClanData implements IXmlReader
 								{
 									productionId = parseInteger(attrs, "id");
 									accountDailyLimit = parseInteger(attrs, "accountDailyLimit", 0);
+									accountMontlyLimit = parseInteger(attrs, "accountMontlyLimit", 0);
 									accountBuyLimit = parseInteger(attrs, "accountBuyLimit", 0);
 								}
 							}
 							
-							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, 1, 100, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, false, accountDailyLimit, accountBuyLimit));
+							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, 1, 100, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, false, accountDailyLimit, accountMontlyLimit, accountBuyLimit));
 						}
 					}
 				}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java
index 60350c6209..2cf97998b8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java
@@ -127,6 +127,7 @@ public class LimitShopCraftData implements IXmlReader
 							boolean announce4 = false;
 							boolean announce5 = false;
 							int accountDailyLimit = 0;
+							int accountMontlyLimit = 0;
 							int accountBuyLimit = 0;
 							for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling())
 							{
@@ -233,6 +234,7 @@ public class LimitShopCraftData implements IXmlReader
 									count5 = parseLong(attrs, "count5", 1L);
 									announce5 = parseBoolean(attrs, "announce5", false);
 									accountDailyLimit = parseInteger(attrs, "accountDailyLimit", 0);
+									accountMontlyLimit = parseInteger(attrs, "accountMontlyLimit", 0);
 									accountBuyLimit = parseInteger(attrs, "accountBuyLimit", 0);
 									
 									final ItemTemplate item = ItemTable.getInstance().getTemplate(productionId);
@@ -244,7 +246,7 @@ public class LimitShopCraftData implements IXmlReader
 								}
 							}
 							
-							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, count, chance, announce, productionId2, count2, chance2, announce2, productionId3, count3, chance3, announce3, productionId4, count4, chance4, announce4, productionId5, count5, announce5, accountDailyLimit, accountBuyLimit));
+							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, count, chance, announce, productionId2, count2, chance2, announce2, productionId3, count3, chance3, announce3, productionId4, count4, chance4, announce4, productionId5, count5, announce5, accountDailyLimit, accountMontlyLimit, accountBuyLimit));
 						}
 					}
 				}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
index 0bdd0c2ba5..f5156d5b4f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
@@ -109,6 +109,7 @@ public class LimitShopData implements IXmlReader
 							ingredientEnchants[4] = 0;
 							int productionId = 0;
 							int accountDailyLimit = 0;
+							int accountMontlyLimit = 0;
 							int accountBuyLimit = 0;
 							for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling())
 							{
@@ -197,6 +198,7 @@ public class LimitShopData implements IXmlReader
 								{
 									productionId = parseInteger(attrs, "id");
 									accountDailyLimit = parseInteger(attrs, "accountDailyLimit", 0);
+									accountMontlyLimit = parseInteger(attrs, "accountMontlyLimit", 0);
 									accountBuyLimit = parseInteger(attrs, "accountBuyLimit", 0);
 									
 									final ItemTemplate item = ItemTable.getInstance().getTemplate(productionId);
@@ -208,7 +210,7 @@ public class LimitShopData implements IXmlReader
 								}
 							}
 							
-							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, 1, 100, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, false, accountDailyLimit, accountBuyLimit));
+							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, 1, 100, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, false, accountDailyLimit, accountMontlyLimit, accountBuyLimit));
 						}
 					}
 				}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/PetExtractData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/PetExtractData.java
new file mode 100644
index 0000000000..e53f5ca3cd
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/PetExtractData.java
@@ -0,0 +1,107 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.data.xml;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.gameserver.model.holders.ItemHolder;
+import org.l2jmobius.gameserver.model.holders.PetExtractionHolder;
+
+/**
+ * @author Geremy
+ */
+public class PetExtractData implements IXmlReader
+{
+	private static final Logger LOGGER = Logger.getLogger(PetExtractData.class.getName());
+	// <Pet_Id, <Pet_Level, Cost>>
+	private final Map<Integer, Map<Integer, PetExtractionHolder>> _extractionData = new HashMap<>();
+	
+	protected PetExtractData()
+	{
+		load();
+	}
+	
+	@Override
+	public void load()
+	{
+		_extractionData.clear();
+		parseDatapackFile("data/PetExtractData.xml");
+		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extractionData.size() + " pet extraction data.");
+	}
+	
+	@Override
+	public void parseDocument(Document doc, File f)
+	{
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling())
+		{
+			if ("list".equalsIgnoreCase(n.getNodeName()))
+			{
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
+				{
+					if ("extraction".equalsIgnoreCase(d.getNodeName()))
+					{
+						final NamedNodeMap attrs = d.getAttributes();
+						final int petId = parseInteger(attrs, "petId");
+						final int petLevel = parseInteger(attrs, "petLevel");
+						final long extractExp = parseLong(attrs, "extractExp");
+						final int extractItem = parseInteger(attrs, "extractItem");
+						final int defaultCostId = parseInteger(attrs, "defaultCostId");
+						final int defaultCostCount = parseInteger(attrs, "defaultCostCount");
+						final int extractCostId = parseInteger(attrs, "extractCostId");
+						final int extractCostCount = parseInteger(attrs, "extractCostCount");
+						Map<Integer, PetExtractionHolder> data = _extractionData.get(petId);
+						if (data == null)
+						{
+							data = new HashMap<>();
+							_extractionData.put(petId, data);
+						}
+						data.put(petLevel, new PetExtractionHolder(petId, petLevel, extractExp, extractItem, new ItemHolder(defaultCostId, defaultCostCount), new ItemHolder(extractCostId, extractCostCount)));
+					}
+				}
+			}
+		}
+	}
+	
+	public PetExtractionHolder getExtraction(int petId, int petLevel)
+	{
+		final Map<Integer, PetExtractionHolder> map = _extractionData.get(petId);
+		if (map == null)
+		{
+			LOGGER.warning(getClass().getSimpleName() + ": Missing pet extraction data: [PetId: " + petId + "] [PetLevel: " + petLevel + "]");
+			return null;
+		}
+		return map.get(petLevel);
+	}
+	
+	public static PetExtractData getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final PetExtractData INSTANCE = new PetExtractData();
+	}
+}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index 7da7b6a28d..60e1308527 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -548,9 +548,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/CategoryType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/CategoryType.java
index 8f6908eb64..7addea7649 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/CategoryType.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/CategoryType.java
@@ -36,6 +36,7 @@ public enum CategoryType
 	STRIDER,
 	WOLF_GROUP,
 	WYVERN_GROUP,
+	PET_GROUP,
 	SUBJOB_GROUP_KNIGHT,
 	HUMAN_FALL_CLASS,
 	HUMAN_MALL_CLASS,
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index b277446b93..7bf956bdc5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
index 40b4ea1c3d..ae43e8d744 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
@@ -25,4 +25,9 @@ import org.l2jmobius.gameserver.model.actor.Player;
 public interface IPlayerActionHandler
 {
 	void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed);
+	
+	default boolean isPetAction()
+	{
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index 8adc39fb95..8772022070 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -65,7 +65,7 @@ public class DailyTaskManager
 	private static final Set<Integer> RESET_SKILLS = new HashSet<>();
 	static
 	{
-		// No known skills.
+		RESET_SKILLS.add(39199); // Hero's Wondrous Cubic
 	}
 	public static final Set<Integer> RESET_ITEMS = new HashSet<>();
 	static
@@ -112,7 +112,8 @@ public class DailyTaskManager
 		GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis());
 		
 		// Wednesday weekly tasks.
-		if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY)
+		final Calendar calendar = Calendar.getInstance();
+		if (calendar.get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY)
 		{
 			clanLeaderApply();
 			resetMonsterArenaWeekly();
@@ -124,6 +125,11 @@ public class DailyTaskManager
 			resetVitalityDaily();
 		}
 		
+		if (calendar.get(Calendar.DAY_OF_MONTH) == 1)
+		{
+			resetMontlyLimitShopData();
+		}
+		
 		// Daily tasks.
 		resetClanBonus();
 		resetClanContributionList();
@@ -675,6 +681,31 @@ public class DailyTaskManager
 		LOGGER.info("LimitShopData has been resetted.");
 	}
 	
+	private void resetMontlyLimitShopData()
+	{
+		for (LimitShopProductHolder holder : LimitShopData.getInstance().getProducts())
+		{
+			// Update data for offline players.
+			try (Connection con = DatabaseFactory.getConnection();
+				PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?"))
+			{
+				ps.setString(1, AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + holder.getProductionId());
+				ps.executeUpdate();
+			}
+			catch (Exception e)
+			{
+				LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset LimitShopData: " + e);
+			}
+			// Update data for online players.
+			for (Player player : World.getInstance().getPlayers())
+			{
+				player.getAccountVariables().remove(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + holder.getProductionId());
+				player.getAccountVariables().storeMe();
+			}
+		}
+		LOGGER.info("LimitShopData has been resetted.");
+	}
+	
 	private void resetResurrectionByPayment()
 	{
 		// Update data for offline players.
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
index 96a825d4bc..c20c4d800a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
@@ -100,6 +100,7 @@ public class IdManager
 				cleanCount += statement.executeUpdate("DELETE FROM character_shortcuts WHERE character_shortcuts.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_skills WHERE character_skills.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_skills_save WHERE character_skills_save.charId NOT IN (SELECT charId FROM characters);");
+				cleanCount += statement.executeUpdate("DELETE FROM character_spirits WHERE character_spirits.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_subclasses WHERE character_subclasses.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_instance_time WHERE character_instance_time.charId NOT IN (SELECT charId FROM characters);");
 				
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java
index bf7f625cf0..cc95b36d14 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java
@@ -225,7 +225,7 @@ public class PurgeRankingManager
 			{
 			}
 		}
-		return top5.entrySet().stream().sorted(Map.Entry.<String, Integer> comparingByValue().reversed()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e2, LinkedHashMap::new));
+		return top5.entrySet().stream().sorted(Entry.<String, Integer> comparingByValue().reversed()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e2, LinkedHashMap::new));
 	}
 	
 	public SimpleEntry<Integer, Integer> getPlayerRating(int category, int charId)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 0c2f5d59de..0b7ad4e019 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -215,7 +215,7 @@ public class ShortCuts implements IRestorable
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
 				newsc.setAutoUse(sc.isAutoUse());
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 08238d2182..f7e3213d47 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1308,7 +1308,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2836,7 +2836,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2849,189 +2849,151 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
-								case ELEMENTAL_SPIRIT_EARTH_ATTACK:
-								case ELEMENTAL_SPIRIT_EARTH_DEFENSE:
-								case ELEMENTAL_SPIRIT_FIRE_ATTACK:
-								case ELEMENTAL_SPIRIT_FIRE_DEFENSE:
-								case ELEMENTAL_SPIRIT_WATER_ATTACK:
-								case ELEMENTAL_SPIRIT_WATER_DEFENSE:
-								case ELEMENTAL_SPIRIT_WIND_ATTACK:
-								case ELEMENTAL_SPIRIT_WIND_DEFENSE:
-								{
-									info.addComponentType(UserInfoType.ATT_SPIRITS);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
+							}
+							case ELEMENTAL_SPIRIT_EARTH_ATTACK:
+							case ELEMENTAL_SPIRIT_EARTH_DEFENSE:
+							case ELEMENTAL_SPIRIT_FIRE_ATTACK:
+							case ELEMENTAL_SPIRIT_FIRE_DEFENSE:
+							case ELEMENTAL_SPIRIT_WATER_ATTACK:
+							case ELEMENTAL_SPIRIT_WATER_DEFENSE:
+							case ELEMENTAL_SPIRIT_WIND_ATTACK:
+							case ELEMENTAL_SPIRIT_WIND_DEFENSE:
+							{
+								info.addComponentType(UserInfoType.ATT_SPIRITS);
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						sendPacket(info);
+					}
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
index d64abd26bd..219bdb5bdf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -383,7 +383,7 @@ import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommi
 import org.l2jmobius.gameserver.network.serverpackets.elementalspirits.ElementalSpiritInfo;
 import org.l2jmobius.gameserver.network.serverpackets.friend.FriendStatus;
 import org.l2jmobius.gameserver.network.serverpackets.limitshop.ExBloodyCoinCount;
-import org.l2jmobius.gameserver.network.serverpackets.pet.PetInfo;
+import org.l2jmobius.gameserver.network.serverpackets.pet.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.surveillance.ExUserWatcherTargetStatus;
 import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipInfo;
 import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
@@ -4674,7 +4674,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -7033,6 +7033,11 @@ public class Player extends Playable
 			player.setOnlineStatus(true, false);
 			
 			PlayerAutoSaveTaskManager.getInstance().add(player);
+			
+			if (Config.ENABLE_ACHIEVEMENT_BOX)
+			{
+				player.getAchievementBox().restore();
+			}
 		}
 		catch (Exception e)
 		{
@@ -8526,9 +8531,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
@@ -10775,7 +10784,7 @@ public class Player extends Playable
 			_pet.setFollowStatus(true);
 			_pet.setInstance(getInstanceWorld());
 			_pet.updateAndBroadcastStatus(0);
-			sendPacket(new PetInfo(_pet, 0));
+			sendPacket(new PetSummonInfo(_pet, 0));
 		}
 		
 		getServitors().values().forEach(s ->
@@ -10786,7 +10795,7 @@ public class Player extends Playable
 			s.setFollowStatus(true);
 			s.setInstance(getInstanceWorld());
 			s.updateAndBroadcastStatus(0);
-			sendPacket(new PetInfo(s, 0));
+			sendPacket(new PetSummonInfo(s, 0));
 		});
 		
 		// Show movie if available.
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Summon.java
index d3dc4dd1b2..b5c17fe076 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -74,10 +74,10 @@ import org.l2jmobius.gameserver.network.serverpackets.TeleportToLocation;
 import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetSkillList;
 import org.l2jmobius.gameserver.network.serverpackets.pet.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.pet.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.pet.PetInventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.pet.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.pet.PetSummonInfo;
 import org.l2jmobius.gameserver.taskmanager.DecayTaskManager;
 
 public abstract class Summon extends Playable
@@ -134,7 +134,7 @@ public abstract class Summon extends Playable
 		{
 			if (isPet())
 			{
-				sendPacket(new PetInfo(this, 1));
+				sendPacket(new PetSummonInfo(this, 1));
 				sendPacket(new ExPetSkillList(true, (Pet) this));
 				if (getInventory() != null)
 				{
@@ -228,7 +228,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -392,7 +392,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		super.onDecay();
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -879,7 +879,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -900,7 +900,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -925,7 +932,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -933,7 +940,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -979,7 +993,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
@@ -1166,7 +1180,7 @@ public abstract class Summon extends Playable
 			{
 				owner.sendPacket(new PetItemList(getInventory().getItems()));
 			}
-			owner.sendPacket(new PetInfo(this, 1));
+			owner.sendPacket(new PetSummonInfo(this, 1));
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index f4cc079630..f7e71e5136 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -873,15 +872,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -892,8 +889,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -902,7 +903,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -975,33 +976,6 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
@@ -1011,9 +985,17 @@ public class CreatureStat
 		// Notify recalculation to child classes.
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index accbff9373..697ec47e4f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
index 97397f753f..9d5faa0c61 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
@@ -57,7 +57,10 @@ public enum CommissionItemType
 	NECKLACE(31),
 	BELT(32),
 	BRACELET(33),
+	AGATHION(62),
 	HAIR_ACCESSORY(34),
+	BROOCH_JEWEL(63),
+	ARTIFACT(64),
 	// Supplies
 	POTION(35),
 	SCROLL_ENCHANT_WEAPON(36),
@@ -65,6 +68,7 @@ public enum CommissionItemType
 	SCROLL_OTHER(38),
 	SOULSHOT(39),
 	SPIRITSHOT(40),
+	OTHER_SUPPLIES(41),
 	// Pet Goods
 	PET_EQUIPMENT(42),
 	PET_SUPPLIES(43),
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
index eb10918430..3a194d1660 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
@@ -47,8 +47,8 @@ public enum CommissionTreeType
 		CommissionItemType.SPEAR,
 		CommissionItemType.OTHER_WEAPON),
 	ARMOR(1, CommissionItemType.HELMET, CommissionItemType.ARMOR_TOP, CommissionItemType.ARMOR_PANTS, CommissionItemType.FULL_BODY, CommissionItemType.GLOVES, CommissionItemType.FEET, CommissionItemType.SHIELD, CommissionItemType.SIGIL, CommissionItemType.UNDERWEAR, CommissionItemType.CLOAK),
-	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.HAIR_ACCESSORY),
-	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT),
+	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.AGATHION, CommissionItemType.HAIR_ACCESSORY, CommissionItemType.BROOCH_JEWEL, CommissionItemType.ARTIFACT),
+	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT, CommissionItemType.OTHER_SUPPLIES),
 	PET_GOODS(4, CommissionItemType.PET_EQUIPMENT, CommissionItemType.PET_SUPPLIES),
 	MISC(
 		5,
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index b7759d1586..1bb8c01d65 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2216,6 +2216,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java
index f72c9ddc4d..7beb8a1d2d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java
@@ -48,9 +48,10 @@ public class LimitShopProductHolder
 	private final long _count5;
 	private final boolean _announce5;
 	private final int _accountDailyLimit;
+	private final int _accountMontlyLimit;
 	private final int _accountBuyLimit;
 	
-	public LimitShopProductHolder(int id, int category, int minLevel, int maxLevel, int[] ingredientIds, long[] ingredientQuantities, int[] ingredientEnchants, int productionId, long count, float chance, boolean announce, int productionId2, long count2, float chance2, boolean announce2, int productionId3, long count3, float chance3, boolean announce3, int productionId4, long count4, float chance4, boolean announce4, int productionId5, long count5, boolean announce5, int accountDailyLimit, int accountBuyLimit)
+	public LimitShopProductHolder(int id, int category, int minLevel, int maxLevel, int[] ingredientIds, long[] ingredientQuantities, int[] ingredientEnchants, int productionId, long count, float chance, boolean announce, int productionId2, long count2, float chance2, boolean announce2, int productionId3, long count3, float chance3, boolean announce3, int productionId4, long count4, float chance4, boolean announce4, int productionId5, long count5, boolean announce5, int accountDailyLimit, int accountMontlyLimit, int accountBuyLimit)
 	{
 		_id = id;
 		_category = category;
@@ -79,6 +80,7 @@ public class LimitShopProductHolder
 		_count5 = count5;
 		_announce5 = announce5;
 		_accountDailyLimit = accountDailyLimit;
+		_accountMontlyLimit = accountMontlyLimit;
 		_accountBuyLimit = accountBuyLimit;
 	}
 	
@@ -217,6 +219,11 @@ public class LimitShopProductHolder
 		return _accountDailyLimit;
 	}
 	
+	public int getAccountMontlyLimit()
+	{
+		return _accountMontlyLimit;
+	}
+	
 	public int getAccountBuyLimit()
 	{
 		return _accountBuyLimit;
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/PetExtractionHolder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/PetExtractionHolder.java
new file mode 100644
index 0000000000..bc54fd0c63
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/PetExtractionHolder.java
@@ -0,0 +1,70 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.model.holders;
+
+/**
+ * @author Geremy
+ */
+public class PetExtractionHolder
+{
+	private final int _petId;
+	private final int _petLevel;
+	private final long _extractExp;
+	private final int _extractItem;
+	private final ItemHolder _defaultCost;
+	private final ItemHolder _extractCost;
+	
+	public PetExtractionHolder(int petId, int petLevel, long extractExp, int extractItem, ItemHolder defaultCost, ItemHolder extractCost)
+	{
+		_petId = petId;
+		_petLevel = petLevel;
+		_extractExp = extractExp;
+		_extractItem = extractItem;
+		_defaultCost = defaultCost;
+		_extractCost = extractCost;
+	}
+	
+	public int getPetId()
+	{
+		return _petId;
+	}
+	
+	public int getPetLevel()
+	{
+		return _petLevel;
+	}
+	
+	public long getExtractExp()
+	{
+		return _extractExp;
+	}
+	
+	public int getExtractItem()
+	{
+		return _extractItem;
+	}
+	
+	public ItemHolder getDefaultCost()
+	{
+		return _defaultCost;
+	}
+	
+	public ItemHolder getExtractCost()
+	{
+		return _extractCost;
+	}
+}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index 7b0aafd404..dfdc849b47 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -39,6 +39,7 @@ import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AgathionData;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -52,6 +53,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -71,12 +73,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPi
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
 import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -91,6 +95,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1640,7 +1645,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2560,6 +2567,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2584,6 +2596,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd()
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2609,6 +2623,124 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index cdf42e7a80..2399b7fc05 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -898,7 +898,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(playable, item, Item::getVisualId))
 				{
 					update = true;
@@ -1050,7 +1051,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(playable, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/FortSiege.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/FortSiege.java
index c128c12ecf..c16afcf700 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/FortSiege.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/FortSiege.java
@@ -268,7 +268,7 @@ public class FortSiege extends ListenersContainer implements Siegable
 					}
 					
 					ThreadPool.schedule(new ScheduleStartSiegeTask(nextTask), _initialDelayInMilliseconds - (nextTask * 1000)); // Prepare task for @nextTask minutes left.
-					LOGGER.info("scheduling " + nextTask + " in " + ((_initialDelayInMilliseconds / 1000) - nextTask) + " sec");
+					// LOGGER.info("scheduling " + nextTask + " in " + ((_initialDelayInMilliseconds / 1000) - nextTask) + " sec");
 				}
 				else if ((_time == 3600) && (_fortInst.getResidenceId() != FortManager.ORC_FORTRESS)) // 1hr remains
 				
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 0e5fbb013a..8099f59e70 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -691,7 +691,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -714,7 +714,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -749,7 +749,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 1a33adcdcf..58288f3690 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -95,6 +95,7 @@ public enum Stat
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
 	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
+	IGNORE_REDUCE_DAMAGE("ignoreReduceDamage"),
 	
 	// ELEMENTAL SPIRITS
 	ELEMENTAL_SPIRIT_FIRE_ATTACK("elementalSpiritFireAttack"),
@@ -148,7 +149,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	MAGIC_CRITICAL_RATE_BY_CRITICAL_RATE("mCritRateByRCrit", Stat::defaultValue, MathUtil::add, MathUtil::mul, 0, 0),
 	BLOW_RATE("blowRate"),
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index 647873dac0..6cc98e9690 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -44,7 +44,18 @@ public class MCritRateFinalizer implements IStatFunction
 		
 		final double physicalBonus = (creature.getStat().getMul(Stat.MAGIC_CRITICAL_RATE_BY_CRITICAL_RATE, 1) - 1) * creature.getStat().getCriticalHit();
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, (baseValue * witBonus * 10) + physicalBonus), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, (baseValue * witBonus * 10) + physicalBonus), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index c305987ba6..c29c9ba398 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -93,6 +93,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index c5257ff589..1aff35bfd5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java
index fc8fc5e8e6..cb7a29e736 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java
@@ -46,6 +46,7 @@ public class AccountVariables extends AbstractVariables
 	public static final String PRIME_SHOP_PRODUCT_DAILY_COUNT = "PSPDailyCount";
 	public static final String LCOIN_SHOP_PRODUCT_COUNT = "LCSCount";
 	public static final String LCOIN_SHOP_PRODUCT_DAILY_COUNT = "LCSDailyCount";
+	public static final String LCOIN_SHOP_PRODUCT_MONTLY_COUNT = "LCSMontlyCount";
 	public static final String VIP_POINTS = "VipPoints";
 	public static final String VIP_TIER = "VipTier";
 	public static final String VIP_EXPIRATION = "VipExpiration";
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/ExClientPackets.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/ExClientPackets.java
index e7fc87836c..a4918e534e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/ExClientPackets.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/ExClientPackets.java
@@ -108,6 +108,7 @@ import org.l2jmobius.gameserver.network.clientpackets.mentoring.RequestMentorLis
 import org.l2jmobius.gameserver.network.clientpackets.pet.ExEvolvePet;
 import org.l2jmobius.gameserver.network.clientpackets.pet.ExPetEquipItem;
 import org.l2jmobius.gameserver.network.clientpackets.pet.ExPetUnequipItem;
+import org.l2jmobius.gameserver.network.clientpackets.pet.ExTryPetExtractSystem;
 import org.l2jmobius.gameserver.network.clientpackets.pet.RequestExAcquirePetSkill;
 import org.l2jmobius.gameserver.network.clientpackets.pledgeV3.RequestExPledgeEnemyDelete;
 import org.l2jmobius.gameserver.network.clientpackets.pledgeV3.RequestExPledgeEnemyInfoList;
@@ -654,7 +655,7 @@ public enum ExClientPackets
 	EX_PLEDGE_ENEMY_DELETE(0x1C8, RequestExPledgeEnemyDelete::new, ConnectionState.IN_GAME),
 	EX_PK_PENALTY_LIST(0x1C9, null, ConnectionState.IN_GAME),
 	EX_PK_PENALTY_LIST_ONLY_LOC(0x1CA, null, ConnectionState.IN_GAME),
-	EX_TRY_PET_EXTRACT_SYSTEM(0x1CB, null, ConnectionState.IN_GAME),
+	EX_TRY_PET_EXTRACT_SYSTEM(0x1CB, ExTryPetExtractSystem::new, ConnectionState.IN_GAME),
 	EX_PLEDGE_V3_SET_ANNOUNCE(0x1CC, RequestExPledgeV3SetAnnounce::new, ConnectionState.IN_GAME),
 	// 306
 	EX_RANKING_FESTIVAL_OPEN(0x1CD, null, ConnectionState.IN_GAME),
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 78c7e62be5..0464b99085 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -108,6 +108,11 @@ public class RequestAcquireSkill implements ClientPacket
 		
 		final int skillId = player.getReplacementSkill(_id);
 		final Skill existingSkill = player.getKnownSkill(skillId); // Mobius: Keep existing sublevel.
+		if ((_level > 65536000) && (existingSkill != null) && (existingSkill.getSubLevel() > 1000))
+		{
+			_level -= existingSkill.getSubLevel() * 65536;
+		}
+		
 		final Skill skill = SkillData.getInstance().getSkill(skillId, _level, existingSkill == null ? 0 : existingSkill.getSubLevel());
 		if (skill == null)
 		{
@@ -644,7 +649,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList();
 		player.updateShortCuts(_id, skill.getLevel(), skill.getSubLevel());
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 14c84055da..63f5c4a527 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -87,7 +87,7 @@ public class RequestShortCutReg implements ClientPacket
 		else if (_page == 23)
 		{
 			final Item item = player.getInventory().getItemByObjectId(_id);
-			if ((item != null) && !item.isPotion())
+			if (((item != null) && !item.isPotion()) || (_type == ShortcutType.ACTION))
 			{
 				return;
 			}
@@ -148,7 +148,7 @@ public class RequestShortCutReg implements ClientPacket
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		sc.setAutoUse(_active);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 		player.sendPacket(new ExActivateAutoShortcut(sc, _active));
 		
 		// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 70bd438394..0032eb2c56 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -223,7 +223,7 @@ public class UseItem implements ClientPacket
 			}
 			
 			// Prevent Death Knight players to equip other weapons.
-			if (item.isWeapon() && (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, player.getClassId().getId())) && ((item.getWeaponItem().getItemType() != WeaponType.SWORD) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND)))
+			if (item.isWeapon() && CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, player.getClassId().getId()) && (item.getWeaponItem().getItemType() != WeaponType.FISHINGROD) && ((item.getWeaponItem().getItemType() != WeaponType.SWORD) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND)))
 			{
 				player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
 				return;
@@ -244,7 +244,7 @@ public class UseItem implements ClientPacket
 			}
 			
 			// Prevent Sylph players to equip other weapons.
-			if (item.isWeapon() && (player.getRace() == Race.SYLPH) && (item.getWeaponItem().getItemType() != WeaponType.PISTOLS))
+			if (item.isWeapon() && (player.getRace() == Race.SYLPH) && (item.getWeaponItem().getItemType() != WeaponType.FISHINGROD) && (item.getWeaponItem().getItemType() != WeaponType.PISTOLS))
 			{
 				player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
 				return;
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
index 16c528948e..0e657662e6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
@@ -150,6 +150,25 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 				return;
 			}
 		}
+		else if (_product.getAccountMontlyLimit() > 0)
+		{
+			final long amount = _product.getAccountMontlyLimit() * _amount;
+			if (amount < 1)
+			{
+				player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+				player.removeRequest(PrimeShopRequest.class);
+				player.sendPacket(new ExPurchaseLimitShopItemResult(false, _shopIndex, _productId, 0, Collections.emptyList()));
+				return;
+			}
+			if (player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + _product.getProductionId(), 0) >= amount)
+			{
+				player.sendMessage("You have reached your montly limit.");
+				player.removeRequest(PrimeShopRequest.class);
+				player.sendPacket(new ExPurchaseLimitShopItemResult(false, _shopIndex, _productId, 0, Collections.emptyList()));
+				return;
+			}
+			
+		}
 		else if (_product.getAccountBuyLimit() > 0) // Count limit.
 		{
 			final long amount = _product.getAccountBuyLimit() * _amount;
@@ -171,7 +190,7 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 		}
 		
 		// Check existing items.
-		final int remainingInfo = Math.max(0, Math.max(_product.getAccountBuyLimit(), _product.getAccountDailyLimit()));
+		final int remainingInfo = Math.max(0, Math.max(_product.getAccountBuyLimit(), Math.max(_product.getAccountDailyLimit(), _product.getAccountMontlyLimit())));
 		for (int i = 0; i < _product.getIngredientIds().length; i++)
 		{
 			if (_product.getIngredientIds()[i] == 0)
@@ -356,6 +375,10 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 		{
 			player.getAccountVariables().set(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + _product.getProductionId(), player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + _product.getProductionId(), 0) + _amount);
 		}
+		if (_product.getAccountMontlyLimit() > 0)
+		{
+			player.getAccountVariables().set(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + _product.getProductionId(), player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + _product.getProductionId(), 0) + _amount);
+		}
 		else if (_product.getAccountBuyLimit() > 0)
 		{
 			player.getAccountVariables().set(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + _product.getProductionId(), player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + _product.getProductionId(), 0) + _amount);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
index 5b243ca0fb..4433741d07 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
@@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetSkillList;
-import org.l2jmobius.gameserver.network.serverpackets.pet.PetInfo;
+import org.l2jmobius.gameserver.network.serverpackets.pet.PetSummonInfo;
 
 /**
  * @author Berezkin Nikolay
@@ -230,7 +230,7 @@ public class ExPetEquipItem implements ClientPacket
 	private void sendInfos(Pet pet, Player player)
 	{
 		pet.getStat().recalculateStats(true);
-		player.sendPacket(new PetInfo(pet, 1));
+		player.sendPacket(new PetSummonInfo(pet, 1));
 		player.sendPacket(new ExPetSkillList(false, pet));
 	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
index c31d8d343f..3891440cd4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
@@ -17,7 +17,7 @@ import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetSkillList;
-import org.l2jmobius.gameserver.network.serverpackets.pet.PetInfo;
+import org.l2jmobius.gameserver.network.serverpackets.pet.PetSummonInfo;
 
 /**
  * @author Berezkin Nikolay
@@ -183,7 +183,7 @@ public class ExPetUnequipItem implements ClientPacket
 	private void sendInfos(Pet pet, Player player)
 	{
 		pet.getStat().recalculateStats(true);
-		player.sendPacket(new PetInfo(pet, 1));
+		player.sendPacket(new PetSummonInfo(pet, 1));
 		player.sendPacket(new ExPetSkillList(false, pet));
 	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExTryPetExtractSystem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExTryPetExtractSystem.java
new file mode 100644
index 0000000000..6bb1753d14
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExTryPetExtractSystem.java
@@ -0,0 +1,115 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.clientpackets.pet;
+
+import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.gameserver.data.xml.NpcData;
+import org.l2jmobius.gameserver.data.xml.PetDataTable;
+import org.l2jmobius.gameserver.data.xml.PetExtractData;
+import org.l2jmobius.gameserver.model.PetData;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
+import org.l2jmobius.gameserver.model.holders.PetExtractionHolder;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.PetInventory;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
+import org.l2jmobius.gameserver.network.GameClient;
+import org.l2jmobius.gameserver.network.SystemMessageId;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
+import org.l2jmobius.gameserver.network.serverpackets.pet.ResultPetExtractSystem;
+
+/**
+ * @author Geremy
+ */
+public class ExTryPetExtractSystem implements ClientPacket
+{
+	private int _itemObjId;
+	
+	@Override
+	public void read(ReadablePacket packet)
+	{
+		_itemObjId = packet.readInt();
+	}
+	
+	@Override
+	public void run(GameClient client)
+	{
+		final Player player = client.getPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item petItem = player.getInventory().getItemByObjectId(_itemObjId);
+		if ((petItem == null) || ((player.getPet() != null) && (player.getPet().getControlItem() == petItem)))
+		{
+			player.sendPacket(new ResultPetExtractSystem(false));
+			return;
+		}
+		
+		final PetData petData = PetDataTable.getInstance().getPetDataByItemId(petItem.getId());
+		final NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(petData.getNpcId());
+		final Pet pet = new Pet(npcTemplate, player, petItem);
+		final PetInventory petInventory = pet.getInventory();
+		final PlayerInventory playerInventory = player.getInventory();
+		if ((petInventory == null) || (playerInventory == null))
+		{
+			player.sendPacket(new ResultPetExtractSystem(false));
+			return;
+		}
+		
+		if (!playerInventory.validateWeight(petInventory.getTotalWeight()) || !playerInventory.validateCapacity(petInventory.getSize()))
+		{
+			player.sendPacket(SystemMessageId.THERE_ARE_ITEMS_IN_THE_PET_S_INVENTORY_TAKE_THEM_OUT_FIRST);
+			player.sendPacket(new ResultPetExtractSystem(false));
+			return;
+		}
+		
+		petInventory.transferItemsToOwner();
+		
+		final Pet petInfo = Pet.restore(petItem, NpcData.getInstance().getTemplate(petData.getNpcId()), player);
+		final int petId = PetDataTable.getInstance().getPetDataByItemId(petItem.getId()).getType();
+		final int petLevel = petInfo.getLevel();
+		final PetExtractionHolder holder = PetExtractData.getInstance().getExtraction(petId, petLevel);
+		if (holder != null)
+		{
+			final int extractItemId = holder.getExtractItem();
+			final int extractItemCount = (int) (petInfo.getStat().getExp() / holder.getExtractExp());
+			final int extractCostId = holder.getExtractCost().getId();
+			final long extractCostCount = holder.getExtractCost().getCount() * extractItemCount;
+			final int defaultCostId = holder.getDefaultCost().getId();
+			final long defaultCostCount = holder.getDefaultCost().getCount();
+			if ((player.getInventory().getInventoryItemCount(extractCostId, -1) >= extractCostCount) && (player.getInventory().getInventoryItemCount(defaultCostId, -1) >= defaultCostCount))
+			{
+				if (player.destroyItemByItemId("Pet Extraction", extractCostId, extractCostCount, player, true) && player.destroyItemByItemId("Pet Extraction", defaultCostId, defaultCostCount, player, true) && player.destroyItem("Pet Extraction", petItem, player, true))
+				{
+					player.addItem("Pet Extraction", extractItemId, extractItemCount, player, true);
+					player.sendPacket(new ResultPetExtractSystem(true));
+				}
+			}
+			else
+			{
+				player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT);
+				player.sendPacket(new ResultPetExtractSystem(false));
+			}
+			return;
+		}
+		
+		player.sendPacket(new ResultPetExtractSystem(false));
+	}
+}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java
index 2cf1ef176b..0266b0eff5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java
@@ -46,7 +46,7 @@ public class ExRequestRandomCraftExtract implements ClientPacket
 		{
 			final int objId = packet.readInt();
 			final long count = packet.readLong();
-			if (count > 1)
+			if (count > 0)
 			{
 				_items.put(objId, count);
 			}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGacha.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGacha.java
index 39ee21e7dd..64b279d2dc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGacha.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGacha.java
@@ -48,6 +48,11 @@ public class RequestSubjugationGacha implements ClientPacket
 	@Override
 	public void run(GameClient client)
 	{
+		if ((_amount < 1) || ((_amount * 20000L) < 1))
+		{
+			return;
+		}
+		
 		final Player player = client.getPlayer();
 		if (player == null)
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index 9540e799e2..07ed7641a9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,129 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 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, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 92, 93,
-		94, 96, 97, 99,
-		1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
index 8e396d93c9..a72d906550 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
@@ -167,7 +167,7 @@ public class FakePlayerInfo extends ServerPacket
 		writeByte(_npc.getTeam().getId());
 		writeInt(_clan != null ? _clan.getCrestLargeId() : 0);
 		writeByte(_fpcHolder.getNobleLevel());
-		writeByte(_fpcHolder.isHero());
+		writeByte(_fpcHolder.isHero() ? 2 : 0); // 152 - Value for enabled changed to 2
 		writeByte(_fpcHolder.isFishing());
 		writeInt(_fpcHolder.getBaitLocationX());
 		writeInt(_fpcHolder.getBaitLocationY());
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index 47076d56c4..61bfe70039 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -163,7 +163,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -323,9 +323,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -343,11 +343,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -371,9 +371,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -403,7 +403,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 05aaedf2c5..46c9ccb5a9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,20 +19,21 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
+		player.restoreAutoShortcutVisual();
 	}
 	
 	@Override
@@ -54,8 +55,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 9c1fbbcab8..851b53dc09 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -43,13 +49,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // TODO: Find me, item visual id ?
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
@@ -60,8 +69,8 @@ public class ShortCutRegister extends ServerPacket
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeByte(0); // C5
 				writeInt(_shortcut.getCharacterType());
-				writeInt(0); // TODO: Find me
-				writeInt(0); // TODO: Find me
+				writeInt(0); // if 1 - cant use
+				writeInt(0); // reuse delay ?
 				break;
 			}
 			case ACTION:
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 679c26e073..06711fb502 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -67,7 +67,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -141,7 +141,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
index 8e5c5f7765..22eb4ac7d4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
@@ -83,6 +83,17 @@ public class ExPurchaseLimitShopItemListNew extends ServerPacket
 					writeInt(product.getAccountDailyLimit() - _player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + product.getProductionId(), 0));
 				}
 			}
+			else if (product.getAccountMontlyLimit() > 0)
+			{
+				if (_player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + product.getProductionId(), 0) >= product.getAccountMontlyLimit())
+				{
+					writeInt(0);
+				}
+				else
+				{
+					writeInt(product.getAccountMontlyLimit() - _player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + product.getProductionId(), 0));
+				}
+			}
 			else if (product.getAccountBuyLimit() > 0) // Count limit.
 			{
 				if (_player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + product.getProductionId(), 0) >= product.getAccountBuyLimit())
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java
index e2a7e8cb46..e4a2d8308e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java
@@ -68,7 +68,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -142,7 +142,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetSummonInfo.java
similarity index 96%
rename from L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java
rename to L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetSummonInfo.java
index fdc110c324..2b6b70cd0a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetSummonInfo.java
@@ -1,194 +1,194 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets.pet;
-
-import java.util.Set;
-
-import org.l2jmobius.gameserver.enums.EvolveLevel;
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-/**
- * 12 - wolf, 13 - buffalo, 14 - tiger, 15-kukkabara, 17 - hawk, 16 - dragon
- */
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isDead() ? 0 : _summon.isShowSummonAnimation() ? 2 : _value);
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeShort(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		// 0% absolute value
-		writeLong(Math.min(_summon.getExpForThisLevel(), _summon.getStat().getExp())); // 0% absolute value
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(-1);
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(0); // Used Summon Points
-		writeByte(0); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		writeShort(aves.size()); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		writeByte(_statusMask);
-		if (_summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			writeInt(pet.getPetData().getType());
-			writeInt(pet.getEvolveLevel());
-			writeInt(pet.getEvolveLevel() == 0 ? -1 : pet.getId());
-		}
-		else
-		{
-			writeInt(0);
-			writeInt(EvolveLevel.None.ordinal());
-			writeInt(0);
-		}
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets.pet;
+
+import java.util.Set;
+
+import org.l2jmobius.gameserver.enums.EvolveLevel;
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+/**
+ * 12 - wolf, 13 - buffalo, 14 - tiger, 15-kukkabara, 17 - hawk, 16 - dragon
+ */
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isDead() ? 0 : _summon.isShowSummonAnimation() ? 2 : _value);
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeShort(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		// 0% absolute value
+		writeLong(Math.min(_summon.getExpForThisLevel(), _summon.getStat().getExp())); // 0% absolute value
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(-1);
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(0); // Used Summon Points
+		writeByte(0); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		writeShort(aves.size()); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		writeByte(_statusMask);
+		if (_summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			writeInt(pet.getPetData().getType());
+			writeInt(pet.getEvolveLevel());
+			writeInt(pet.getEvolveLevel() == 0 ? -1 : pet.getId());
+		}
+		else
+		{
+			writeInt(0);
+			writeInt(EvolveLevel.None.ordinal());
+			writeInt(0);
+		}
+	}
+}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ResultPetExtractSystem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ResultPetExtractSystem.java
new file mode 100644
index 0000000000..0deca5b570
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ResultPetExtractSystem.java
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets.pet;
+
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
+
+/**
+ * @author Geremy
+ */
+public class ResultPetExtractSystem extends ServerPacket
+{
+	private final boolean _success;
+	
+	public ResultPetExtractSystem(boolean success)
+	{
+		_success = success;
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.EX_RESULT_PET_EXTRACT_SYSTEM.writeId(this);
+		writeInt(_success);
+	}
+}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/not_done/Q10905_HuntingTime.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ShowPetExtractSystem.java
similarity index 61%
rename from L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/not_done/Q10905_HuntingTime.java
rename to L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ShowPetExtractSystem.java
index a1c94261cc..29683dc5a5 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/not_done/Q10905_HuntingTime.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ShowPetExtractSystem.java
@@ -1,36 +1,35 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package quests.not_done;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.model.quest.Quest;
-
-/**
- * @author Mobius
- */
-public class Q10905_HuntingTime extends Quest
-{
-	private static final int START_NPC = 34599;
-	
-	public Q10905_HuntingTime()
-	{
-		super(10905);
-		addStartNpc(START_NPC);
-		addTalkId(START_NPC);
-		addCondMinLevel(Config.PLAYER_MAXIMUM_LEVEL, getNoQuestMsg(null));
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets.pet;
+
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
+
+/**
+ * @author Geremy
+ */
+public class ShowPetExtractSystem extends ServerPacket
+{
+	public static final ShowPetExtractSystem STATIC_PACKET = new ShowPetExtractSystem();
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.EX_SHOW_PET_EXTRACT_SYSTEM.writeId(this);
+		writeInt(0);
+	}
+}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index d6e032a4c7..2bfee034a2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -25,11 +26,13 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
@@ -42,9 +45,12 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
+	private static final Integer PET_ATTACK_ACTION = 16;
+	private static final Integer SUMMON_ATTACK_ACTION = 22;
 	
 	protected AutoPlayTaskManager()
 	{
@@ -94,6 +100,25 @@ public class AutoPlayTaskManager
 					}
 					else if ((creature.getTarget() == player) || (creature.getTarget() == null))
 					{
+						// Pet Attack.
+						final Pet pet = player.getPet();
+						if ((pet != null) && player.getAutoUseSettings().getAutoActions().contains(PET_ATTACK_ACTION) && pet.hasAI() && !pet.isMoving() && !pet.isDisabled() && (pet.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (pet.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+						{
+							pet.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+						}
+						
+						// Summon Attack.
+						if (player.hasSummon() && player.getAutoUseSettings().getAutoActions().contains(SUMMON_ATTACK_ACTION))
+						{
+							for (Summon summon : player.getServitors().values())
+							{
+								if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+								{
+									summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+								}
+							}
+						}
+						
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
@@ -122,23 +147,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -146,6 +180,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -180,32 +217,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) && (targetMode != 4 /* Counterattack */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) && (targetMode != 4 /* Counterattack */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -256,7 +316,7 @@ public class AutoPlayTaskManager
 				}
 				case 4: // Counterattack
 				{
-					return creature.isMonster() || (creature.isPlayable() && creature.isAutoAttackable(player));
+					return creature.isMonster() || (creature.isPlayer() && ((creature.getTarget() == player) && (creature.getActingPlayer().getEinhasadOverseeingLevel() >= 1)));
 				}
 				default: // Any Target
 				{
@@ -315,6 +375,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 574af07cdd..473fcb12a6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -36,7 +36,9 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.effects.EffectType;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemUse;
@@ -47,12 +49,12 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.EffectScope;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -429,8 +431,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
@@ -442,7 +445,24 @@ public class AutoUseTaskManager
 							final IPlayerActionHandler actionHandler = PlayerActionHandler.getInstance().getHandler(actionHolder.getHandler());
 							if (actionHandler != null)
 							{
-								actionHandler.useAction(player, actionHolder, false, false);
+								if (!actionHandler.isPetAction())
+								{
+									actionHandler.useAction(player, actionHolder, false, false);
+								}
+								else
+								{
+									final Summon summon = player.getAnyServitor();
+									if ((summon != null) && !summon.isAlikeDead())
+									{
+										final Skill skill = summon.getKnownSkill(actionHolder.getOptionId());
+										if ((skill != null) && !canSummonCastSkill(player, summon, skill))
+										{
+											continue ACTIONS;
+										}
+										
+										actionHandler.useAction(player, actionHolder, false, false);
+									}
+								}
 							}
 						}
 					}
@@ -525,6 +545,59 @@ public class AutoUseTaskManager
 			
 			return !player.isSkillDisabled(skill) && skill.checkCondition(player, target, false);
 		}
+		
+		private boolean canSummonCastSkill(Player player, Summon summon, Skill skill)
+		{
+			if (skill.isBad() && (player.getTarget() == null))
+			{
+				return false;
+			}
+			
+			final int mpConsume = skill.getMpConsume() + skill.getMpInitialConsume();
+			if ((((mpConsume != 0) && (mpConsume > (int) Math.floor(summon.getCurrentMp()))) || ((skill.getHpConsume() != 0) && (skill.getHpConsume() > (int) Math.floor(summon.getCurrentHp())))))
+			{
+				return false;
+			}
+			
+			if (summon.isSkillDisabled(skill))
+			{
+				return false;
+			}
+			
+			if (((player.getTarget() != null) && !skill.checkCondition(summon, player.getTarget(), false)) || ((player.getTarget() == null) && !skill.checkCondition(summon, player, false)))
+			{
+				return false;
+			}
+			
+			if ((skill.getItemConsumeCount() > 0) && (summon.getInventory().getInventoryItemCount(skill.getItemConsumeId(), -1) < skill.getItemConsumeCount()))
+			{
+				return false;
+			}
+			
+			if (skill.getTargetType().equals(TargetType.SELF) || skill.getTargetType().equals(TargetType.SUMMON))
+			{
+				final BuffInfo summonInfo = summon.getEffectList().getBuffInfoBySkillId(skill.getId());
+				return (summonInfo != null) && (summonInfo.getTime() >= REUSE_MARGIN_TIME);
+			}
+			
+			if ((skill.getEffects(EffectScope.GENERAL) != null) && skill.getEffects(EffectScope.GENERAL).stream().anyMatch(a -> a.getEffectType().equals(EffectType.MANAHEAL_BY_LEVEL)) && (player.getCurrentMpPercent() > 80))
+			{
+				return false;
+			}
+			
+			final BuffInfo buffInfo = player.getEffectList().getBuffInfoBySkillId(skill.getId());
+			final BuffInfo abnormalBuffInfo = player.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
+			if (abnormalBuffInfo != null)
+			{
+				if (buffInfo != null)
+				{
+					return (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()));
+				}
+				return (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel()) || abnormalBuffInfo.isAbnormalType(AbnormalType.NONE);
+			}
+			
+			return true;
+		}
 	}
 	
 	public synchronized void startAutoUseTask(Player player)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/readme.txt b/L2J_Mobius_Essence_5.2_FrostLord/readme.txt
index 916dd3d75e..fbe1d0bd2b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/readme.txt
+++ b/L2J_Mobius_Essence_5.2_FrostLord/readme.txt
@@ -127,6 +127,7 @@ Fluffy Reinforcement: https://eu.4game.com/patchnotes/lineage2essence/204/
 
 Dwelling of Spirits: https://eu.4game.com/patchnotes/lineage2essence/261/
 -Transcendent hunting zones
+-Pet extraction system
 
 Sylph: https://eu.4game.com/patchnotes/lineage2essence/281/
 -Sylph creation support
@@ -142,6 +143,7 @@ Frost Lord: https://eu.4game.com/patchnotes/lineage2essence/329/
 -Frost Lord castle
 -Revenge system
 
+
 Customs:
 -Newbie Helper NPC location info
 -Newbie Helper buff support until 40 level
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/account_gsdata.sql
index ed8c60bfae..a0072cc6e4 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/account_premium.sql
index 89f5887236..ce4703c5e7 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/achievement_box.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/achievement_box.sql
index a6750eef4c..64c5b1e4e8 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/achievement_box.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/achievement_box.sql
@@ -15,4 +15,4 @@ CREATE TABLE IF NOT EXISTS `achievement_box` (
 `box_state_slot_4` INT NOT NULL DEFAULT 0,
 `boxtype_slot_4` INT NOT NULL DEFAULT 0,
 PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/airships.sql
index 50453102dd..d5dece1b03 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/announcements.sql
index 0fef63e83e..88f8f519ad 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/auction_bid.sql
index 85b978f103..2e37fbe5ba 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/bbs_favorites.sql
index e7ace21bc9..a43fd1b53a 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/bot_reported_char_data.sql
index d7acdfa31b..98daf2dc12 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/buffer_schemes.sql
index 1784421092..bd964c8cc2 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/buffer_schemes.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL,
     PRIMARY KEY (`object_id`,`scheme_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle.sql
index c7b5613401..9fb7fea4e6 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 -- (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_doorupgrade.sql
index ee822091b4..43a573b36e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_functions.sql
index d270fca8a8..d8c1aaaeeb 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_manor_procure.sql
index 54c8517f65..a6cd5a00c3 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_manor_production.sql
index 3980eef7aa..71ea5b8591 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_siege_guards.sql
index b0c16e12c9..7449f852c3 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_trapupgrade.sql
index a0854df17e..139a3a5d45 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_contacts.sql
index 3c2c5fb85a..9d8d163095 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_hennas.sql
index 668374b2ab..8174451ef2 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_instance_time.sql
index 1a82cf40e2..2eaa3164a3 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_item_reuse_save.sql
index f2773fc195..22857bd4de 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_macroses.sql
index 7db9ed6b15..0a5f6b3390 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(1255) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_mentees.sql
index 2ad58e3219..d067728900 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_offline_trade.sql
index f61c711822..16925760e5 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_offline_trade_items.sql
index d8a9e0b8e1..38ffd73ae0 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_potens.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_potens.sql
index 16b2a7bc7c..e8b138b33b 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_potens.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_potens.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_potens` (
   `enchant_level` INT NOT NULL DEFAULT 0,
   `enchant_exp` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot_position`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_premium_items.sql
index 6b25480f4c..0f613d1029 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_purge.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_purge.sql
index d50a902ce1..9c08f111be 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_purge.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_purge.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_purge` (
   `keys` int(10) UNSIGNED NOT NULL DEFAULT 0,
   `remainingKeys` int(10) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`category`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_quests.sql
index 6199526ae6..93db47171d 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_random_craft.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_random_craft.sql
index 977113bbe3..c83402513c 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_random_craft.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_random_craft.sql
@@ -25,4 +25,4 @@ CREATE TABLE IF NOT EXISTS `character_random_craft` (
   `item_5_locked` TINYINT NOT NULL DEFAULT 0,
   `item_5_lock_left` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_ranking_history.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_ranking_history.sql
index 3f938ba850..d2da345dec 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_ranking_history.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_ranking_history.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_ranking_history` (
   `ranking` int(20) NOT NULL,
   `exp` bigint(20) NOT NULL,
   PRIMARY KEY (`charId`,`day`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_recipebook.sql
index 74cc6b8bd6..807005f0c1 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_recipeshoplist.sql
index e448547654..e81faed7a4 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_reco_bonus.sql
index f283ca5136..9717ebc5e9 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_revenge_history.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_revenge_history.sql
index 5be9d849cf..717d779932 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_revenge_history.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_revenge_history.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `character_revenge_history` (
   `shared_teleport_remaining` int NOT NULL DEFAULT 0,
   `kill_time` BIGINT(10) UNSIGNED NOT NULL,
   `share_time` BIGINT(10) UNSIGNED NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_spirits.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_spirits.sql
index ac73d8dbe3..bb4044039f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_spirits.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_spirits.sql
@@ -11,6 +11,5 @@ CREATE TABLE `character_spirits`
     `crit_rate_points`   TINYINT      NOT NULL DEFAULT 0,
     `crit_damage_points` TINYINT      NOT NULL DEFAULT 0,
     `in_use`             BOOLEAN      NOT NULL DEFAULT FALSE,
-    PRIMARY KEY (`charId`, `type`),
-    FOREIGN KEY FK_CHARACTER_SPIRITS (`charId`) REFERENCES characters (`charId`) ON DELETE CASCADE
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+    PRIMARY KEY (`charId`, `type`)
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_summons.sql
index e089d258b3..1936e548d4 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_surveillances.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_surveillances.sql
index 49b3fdaa3d..734b714c5e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_surveillances.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_surveillances.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_surveillances` (
   `charId` INT UNSIGNED NOT NULL,
   `targetId` INT UNSIGNED NOT NULL,
   PRIMARY KEY (`charId`,`targetId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_tpbookmark.sql
index df70351c2e..2cd0efe8b1 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_variables.sql
index 97a8a898d0..82f8e79930 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/characters.sql
index 4df7d3f88c..f39a66c2db 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/characters.sql
@@ -62,4 +62,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_data.sql
index f8b64d99db..49f88c0122 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_data.sql
@@ -24,4 +24,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_notices.sql
index 3ab4c18480..7464ee18bd 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_privs.sql
index 6478e63f8a..af4e35a46b 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_skills.sql
index 785d9e489a..10b722e90e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_subpledges.sql
index 558ae695e1..64c31b7f38 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/collection_favorites.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/collection_favorites.sql
index 7571da448f..49758d7815 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/collection_favorites.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/collection_favorites.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `collection_favorites` (
   `accountName` VARCHAR(45) NOT NULL DEFAULT '',
   `collectionId` int(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`accountName`,`collectionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/collections.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/collections.sql
index 8c0fafc9fd..1ff9772ad3 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/collections.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/collections.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `collections` (
   `collectionId` int(3) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`accountName`,`collectionId`,`index`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/custom_mail.sql
index 59cb8b5cfa..0ad31ec68a 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/custom_teleport.sql
index 27a5d0d877..9dd08290ac 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/enchant_challenge_points.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/enchant_challenge_points.sql
index 0cdbee7ee0..f6a80aaeed 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/enchant_challenge_points.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/enchant_challenge_points.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `enchant_challenge_points` (
   `groupId` INT NOT NULL,
   `points` INT NOT NULL,
   PRIMARY KEY (`charId`,`groupId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/enchant_challenge_points_recharges.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/enchant_challenge_points_recharges.sql
index 61bbd111af..612ed9c4de 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/enchant_challenge_points_recharges.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/enchant_challenge_points_recharges.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `enchant_challenge_points_recharges` (
   `optionIndex` INT NOT NULL,
   `count` INT NOT NULL,
   PRIMARY KEY (`charId`, `groupId`, `optionIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort.sql
index bb4f761682..caf1e50e76 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 -- (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8bca5d13fe..87e445876e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort_functions.sql
index 3c0bdfc42a..9ec9f577d2 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort_siege_guards.sql
index 19df57a3b9..43763210b4 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort_spawnlist.sql
index 22303a9b09..144979acd9 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,4 +11,4 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fortsiege_clans.sql
index ea5e71a909..5ae471842d 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/forums.sql
index d7bb88e274..af3a8be6ec 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/global_tasks.sql
index ec8fd2c36e..5b2a05d01d 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/global_variables.sql
index 580d9cd7e5..42bde4188f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/grandboss_data.sql
index b4a1f552fd..7cf6d2865d 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, 93069, 8925, -3904, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/heroes.sql
index ae59eb8ba1..f2ee5692a8 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/heroes.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/heroes_diary.sql
index e2195a1fea..0cc38a3bdf 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/huntpass.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/huntpass.sql
index 7108d1448a..69c5e19f44 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/huntpass.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/huntpass.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `huntpass` (
   `sayha_points_used` INT NOT NULL DEFAULT 0,
   `unclaimed_reward` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_auction.sql
index d73ec83417..4d654f9671 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_auction_bid.sql
index a132cbf33b..1fa2a7d060 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_elementals.sql
index 73c76bff70..16212982cb 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_transaction_history.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_transaction_history.sql
index f8ba353a1f..cd3be96e9a 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_transaction_history.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_transaction_history.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_transaction_history` (
    `price` BIGINT UNSIGNED NOT NULL,
    `count` BIGINT UNSIGNED NOT NULL,
    PRIMARY KEY (`created_time`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/items.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/items.sql
index c2225c1f32..c701ef6748 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/itemsonground.sql
index e0750ce461..cd0b66704c 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/merchant_lease.sql
index 5860107e3d..a5228f511e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/olympiad_data.sql
index f3f1b5b54e..c00edf499e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/olympiad_fights.sql
index ccd4ac94ec..f25cc4c1fa 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(4) NOT NULL DEFAULT 0,
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/olympiad_nobles.sql
index 386b27df45..0f48e9f71c 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index f22562d0d5..fde44db92f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/pet_evolves.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/pet_evolves.sql
index e825631c85..51fcd5eba8 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/pet_evolves.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/pet_evolves.sql
@@ -5,4 +5,4 @@ CREATE TABLE `pet_evolves` (
 	`level` int NOT NULL DEFAULT '0',
 	PRIMARY KEY  (`itemObjId`, `index`, `level`),
     UNIQUE KEY `pet_evolves` (`itemObjId`, `index`, `level`)
-) ENGINE=MyISAM;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/pet_skills.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/pet_skills.sql
index 2b502c7738..b680f21972 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/pet_skills.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/pet_skills.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `pet_skills` (
   `skillId` INT NOT NULL DEFAULT 0,
   `skillLevel` INT(3) NOT NULL DEFAULT 1,
   PRIMARY KEY (`petObjItemId`,`skillId`,`skillLevel`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/petition_feedback.sql
index 2907d19d72..7752f5ab17 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/pets.sql
index 58b188bbcd..b7e9d545db 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/posts.sql
index 4b212c323c..179355fd62 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/siege_clans.sql
index f649ceb8e7..0cec8f57b5 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/topic.sql
index 75f73ee48c..ac232c9d55 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/world_exchange_items.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/world_exchange_items.sql
index 0db48c4d37..0c64236313 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/world_exchange_items.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/game/world_exchange_items.sql
@@ -9,4 +9,4 @@ CREATE TABLE `world_exchange_items`  (
   `start_time` bigint(13) unsigned NOT NULL DEFAULT '0',
   `end_time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`world_exchange_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/login/account_data.sql
index 1614f50a50..9f90064c1c 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/login/accounts.sql
index 66583e0598..00030c86cc 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/login/accounts_ipauth.sql
index 0421147ef2..5e37e293e6 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/login/gameservers.sql
index c6f6c5ee36..d2a3e1ee5d 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_Essence_6.3_Crusader/dist/game/config/Custom/FakePlayers.ini
index f745b0d31e..d10a01dec1 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/config/General.ini b/L2J_Mobius_Essence_6.3_Crusader/dist/game/config/General.ini
index 01d27cf6f0..d0861daa05 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/config/General.ini
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/config/General.ini
@@ -436,8 +436,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
@@ -646,6 +646,11 @@ AutoPlayAttackAction = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 
 # ---------------------------------------------------------------------------
 # Purge Settings
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/ActionData.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/ActionData.xml
index 3ede8e344b..f800f0e749 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/ActionData.xml
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
-	<action id="0" handler="SitStand" />
-	<action id="1" handler="RunWalk" />
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
+	<action id="0" handler="SitStand" /> <!-- Sit / Stand -->
+	<action id="1" handler="RunWalk" /> <!-- Walk / Run -->
+	<action id="2" handler="None" /> <!-- Attack -->
+	<action id="3" handler="None" /> <!-- Trade -->
+	<action id="4" handler="None" /> <!-- Next Target (Melee) -->
+	<action id="5" handler="None" /> <!-- Pick Up -->
+	<action id="6" handler="None" /> <!-- Assist -->
+	<action id="7" handler="None" /> <!-- Invite -->
+	<action id="8" handler="None" /> <!-- Leave Party -->
+	<action id="9" handler="None" /> <!-- Dismiss Party Member -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store - Sell -->
 	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
-	<action id="16" handler="PetAttack" /> <!-- Attack -->
-	<action id="17" handler="PetStop" /> <!-- Stop -->
-	<action id="19" handler="UnsummonPet" />
-	<action id="21" handler="ServitorHold" /> <!-- Change Movement Mode -->
-	<action id="22" handler="ServitorAttack" /> <!-- Attack -->
-	<action id="23" handler="ServitorStop" /> <!-- Stop -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
+	<action id="16" handler="PetAttack" /> <!-- Pet's Attack -->
+	<action id="17" handler="PetStop" /> <!-- Stop Pet -->
+	<action id="19" handler="UnsummonPet" /> <!-- Recall Pet -->
+	<action id="20" handler="None" /> <!-- Special skill -->
+	<action id="21" handler="ServitorHold" /> <!-- Change Servitor's Movement Mode -->
+	<action id="22" handler="ServitorAttack" /> <!-- Servitor's attack -->
+	<action id="23" handler="ServitorStop" /> <!-- Stop Servitor -->
 	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
-	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Wild Cannon -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
+	<action id="27" handler="None" /> <!-- Special skill -->
+	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store - Buy -->
+	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Switch Mode -->
 	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
-	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Soulless - Toxic Smoke -->
-	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Manufacture -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Hog Cannon - Attack -->
-	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Kai the Cat - Self Damage Shield -->
-	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Unicorn Merrow - Hydro Screw -->
-	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Big Boom - Boom Attack -->
-	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Unicorn Boxer - Master Recharge -->
-	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mew the Cat - Mega Storm Strike -->
-	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Silhouette - Steal Blood -->
-	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanic Golem - Mech. Cannon -->
-	<action id="52" handler="UnsummonServitor" />
-	<action id="53" handler="ServitorMove" /> <!-- Move to target -->
-	<action id="54" handler="PetMove" /> <!-- Move to target -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<action id="64" handler="TeleportBookmark" />
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
+	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Toxic Smoke -->
+	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Workshop -->
+	<action id="38" handler="Ride" /> <!-- Mount/Dismount -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Parasite Burst -->
+	<action id="40" handler="None" /> <!-- Recommend -->
+	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Cannon -->
+	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Personal Damage Shield -->
+	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Water Pit -->
+	<action id="44" handler="ServitorSkillUse" option="4139" /> <!-- Booming Attack -->
+	<action id="45" handler="ServitorSkillUse" option="4025" /> <!-- Master Recharge -->
+	<action id="46" handler="ServitorSkillUse" option="4261" /> <!-- Mega Storm Strike -->
+	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Steal Blood -->
+	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanical Cannon -->
+	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Wild Temper -->
+	<action id="50" handler="None" /> <!-- Change Party Leader -->
+	<action id="52" handler="UnsummonServitor" /> <!-- Unsummon -->
+	<action id="53" handler="ServitorMove" /> <!-- Move -->
+	<action id="56" handler="None" /> <!-- Command Channel Invite -->
+	<action id="64" handler="TeleportBookmark" /> <!-- My Teleport -->
 	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
 	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
 	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
@@ -50,175 +50,203 @@
 	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
 	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
 	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Token 1: Star -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Token 2: Heart -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Token 3: Moon -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Token 4: Cross -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Token 1: Star -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Token 2: Heart -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Token 3: Moon -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Token 4: Cross -->
 	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
 	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" />
-	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Golem - Siege Hammer -->
-	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wind Hatchling/Strider - Wild Stun -->
-	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wind Hatchling/Strider - Wild Defense -->
-	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Star Hatchling/Strider - Bright Burst -->
-	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Star Hatchling/Strider - Bright Heal -->
-	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Cat Queen - Blessing of Queen -->
-	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Cat Queen - Gift of Queen -->
-	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Cat Queen - Cure of Queen -->
-	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Unicorn Seraphim - Blessing of Seraphim -->
-	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Unicorn Seraphim - Gift of Seraphim -->
-	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Unicorn Seraphim - Cure of Seraphim -->
-	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Nightshade - Curse of Shade -->
-	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Nightshade - Mass Curse of Shade -->
-	<action id="1015" handler="ServitorSkillUse" option="50094" /> <!-- Nightshade - Shadow's Despair -->
-	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Man - Cursed Blow -->
-	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Man - Cursed Strike/Stun -->
-	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Feline King - Slash -->
-	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Feline King - Spinning Slash -->
-	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Feline King - Grip of the Cat -->
-	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Magnus the Unicorn - Whiplash -->
-	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Magnus the Unicorn - Tridal Wave -->
-	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Spectral Lord - Corpse Kaboom -->
-	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Spectral Lord - Dicing Death -->
-	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Spectral Lord - Force Curse -->
-	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Swoop Cannon - Cannon Fodder -->
-	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Swoop Cannon - Big Bang -->
-	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Great Wolf - Bite Attack -->
-	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Great Wolf - Maul -->
-	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Great Wolf - Cry of the Wolf -->
-	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Great Wolf - Awakening -->
-	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Great Wolf - Howl -->
-	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider - Roar -->
-	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast - Bite -->
-	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast - Stun Attack -->
-	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast - Fire Breath -->
-	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast - Roar -->
-	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Feline Queen - Bless The Body -->
-	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Feline Queen - Bless The Soul -->
-	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Feline Queen - Haste -->
-	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Unicorn Seraphim - Acumen -->
-	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Unicorn Seraphim - Clarity -->
-	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Unicorn Seraphim - Empower -->
-	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Unicorn Seraphim - Wild Magic -->
-	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Nightshade - Death Whisper -->
-	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Nightshade - Focus -->
-	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Nightshade - Guidance -->
-	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Wild Beast Fighter, White Weasel - Death blow -->
-	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Wild Beast Fighter - Double attack -->
-	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Wild Beast Fighter - Spin attack -->
-	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Wild Beast Fighter - Meteor Shower -->
-	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening -->
-	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Fox Shaman, Spirit Shaman - Thunder Bolt -->
-	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Fox Shaman, Spirit Shaman - Flash -->
-	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
-	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
-	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
-	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
-	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
-	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
-	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
-	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Toy Knight - Battle Cry -->
-	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Turtle Ascetic - Power Smash -->
-	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Turtle Ascetic - Energy Burst -->
-	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Turtle Ascetic - Shockwave -->
-	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Turtle Ascetic - Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
-	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off -->
+	<action id="93" handler="None" /> <!-- Next Target (Range) -->
+	<action id="96" handler="None" /> <!-- Strike Back -->
+	<action id="97" handler="None" /> <!-- Combat Mode -->
+	<action id="98" handler="None" /> <!-- Disapproval -->
+	<action id="99" handler="None" /> <!-- Share location -->
+	<action id="100" handler="None" /> <!-- Party/Command Channel Request -->
+	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Hammer -->
+	<action id="1001" handler="None" /> <!-- Ultimate Bombastic Buster -->
+	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Hostile Feeling -->
+	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wild Stun -->
+	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wild Defense -->
+	<action id="1005" handler="PetSkillUse" option="4712" /> <!-- Bright Burst -->
+	<action id="1006" handler="PetSkillUse" option="4713" /> <!-- Bright Heal -->
+	<action id="1007" handler="ServitorSkillUse" option="4699" /> <!-- Queen's Blessing -->
+	<action id="1008" handler="ServitorSkillUse" option="4700" /> <!-- Queen's Gift -->
+	<action id="1009" handler="ServitorSkillUse" option="4701" /> <!-- Queen's Cure -->
+	<action id="1010" handler="ServitorSkillUse" option="4702" /> <!-- Seraphim's Blessing -->
+	<action id="1011" handler="ServitorSkillUse" option="4703" /> <!-- Seraphim's Gift -->
+	<action id="1012" handler="ServitorSkillUse" option="4704" /> <!-- Seraphim's Cure -->
+	<action id="1013" handler="ServitorSkillUse" option="4705" /> <!-- Shadow's Curse -->
+	<action id="1014" handler="ServitorSkillUse" option="4706" /> <!-- Shadow's Mass Curse -->
+	<action id="1015" handler="ServitorSkillUse" option="50094" /> <!-- Shadow's Despair -->
+	<action id="1016" handler="ServitorSkillUse" option="4709" /> <!-- Cursed Blow -->
+	<action id="1017" handler="ServitorSkillUse" option="4708" /> <!-- Cursed Strike -->
+	
+	<!-- TODO: Find skill ids. -->
+	<action id="1018" handler="ServitorSkillUse" option="0" /> <!-- Cursed HP Draining -->
+	<action id="1019" handler="ServitorSkillUse" option="0" /> <!-- Kat the Cat's Skill 2 -->
+	<action id="1020" handler="ServitorSkillUse" option="0" /> <!-- Mew the Cat's Skill 2 -->
+	<action id="1021" handler="ServitorSkillUse" option="0" /> <!-- Kai the Cat's Skill 2 -->
+	<action id="1022" handler="ServitorSkillUse" option="0" /> <!-- Boxer the Unicorn's Skill 2 -->
+	<action id="1023" handler="ServitorSkillUse" option="0" /> <!-- Mirage the Unicorn's Skill 2 -->
+	<action id="1024" handler="ServitorSkillUse" option="0" /> <!-- Merrow the Unicorn's Skill 2 -->
+	<action id="1025" handler="ServitorSkillUse" option="0" /> <!-- Shadow's Skill 1 -->
+	<action id="1026" handler="ServitorSkillUse" option="0" /> <!-- Shadow's Skill 2 -->
+	<action id="1027" handler="ServitorSkillUse" option="0" /> <!-- Silhouette's Skill -->
+	<action id="1028" handler="ServitorSkillUse" option="0" /> <!-- Reanimated Man's Skill 1 -->
+	<action id="1029" handler="ServitorSkillUse" option="0" /> <!-- Reanimated Man's Skill 2 -->
+	<action id="1030" handler="ServitorSkillUse" option="0" /> <!-- Corrupted Man's Skill 2 -->
+	
+	<action id="1031" handler="ServitorSkillUse" option="5135" /> <!-- Slash -->
+	<action id="1032" handler="ServitorSkillUse" option="5136" /> <!-- Spin Slash -->
+	<action id="1033" handler="ServitorSkillUse" option="5137" /> <!-- Cat's Grip -->
+	<action id="1034" handler="ServitorSkillUse" option="5138" /> <!-- Whiplash -->
+	<action id="1035" handler="ServitorSkillUse" option="5139" /> <!-- Tidal Wave -->
+	<action id="1036" handler="ServitorSkillUse" option="5142" /> <!-- Corpse Burst -->
+	<action id="1037" handler="ServitorSkillUse" option="5141" /> <!-- Dicing Death -->
+	<action id="1038" handler="ServitorSkillUse" option="5140" /> <!-- Dark Curse -->
+	<action id="1039" handler="ServitorSkillUse" option="5110" /> <!-- Cannon Fodder -->
+	<action id="1040" handler="ServitorSkillUse" option="5111" /> <!-- Big Bang -->
+	<action id="1041" handler="PetSkillUse" option="5442" /> <!-- Bite Attack -->
+	<action id="1042" handler="PetSkillUse" option="5444" /> <!-- Tearing Blow -->
+	<action id="1043" handler="PetSkillUse" option="5443" /> <!-- Wolf Cry -->
+	<action id="1044" handler="PetSkillUse" option="5445" /> <!-- Awakening -->
+	<action id="1045" handler="PetSkillUse" option="5584" /> <!-- Wolf Howl -->
+	<action id="1046" handler="PetSkillUse" option="5585" /> <!-- Strider Roar -->
+	<action id="1047" handler="ServitorSkillUse" option="5580" /> <!-- Divine Beast's Bite -->
+	<action id="1048" handler="ServitorSkillUse" option="5581" /> <!-- Divine Beast's Stun Attack -->
+	<action id="1049" handler="ServitorSkillUse" option="5582" /> <!-- Divine Beast's Fire Breath -->
+	<action id="1050" handler="ServitorSkillUse" option="5583" /> <!-- Divine Beast's Roar -->
+	<action id="1051" handler="ServitorSkillUse" option="5638" /> <!-- Blessed Body -->
+	<action id="1052" handler="ServitorSkillUse" option="5639" /> <!-- Blessed Soul -->
+	<action id="1053" handler="ServitorSkillUse" option="5640" /> <!-- Haste -->
+	<action id="1054" handler="ServitorSkillUse" option="5643" /> <!-- Acumen -->
+	<action id="1055" handler="ServitorSkillUse" option="5647" /> <!-- Clarity -->
+	<action id="1056" handler="ServitorSkillUse" option="5648" /> <!-- Empower -->
+	<action id="1057" handler="ServitorSkillUse" option="5646" /> <!-- Wild Magic -->
+	<action id="1058" handler="ServitorSkillUse" option="5652" /> <!-- Death Whisper -->
+	<action id="1059" handler="ServitorSkillUse" option="5653" /> <!-- Focus -->
+	<action id="1060" handler="ServitorSkillUse" option="5654" /> <!-- Guidance -->
+	<action id="1061" handler="PetSkillUse" option="5745" /> <!-- Death Blow -->
+	<action id="1062" handler="PetSkillUse" option="5746" /> <!-- Double Attack -->
+	<action id="1063" handler="PetSkillUse" option="5747" /> <!-- Spin Attack -->
+	<action id="1064" handler="PetSkillUse" option="5748" /> <!-- Meteor Shower -->
+	<action id="1065" handler="PetSkillUse" option="5753" /> <!-- Awakening -->
+	<action id="1066" handler="PetSkillUse" option="5749" /> <!-- Thunder Bolt -->
+	<action id="1067" handler="PetSkillUse" option="5750" /> <!-- Blaze -->
+	<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Lightning Wave -->
+	<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Flare -->
+	<action id="1070" handler="PetSkillUse" option="5771" /> <!-- Buff Control -->
+	<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Power Strike -->
+	<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Piercing Attack -->
+	<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Whirlwind -->
+	<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Spear Smash -->
+	<action id="1075" handler="PetSkillUse" option="6049" /> <!-- Battle Cry -->
+	<action id="1076" handler="PetSkillUse" option="6050" /> <!-- Power Smash -->
+	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Energy Burst -->
+	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Shock Wave -->
+	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Howl -->
+	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch Tactics -->
+	<action id="1085" handler="ServitorSkillUse" option="4707" /> <!-- Shadow's Sacrifice -->
 	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
-	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
-	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
-	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Deinonychus - Tail Strike -->
-	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Guardian's Strider - Strider Bite -->
-	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Guardian's Strider - Strider Fear -->
-	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Guardian's Strider - Strider Dash -->
-	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen - Maguen Strike -->
-	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen - Maguen Wind Walk -->
-	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Elite Maguen - Maguen Power Strike -->
-	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen - Elite Maguen Wind Walk -->
-	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen - Maguen Return -->
-	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Elite Maguen - Maguen Party Return -->
-	<action id="1099" handler="ServitorAttack" /> <!-- All Attack -->
-	<action id="1100" handler="ServitorMove" /> <!-- All Move to target -->
-	<action id="1101" handler="ServitorStop" /> <!-- All Stop -->
-	<action id="1102" handler="UnsummonServitor" />
-	<action id="1103" handler="ServitorMode" option="1" /> <!-- All Passive mode -->
-	<action id="1104" handler="ServitorMode" option="2" /> <!-- All Defending mode -->
-	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Cute Bear - Bear Claw -->
-	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Cute Bear - Bear Tumbling -->
-	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Saber Tooth Cougar- Cougar Bite -->
-	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Saber Tooth Cougar - Cougar Pounce -->
-	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Grim Reaper - Reaper Touch -->
-	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Grim Reaper - Reaper Power -->
-	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Golden Lion - Lion Roar -->
-	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Golden Lion - Lion Claw -->
-	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Golden Lion - Lion Dash -->
-	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Golden Lion - Lion Flame -->
-	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Hawk - Thunder Flight -->
-	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Hawk - Thunder Purity -->
-	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Hawk - Thunder Feather Blast -->
-	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Hawk - Thunder Sharp Claw -->
-	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Tree of Life - Blessing of Tree -->
-	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Golem - Siege Punch -->
-	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Wynn Kai the Cat - Feline Aggression -->
-	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Wynn Kai the Cat - Feline Stun -->
-	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Wynn Feline King - Feline Bite -->
-	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Wynn Feline King - Feline Pounce -->
-	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Wynn Feline Queen - Feline Touch -->
-	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Wynn Feline Queen - Feline Power -->
-	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Wynn Merrow - Unicorn's Aggression -->
-	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Wynn Merrow - Unicorn's Stun -->
-	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Wynn Magnus - Unicorn's Bite -->
-	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Wynn Magnus - Unicorn's Pounce -->
-	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Wynn Seraphim - Unicorn's Touch -->
-	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Wynn Seraphim - Unicorn's Power -->
-	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Wynn Nightshade - Phantom Aggression -->
-	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Wynn Nightshade - Phantom Stun -->
-	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Wynn Spectral Lord - Phantom Bite -->
-	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Wynn Spectral Lord - Phantom Pounce -->
-	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Wynn Soulless - Phantom Touch -->
-	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Wynn Soulless - Phantom Power -->
-	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Blood Panther - Panther Roar -->
-	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Blood Panther - Panther Rush -->
-	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Commando Cat - Commando Jumping Attack -->
-	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Commando Cat - Commando Double Slash -->
-	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Witch Cat - Elemental Slam -->
-	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Witch Cat - Witch Cat Power -->
-	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Unicorn Lancer - Lancer Rush -->
-	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Unicorn Lancer - Power Stamp -->
-	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Unicorn Cherub - Multiple Icicles -->
-	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Unicorn Cherub - Cherub Power -->
-	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Dark Crusader - Phantom Sword Attack -->
-	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
-	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
-	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
-	<action id="1168" handler="ServitorSkillUse" option="47902" /> <!-- Emperor's Blessing -->
-	<action id="1169" handler="ServitorSkillUse" option="47903" /> <!-- Outcry -->
-	<action id="1170" handler="ServitorSkillUse" option="47905" /> <!-- Guard's Blessing -->
-	<action id="1171" handler="ServitorSkillUse" option="47906" /> <!-- Trample -->
-	<action id="1172" handler="ServitorSkillUse" option="47908" /> <!-- Lord's Blessing -->
-	<action id="1173" handler="ServitorSkillUse" option="47909" /> <!-- Specter's Dance -->
-	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
-	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
-	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
-	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
-	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
-	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
-	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
-	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
-	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
-	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
-	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
-	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
-	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
-	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
-	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
-	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
+	<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther's Dark Claw -->
+	<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther's Fatal Claw -->
+	<action id="1089" handler="PetSkillUse" option="6199" /> <!-- Tail Strike -->
+	<action id="1090" handler="PetSkillUse" option="6205" /> <!-- Strider Bite -->
+	<action id="1091" handler="PetSkillUse" option="6206" /> <!-- Strider Fear -->
+	<action id="1092" handler="PetSkillUse" option="6207" /> <!-- Strider Dash -->
+	<action id="1093" handler="PetSkillUse" option="6618" /> <!-- Maguen's Strike -->
+	<action id="1094" handler="PetSkillUse" option="6681" /> <!-- Maguen Wind Walk -->
+	<action id="1095" handler="PetSkillUse" option="6619" /> <!-- Maguen's Power Strike -->
+	<action id="1096" handler="PetSkillUse" option="6682" /> <!-- Elite Maguen Wind Walk -->
+	<action id="1097" handler="PetSkillUse" option="6683" /> <!-- Maguen Return -->
+	<action id="1098" handler="PetSkillUse" option="6684" /> <!-- Maguen Party Return -->
+	<action id="1099" handler="ServitorAttack" /> <!-- Servitor's attack -->
+	<action id="1100" handler="ServitorMove" /> <!-- Servitor Move -->
+	<action id="1101" handler="ServitorStop" /> <!-- Stop Servitor -->
+	<action id="1102" handler="UnsummonServitor" /> <!-- Cancel Summon -->
+	<action id="1103" handler="ServitorMode" option="1" /> <!-- Passive -->
+	<action id="1104" handler="ServitorMode" option="2" /> <!-- Defense -->
+	<action id="1106" handler="ServitorSkillUse" option="11278" /> <!-- Bear Claw -->
+	<action id="1107" handler="ServitorSkillUse" option="11279" /> <!-- Bear Tumbling -->
+	<action id="1108" handler="ServitorSkillUse" option="11280" /> <!-- Cougar Bite -->
+	<action id="1109" handler="ServitorSkillUse" option="11281" /> <!-- Cougar Pounce -->
+	<action id="1110" handler="ServitorSkillUse" option="11282" /> <!-- Reaper Touch -->
+	<action id="1111" handler="ServitorSkillUse" option="11283" /> <!-- Reaper Power -->
+	<action id="1113" handler="ServitorSkillUse" option="10051" /> <!-- Lion Roar -->
+	<action id="1114" handler="ServitorSkillUse" option="10052" /> <!-- Lion Claw -->
+	<action id="1115" handler="ServitorSkillUse" option="10053" /> <!-- Lion Dash -->
+	<action id="1116" handler="ServitorSkillUse" option="10054" /> <!-- Lion Flame -->
+	<action id="1117" handler="ServitorSkillUse" option="10794" /> <!-- Thunder Flight -->
+	<action id="1118" handler="ServitorSkillUse" option="10795" /> <!-- Thunder Purity -->
+	<action id="1120" handler="ServitorSkillUse" option="10797" /> <!-- Thunder Feather Blast -->
+	<action id="1121" handler="ServitorSkillUse" option="10798" /> <!-- Thunder Sharp Claw -->
+	<action id="1122" handler="ServitorSkillUse" option="11806" /> <!-- Blessing of Life -->
+	<action id="1123" handler="ServitorSkillUse" option="14767" /> <!-- Siege Punch -->
+	<action id="1124" handler="ServitorSkillUse" option="11323" /> <!-- Feline Aggression -->
+	<action id="1125" handler="ServitorSkillUse" option="11324" /> <!-- Feline Stun -->
+	<action id="1126" handler="ServitorSkillUse" option="11325" /> <!-- Feline Bite -->
+	<action id="1127" handler="ServitorSkillUse" option="11326" /> <!-- Feline Pounce -->
+	<action id="1128" handler="ServitorSkillUse" option="11327" /> <!-- Feline Touch -->
+	<action id="1129" handler="ServitorSkillUse" option="11328" /> <!-- Feline Power -->
+	<action id="1130" handler="ServitorSkillUse" option="11332" /> <!-- Unicorn's Aggression -->
+	<action id="1131" handler="ServitorSkillUse" option="11333" /> <!-- Unicorn's Stun -->
+	<action id="1132" handler="ServitorSkillUse" option="11334" /> <!-- Unicorn's Bite -->
+	<action id="1133" handler="ServitorSkillUse" option="11335" /> <!-- Unicorn's Pounce -->
+	<action id="1134" handler="ServitorSkillUse" option="11336" /> <!-- Unicorn's Touch -->
+	<action id="1135" handler="ServitorSkillUse" option="11337" /> <!-- Unicorn's Power -->
+	<action id="1136" handler="ServitorSkillUse" option="11341" /> <!-- Phantom Aggression -->
+	<action id="1137" handler="ServitorSkillUse" option="11342" /> <!-- Phantom Stun -->
+	<action id="1138" handler="ServitorSkillUse" option="11343" /> <!-- Phantom Bite -->
+	<action id="1139" handler="ServitorSkillUse" option="11344" /> <!-- Phantom's Pounce -->
+	<action id="1140" handler="ServitorSkillUse" option="11345" /> <!-- Phantom Touch -->
+	<action id="1141" handler="ServitorSkillUse" option="11346" /> <!-- Phantom Power -->
+	<action id="1142" handler="ServitorSkillUse" option="10087" /> <!-- Panther Roar -->
+	<action id="1143" handler="ServitorSkillUse" option="10088" /> <!-- Panther Rush -->
+	<action id="1144" handler="ServitorSkillUse" option="11375" /> <!-- Magic Missile -->
+	<action id="1145" handler="ServitorSkillUse" option="11376" /> <!-- Entrenching -->
+	<action id="1146" handler="ServitorSkillUse" option="11378" /> <!-- Chain Block -->
+	<action id="1147" handler="ServitorSkillUse" option="11377" /> <!-- Blocked Target Change -->
+	<action id="1148" handler="ServitorSkillUse" option="11379" /> <!-- Breaking Blaster -->
+	<action id="1149" handler="ServitorSkillUse" option="11380" /> <!-- Blinking Attack -->
+	<action id="1150" handler="ServitorSkillUse" option="11382" /> <!-- Beast Within -->
+	<action id="1151" handler="ServitorSkillUse" option="11381" /> <!-- Hide -->
+	<action id="1152" handler="ServitorSkillUse" option="11383" /> <!-- Strong Bite -->
+	<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dire Claw -->
+	<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Leap Attack -->
+	<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Last Dire Claw -->
+	<action id="1156" handler="ServitorSkillUse" option="49032" /> <!-- Horn Thrust -->
+	<action id="1157" handler="ServitorSkillUse" option="49033" /> <!-- Rump Stun -->
+	<action id="1158" handler="ServitorSkillUse" option="49034" /> <!-- Pulling Body -->
+	<action id="1159" handler="ServitorSkillUse" option="49035" /> <!-- Breath of Hurricane -->
+	<action id="1160" handler="ServitorSkillUse" option="49042" /> <!-- Arrow Feather -->
+	<action id="1161" handler="ServitorSkillUse" option="49043" /> <!-- Quick Jump -->
+	
+	<!-- TODO: Find skill ids. -->
+	<action id="1162" handler="ServitorSkillUse" option="0" /> <!-- Feather Trap -->
+	<action id="1163" handler="ServitorSkillUse" option="0" /> <!-- Trap Explosion -->
+	
+	<action id="1164" handler="ServitorSkillUse" option="49044" /> <!-- Scout's Strike -->
+	<action id="1165" handler="ServitorSkillUse" option="49052" /> <!-- Crippling Bite -->
+	<action id="1166" handler="ServitorSkillUse" option="49054" /> <!-- Rushing Assault -->
+	<action id="1167" handler="ServitorSkillUse" option="49055" /> <!-- Back Explosion -->
+	<action id="1168" handler="ServitorSkillUse" option="47902" /> <!-- Skill: Emperor's Blessing -->
+	<action id="1169" handler="ServitorSkillUse" option="47903" /> <!-- Skill: Outcry -->
+	<action id="1170" handler="ServitorSkillUse" option="47905" /> <!-- Skill: Guard's Blessing -->
+	<action id="1171" handler="ServitorSkillUse" option="47906" /> <!-- Skill: Trample -->
+	<action id="1172" handler="ServitorSkillUse" option="47908" /> <!-- Skill: Lord's Blessing -->
+	<action id="1173" handler="ServitorSkillUse" option="47909" /> <!-- Skill: Specter's Dance -->
+	<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Hand of Warmth -->
+	<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Rosy Seduction -->
+	<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Art of Seduction -->
+	<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Thunder Bolt -->
+	<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Blaze -->
+	<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Lightning Wave -->
+	<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Buff Control -->
+	<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Piercing Attack -->
+	<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Spin Attack -->
+	<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Impale -->
+	<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Battle Cry -->
+	<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Power Smash -->
+	<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Energy Burst -->
+	<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Shock Wave -->
+	<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Ignite -->
+	<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Switch Tactics -->
+	<action id="5016" handler="PetSkillUse" option="23318" /> <!-- Cat the Ranger Boost -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/CategoryData.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/CategoryData.xml
index 4316018060..73ff94df19 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/CategoryData.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/CategoryData.xml
@@ -387,6 +387,38 @@
 	<category name="WYVERN_GROUP">
 		<id>15955</id> <!-- wyvern -->
 	</category>
+	<category name="PET_GROUP">
+		<id>16079</id> <!-- Buffalo Calf -->
+		<id>16080</id> <!-- Black Buffalo -->
+		<id>16081</id> <!-- White Buffalo -->
+		<id>16082</id> <!-- Black Combat Buffalo -->
+		<id>16083</id> <!-- White Combat Buffalo -->
+		<id>16084</id> <!-- Tiger Cub -->
+		<id>16085</id> <!-- White Tiger -->
+		<id>16086</id> <!-- Tiger -->
+		<id>16087</id> <!-- White Sharp clawed Tiger -->
+		<id>16088</id> <!-- Steel Sharp clawed Tiger -->
+		<id>16089</id> <!-- Kookaburra Chick -->
+		<id>16090</id> <!-- Red Kookaburra -->
+		<id>16091</id> <!-- Blue Kookaburra -->
+		<id>16092</id> <!-- Red Combat Kookaburra -->
+		<id>16093</id> <!-- Blue Combat Kookaburra -->
+		<id>16094</id> <!-- Dragon Hatchling -->
+		<id>16095</id> <!-- Green Dragon -->
+		<id>16096</id> <!-- Red Dragon -->
+		<id>16097</id> <!-- Earth Dragon -->
+		<id>16098</id> <!-- Fire Dragon -->
+		<id>16099</id> <!-- Hawk Hatchling -->
+		<id>16100</id> <!-- Red Hawk -->
+		<id>16101</id> <!-- Blue Hawk -->
+		<id>16102</id> <!-- Red Combat Hawk -->
+		<id>16103</id> <!-- Blue Combat Hawk -->
+		<id>16104</id> <!-- Wolf Cub -->
+		<id>16105</id> <!-- Black Wolf -->
+		<id>16106</id> <!-- While Wolf -->
+		<id>16107</id> <!-- Black Steel Wolf -->
+		<id>16108</id> <!-- White Steel Wolf -->
+	</category>
 	<category name="SUBJOB_GROUP_KNIGHT">
 		<id>5</id> <!-- paladin -->
 		<id>6</id> <!-- dark_avenger -->
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/DailyMission.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/DailyMission.xml
index 387ef266e8..0f9f9bc1a3 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/DailyMission.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/DailyMission.xml
@@ -1,767 +1,768 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/DailyMission.xsd">
 	<reward id="2001" reward_id="2001" name="Daily Hunting I (Lv. 21-40)" requiredCompletion="30" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 30 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 30 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">21</param>
 			<param name="maxLevel">40</param>
 		</handler>
 		<items>
-			<item id="90907" count="3" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="10" /> <!-- Spirit Ore -->
-			<item id="91912" count="3" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="3" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="10" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="3" /> <!-- HP Potion -->
 		</items>
 	</reward>
 	<reward id="2002" reward_id="2002" name="Daily Hunting II (Lv. 21-40)" requiredCompletion="60" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 60 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 60 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">21</param>
 			<param name="maxLevel">40</param>
 		</handler>
 		<items>
-			<item id="90907" count="3" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="10" /> <!-- Spirit Ore -->
-			<item id="91912" count="3" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="3" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="10" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="3" /> <!-- HP Potion -->
 		</items>
 	</reward>
 	<reward id="2003" reward_id="2003" name="Daily Hunting III (Lv. 21-40)" requiredCompletion="100" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 100 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 100 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">21</param>
 			<param name="maxLevel">40</param>
 		</handler>
 		<items>
-			<item id="90907" count="3" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="10" /> <!-- Spirit Ore -->
-			<item id="91912" count="3" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="3" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="10" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="3" /> <!-- HP Potion -->
 		</items>
 	</reward>
 	<reward id="2004" reward_id="2004" name="Daily Hunting IV (Lv. 21-40)" requiredCompletion="130" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 130 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 130 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">21</param>
 			<param name="maxLevel">40</param>
 		</handler>
 		<items>
-			<item id="90907" count="3" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="10" /> <!-- Spirit Ore -->
-			<item id="91912" count="3" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="3" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="10" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="3" /> <!-- HP Potion -->
 		</items>
 	</reward>
 	<reward id="2005" reward_id="2005" name="Daily Hunting V (Lv. 21-40)" requiredCompletion="160" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 160 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 160 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">21</param>
 			<param name="maxLevel">40</param>
 		</handler>
 		<items>
-			<item id="90907" count="3" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="10" /> <!-- Spirit Ore -->
-			<item id="91912" count="3" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="3" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="10" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="3" /> <!-- HP Potion -->
 		</items>
 	</reward>
 	<reward id="2101" reward_id="2101" name="Daily Hunting I (Lv. 41-50)" requiredCompletion="40" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 40 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 40 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">41</param>
 			<param name="maxLevel">50</param>
 		</handler>
 		<items>
-			<item id="90907" count="4" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="4" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="4" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="4" /> <!-- HP Potion -->
 		</items>
 	</reward>
 	<reward id="2102" reward_id="2102" name="Daily Hunting II (Lv. 41-50)" requiredCompletion="80" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 80 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 80 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">41</param>
 			<param name="maxLevel">50</param>
 		</handler>
 		<items>
-			<item id="90907" count="4" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="4" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="4" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="4" /> <!-- HP Potion -->
 		</items>
 	</reward>
 	<reward id="2103" reward_id="2103" name="Daily Hunting III (Lv. 41-50)" requiredCompletion="120" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 120 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 120 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">41</param>
 			<param name="maxLevel">50</param>
 		</handler>
 		<items>
-			<item id="90907" count="4" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="4" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="4" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="4" /> <!-- HP Potion -->
 		</items>
 	</reward>
 	<reward id="2104" reward_id="2104" name="Daily Hunting IV (Lv. 41-50)" requiredCompletion="160" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 160 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 160 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">41</param>
 			<param name="maxLevel">50</param>
 		</handler>
 		<items>
-			<item id="90907" count="4" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="4" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="4" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="4" /> <!-- HP Potion -->
 		</items>
 	</reward>
 	<reward id="2105" reward_id="2105" name="Daily Hunting V (Lv. 41-50)" requiredCompletion="200" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 200 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 200 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">41</param>
 			<param name="maxLevel">50</param>
 		</handler>
 		<items>
-			<item id="90907" count="4" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="4" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="4" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="4" /> <!-- HP Potion -->
 		</items>
 	</reward>
 	<reward id="2201" reward_id="2201" name="Daily Hunting I (Lv. 51-60)" requiredCompletion="50" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 50 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 50 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">51</param>
 			<param name="maxLevel">60</param>
 		</handler>
 		<items>
-			<item id="90907" count="5" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="5" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="5" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="5" /> <!-- HP Potion -->
 		</items>
 	</reward>
 	<reward id="2202" reward_id="2202" name="Daily Hunting II (Lv. 51-60)" requiredCompletion="100" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 100 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 100 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">51</param>
 			<param name="maxLevel">60</param>
 		</handler>
 		<items>
-			<item id="90907" count="5" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="5" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="5" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="5" /> <!-- HP Potion -->
 		</items>
 	</reward>
 	<reward id="2203" reward_id="2203" name="Daily Hunting III (Lv. 51-60)" requiredCompletion="150" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 150 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 150 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">51</param>
 			<param name="maxLevel">60</param>
 		</handler>
 		<items>
-			<item id="90907" count="5" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="5" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="5" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="5" /> <!-- HP Potion -->
 		</items>
 	</reward>
 	<reward id="2204" reward_id="2204" name="Daily Hunting IV (Lv. 51-60)" requiredCompletion="200" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 200 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 200 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">51</param>
 			<param name="maxLevel">60</param>
 		</handler>
 		<items>
-			<item id="90907" count="5" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="5" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="5" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="5" /> <!-- HP Potion -->
 		</items>
 	</reward>
 	<reward id="2205" reward_id="2205" name="Daily Hunting V (Lv. 51-60)" requiredCompletion="250" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 250 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 250 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">51</param>
 			<param name="maxLevel">60</param>
 		</handler>
 		<items>
-			<item id="90907" count="5" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="5" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="5" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="5" /> <!-- HP Potion -->
 		</items>
 	</reward>
 	<reward id="2301" reward_id="2301" name="Daily Hunting I (Lv. 61-70)" requiredCompletion="60" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 60 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 60 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">61</param>
 			<param name="maxLevel">70</param>
 		</handler>
 		<items>
-			<item id="90907" count="6" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="6" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="6" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="6" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2302" reward_id="2302" name="Daily Hunting II (Lv. 61-70)" requiredCompletion="120" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 120 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 120 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">61</param>
 			<param name="maxLevel">70</param>
 		</handler>
 		<items>
-			<item id="90907" count="6" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="6" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="6" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="6" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2303" reward_id="2303" name="Daily Hunting III (Lv. 61-70)" requiredCompletion="180" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 180 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 180 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">61</param>
 			<param name="maxLevel">70</param>
 		</handler>
 		<items>
-			<item id="90907" count="6" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="6" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="6" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="6" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2304" reward_id="2304" name="Daily Hunting IV (Lv. 61-70)" requiredCompletion="240" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 240 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 240 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">61</param>
 			<param name="maxLevel">70</param>
 		</handler>
 		<items>
-			<item id="90907" count="6" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="6" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="6" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="6" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2305" reward_id="2305" name="Daily Hunting V (Lv. 61-70)" requiredCompletion="300" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 300 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 300 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">61</param>
 			<param name="maxLevel">70</param>
 		</handler>
 		<items>
-			<item id="90907" count="6" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="6" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="6" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="6" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2401" reward_id="2401" name="Daily Hunting I (Lv. 71-75)" requiredCompletion="80" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 80 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 80 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">71</param>
 			<param name="maxLevel">75</param>
 		</handler>
 		<items>
-			<item id="90907" count="7" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="30" /> <!-- Spirit Ore -->
-			<item id="91912" count="7" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="7" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="30" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="7" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2402" reward_id="2402" name="Daily Hunting II (Lv. 71-75)" requiredCompletion="150" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 150 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 150 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">71</param>
 			<param name="maxLevel">75</param>
 		</handler>
 		<items>
-			<item id="90907" count="7" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="30" /> <!-- Spirit Ore -->
-			<item id="91912" count="7" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="7" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="30" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="7" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2403" reward_id="2403" name="Daily Hunting III (Lv. 71-75)" requiredCompletion="200" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 200 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 200 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">71</param>
 			<param name="maxLevel">75</param>
 		</handler>
 		<items>
-			<item id="90907" count="7" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="30" /> <!-- Spirit Ore -->
-			<item id="91912" count="7" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="7" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="30" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="7" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2404" reward_id="2404" name="Daily Hunting IV (Lv. 71-75)" requiredCompletion="300" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 300 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 300 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">71</param>
 			<param name="maxLevel">75</param>
 		</handler>
 		<items>
-			<item id="90907" count="7" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="30" /> <!-- Spirit Ore -->
-			<item id="91912" count="7" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="7" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="30" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="7" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2405" reward_id="2405" name="Daily Hunting V (Lv. 71-75)" requiredCompletion="400" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 400 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 400 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">71</param>
 			<param name="maxLevel">75</param>
 		</handler>
 		<items>
-			<item id="90907" count="7" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="30" /> <!-- Spirit Ore -->
-			<item id="91912" count="7" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="7" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="30" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="7" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2501" reward_id="2501" name="Daily Hunting I (Lv. 76+)" requiredCompletion="100" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 100 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 100 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="90907" count="8" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="40" /> <!-- Spirit Ore -->
-			<item id="91912" count="8" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="8" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="40" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="8" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2502" reward_id="2502" name="Daily Hunting II (Lv. 76+)" requiredCompletion="200" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 200 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 200 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="90907" count="8" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="40" /> <!-- Spirit Ore -->
-			<item id="91912" count="8" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="8" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="40" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="8" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2503" reward_id="2503" name="Daily Hunting III (Lv. 76+)" requiredCompletion="300" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 300 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 300 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="90907" count="8" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="40" /> <!-- Spirit Ore -->
-			<item id="91912" count="8" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="8" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="40" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="8" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2504" reward_id="2504" name="Daily Hunting IV (Lv. 76+)" requiredCompletion="400" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 400 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 400 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="90907" count="8" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="40" /> <!-- Spirit Ore -->
-			<item id="91912" count="8" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="8" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="40" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="8" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
-			<item id="97145" count="30" /> <!-- Ancient Adena -->
+			<item id="97145" count="20" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
 	<reward id="2505" reward_id="2505" name="Daily Hunting V (Lv. 76+)" requiredCompletion="500" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 500 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 500 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="90907" count="8" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="40" /> <!-- Spirit Ore -->
-			<item id="91912" count="8" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="8" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="40" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="8" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 			<item id="97145" count="30" /> <!-- Ancient Adena -->
+			<item id="93096" count="50" /> <!-- Red Libra Coin (Time-limited) - Sealed -->
 		</items>
 	</reward>
-	<reward id="1141" reward_id="827" name="Adventurer's Journey I (Lv. 20-30)" requiredCompletion="70" isOneTime="true">
+	<reward id="1141" reward_id="827" name="Adventurer's Journey I (Lv. 20-30)" requiredCompletion="70">
 		<!-- Kill 70 monsters in the following hunting zones: Ruins of Agony, Abandoned Camp. -->
 		<handler name="monster">
 			<param name="minLevel">20</param>
 			<param name="maxLevel">30</param>
 		</handler>
 		<items>
-			<item id="91654" count="1" /> <!-- Adventurer's Mark Lv.1 -->
+			<item id="91654" count="1" /> <!-- Adventurer's Mark Lv. 1 - Sealed -->
 		</items>
 	</reward>
-	<reward id="1142" reward_id="828" name="Adventurer's Journey II (Lv. 30-40)" requiredCompletion="150" isOneTime="true">
+	<reward id="1142" reward_id="828" name="Adventurer's Journey II (Lv. 30-40)" requiredCompletion="150">
 		<!-- Kill 150 monsters in the following hunting zones: Gorgon Flower Garden, Death Pass. -->
 		<handler name="monster">
 			<param name="minLevel">30</param>
 			<param name="maxLevel">40</param>
 		</handler>
 		<items>
-			<item id="91655" count="1" /> <!-- Adventurer's Mark Lv.2 -->
+			<item id="91655" count="1" /> <!-- Adventurer's Mark Lv. 2 - Sealed -->
 		</items>
 	</reward>
-	<reward id="1143" reward_id="829" name="Adventurer's Journey III (Lv. 40-60)" requiredCompletion="500" isOneTime="true">
+	<reward id="1143" reward_id="829" name="Adventurer's Journey III (Lv. 40-60)" requiredCompletion="500">
 		<!-- Kill 500 monsters in the following hunting zones: Sea of Spores, Cemetery, Fields of Massacre. -->
 		<handler name="monster">
 			<param name="minLevel">40</param>
 			<param name="maxLevel">60</param>
 		</handler>
 		<items>
-			<item id="91656" count="1" /> <!-- Adventurer's Mark Lv.3 -->
+			<item id="91656" count="1" /> <!-- Adventurer's Mark Lv. 3 - Sealed -->
 		</items>
 	</reward>
-	<reward id="1144" reward_id="830" name="Adventurer's Journey IV (Lv. 60-75" requiredCompletion="700" isOneTime="true">
+	<reward id="1144" reward_id="830" name="Adventurer's Journey IV (Lv. 60-75)" requiredCompletion="700">
 		<!-- Kill 700 monsters in the following hunting zones: Plains of Glory, War-Torn Plains, Silent Valley. -->
 		<handler name="monster">
 			<param name="minLevel">60</param>
 			<param name="maxLevel">75</param>
 		</handler>
 		<items>
-			<item id="91657" count="1" /> <!-- Adventurer's Mark Lv.4 -->
+			<item id="91657" count="1" /> <!-- Adventurer's Mark Lv. 4 - Sealed -->
 		</items>
 	</reward>
-	<reward id="1145" reward_id="831" name="Adventurer's Journey V (Lv. 76+)" requiredCompletion="1000" isOneTime="true">
+	<reward id="1145" reward_id="831" name="Adventurer's Journey V (Lv. 76+)" requiredCompletion="1000">
 		<!-- Kill 1000 monsters in the following hunting zones: Plains of the Lizardmen, Dragon Valley (west). -->
 		<handler name="monster">
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="91931" count="1" /> <!-- Adventurer's Mark Lv.5 -->
+			<item id="91931" count="1" /> <!-- Adventurer's Mark Lv. 5 - Sealed -->
 		</items>
 	</reward>
 	<reward id="4001" reward_id="1078" name="Reach Level 20" requiredCompletion="20">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 20. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 20. -->
 		<handler name="level">
 			<param name="level">20</param>
 		</handler>
 		<items>
-			<item id="94269" count="2" /> <!-- Scroll: Boost Attack -->
+			<item id="94269" count="2" /> <!-- Scroll: Boost Attack - Sealed -->
 		</items>
 	</reward>
 	<reward id="4002" reward_id="1079" name="Reach Level 30" requiredCompletion="30">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 30. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 30. -->
 		<handler name="level">
 			<param name="level">30</param>
 		</handler>
 		<items>
-			<item id="94269" count="3" /> <!-- Scroll: Boost Attack -->
+			<item id="94269" count="3" /> <!-- Scroll: Boost Attack - Sealed -->
 		</items>
 	</reward>
 	<reward id="4003" reward_id="1080" name="Reach Level 40" requiredCompletion="40">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 40. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 40. -->
 		<handler name="level">
 			<param name="level">40</param>
 		</handler>
 		<items>
-			<item id="94269" count="4" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="1" /> <!-- Scroll: Boost Defense -->
+			<item id="94269" count="4" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="1" /> <!-- Scroll: Boost Defense - Sealed -->
 		</items>
 	</reward>
 	<reward id="4004" reward_id="1081" name="Reach Level 45" requiredCompletion="45">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 45. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 45. -->
 		<handler name="level">
 			<param name="level">45</param>
 		</handler>
 		<items>
-			<item id="94269" count="5" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="2" /> <!-- Scroll: Boost Defense -->
+			<item id="94269" count="5" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="2" /> <!-- Scroll: Boost Defense - Sealed -->
 		</items>
 	</reward>
 	<reward id="5011" reward_id="5011" name="Reach Level 46" requiredCompletion="46">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 46. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 46. Event. -->
 		<handler name="level">
 			<param name="level">46</param>
 		</handler>
 		<items>
-			<item id="91910" count="5" /> <!-- Sayha's Blessing - Lv. 1-75 -->
+			<item id="91910" count="5" /> <!-- Sayha's Blessing - Lv. 1-75 - Sealed -->
 		</items>
 	</reward>
 	<reward id="5012" reward_id="5012" name="Reach Level 47" requiredCompletion="47">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 47. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 47. Event. -->
 		<handler name="level">
 			<param name="level">47</param>
 		</handler>
 		<items>
-			<item id="91910" count="5" /> <!-- Sayha's Blessing - Lv. 1-75 -->
+			<item id="91910" count="5" /> <!-- Sayha's Blessing - Lv. 1-75 - Sealed -->
 		</items>
 	</reward>
 	<reward id="5013" reward_id="5013" name="Reach Level 48" requiredCompletion="48">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 48. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 48. Event. -->
 		<handler name="level">
 			<param name="level">48</param>
 		</handler>
 		<items>
-			<item id="91910" count="5" /> <!-- Sayha's Blessing - Lv. 1-75 -->
+			<item id="91910" count="5" /> <!-- Sayha's Blessing - Lv. 1-75 - Sealed -->
 		</items>
 	</reward>
 	<reward id="5014" reward_id="5014" name="Reach Level 49" requiredCompletion="49">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 49. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 49. Event. -->
 		<handler name="level">
 			<param name="level">49</param>
 		</handler>
 		<items>
-			<item id="91910" count="5" /> <!-- Sayha's Blessing - Lv. 1-75 -->
+			<item id="91910" count="5" /> <!-- Sayha's Blessing - Lv. 1-75 - Sealed -->
 		</items>
 	</reward>
 	<reward id="4005" reward_id="1082" name="Reach Level 50" requiredCompletion="50">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 50. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 50. -->
 		<handler name="level">
 			<param name="level">50</param>
 		</handler>
 		<items>
-			<item id="94269" count="6" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="3" /> <!-- Scroll: Boost Defense -->
+			<item id="94269" count="6" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="3" /> <!-- Scroll: Boost Defense - Sealed -->
 		</items>
 	</reward>
 	<reward id="4006" reward_id="1083" name="Reach Level 55" requiredCompletion="55">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 55. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 55. -->
 		<handler name="level">
 			<param name="level">55</param>
 		</handler>
 		<items>
-			<item id="94269" count="7" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="4" /> <!-- Scroll: Boost Defense -->
+			<item id="94269" count="7" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="4" /> <!-- Scroll: Boost Defense - Sealed -->
 		</items>
 	</reward>
 	<reward id="4007" reward_id="1084" name="Reach Level 60" requiredCompletion="60">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 60. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 60. -->
 		<handler name="level">
 			<param name="level">60</param>
 		</handler>
 		<items>
-			<item id="94269" count="8" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="5" /> <!-- Scroll: Boost Defense -->
+			<item id="94269" count="8" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="5" /> <!-- Scroll: Boost Defense - Sealed -->
 		</items>
 	</reward>
 	<reward id="4008" reward_id="1085" name="Reach Level 65" requiredCompletion="65">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 65. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 65. -->
 		<handler name="level">
 			<param name="level">65</param>
 		</handler>
 		<items>
-			<item id="94269" count="9" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="6" /> <!-- Scroll: Boost Defense -->
+			<item id="94269" count="9" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="6" /> <!-- Scroll: Boost Defense - Sealed -->
 		</items>
 	</reward>
 	<reward id="4009" reward_id="1086" name="Reach Level 68" requiredCompletion="68">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 68. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 68. -->
 		<handler name="level">
 			<param name="level">68</param>
 		</handler>
 		<items>
-			<item id="94269" count="10" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="7" /> <!-- Scroll: Boost Defense -->
+			<item id="94269" count="10" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="7" /> <!-- Scroll: Boost Defense - Sealed -->
 		</items>
 	</reward>
 	<reward id="4010" reward_id="1087" name="Reach Level 71" requiredCompletion="71">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 71. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 71. -->
 		<handler name="level">
 			<param name="level">71</param>
 		</handler>
 		<items>
-			<item id="94269" count="11" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="8" /> <!-- Scroll: Boost Defense -->
+			<item id="94269" count="11" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="8" /> <!-- Scroll: Boost Defense - Sealed -->
 		</items>
 	</reward>
 	<reward id="4011" reward_id="1088" name="Reach Level 74" requiredCompletion="74">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 74. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 74. -->
 		<handler name="level">
 			<param name="level">74</param>
 		</handler>
 		<items>
-			<item id="94269" count="12" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="9" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="2" /> <!-- XP Growth Scroll -->
+			<item id="94269" count="12" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="9" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="2" /> <!-- XP Growth Scroll - Sealed -->
 		</items>
 	</reward>
 	<reward id="4012" reward_id="1089" name="Reach Level 76" requiredCompletion="76">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 76. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 76. -->
 		<handler name="level">
 			<param name="level">76</param>
 		</handler>
 		<items>
-			<item id="94269" count="13" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="10" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="4" /> <!-- XP Growth Scroll -->
+			<item id="94269" count="13" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="10" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="4" /> <!-- XP Growth Scroll - Sealed -->
 		</items>
 	</reward>
 	<reward id="4013" reward_id="1090" name="Reach Level 78" requiredCompletion="78">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 78. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 78. -->
 		<handler name="level">
 			<param name="level">78</param>
 		</handler>
 		<items>
-			<item id="94269" count="14" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="11" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="6" /> <!-- XP Growth Scroll -->
+			<item id="94269" count="14" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="11" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="6" /> <!-- XP Growth Scroll - Sealed -->
 		</items>
 	</reward>
 	<reward id="4014" reward_id="1091" name="Reach Level 79" requiredCompletion="79">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 79. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 79. -->
 		<handler name="level">
 			<param name="level">79</param>
 		</handler>
 		<items>
-			<item id="94269" count="15" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="12" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="8" /> <!-- XP Growth Scroll -->
+			<item id="94269" count="15" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="12" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="8" /> <!-- XP Growth Scroll - Sealed -->
 		</items>
 	</reward>
 	<reward id="4015" reward_id="1092" name="Reach Level 80" requiredCompletion="80">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 80. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 80. -->
 		<handler name="level">
 			<param name="level">80</param>
 		</handler>
 		<items>
-			<item id="94269" count="16" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="13" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="10" /> <!-- XP Growth Scroll -->
+			<item id="94269" count="16" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="13" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="10" /> <!-- XP Growth Scroll - Sealed -->
 		</items>
 	</reward>
 	<reward id="4016" reward_id="1093" name="Reach Level 81" requiredCompletion="81">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 81. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 81. -->
 		<handler name="level">
 			<param name="level">81</param>
 		</handler>
 		<items>
-			<item id="94269" count="17" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="14" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="12" /> <!-- XP Growth Scroll -->
+			<item id="94269" count="17" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="14" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="12" /> <!-- XP Growth Scroll - Sealed -->
 		</items>
 	</reward>
 	<reward id="4017" reward_id="1094" name="Reach Level 82" requiredCompletion="82">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 82. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 82. -->
 		<handler name="level">
 			<param name="level">82</param>
 		</handler>
 		<items>
-			<item id="94269" count="18" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="15" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="14" /> <!-- XP Growth Scroll -->
+			<item id="94269" count="18" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="15" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="14" /> <!-- XP Growth Scroll - Sealed -->
 		</items>
 	</reward>
 	<reward id="4018" reward_id="1095" name="Reach Level 83" requiredCompletion="83">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 83. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 83. -->
 		<handler name="level">
 			<param name="level">83</param>
 		</handler>
 		<items>
-			<item id="94269" count="19" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="16" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="16" /> <!-- XP Growth Scroll -->
+			<item id="94269" count="19" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="16" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="16" /> <!-- XP Growth Scroll - Sealed -->
 		</items>
 	</reward>
 	<reward id="4019" reward_id="1096" name="Reach Level 84" requiredCompletion="84">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 84. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 84. -->
 		<handler name="level">
 			<param name="level">84</param>
 		</handler>
 		<items>
-			<item id="94269" count="20" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="17" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="18" /> <!-- XP Growth Scroll -->
+			<item id="94269" count="20" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="17" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="18" /> <!-- XP Growth Scroll - Sealed -->
 		</items>
 	</reward>
 	<reward id="4020" reward_id="1097" name="Reach Level 85" requiredCompletion="85">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 85. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 85. -->
 		<handler name="level">
 			<param name="level">85</param>
 		</handler>
 		<items>
-			<item id="94269" count="21" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="18" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="20" /> <!-- XP Growth Scroll -->
-			<item id="94777" count="1" /> <!-- Berserker's Scroll -->
-			<item id="93062" count="1" /> <!-- Hat of Glory -->
+			<item id="94269" count="21" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="18" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="20" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="94777" count="1" /> <!-- Berserker's Scroll - Sealed -->
+			<item id="93062" count="1" /> <!-- Hat of Glory - Sealed -->
 		</items>
 	</reward>
 	<reward id="4021" reward_id="1098" name="Reach Level 86" requiredCompletion="86">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 86. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 86. -->
 		<handler name="level">
 			<param name="level">86</param>
 		</handler>
 		<items>
-			<item id="94269" count="22" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="19" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="22" /> <!-- XP Growth Scroll -->
-			<item id="94777" count="2" /> <!-- Berserker's Scroll -->
-			<item id="93064" count="1" /> <!-- <Rare> Weight Limit Ticket of Glory -->
+			<item id="94269" count="22" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="19" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="22" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="94777" count="2" /> <!-- Berserker's Scroll - Sealed -->
+			<item id="93064" count="1" /> <!-- Weight Limit Coupon of Glory - Sealed -->
 		</items>
 	</reward>
 	<reward id="4022" reward_id="1099" name="Reach Level 87" requiredCompletion="87">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 87. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 87. -->
 		<handler name="level">
 			<param name="level">87</param>
 		</handler>
 		<items>
-			<item id="94269" count="23" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="20" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="24" /> <!-- XP Growth Scroll -->
-			<item id="94777" count="3" /> <!-- Berserker's Scroll -->
-			<item id="93059" count="1" /> <!-- <Rare> Spellbook: Mount Glory of Champion -->
+			<item id="94269" count="23" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="20" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="24" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="94777" count="3" /> <!-- Berserker's Scroll - Sealed -->
+			<item id="93059" count="1" /> <!-- Spellbook: Mount Glorious Steed - Sealed -->
 		</items>
 	</reward>
 	<reward id="4023" reward_id="1100" name="Reach Level 88" requiredCompletion="88">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 88. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 88. -->
 		<handler name="level">
 			<param name="level">88</param>
 		</handler>
 		<items>
-			<item id="94269" count="24" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="22" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="24" /> <!-- XP Growth Scroll -->
-			<item id="94777" count="4" /> <!-- Berserker's Scroll -->
-			<item id="93063" count="1" /> <!-- <Rare> Inventory Expansion Ticket of Glory -->
+			<item id="94269" count="24" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="22" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="24" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="94777" count="4" /> <!-- Berserker's Scroll - Sealed -->
+			<item id="93063" count="1" /> <!-- Inventory Expansion Coupon of Glory - Sealed -->
 		</items>
 	</reward>
 	<reward id="4024" reward_id="1101" name="Reach Level 89" requiredCompletion="89">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 89. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 89. -->
 		<handler name="level">
 			<param name="level">89</param>
 		</handler>
 		<items>
-			<item id="94269" count="24" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="24" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="24" /> <!-- XP Growth Scroll -->
-			<item id="94777" count="5" /> <!-- Berserker's Scroll -->
-			<item id="93061" count="1" /> <!-- <Rare> Spellbook: Mount Shining Lady -->
+			<item id="94269" count="24" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="24" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="24" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="94777" count="5" /> <!-- Berserker's Scroll - Sealed -->
+			<item id="93061" count="1" /> <!-- Spellbook: Mount Shining Lady - Sealed -->
 		</items>
 	</reward>
 	<reward id="4025" reward_id="1102" name="Reach Level 90" requiredCompletion="90">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 90. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 90. -->
 		<handler name="level">
 			<param name="level">90</param>
 		</handler>
 		<items>
-			<item id="94269" count="24" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="24" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="24" /> <!-- XP Growth Scroll -->
-			<item id="94777" count="5" /> <!-- Berserker's Scroll -->
-			<item id="94765" count="1" /> <!-- Lv. 90 Achievement Reward Box -->
+			<item id="94269" count="24" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="24" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="24" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="94777" count="5" /> <!-- Berserker's Scroll - Sealed -->
+			<item id="94765" count="1" /> <!-- Lv. 90 Achievement Reward Box - Sealed -->
 		</items>
 	</reward>
 	<reward id="4026" reward_id="4026" name="Reach Level 91" requiredCompletion="91">
-		<!-- One-time mission. A reward is given when you reach Lv. 91.-->
+		<!-- One-time mission. A reward is given when you reach Lv. 91. -->
 		<handler name="level">
 			<param name="level">91</param>
 		</handler>
 		<items>
-			<item id="94269" count="30" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="30" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="30" /> <!-- XP Growth Scroll -->
-			<item id="94777" count="6" /> <!-- Berserker's Scroll -->
-			<item id="95888" count="1" /> <!-- Lv. 91 Achievement Reward Box -->
+			<item id="94269" count="30" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="30" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="30" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="94777" count="6" /> <!-- Berserker's Scroll - Sealed -->
+			<item id="95888" count="1" /> <!-- Lv. 91 Achievement Reward Box - Sealed -->
 		</items>
 	</reward>
 	<reward id="4027" reward_id="4027" name="Reach Level 92" requiredCompletion="92">
-		<!-- One-time mission. A reward is given when you reach Lv. 92.-->
+		<!-- One-time mission. A reward is given when you reach Lv. 92. -->
 		<handler name="level">
 			<param name="level">92</param>
 		</handler>
 		<items>
-			<item id="94269" count="36" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="36" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="36" /> <!-- XP Growth Scroll -->
-			<item id="94777" count="7" /> <!-- Berserker's Scroll -->
-			<item id="95889" count="1" /> <!-- Lv. 92 Achievement Reward Box -->
+			<item id="94269" count="36" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="36" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="36" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="94777" count="7" /> <!-- Berserker's Scroll - Sealed -->
+			<item id="95889" count="1" /> <!-- Lv. 92 Achievement Reward Box - Sealed -->
 		</items>
 	</reward>
 	<reward id="3007" reward_id="3007" name="Sayha's Blessing" requiredCompletion="10">
@@ -771,8 +772,9 @@
 			<param name="id">91910</param>
 		</handler>
 		<items>
-			<item id="94780" count="2" /> <!-- Growth Rune Fragment Sealed -->
-			<item id="97224" count="5" /> <!-- Mission Points -->
+			<item id="93274" count="10" /> <!-- Sayha's Cookie - Sealed -->
+			<item id="90907" count="30" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="500" /> <!-- Spirit Ore - Sealed -->
 		</items>
 	</reward>
 	<reward id="1500" reward_id="1500" name="Hunt in Transcendent Instance Zones" requiredCompletion="300">
@@ -780,95 +782,98 @@
 		<handler name="monster">
 			<param name="minLevel">40</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">22107,22108,22109,22122,22331,22111,22110,22112,22123,22116,22117,22118,22124,22113,22114,22115,22147,22148,22149,22275,22276,22277,22278</param>
 		</handler>
 		<items>
-			<item id="93274" count="100" /> <!-- Sayha's Cookie Sealed -->
+			<item id="93274" count="100" /> <!-- Sayha's Cookie - Sealed -->
 			<item id="97224" count="20" /> <!-- Mission Points -->
 			<item id="97145" count="50" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
-	<reward id="3019" reward_id="3011" name="Difficult Assault on the Orc Fortress" requiredCompletion="1">
+	<reward id="3019" reward_id="3019" name="Difficult Assault on Orc Fortress" requiredCompletion="1">
 		<!-- A reward is given for killing titled monsters during the battle for the Orc Fortress. -->
 		<handler name="monster">
 			<param name="minLevel">60</param>
 			<param name="maxLevel">99</param>
+			<param name="ids">22156</param>
 		</handler>
 		<items>
-			<item id="93068" count="1" /> <!-- Red Lantern -->
-			<item id="49674" count="3" /> <!-- XP Growth Scroll -->
+			<item id="49674" count="3" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="93068" count="1" /> <!-- Red Lantern - 1st Place - Sealed -->
+			<item id="97145" count="50" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
-	<reward id="3020" reward_id="3012" name="Assault on Orc Fortress" requiredCompletion="50">
+	<reward id="3020" reward_id="3020" name="Assault on Orc Fortress" requiredCompletion="50">
 		<!-- A reward is given for killing titleless monsters during the battle for the Orc Fortress. -->
 		<handler name="monster">
 			<param name="minLevel">60</param>
 			<param name="maxLevel">99</param>
+			<param name="ids">22164,22165,22166,22167,22168,22169,22170,22171,22172,22173,22174,22175,22176,22177,22178,22179,22180,22181</param>
 		</handler>
 		<items>
-			<item id="93070" count="5" /> <!-- Blue Lantern -->
-			<item id="49674" count="2" /> <!-- XP Growth Scroll -->
+			<item id="49674" count="2" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="93070" count="5" /> <!-- Blue Lantern - 3rd Place - Sealed -->
 		</items>
 	</reward>
-	<reward id="3013" reward_id="3013" name="3 vs 3 Olympiad Winner I" requiredCompletion="1">
-		<!-- One-time mission. A reward is given for winning a 3 vs 3 Olympiad match. Not available on Sundays. -->
+	<reward id="3013" reward_id="3013" name="Olympiad Winner I" requiredCompletion="1" isOneTime="false">
+		<!-- One-time mission. A reward is given for winning an Olympiad match. Available from Monday till Friday. -->
 		<handler name="olympiad" />
 		<items>
-			<item id="92991" count="3" /> <!-- Einhasad's Blessing Scroll -->
+			<item id="92991" count="3" /> <!-- Einhasad's Blessing Scroll - Sealed -->
 		</items>
 	</reward>
-	<reward id="3014" reward_id="3014" name="3 vs 3 Olympiad Winner II" requiredCompletion="2">
-		<!-- One-time mission. A reward is given for winning 2 of 3 vs 3 Olympiad matches. Not available on Sundays. -->
+	<reward id="3014" reward_id="3014" name="Olympiad Winner II" requiredCompletion="2" isOneTime="false">
+		<!-- One-time mission. A reward is given for winning 2 Olympiad matches. Available from Monday till Friday. -->
 		<handler name="olympiad" />
 		<items>
-			<item id="91690" count="50" /> <!-- Special HP Recovery Potion -->
+			<item id="91690" count="50" /> <!-- Special HP Recovery Potion - Sealed -->
 		</items>
 	</reward>
-	<reward id="3015" reward_id="3015" name="3 vs 3 Olympiad Winner III" requiredCompletion="3">
-		<!-- One-time mission. A reward is given for winning 3 of 3 vs 3 Olympiad matches. Not available on Sundays. -->
+	<reward id="3015" reward_id="3015" name="Olympiad Winner III" requiredCompletion="3">
+		<!-- One-time mission. A reward is given for winning 3 Olympiad matches. Available from Monday till Friday. -->
 		<handler name="olympiad" />
 		<items>
-			<item id="92991" count="5" /> <!-- Einhasad's Blessing Scroll -->
+			<item id="92991" count="5" /> <!-- Einhasad's Blessing Scroll - Sealed -->
 		</items>
 	</reward>
-	<reward id="3016" reward_id="3016" name="3 vs 3 Olympiad Winner IV" requiredCompletion="4">
-		<!-- One-time mission. A reward is given for winning 4 of 3 vs 3 Olympiad matches. Not available on Sundays. -->
+	<reward id="3016" reward_id="3016" name="Olympiad Winner IV" requiredCompletion="4">
+		<!-- One-time mission. A reward is given for winning 4 Olympiad matches. Available from Monday till Friday. -->
 		<handler name="olympiad" />
 		<items>
-			<item id="91690" count="100" /> <!-- Special HP Recovery Potion -->
+			<item id="91690" count="100" /> <!-- Special HP Recovery Potion - Sealed -->
 		</items>
 	</reward>
-	<reward id="3017" reward_id="3017" name="3 vs 3 Olympiad Winner V" requiredCompletion="5">
-		<!-- One-time mission. A reward is given for winning 5 of 3 vs 3 Olympiad matches. Not available on Sundays. -->
+	<reward id="3017" reward_id="3017" name="Olympiad Winner V" requiredCompletion="5">
+		<!-- One-time mission. A reward is given for winning 5 Olympiad matches. Available from Monday till Friday. -->
 		<handler name="olympiad" />
 		<items>
-			<item id="93290" count="1" /> <!-- Victory Pack -->
+			<item id="95687" count="1" /> <!-- Olympiad Treasure Chest - Sealed -->
 		</items>
 	</reward>
 	<reward id="3018" reward_id="3018" name="Olympiad Competitor" requiredCompletion="50">
-		<!-- A reward is given when player will participating in 50 Olympiad matches in a month. Available from monday to friday. -->
+		<!-- A reward is given for participating in 50 Olympiad matches in a month. Available from Monday till Friday. -->
 		<handler name="olympiad" />
 		<items>
-			<item id="97224" count="150" /> <!-- Mission Points -->
-			<item id="95687" count="1" /> <!-- Olympiad Treasure Chest Sealed -->
+			<item id="95687" count="1" /> <!-- Olympiad Treasure Chest - Sealed -->
+			<item id="97224" count="50" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="1017" reward_id="117" name="In-game Weekend" requiredCompletion="1">
 		<!-- Weekly mission. A reward is given for playing the game on Saturday or Sunday. -->
 		<handler name="loginweekend" />
 		<items>
-			<item id="94269" count="1" /> <!--  -->
-			<item id="3031" count="50" /> <!--  -->
+			<item id="94269" count="1" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="3031" count="50" /> <!-- Spirit Ore - Sealed -->
 		</items>
 	</reward>
-	<reward id="1023" reward_id="501" name="Joining a Clan" requiredCompletion="1">
+	<reward id="1023" reward_id="501" name="Join a Clan" requiredCompletion="1">
 		<!-- One-time mission. A reward is given when joining a clan for the first time. -->
 		<handler name="joinclan">
 			<param name="minLevel">40</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="90768" count="1" /> <!-- Hair Accessory Coupon -->
+			<item id="90768" count="1" /> <!-- Head Accessory Coupon - Sealed -->
 		</items>
 	</reward>
 	<reward id="9001" reward_id="9001" name="Clan Raid Attack" requiredCompletion="1">
@@ -879,39 +884,41 @@
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="3031" count="150" /> <!-- Spirit Ore -->
-			<item id="94481" count="50" /> <!-- Clan XP -->
-			<item id="94269" count="3" /> <!-- Scroll: Boost Attack -->
+			<item id="94269" count="3" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="3031" count="150" /> <!-- Spirit Ore - Sealed -->
+			<item id="94481" count="500" /> <!-- Clan XP - Sealed -->
 		</items>
 	</reward>
 	<reward id="9002" reward_id="9002" name="Dwelling of Spirits" requiredCompletion="50">
-		<!-- Weekly mission. A reward is given for defeating monsters during a clan raid to the Dwelling of Spirits. -->
+		<!-- Weekly mission. A reward is given for defeating monsters during a command channel raid to the Dwelling of Spirits. -->
 		<handler name="monster">
 			<param name="ids">22271,22272,22273</param>
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
+			<item id="91830" count="5" /> <!-- Improved Fire Attack Potion -->
 			<item id="91831" count="5" /> <!-- Improved Water Attack Potion -->
 			<item id="91832" count="5" /> <!-- Improved Wind Attack Potion -->
 			<item id="91833" count="5" /> <!-- Improved Earth Attack Potion -->
-			<item id="91830" count="5" /> <!-- Improved Fire Attack Potion -->
-			<item id="94481" count="250" /> <!-- Clan XP Sealed -->
-			<item id="97224" count="10" /> <!-- Mission Points -->
+			<item id="94481" count="250" /> <!-- Clan XP - Sealed -->
+			<item id="97224" count="5" /> <!-- Mission Points -->
 		</items>
 	</reward>
-	<reward id="9003" reward_id="9003" name="Spirit Kings" requiredCompletion="1">
-		<!-- Weekly mission. A reward is given for defeating Ignis, Nebula, Procella or Petram during a clan raid to the Dwelling of Spirits. -->
+	<reward id="9003" reward_id="9003" name="Spirit Rulers" requiredCompletion="1">
+		<!-- Weekly mission. A reward is given for defeating Ignis, Nebula, Procella or Petram during a command channel raid to the Dwelling of Spirits. -->
 		<handler name="monster">
 			<param name="ids">29105,29106,29107,29108</param>
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
+			<item id="91830" count="5" /> <!-- Improved Fire Attack Potion -->
 			<item id="91831" count="5" /> <!-- Improved Water Attack Potion -->
 			<item id="91832" count="5" /> <!-- Improved Wind Attack Potion -->
 			<item id="91833" count="5" /> <!-- Improved Earth Attack Potion -->
-			<item id="91830" count="5" /> <!-- Improved Fire Attack Potion -->
+			<item id="94481" count="500" /> <!-- Clan XP - Sealed -->
+			<item id="97145" count="20" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
 	<reward id="9004" reward_id="9004" name="Battle with Frintezza" requiredCompletion="1">
@@ -922,12 +929,12 @@
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="90907" count="20" /> <!-- Soulshot Ticket Sealed -->
-			<item id="3031" count="200" /> <!-- Spirit Ore Sealed -->
-			<item id="94481" count="200" /> <!-- Clan XP Sealed -->
-			<item id="94879" count="300" /> <!-- Grace Potion Sealed -->
+			<item id="90907" count="20" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="200" /> <!-- Spirit Ore - Sealed -->
+			<item id="94481" count="500" /> <!-- Clan XP - Sealed -->
+			<item id="94879" count="300" /> <!-- Grace Potion - Sealed -->
+			<item id="97224" count="5" /> <!-- Mission Points -->
 			<item id="97145" count="20" /> <!-- Ancient Adena -->
-			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="1112" reward_id="508" name="Fire Spirit Lv. 3" requiredCompletion="3">
@@ -936,7 +943,7 @@
 			<param name="element">FIRE</param>
 		</handler>
 		<items>
-			<item id="91185" count="30" /> <!-- Mid-grade Spirit's Blessing -->
+			<item id="91185" count="30" /> <!-- Mid-grade Spirit's Blessing - Sealed -->
 		</items>
 	</reward>
 	<reward id="1113" reward_id="509" name="Water Spirit Lv. 3" requiredCompletion="3">
@@ -945,7 +952,7 @@
 			<param name="element">WATER</param>
 		</handler>
 		<items>
-			<item id="91185" count="30" /> <!-- Mid-grade Spirit's Blessing -->
+			<item id="91185" count="30" /> <!-- Mid-grade Spirit's Blessing - Sealed -->
 		</items>
 	</reward>
 	<reward id="1114" reward_id="510" name="Wind Spirit Lv. 3" requiredCompletion="3">
@@ -954,7 +961,7 @@
 			<param name="element">WIND</param>
 		</handler>
 		<items>
-			<item id="91185" count="30" /> <!-- Mid-grade Spirit's Blessing -->
+			<item id="91185" count="30" /> <!-- Mid-grade Spirit's Blessing - Sealed -->
 		</items>
 	</reward>
 	<reward id="1115" reward_id="511" name="Earth Spirit Lv. 3" requiredCompletion="3">
@@ -963,67 +970,67 @@
 			<param name="element">EARTH</param>
 		</handler>
 		<items>
-			<item id="91185" count="30" /> <!-- Mid-grade Spirit's Blessing -->
+			<item id="91185" count="30" /> <!-- Mid-grade Spirit's Blessing - Sealed -->
 		</items>
 	</reward>
 	<reward id="1162" reward_id="2031" name="Fire Spirit Lv. 5" requiredCompletion="5">
-		<!-- One-time quest. A reward is given when evolving the Fire Spirit up to Lv. 5. -->
+		<!-- One-time mission. A reward is given when evolving the Fire Spirit up to Lv. 5. -->
 		<handler name="spiritevolve">
 			<param name="element">FIRE</param>
 		</handler>
 		<items>
-			<item id="91186" count="30" />
+			<item id="91186" count="30" /> <!-- High-grade Spirit's Blessing - Sealed -->
 		</items>
 	</reward>
 	<reward id="1163" reward_id="2032" name="Water Spirit Lv. 5" requiredCompletion="5">
-		<!-- One-time quest. A reward is given when evolving the Water Spirit up to Lv. 5. -->
+		<!-- One-time mission. A reward is given when evolving the Water Spirit up to Lv. 5. -->
 		<handler name="spiritevolve">
 			<param name="element">WATER</param>
 		</handler>
 		<items>
-			<item id="91186" count="30" />
+			<item id="91186" count="30" /> <!-- High-grade Spirit's Blessing - Sealed -->
 		</items>
 	</reward>
 	<reward id="1164" reward_id="2033" name="Wind Spirit Lv. 5" requiredCompletion="5">
-		<!-- One-time quest. A reward is given when evolving the Wind Spirit up to Lv. 5. -->
+		<!-- One-time mission. A reward is given when evolving the Wind Spirit up to Lv. 5. -->
 		<handler name="spiritevolve">
 			<param name="element">WIND</param>
 		</handler>
 		<items>
-			<item id="91186" count="30" />
+			<item id="91186" count="30" /> <!-- High-grade Spirit's Blessing - Sealed -->
 		</items>
 	</reward>
 	<reward id="1165" reward_id="2034" name="Earth Spirit Lv. 5" requiredCompletion="5">
-		<!-- One-time quest. A reward is given when evolving the Earth Spirit up to Lv. 5. -->
+		<!-- One-time mission. A reward is given when evolving the Earth Spirit up to Lv. 5. -->
 		<handler name="spiritevolve">
 			<param name="element">EARTH</param>
 		</handler>
 		<items>
-			<item id="91186" count="30" />
+			<item id="91186" count="30" /> <!-- High-grade Spirit's Blessing - Sealed -->
 		</items>
 	</reward>
-	<reward id="1116" reward_id="118" name="Attribute monsters hunting" requiredCompletion="1800">
-		<!-- A reward is given once a week for elemental monster hunting. -->
+	<reward id="1116" reward_id="118" name="Attribute Monster Hunting" requiredCompletion="1800">
+		<!-- Weekly mission. A reward is given for killing attribute monsters. -->
 		<handler name="monster">
 			<param name="ids">20792,20794,20795,20796,20797,20798,20799,20800,20801,20802,20803,20849,20995,21661,21662,21663,21664,21665,21666,21667,21668,21669,21670,21671,21672,21673,21674,21675,21676,21678,21685,21686,21761,21762,21763,21764,21765,21766,21767,21768,21769,21770,21771,21772,21773,21774,21775,21776,21777,21778,21779,21780,21781,21782,21783,21784,21785,21786,21787,21788,21789,21790,21791,21792,21793,21813,21814,21815,21816,21817,21818,21819,21820,21821,21822,21823,21824,21825,21826,21827,21828,21829,21830,21831,21832</param>
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="91030" count="10" /> <!-- Blessed Soul -->
-			<item id="97224" count="10" /> <!-- Mission Points -->
+			<item id="91030" count="10" /> <!-- Blessed Soul - Sealed -->
+			<item id="97224" count="5" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="1503" reward_id="1503" name="Explore Primeval Isle" requiredCompletion="200">
 		<!-- A reward is given for killing 200 monsters on the Primeval Isle. -->
 		<handler name="monster">
-			<param name="minLevel">79</param>
+			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">22058,21969,22056,21962,21964,21966,21968,21974,22059,21976,21971</param>
 		</handler>
 		<items>
-			<item id="94879" count="50" /> <!-- Grace PotionSealed -->
-			<item id="97224" count="20" /> <!-- Mission Points -->
+			<item id="94879" count="50" /> <!-- Grace Potion - Sealed -->
+			<item id="97224" count="5" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="5036" reward_id="5036" name="Assault on Elmoreden Tower" requiredCompletion="50">
@@ -1034,9 +1041,9 @@
 			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
 		</handler>
 		<items>
-			<item id="91671" count="1" /> <!--  -->
-			<item id="97247" count="1" /> <!--  -->
-			<item id="97224" count="20" /> <!--  -->
+			<item id="97418" count="1" /> <!-- Green Lantern (Time-limited) - Sealed -->
+			<item id="97247" count="1" /> <!-- Asofe - Sealed -->
+			<item id="97224" count="20" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="5037" reward_id="5037" name="Assault on Elmoreden Tower" requiredCompletion="50">
@@ -1047,9 +1054,9 @@
 			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
 		</handler>
 		<items>
-			<item id="91670" count="1" /> <!--  -->
-			<item id="97247" count="3" /> <!--  -->
-			<item id="97224" count="20" /> <!--  -->
+			<item id="97417" count="1" /> <!-- Blue Lantern (Time-limited) - Sealed -->
+			<item id="97247" count="3" /> <!-- Asofe - Sealed -->
+			<item id="97224" count="20" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="5038" reward_id="5038" name="Assault on Elmoreden Tower" requiredCompletion="50">
@@ -1060,9 +1067,9 @@
 			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
 		</handler>
 		<items>
-			<item id="91669" count="2" /> <!--  -->
-			<item id="97247" count="5" /> <!--  -->
-			<item id="97224" count="20" /> <!--  -->
+			<item id="97416" count="2" /> <!-- Purple Lantern (Time-limited) - Sealed -->
+			<item id="97247" count="5" /> <!-- Asofe - Sealed -->
+			<item id="97224" count="20" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="5039" reward_id="5039" name="Assault on Elmoreden Tower" requiredCompletion="50">
@@ -1073,88 +1080,54 @@
 			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
 		</handler>
 		<items>
-			<item id="91668" count="2" /> <!--  -->
-			<item id="97247" count="7" /> <!--  -->
-			<item id="97224" count="20" /> <!--  -->
+			<item id="97415" count="2" /> <!-- Red Lantern (Time-limited) - Sealed -->
+			<item id="97247" count="7" /> <!-- Asofe - Sealed -->
+			<item id="97224" count="20" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="1505" reward_id="1505" name="Monster Purge" requiredCompletion="1">
 		<!-- A reward is given after receiving the reward for using the Purge system in the corresponding hunting zones. -->
 		<handler name="purge" />
 		<items>
-			<item id="94879" count="1" /> <!-- Aden Purge Crystal Sealed -->
+			<item id="95481" count="1" /> <!-- Aden Purge Crystal - Sealed -->
 			<item id="97224" count="20" /> <!-- Mission Points -->
 		</items>
 	</reward>
-	<reward id="1506" reward_id="1506" name="Forgotten Primeval Garden I" requiredCompletion="100">
-		<!-- A reward is given for killing 100 Swift Hunter monsters in Forgotten Primeval Garden. -->
+	<reward id="1509" reward_id="1509" name="Explore Dreamland" requiredCompletion="1">
+		<!-- A reward is given for killing one of the following monsters in the Dream Dungeon: Gustav, Gustav's Steward, Gabrielle, Gabrielle's Minion, Ventus, Rekario, Tiat, Baint. -->
 		<handler name="monster">
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">18678,18679,18680,18681,18682,18683,18684,18685</param>
 		</handler>
 		<items>
-			<item id="92459" count="1" /> <!--  -->
-			<item id="97246" count="5" /> <!--  -->
-		</items>
-	</reward>
-	<reward id="1507" reward_id="1507" name="Forgotten Primeval Garden II" requiredCompletion="300">
-		<!-- A reward is given for killing 300 Swift Hunter monsters in Forgotten Primeval Garden. -->
-		<handler name="monster">
-			<param name="minLevel">76</param>
-			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
-		</handler>
-		<items>
-			<item id="92459" count="2" /> <!--  -->
-		</items>
-	</reward>
-	<reward id="1508" reward_id="1508" name="Forgotten Primeval Garden III" requiredCompletion="1000">
-		<!-- A reward is given for killing 1000 Swift Hunter monsters in Forgotten Primeval Garden. -->
-		<handler name="monster">
-			<param name="minLevel">76</param>
-			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
-		</handler>
-		<items>
-			<item id="96787" count="4" /> <!--  -->
-			<item id="97145" count="100" /> <!--  -->
-		</items>
-	</reward>
-	<reward id="1509" reward_id="1509" name="Exploring Dreamland" requiredCompletion="1">
-		<!-- A reward is given for killing one of the following monsters in the Dream Dungeon: Gustav, Gustav's Steward, Gabrielle, Gabrielle's Minion, Ventus, Rekario, Tiat, Baint. / Kill 1 raid boss in one of the four dungeons. -->
-		<handler name="monster">
-			<param name="minLevel">76</param>
-			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
-		</handler>
-		<items>
-			<item id="96925" count="1" /> <!-- Dream Orb Sealed -->
-			<item id="93068" count="1" /> <!-- Red Lantern - 1st Place Sealed -->
+			<item id="96925" count="1" /> <!-- Dream Orb - Sealed -->
+			<item id="93068" count="2" /> <!-- Red Lantern - 1st Place - Sealed -->
 			<item id="97224" count="5" /> <!-- Mission Points -->
 			<item id="97145" count="100" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
-	<reward id="1510" reward_id="1510" name="Exploring Dreamland's Secret Places" requiredCompletion="1">
-		<!-- A reward is given for killing Feline King or Feline Queen in the Cat Guild's Lair of the Dream Dungeon. / Kill 1 raid boss in the Cat Guild's dungeon. -->
+	<reward id="1510" reward_id="1510" name="Explore Dreamland's Secret Places" requiredCompletion="1">
+		<!-- A reward is given for killing Feline King or Feline Queen in the Cat Guild's Lair of the Dream Dungeon. -->
 		<handler name="monster">
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">18686,18687</param>
 		</handler>
 		<items>
-			<item id="96925" count="1" /> <!-- Dream Orb Sealed -->
+			<item id="96925" count="1" /> <!-- Dream Orb - Sealed -->
 		</items>
 	</reward>
-	<reward id="1511" reward_id="1511" name="Exploring Alligator Island" requiredCompletion="100">
-		<!-- A reward is given for killing 100 Evolved monsters on Alligator Island. / Kill 100 Evolved monsters. -->
+	<reward id="1511" reward_id="1511" name="Explore Alligator Island" requiredCompletion="100">
+		<!-- A reward is given for killing 100 Evolved monsters on Alligator Island. -->
 		<handler name="monster">
 			<param name="minLevel">70</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">22192,22197</param>
 		</handler>
 		<items>
-			<item id="96925" count="1" /> <!-- Dream Orb Sealed -->
+			<item id="94780" count="2" /> <!-- Growth Rune Fragment - Sealed -->
+			<item id="97224" count="15" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="1512" reward_id="1512" name="Incessant Training" requiredCompletion="1">
@@ -1162,10 +1135,10 @@
 		<handler name="monster">
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">25952,25953,25954,25955,25961,25962,25963</param>
 		</handler>
 		<items>
-			<item id="97145" count="50" /> <!--  -->
+			<item id="97145" count="50" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
 	<reward id="1513" reward_id="1513" name="Combat on Balok Battleground" requiredCompletion="10">
@@ -1173,10 +1146,10 @@
 		<handler name="monster">
 			<param name="minLevel">60</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">22413,22414,22415,22416,22417</param>
 		</handler>
 		<items>
-			<item id="97145" count="50" /> <!--  -->
+			<item id="97145" count="50" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
 	<reward id="1514" reward_id="1514" name="Explore Goddard" requiredCompletion="1000">
@@ -1184,10 +1157,10 @@
 		<handler name="monster">
 			<param name="minLevel">85</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">22426,22427,22428,22429,22431,22432,22433,22434,22435,22436,22437,22438,22439,22440,22441,22442,22443,22445,22446</param>
 		</handler>
 		<items>
-			<item id="97145" count="100" /> <!--  -->
+			<item id="97145" count="100" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
 	<reward id="1515" reward_id="1515" name="Explore Antharas' Lair" requiredCompletion="300">
@@ -1195,10 +1168,10 @@
 		<handler name="monster">
 			<param name="minLevel">85</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">20761,21085,20627,20623,20621,20407,20626,20625,20624,20622,20620,21084,20405,21089,21087,21086,20629,20628,22500</param>
 		</handler>
 		<items>
-			<item id="97246" count="10" /> <!--  -->
+			<item id="97246" count="10" /> <!-- Enria - Sealed -->
 		</items>
 	</reward>
 	<reward id="1516" reward_id="1516" name="Explore Frost Lord's Castle" requiredCompletion="300">
@@ -1206,21 +1179,115 @@
 		<handler name="monster">
 			<param name="minLevel">85</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">22351,22346,22347,22345,22352,22349,22350,22348</param>
 		</handler>
 		<items>
-			<item id="97246" count="10" /> <!--  -->
+			<item id="97246" count="10" /> <!-- Enria - Sealed -->
 		</items>
 	</reward>
-	<reward id="5033" reward_id="5033" name="Ephemeral Frozen Canyon" requiredCompletion="50">
-		<!-- Daily mission (once per account). A reward is given for killing 50 monsters in the Frozen Canyon during the event. -->
+	<reward id="1517" reward_id="1517" name="Explore Valakas' Temple" requiredCompletion="1">
+		<!-- A reward is given for defeating any of the following monsters during the 'Explore Valakas' Temple' command channel raid: Ifrit, Ifrin, Iff, Blazing Dragon. -->
 		<handler name="monster">
-			<param name="minLevel">65</param>
+			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">25964,25965,25966,25967</param>
 		</handler>
 		<items>
-			<item id="95836" count="50" /> <!-- Dream Orb Sealed -->
+			<item id="93068" count="2" /> <!-- Red Lantern - 1st Place - Sealed -->
+			<item id="94481" count="500" /> <!-- Clan XP - Sealed -->
+			<item id="97224" count="5" /> <!-- Mission Points -->
+			<item id="97145" count="20" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
-</list>
\ No newline at end of file
+	<reward id="1518" reward_id="1518" name="Explore the Primeval Garden" requiredCompletion="1000">
+		<!-- A reward is given for killing 1000 Swift Hunter monsters in the Primeval Garden. -->
+		<handler name="monster">
+			<param name="minLevel">76</param>
+			<param name="maxLevel">99</param>
+			<param name="ids">22269,22270</param>
+		</handler>
+		<items>
+			<item id="93685" count="10" /> <!-- Enchant Kit: Talisman of Speed - Sealed -->
+			<item id="97145" count="100" /> <!-- Ancient Adena -->
+		</items>
+	</reward>
+	<reward id="1519" reward_id="1519" name="Explore the Garden of Eva" requiredCompletion="1000" isOneTime="false">
+		<!-- A reward is given for killing 1000 Eva's Energy Reserve monsters in the Garden of Eva. -->
+		<handler name="monster">
+			<param name="minLevel">76</param>
+			<param name="maxLevel">99</param>
+			<param name="ids">22528,22523</param>
+		</handler>
+		<items>
+			<item id="92020" count="10" /> <!-- Enchant Kit: Talisman of Eva - Sealed -->
+			<item id="97145" count="100" /> <!-- Ancient Adena -->
+		</items>
+	</reward>
+	<!--
+	<reward id="1520" reward_id="1520" name="Daily Upgrade of Hidden Power" requiredCompletion="7" isOneTime="false">
+		<Daily mission. A reward is given for 7 upgrades of the hidden power.
+		<handler name="monster">
+			<param name="minLevel">0</param>
+			<param name="maxLevel">0</param>
+		</handler>
+		<items>
+			<item id="97145" count="10" /> Ancient Adena
+		</items>
+	</reward>
+	<reward id="1521" reward_id="1521" name="Constant Upgrade of Hidden Power" requiredCompletion="80" isOneTime="false">
+		Weekly mission. A reward is given for 80 upgrades of the hidden power.
+		<handler name="monster">
+			<param name="minLevel">0</param>
+			<param name="maxLevel">0</param>
+		</handler>
+		<items>
+			<item id="97147" count="1" /> Dye Powder - Sealed
+		</items>
+	</reward>
+	-->
+	<reward id="1522" reward_id="1522" name="Investigate the Primeval Garden" requiredCompletion="100" isOneTime="false">
+		<!-- Daily mission.\nA reward is given for killing 100 Swift Hunter monsters in the Primeval Garden. -->
+		<handler name="monster">
+			<param name="minLevel">76</param>
+			<param name="maxLevel">99</param>
+			<param name="ids">22269,22270</param>
+		</handler>
+		<items>
+			<item id="93685" count="1" /> <!-- Enchant Kit: Talisman of Speed - Sealed -->
+		</items>
+	</reward>
+	<reward id="1523" reward_id="1523" name="Investigate the Garden of Eva" requiredCompletion="100" isOneTime="false">
+		<!-- Daily mission. A reward is given for killing 100 Eva's Energy Reserve monsters in the Garden of Eva. -->
+		<handler name="monster">
+			<param name="minLevel">76</param>
+			<param name="maxLevel">99</param>
+			<param name="ids">22528,22523</param>
+		</handler>
+		<items>
+			<item id="92020" count="1" /> <!-- Enchant Kit: Talisman of Eva - Sealed -->
+		</items>
+	</reward>
+	<reward id="1525" reward_id="1525" name="Hunt in the Tower of Insolence" requiredCompletion="100" isOneTime="false">
+		<!-- A reward is given for killing 100 Magic Slave monsters in the Tower of Insolence. -->
+		<handler name="monster">
+			<param name="minLevel">80</param>
+			<param name="maxLevel">99</param>
+			<param name="ids">22564,22569,22574,22579,22584,22589,22593,22597,22601,22605,22609,22613</param>
+		</handler>
+		<items>
+			<item id="98037" count="2" /> <!-- +0 ~ +4 Cloak of Protection Pack - Sealed -->
+		</items>
+	</reward>
+	<reward id="9999999" reward_id="9999999" name="Daily Hunting I (Lv. 21-40)" requiredCompletion="30" isOneTime="false">
+		<!-- Daily mission. A reward is given for killing any 30 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
+		<handler name="monster">
+			<param name="minLevel">21</param>
+			<param name="maxLevel">40</param>
+		</handler>
+		<items>
+			<item id="90907" count="3" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="10" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="3" /> <!-- HP Potion -->
+		</items>
+	</reward>
+</list>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/PetExtractData.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/PetExtractData.xml
new file mode 100644
index 0000000000..db6643827e
--- /dev/null
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/PetExtractData.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/PetExtractData.xsd">
+	<extraction petLevel="50" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+</list>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30731.htm b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30731.htm
index 7d5bb217c7..daf4f90fc3 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30731.htm
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30731.htm
@@ -9,7 +9,7 @@ The Pet Manager Association is always happy to assist you and your pet.<br>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/exchange.htm">"Here is a Pet Coupon. Give me a pet."</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30827.htm b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30827.htm
index 830447a916..1a6e7f97c6 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30827.htm
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30827.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30828.htm b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30828.htm
index 0a7f19fda4..81b47f5ca8 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30828.htm
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30828.htm
@@ -10,7 +10,7 @@ Pet Manager Waters:<br>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30829.htm b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30829.htm
index 61e46bf654..67f60c6f2e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30829.htm
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30829.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30830.htm b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30830.htm
index 6b1860ae08..26536da2b6 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30830.htm
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30830.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30831.htm b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30831.htm
index b707cd690d..04d1428ac0 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30831.htm
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/30831.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/31067.htm b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/31067.htm
index 9ff970708b..5963bbead2 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/31067.htm
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/31067.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/31265.htm b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/31265.htm
index 5de92941aa..acd3d39c17 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/31265.htm
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/31265.htm
@@ -10,7 +10,7 @@ Perhaps I should write a book, eh? "The Impact of Striders on the History of the
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/31309.htm b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/31309.htm
index 9487647c8a..3d6ff06a25 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/31309.htm
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/31309.htm
@@ -10,7 +10,7 @@ Oh, hello. Ah, you noticed my pure-bred black-striped Alpine Cougar, eh? It is n
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/31954.htm b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/31954.htm
index c8025dde3e..e0218b5231 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/31954.htm
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/31954.htm
@@ -10,7 +10,7 @@ As the number of people who interested in raising pets increases these days, the
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/33579.htm b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/33579.htm
index c67cae00f5..cafc07db04 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/33579.htm
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/petmanager/33579.htm
@@ -7,7 +7,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">"I want to evolve a pet."</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/exchange.htm">"Here is a Pet Coupon. Give me a pet."</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/instances/DwellingOfSpirits.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/instances/DwellingOfSpirits.xml
index 24a5c3b457..c5467892ab 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/instances/DwellingOfSpirits.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/instances/DwellingOfSpirits.xml
@@ -35,13 +35,6 @@
 		<reset day="SUNDAY" hour="6" minute="30" />
 	</reenter>
 	<spawnlist>
-		<group name="ExitPortal" spawnByDefault="false">
-			<npc id="15970" x="-114343" y="-77747" z="-11442" heading="46786" /> <!-- Exit Portal -->
-			<npc id="15971" x="-114343" y="-77747" z="-11442" heading="46786" /> <!-- Exit Portal -->
-			<npc id="15972" x="-114343" y="-77720" z="-11442" heading="46786" /> <!-- Exit Portal -->
-			<npc id="15973" x="-114343" y="-77733" z="-11442" heading="46786" /> <!-- Exit Portal -->
-			<npc id="15974" x="-114343" y="-77755" z="-11442" heading="46786" /> <!-- Exit Portal -->
-		</group>
 		<group name="sealstone" spawnByDefault="true">
 			<npc id="34178" x="-114324" y="-78273" z="-11433" heading="15825" /> <!-- Seal Stone -->
 		</group>
@@ -49,77 +42,53 @@
 			<npc id="34176" x="-114324" y="-78273" z="-11433" heading="15474" /> <!-- Animael -->
 		</group>
 		<group name="NormalMobs" spawnByDefault="false">
-			<npc id="22272" x="-114091" y="-77461" z="-11443" heading="16383" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114048" y="-77429" z="-11443" heading="6673" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114045" y="-77406" z="-11443" heading="24645" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113837" y="-76943" z="-11443" heading="8327" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113945" y="-76923" z="-11443" heading="30858" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114859" y="-76897" z="-11443" heading="58120" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114785" y="-76841" z="-11443" heading="55942" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114711" y="-76987" z="-11443" heading="61107" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114699" y="-77113" z="-11443" heading="16383" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114723" y="-77045" z="-11443" heading="57831" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114852" y="-78363" z="-11443" heading="657" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114984" y="-78475" z="-11443" heading="1141" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114916" y="-78442" z="-11443" heading="65129" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114841" y="-78428" z="-11443" heading="63813" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114938" y="-78411" z="-11443" heading="9120" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113616" y="-78459" z="-11443" heading="30680" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113622" y="-78398" z="-11443" heading="28616" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113591" y="-78301" z="-11442" heading="37105" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113604" y="-78239" z="-11443" heading="35386" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113693" y="-78249" z="-11443" heading="29763" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113568" y="-78336" z="-11442" heading="28986" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113818" y="-78174" z="-11443" heading="55979" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-114618" y="-77313" z="-11443" heading="22097" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-113589" y="-78333" z="-11443" heading="30535" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-114840" y="-78561" z="-11443" heading="32322" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113933" y="-77703" z="-11443" heading="1785" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113872" y="-77793" z="-11443" heading="60399" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114852" y="-77864" z="-11443" heading="13028" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114822" y="-77925" z="-11443" heading="17015" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-114554" y="-78998" z="-11443" heading="8750" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114193" y="-78871" z="-11441" heading="32032" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114105" y="-79053" z="-11443" heading="2811" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114456" y="-79050" z="-11443" heading="30111" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-113845" y="-78477" z="-11443" heading="62467" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Corrupted Fairy -->
+			<npc id="22272" x="-114091" y="-77461" z="-11443" heading="16383" respawnTime="60sec" />
+			<npc id="22271" x="-114048" y="-77429" z="-11443" heading="6673" respawnTime="60sec" />
+			<npc id="22271" x="-114045" y="-77406" z="-11443" heading="24645" respawnTime="60sec" />
+			<npc id="22271" x="-113837" y="-76943" z="-11443" heading="8327" respawnTime="60sec" />
+			<npc id="22271" x="-113945" y="-76923" z="-11443" heading="30858" respawnTime="60sec" />
+			<npc id="22271" x="-114859" y="-76897" z="-11443" heading="58120" respawnTime="60sec" />
+			<npc id="22271" x="-114785" y="-76841" z="-11443" heading="55942" respawnTime="60sec" />
+			<npc id="22271" x="-114711" y="-76987" z="-11443" heading="61107" respawnTime="60sec" />
+			<npc id="22271" x="-114699" y="-77113" z="-11443" heading="16383" respawnTime="60sec" />
+			<npc id="22271" x="-114723" y="-77045" z="-11443" heading="57831" respawnTime="60sec" />
+			<npc id="22271" x="-114852" y="-78363" z="-11443" heading="657" respawnTime="60sec" />
+			<npc id="22271" x="-114984" y="-78475" z="-11443" heading="1141" respawnTime="60sec" />
+			<npc id="22271" x="-114916" y="-78442" z="-11443" heading="65129" respawnTime="60sec" />
+			<npc id="22271" x="-114841" y="-78428" z="-11443" heading="63813" respawnTime="60sec" />
+			<npc id="22271" x="-114938" y="-78411" z="-11443" heading="9120" respawnTime="60sec" />
+			<npc id="22271" x="-113616" y="-78459" z="-11443" heading="30680" respawnTime="60sec" />
+			<npc id="22271" x="-113622" y="-78398" z="-11443" heading="28616" respawnTime="60sec" />
+			<npc id="22271" x="-113591" y="-78301" z="-11442" heading="37105" respawnTime="60sec" />
+			<npc id="22271" x="-113604" y="-78239" z="-11443" heading="35386" respawnTime="60sec" />
+			<npc id="22271" x="-113693" y="-78249" z="-11443" heading="29763" respawnTime="60sec" />
+			<npc id="22271" x="-113568" y="-78336" z="-11442" heading="28986" respawnTime="60sec" />
+			<npc id="22271" x="-113818" y="-78174" z="-11443" heading="55979" respawnTime="60sec" />
+			<npc id="22272" x="-114618" y="-77313" z="-11443" heading="22097" respawnTime="60sec" />
+			<npc id="22272" x="-113589" y="-78333" z="-11443" heading="30535" respawnTime="60sec" />
+			<npc id="22272" x="-114840" y="-78561" z="-11443" heading="32322" respawnTime="60sec" />
+			<npc id="22271" x="-113933" y="-77703" z="-11443" heading="1785" respawnTime="60sec" />
+			<npc id="22271" x="-113872" y="-77793" z="-11443" heading="60399" respawnTime="60sec" />
+			<npc id="22271" x="-114852" y="-77864" z="-11443" heading="13028" respawnTime="60sec" />
+			<npc id="22271" x="-114822" y="-77925" z="-11443" heading="17015" respawnTime="60sec" />
+			<npc id="22272" x="-114554" y="-78998" z="-11443" heading="8750" respawnTime="60sec" />
+			<npc id="22271" x="-114193" y="-78871" z="-11441" heading="32032" respawnTime="60sec" />
+			<npc id="22271" x="-114105" y="-79053" z="-11443" heading="2811" respawnTime="60sec" />
+			<npc id="22271" x="-114456" y="-79050" z="-11443" heading="30111" respawnTime="60sec" />
+			<npc id="22272" x="-113845" y="-78477" z="-11443" heading="62467" respawnTime="60sec" />
+			<npc id="22271" x="-114676" y="-78345" z="-11439" heading="30937" respawnTime="60sec" />
 		</group>
 		<group name="ruipwave_1" spawnByDefault="false">
-			<npc id="22273" x="-113945" y="-76923" z="-11443" heading="30858" /> <!-- Ruip portal container-->
-			<npc id="22273" x="-114840" y="-78561" z="-11443" heading="32322" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114852" y="-77864" z="-11443" heading="13028" /> <!-- Ruip portal container-->
-			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113845" y="-78477" z="-11443" heading="62467" /> <!-- Ruip portal container-->
-			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113568" y="-78336" z="-11442" heading="28986" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113872" y="-77793" z="-11443" heading="60399" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113589" y="-78333" z="-11443" heading="30535" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113818" y="-78174" z="-11443" heading="55979" /> <!-- Ruip portal container -->
-		</group>
-		<group name="ruipwave_2" spawnByDefault="false">
-			<npc id="22273" x="-113622" y="-78398" z="-11443" heading="28616" /> <!-- Ruip portal container-->
-			<npc id="22273" x="-113622" y="-78398" z="-11443" heading="28616" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114323" y="-78914" z="-11443" heading="13828" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114840" y="-78561" z="-11443" heading="32322" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114785" y="-76841" z="-11443" heading="55942" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114554" y="-78998" z="-11443" heading="8750" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114841" y="-78428" z="-11443" heading="63813" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114840" y="-78561" z="-11443" heading="32322" /> <!-- Ruip portal container -->
-		</group>
-		<group name="portalearth" spawnByDefault="false">
-			<npc id="15971" x="-113516" y="-77521" z="-11419" heading="8750" />
-		</group>
-		<group name="portalwind" spawnByDefault="false">
-			<npc id="15969" x="-114554" y="-78998" z="-11443" heading="8750" />
-		</group>
-		<group name="portalfire" spawnByDefault="false">
-			<npc id="15970" x="-114554" y="-78998" z="-11443" heading="8750" />
-		</group>
-		<group name="portalwater" spawnByDefault="false">
-			<npc id="15972" x="-114554" y="-78998" z="-11443" heading="8750" />
+			<npc id="22273" x="-113945" y="-76923" z="-11443" heading="30858" respawnTime="60sec" />
+			<npc id="22273" x="-114840" y="-78561" z="-11443" heading="32322" respawnTime="60sec" />
+			<npc id="22273" x="-114852" y="-77864" z="-11443" heading="13028" respawnTime="60sec" />
+			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" respawnTime="60sec" />
+			<npc id="22273" x="-113845" y="-78477" z="-11443" heading="62467" respawnTime="60sec" />
+			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" respawnTime="60sec" />
+			<npc id="22273" x="-113568" y="-78336" z="-11442" heading="28986" respawnTime="60sec" />
+			<npc id="22273" x="-113872" y="-77793" z="-11443" heading="60399" respawnTime="60sec" />
+			<npc id="22273" x="-113589" y="-78333" z="-11443" heading="30535" respawnTime="60sec" />
+			<npc id="22273" x="-113818" y="-78174" z="-11443" heading="55979" respawnTime="60sec" />
 		</group>
 	</spawnlist>
 </instance>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/multisell/custom/600016.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/multisell/custom/600016.xml
index 15f5a77492..b1bbf39e7a 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/multisell/custom/600016.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/multisell/custom/600016.xml
@@ -5,19 +5,19 @@
 	</npcs>
 	<item>
 		<!-- Adena -->
-		<ingredient count="20119720" id="57" />
+		<ingredient count="2119720" id="57" />
 		<!-- Zubei's Helmet -->
 		<production count="1" id="503" />
 	</item>
 	<item>
 		<!-- Adena -->
-		<ingredient count="4319200" id="57" />
+		<ingredient count="2319200" id="57" />
 		<!-- Zubei's Breastplate -->
 		<production count="1" id="357" />
 	</item>
 	<item>
 		<!-- Adena -->
-		<ingredient count="20199540" id="57" />
+		<ingredient count="2199540" id="57" />
 		<!-- Zubei's Gaiters -->
 		<production count="1" id="383" />
 	</item>
@@ -35,13 +35,13 @@
 	</item>
 	<item>
 		<!-- Adena -->
-		<ingredient count="3239400" id="57" />
+		<ingredient count="2410000" id="57" />
 		<!-- Tunic of Zubei -->
 		<production count="1" id="2397" />
 	</item>
 	<item>
 		<!-- Adena -->
-		<ingredient count="2149660" id="57" />
+		<ingredient count="2995400" id="57" />
 		<!-- Stockings of Zubei -->
 		<production count="1" id="2402" />
 	</item>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/34414.htm b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/34414.htm
new file mode 100644
index 0000000000..51ace5fb0f
--- /dev/null
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/34414.htm
@@ -0,0 +1,7 @@
+<html><body>Siben:<br>
+<br>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AztacanArea The_Midway_Gate">The Midway Gate (Lv. 70-87) - 100,000 adena</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AztacanArea The_Eastern_Gate">The Eastern Gate (Lv. 88+) - 100,000 adena</button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AztacanArea The_Western_Gate">The Western Gate (Lv. 88) - 100,000 adena</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AztacanArea Mineral_shop">Buy supplies and minerals</button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
new file mode 100644
index 0000000000..6606e36f7e
--- /dev/null
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
@@ -0,0 +1,190 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.DwellingOfSpiritsResidence;
+
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.SkillHolder;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.SkillCaster;
+
+import ai.AbstractNpcAI;
+
+/**
+ * @author RobikBobik
+ */
+public class ResidenceOfKingIgnis extends AbstractNpcAI
+{
+	// NPCs
+	private static final int IGNIS = 29105;
+	// Skills
+	private static final SkillHolder FIRE_RAG_1 = new SkillHolder(50050, 1);
+	private static final SkillHolder FIRE_RAG_2 = new SkillHolder(50050, 2);
+	private static final SkillHolder FIRE_RAG_3 = new SkillHolder(50050, 3);
+	private static final SkillHolder FIRE_RAG_4 = new SkillHolder(50050, 4);
+	private static final SkillHolder FIRE_RAG_5 = new SkillHolder(50050, 5);
+	private static final SkillHolder FIRE_RAG_6 = new SkillHolder(50050, 6);
+	private static final SkillHolder FIRE_RAG_7 = new SkillHolder(50050, 7);
+	private static final SkillHolder FIRE_RAG_8 = new SkillHolder(50050, 8);
+	private static final SkillHolder FIRE_RAG_9 = new SkillHolder(50050, 9);
+	private static final SkillHolder FIRE_RAG_10 = new SkillHolder(50050, 10);
+	
+	public ResidenceOfKingIgnis()
+	{
+		addAttackId(IGNIS);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "CAST_FIRE_RAGE_1":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_1.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_1.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_2":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_2.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_2.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_3":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_3.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_3.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_4":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_4.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_4.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_5":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_5.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_5.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_6":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_6.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_6.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_7":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_7.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_7.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_8":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_8.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_8.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_9":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_9.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_9.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_10":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_10.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_10.getSkill());
+				}
+				break;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
+	{
+		if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.99)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.70)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_1", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.70)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.50)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_2", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.50)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.40)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_3", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.40)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.25)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_4", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.25)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.15)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_5", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.15)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.10)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_6", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.10)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.7)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_7", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.7)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.5)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_8", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.5)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.3)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_9", 1000, npc, null);
+		}
+		else if (npc.getCurrentHp() < (npc.getMaxHp() * 0.3))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_10", 1000, npc, null);
+		}
+		return super.onAttack(npc, attacker, damage, isSummon, skill);
+	}
+	
+	public static void main(String[] args)
+	{
+		new ResidenceOfKingIgnis();
+	}
+}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
new file mode 100644
index 0000000000..0bb5893075
--- /dev/null
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
@@ -0,0 +1,309 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.DwellingOfSpiritsResidence;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.l2jmobius.gameserver.enums.ChatType;
+import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.SkillHolder;
+import org.l2jmobius.gameserver.model.instancezone.Instance;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.model.skill.Skill;
+
+import ai.AbstractNpcAI;
+
+public class ResidenceOfKingPetram extends AbstractNpcAI
+{
+	// NPCs
+	private static final int PETRAM = 29108;
+	private static final int PETRAM_PIECE = 29116;
+	private static final int PETRAM_FRAGMENT = 29117;
+	// Skills
+	private static final SkillHolder EARTH_ENERGY = new SkillHolder(50066, 1);
+	private static final SkillHolder EARTH_FURY = new SkillHolder(50059, 1);
+	private static final SkillHolder TEST = new SkillHolder(5712, 1);
+	
+	public ResidenceOfKingPetram()
+	{
+		addKillId(PETRAM_PIECE, PETRAM_FRAGMENT);
+		addAttackId(PETRAM);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "SPAWN_MINION":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if (world != null)
+				{
+					final Npc petram = world.getNpc(PETRAM);
+					petram.doCast(EARTH_ENERGY.getSkill());
+					
+					petram.setInvul(true);
+					petram.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.EARTH_KING_BARRIER2_AVE);
+					petram.updateAbnormalVisualEffects();
+					petram.broadcastSay(ChatType.NPC_SHOUT, "HaHa, fighters lets kill them. Now Im invul!!!");
+					
+					final int stage = getHigherStage(world);
+					for (int minionIndex = 0; minionIndex < StageData.getMinionsStageData(stage).length; minionIndex++)
+					{
+						final MinionData minionData = StageData.getMinionsStageData(stage)[minionIndex];
+						final Location minionLocation = minionData.getMinionLocation();
+						world.setParameter("minion" + minionIndex, addSpawn(npc, minionData.getMinionId(), minionLocation.getX(), minionLocation.getY(), minionLocation.getZ(), minionLocation.getHeading(), false, -1, true, npc.getInstanceId()));
+					}
+					
+					startQuestTimer("SUPPORT_PETRAM", 200, npc, null);
+				}
+				break;
+			}
+			case "SUPPORT_PETRAM":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if ((world != null) && (world.getNpc(PETRAM) != null) && !world.getNpc(PETRAM).isDead())
+				{
+					final int stage = getHigherStage(world);
+					for (int minionIndex = 0; minionIndex < StageData.getMinionsStageData(stage).length; minionIndex++)
+					{
+						world.getParameters().getObject("minion" + minionIndex, Npc.class).setTarget(world.getNpc(PETRAM));
+						world.getParameters().getObject("minion" + minionIndex, Npc.class).doCast(TEST.getSkill());
+					}
+					startQuestTimer("SUPPORT_PETRAM", 10100, npc, null);
+				}
+				break;
+			}
+			case "REMOVE_INVUL":
+			{
+				if (npc != null)
+				{
+					final Instance world = npc.getInstanceWorld();
+					if (world != null)
+					{
+						final Npc petram = world.getNpc(PETRAM);
+						if (petram != null)
+						{
+							petram.doCast(EARTH_FURY.getSkill());
+							petram.setInvul(false);
+							petram.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.EARTH_KING_BARRIER2_AVE);
+							petram.updateAbnormalVisualEffects();
+							petram.broadcastSay(ChatType.NPC_SHOUT, "Nooooo... Nooooo...");
+						}
+						
+						for (int i = 0; i < 12; i++)
+						{
+							final Npc minion = world.getParameters().getObject("minion" + i, Npc.class);
+							if (minion != null)
+							{
+								minion.deleteMe();
+							}
+						}
+					}
+				}
+				break;
+			}
+		}
+		
+		return null;
+	}
+	
+	private int getHigherStage(Instance world)
+	{
+		for (int stage = StageData.getMinionsStageData().size() - 1; stage >= 0; stage--)
+		{
+			if (world.getParameters().getBoolean("stage" + stage, false))
+			{
+				return stage;
+			}
+		}
+		
+		return 0;
+	}
+	
+	@Override
+	public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
+	{
+		final Instance world = npc.getInstanceWorld();
+		synchronized (this)
+		{
+			for (int stage = 0; stage < StageData.getMinionsStageData().size(); stage++)
+			{
+				if ((npc.getCurrentHpPercent() < StageData.getHpPercents()[stage]) && !world.getParameters().getBoolean("stage" + stage, false))
+				{
+					world.setParameter("stage" + stage, true);
+					startQuestTimer("SPAWN_MINION", 100, npc, null);
+				}
+			}
+		}
+		
+		return super.onAttack(npc, attacker, damage, isSummon, skill);
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player player, boolean isSummon)
+	{
+		final Instance world = npc.getInstanceWorld();
+		if (world == null)
+		{
+			return null;
+		}
+		
+		final int stage = getHigherStage(world);
+		int aliveMinionsCount = 0;
+		for (int minionIndex = 0; minionIndex < StageData.getMinionsStageData(stage).length; minionIndex++)
+		{
+			if ((world.getParameters().getObject("minion" + minionIndex, Npc.class) != null) && !world.getParameters().getObject("minion" + minionIndex, Npc.class).isDead())
+			{
+				aliveMinionsCount++;
+			}
+		}
+		
+		boolean breakInvul = false;
+		switch (stage)
+		{
+			case 0:
+			{
+				if (aliveMinionsCount == 0)
+				{
+					breakInvul = true;
+				}
+				break;
+			}
+			case 1:
+			{
+				if (aliveMinionsCount <= 4)
+				{
+					breakInvul = true;
+				}
+				break;
+			}
+			case 2:
+			{
+				if (aliveMinionsCount <= 6)
+				{
+					breakInvul = true;
+				}
+				break;
+			}
+		}
+		
+		if (breakInvul)
+		{
+			startQuestTimer("REMOVE_INVUL", 500, world.getNpc(PETRAM), null);
+		}
+		
+		return super.onKill(npc, player, isSummon);
+	}
+	
+	private static class StageData
+	{
+		private static final int[] _hpPercents = new int[]
+		{
+			75,
+			50,
+			10
+		};
+		private static final Map<Integer, MinionData[]> _minionsStageData = new HashMap<>();
+		static
+		{
+			// Stage 1
+			_minionsStageData.put(0, new MinionData[]
+			{
+				new MinionData(PETRAM_FRAGMENT, new Location(221543, 191530, -15486, 1131)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222069, 192019, -15486, 49364)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222595, 191479, -15486, 34013)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222077, 191017, -15486, 16383))
+			});
+			
+			// Stage 2
+			_minionsStageData.put(1, new MinionData[]
+			{
+				new MinionData(PETRAM_FRAGMENT, new Location(221069, 191544, -15486, 2280)),
+				new MinionData(PETRAM_FRAGMENT, new Location(221366, 192223, -15486, 56731)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222067, 192508, -15486, 50632)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222765, 192216, -15486, 39607)),
+				new MinionData(PETRAM_FRAGMENT, new Location(223057, 191472, -15486, 33154)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222773, 190814, -15486, 25376)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222063, 190516, -15486, 16383)),
+				new MinionData(PETRAM_FRAGMENT, new Location(221342, 190800, -15486, 10837))
+			});
+			// Stage 3
+			_minionsStageData.put(2, new MinionData[]
+			{
+				new MinionData(PETRAM_PIECE, new Location(221543, 191530, -15486, 1131)),
+				new MinionData(PETRAM_PIECE, new Location(222069, 192019, -15486, 49364)),
+				new MinionData(PETRAM_PIECE, new Location(222595, 191479, -15486, 34013)),
+				new MinionData(PETRAM_PIECE, new Location(222077, 191017, -15486, 16383)),
+				new MinionData(PETRAM_PIECE, new Location(221069, 191544, -15486, 2280)),
+				new MinionData(PETRAM_PIECE, new Location(221366, 192223, -15486, 56731)),
+				new MinionData(PETRAM_PIECE, new Location(222067, 192508, -15486, 50632)),
+				new MinionData(PETRAM_PIECE, new Location(222765, 192216, -15486, 39607)),
+				new MinionData(PETRAM_PIECE, new Location(223057, 191472, -15486, 33154)),
+				new MinionData(PETRAM_PIECE, new Location(222773, 190814, -15486, 25376)),
+				new MinionData(PETRAM_PIECE, new Location(222063, 190516, -15486, 16383)),
+				new MinionData(PETRAM_PIECE, new Location(221342, 190800, -15486, 10837))
+			});
+		}
+		
+		public static int[] getHpPercents()
+		{
+			return _hpPercents;
+		}
+		
+		public static Map<Integer, MinionData[]> getMinionsStageData()
+		{
+			return _minionsStageData;
+		}
+		
+		public static MinionData[] getMinionsStageData(int stage)
+		{
+			return _minionsStageData.get(stage);
+		}
+	}
+	
+	private static class MinionData
+	{
+		final int _minionId;
+		final Location _minionLocation;
+		
+		private MinionData(int minionId, Location minionLocation)
+		{
+			_minionId = minionId;
+			_minionLocation = minionLocation;
+		}
+		
+		public int getMinionId()
+		{
+			return _minionId;
+		}
+		
+		public Location getMinionLocation()
+		{
+			return _minionLocation;
+		}
+	}
+	
+	public static void main(String[] args)
+	{
+		new ResidenceOfKingPetram();
+	}
+}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
new file mode 100644
index 0000000000..93deb9dce3
--- /dev/null
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
@@ -0,0 +1,179 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.DwellingOfSpiritsResidence;
+
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.SkillHolder;
+import org.l2jmobius.gameserver.model.instancezone.Instance;
+import org.l2jmobius.gameserver.model.skill.SkillCaster;
+
+import ai.AbstractNpcAI;
+
+/**
+ * @author RobikBobik, Mobius
+ */
+public class ResidenceOfKingProcella extends AbstractNpcAI
+{
+	// NPCs
+	private static final int PROCELLA = 29107;
+	private static final int PROCELLA_GUARDIAN_1 = 29112;
+	private static final int PROCELLA_GUARDIAN_2 = 29113;
+	private static final int PROCELLA_GUARDIAN_3 = 29114;
+	private static final int PROCELLA_STORM = 29115;
+	// Skills
+	private static final SkillHolder HURRICANE_SUMMON = new SkillHolder(50042, 1);
+	private static final int HURRICANE_BOLT = 50043;
+	private static final SkillHolder HURRICANE_BOLT_LV_1 = new SkillHolder(50043, 1);
+	// Misc
+	private static final int STORM_MAX_COUNT = 16;
+	
+	public ResidenceOfKingProcella()
+	{
+		addKillId(PROCELLA, PROCELLA_GUARDIAN_1, PROCELLA_GUARDIAN_2, PROCELLA_GUARDIAN_3);
+		addSpawnId(PROCELLA);
+	}
+	
+	@Override
+	public String onSpawn(Npc npc)
+	{
+		final Instance world = npc.getInstanceWorld();
+		if (world != null)
+		{
+			startQuestTimer("SPAWN_MINION", 300000 + getRandom(-15000, 15000), npc, null);
+			startQuestTimer("SPAWN_STORM", 5000, npc, null);
+			world.setParameter("stormCount", 0);
+		}
+		return null;
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "SPAWN_MINION":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if ((world != null) && (npc.getId() == PROCELLA))
+				{
+					world.setParameter("minion1", addSpawn(PROCELLA_GUARDIAN_1, 212663, 179421, -15486, 31011, true, 0, true, npc.getInstanceId()));
+					world.setParameter("minion2", addSpawn(PROCELLA_GUARDIAN_2, 213258, 179822, -15486, 12001, true, 0, true, npc.getInstanceId()));
+					world.setParameter("minion3", addSpawn(PROCELLA_GUARDIAN_3, 212558, 179974, -15486, 12311, true, 0, true, npc.getInstanceId()));
+					startQuestTimer("HIDE_PROCELLA", 1000, world.getNpc(PROCELLA), null);
+				}
+				break;
+			}
+			case "SPAWN_STORM":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if ((world != null) && (world.getParameters().getInt("stormCount", 0) < STORM_MAX_COUNT))
+				{
+					world.getNpc(PROCELLA).doCast(HURRICANE_SUMMON.getSkill());
+					final Npc procellaStorm = addSpawn(PROCELLA_STORM, world.getNpc(PROCELLA).getX() + getRandom(-500, 500), world.getNpc(PROCELLA).getY() + getRandom(-500, 500), world.getNpc(PROCELLA).getZ(), 31011, true, 0, true, npc.getInstanceId());
+					procellaStorm.setRandomWalking(true);
+					world.getParameters().increaseInt("stormCount", 1);
+					startQuestTimer("SPAWN_STORM", 60000, world.getNpc(PROCELLA), null);
+					startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", 100, procellaStorm, player);
+				}
+				break;
+			}
+			case "HIDE_PROCELLA":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if (world != null)
+				{
+					if (world.getNpc(PROCELLA).isInvisible())
+					{
+						world.getNpc(PROCELLA).setInvisible(false);
+					}
+					else
+					{
+						world.getNpc(PROCELLA).setInvisible(true);
+						startQuestTimer("SPAWN_MINION", 300000 + getRandom(-15000, 15000), world.getNpc(PROCELLA), player);
+					}
+				}
+				break;
+			}
+			case "CHECK_CHAR_INSIDE_RADIUS_NPC":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if (world != null)
+				{
+					final Player plr = world.getPlayers().stream().findAny().orElse(null); // Usamos orElse(null) para evitar el Optional vacΓ­o
+					if ((plr != null) && (plr.isInsideRadius3D(npc, 100)))
+					{
+						npc.abortAttack();
+						npc.abortCast();
+						npc.setTarget(plr);
+						
+						if (plr.getKnownSkill(HURRICANE_BOLT) != null) // Verificamos si el jugador tiene la habilidad
+						{
+							if (plr.getAffectedSkillLevel(HURRICANE_BOLT) == 1)
+							{
+								npc.abortCast();
+								startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", 100, npc, player);
+							}
+							else
+							{
+								if (SkillCaster.checkUseConditions(npc, HURRICANE_BOLT_LV_1.getSkill()))
+								{
+									npc.doCast(HURRICANE_BOLT_LV_1.getSkill());
+								}
+							}
+						}
+						startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", 100, npc, player);
+					}
+					else
+					{
+						startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", 100, npc, player);
+					}
+				}
+				break;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player player, boolean isSummon)
+	{
+		final Instance world = npc.getInstanceWorld();
+		if (world == null)
+		{
+			return null;
+		}
+		
+		if (npc.getId() == PROCELLA)
+		{
+			cancelQuestTimer("SPAWN_MINION", npc, player.getActingPlayer());
+			cancelQuestTimer("SPAWN_STORM", npc, player.getActingPlayer());
+			cancelQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", npc, player.getActingPlayer());
+		}
+		else if ((world.getParameters().getObject("minion1", Npc.class).isDead()) && (world.getParameters().getObject("minion2", Npc.class).isDead()) && (world.getParameters().getObject("minion3", Npc.class).isDead()))
+		{
+			startQuestTimer("HIDE_PROCELLA", 1000, world.getNpc(PROCELLA), null);
+		}
+		
+		return super.onKill(npc, player, isSummon);
+	}
+	
+	public static void main(String[] args)
+	{
+		new ResidenceOfKingProcella();
+	}
+}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
new file mode 100644
index 0000000000..9c3c7ea37b
--- /dev/null
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
@@ -0,0 +1,209 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.DwellingOfSpiritsResidence;
+
+import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.SkillHolder;
+import org.l2jmobius.gameserver.model.instancezone.Instance;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.SkillCaster;
+
+import ai.AbstractNpcAI;
+
+/**
+ * @author RobikBobik
+ */
+public class ResidenceOfQueenNebula extends AbstractNpcAI
+{
+	// NPCs
+	private static final int NEBULA = 29106;
+	private static final int WATER_SLIME = 29111;
+	// Skills
+	private static final int AQUA_RAGE = 50036;
+	private static final SkillHolder AQUA_RAGE_1 = new SkillHolder(AQUA_RAGE, 1);
+	private static final SkillHolder AQUA_RAGE_2 = new SkillHolder(AQUA_RAGE, 2);
+	private static final SkillHolder AQUA_RAGE_3 = new SkillHolder(AQUA_RAGE, 3);
+	private static final SkillHolder AQUA_RAGE_4 = new SkillHolder(AQUA_RAGE, 4);
+	private static final SkillHolder AQUA_RAGE_5 = new SkillHolder(AQUA_RAGE, 5);
+	private static final SkillHolder AQUA_SUMMON = new SkillHolder(50037, 1);
+	
+	public ResidenceOfQueenNebula()
+	{
+		addKillId(NEBULA, WATER_SLIME);
+		addAttackId(NEBULA);
+		addSpawnId(NEBULA);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "SPAWN_WATER_SLIME":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if (world != null)
+				{
+					final Player plr = world.getPlayers().stream().findAny().get();
+					startQuestTimer("CAST_AQUA_RAGE", 60000 + getRandom(-15000, 15000), npc, plr);
+					if (npc.getId() == NEBULA)
+					{
+						npc.doCast(AQUA_SUMMON.getSkill());
+						for (int i = 0; i < getRandom(4, 6); i++)
+						{
+							addSpawn(npc, WATER_SLIME, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, -1, true, npc.getInstanceId());
+							startQuestTimer("SPAWN_WATER_SLIME", 300000, npc, null);
+						}
+					}
+				}
+				break;
+			}
+			case "PLAYER_PARA":
+			{
+				if (player.getAffectedSkillLevel(AQUA_RAGE) == 5)
+				{
+					player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.FROZEN_PILLAR);
+					player.setImmobilized(true);
+					startQuestTimer("PLAYER_UNPARA", 5000, npc, player);
+				}
+				break;
+			}
+			case "PLAYER_UNPARA":
+			{
+				player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, AQUA_RAGE_5.getSkill());
+				player.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.FROZEN_PILLAR);
+				player.setImmobilized(false);
+				break;
+			}
+			case "CAST_AQUA_RAGE":
+			{
+				startQuestTimer("CAST_AQUA_RAGE", 5000, npc, player);
+				if ((player.isInsideRadius3D(npc, 1000)))
+				{
+					if (player.getAffectedSkillLevel(AQUA_RAGE) == 1)
+					{
+						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_2.getSkill()))
+						{
+							npc.doCast(AQUA_RAGE_2.getSkill());
+						}
+					}
+					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 2)
+					{
+						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_3.getSkill()))
+						{
+							npc.doCast(AQUA_RAGE_3.getSkill());
+						}
+					}
+					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 3)
+					{
+						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_4.getSkill()))
+						{
+							npc.doCast(AQUA_RAGE_4.getSkill());
+						}
+					}
+					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 4)
+					{
+						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_5.getSkill()))
+						{
+							npc.doCast(AQUA_RAGE_5.getSkill());
+							startQuestTimer("PLAYER_PARA", 100, npc, player);
+						}
+					}
+					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 5)
+					{
+						npc.abortCast();
+					}
+					else if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_1.getSkill()))
+					{
+						npc.doCast(AQUA_RAGE_1.getSkill());
+					}
+				}
+				break;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public String onSpawn(Npc npc)
+	{
+		startQuestTimer("SPAWN_WATER_SLIME", 300000, npc, null);
+		return super.onSpawn(npc);
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player player, boolean isSummon)
+	{
+		switch (npc.getId())
+		{
+			case NEBULA:
+			{
+				cancelQuestTimer("CAST_AQUA_RAGE", npc, player);
+				cancelQuestTimer("SPAWN_WATER_SLIME", npc, player);
+				break;
+			}
+			case WATER_SLIME:
+			{
+				if (player.getAffectedSkillLevel(AQUA_RAGE) == 1)
+				{
+					if (getRandomBoolean())
+					{
+						player.stopSkillEffects(AQUA_RAGE_1.getSkill());
+					}
+				}
+				else if (player.getAffectedSkillLevel(AQUA_RAGE) == 2)
+				{
+					if (getRandomBoolean())
+					{
+						player.stopSkillEffects(AQUA_RAGE_2.getSkill());
+						final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 1);
+						skill.applyEffects(player, player);
+					}
+				}
+				else if (player.getAffectedSkillLevel(AQUA_RAGE) == 3)
+				{
+					if (getRandomBoolean())
+					{
+						player.stopSkillEffects(AQUA_RAGE_3.getSkill());
+						final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 2);
+						skill.applyEffects(player, player);
+					}
+				}
+				else if (player.getAffectedSkillLevel(AQUA_RAGE) == 4)
+				{
+					if (getRandomBoolean())
+					{
+						player.stopSkillEffects(AQUA_RAGE_4.getSkill());
+						final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 3);
+						skill.applyEffects(player, player);
+					}
+				}
+				break;
+			}
+		}
+		return super.onKill(npc, player, isSummon);
+	}
+	
+	public static void main(String[] args)
+	{
+		new ResidenceOfQueenNebula();
+	}
+}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
index e9e2c539a0..b025542e79 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
@@ -54,12 +54,12 @@ public class FrostLordCastleZone extends AbstractNpcAI
 	private static final AtomicReference<SpawnTemplate> SPAWN_BATTLE_MOBS = new AtomicReference<>();
 	private static final AtomicReference<SpawnTemplate> SPAWN_ENCHANCED_MOBS = new AtomicReference<>();
 	
-	public static final int[] REGGIESYS_GLAKIAS =
+	protected static final int[] REGGIESYS_GLAKIAS =
 	{
 		29136,
 		29137
 	};
-	public static final int[] SLICING_GLAKIAS =
+	protected static final int[] SLICING_GLAKIAS =
 	{
 		29138,
 		29139
@@ -72,21 +72,20 @@ public class FrostLordCastleZone extends AbstractNpcAI
 	private static final Location GLAKIAS_SPAWN_LOC = new Location(114713, -114799, -11209, 33289);
 	
 	// Teleports
-	private static final Location The_north_eastern_entrance = new Location(-56255, 13537, -3336);
-	private static final Location The_south_eastern_entrance = new Location(-49550, 17189, -3016);
-	private static final Location The_north_western_entrance = new Location(-52849, 5272, -240);
-	private static final Location The_south_western_entrance = new Location(-52849, 5272, -240);
+	private static final Location NORTH_EASTERN_ENTRANCE = new Location(-56255, 13537, -3336);
+	private static final Location SOUTH_EASTERN_ENTRANCE = new Location(-49550, 17189, -3016);
+	private static final Location NORTH_WESTERN_ENTRANCE = new Location(-52849, 5272, -240);
+	private static final Location SOUTH_WESTERN_ENTRANCE = new Location(-52849, 5272, -240);
 	
-	private static final Location Crossroad = new Location(145598, 144091, -11789);
-	private static final Location Northern_Secret_Passage = new Location(149478, 147145, -12339);
+	private static final Location CROSSROAD = new Location(145598, 144091, -11789);
+	private static final Location NOTHERN_SECRET_PASSAGE = new Location(149478, 147145, -12339);
 	
-	private static final Location Glakias_House = new Location(113479, -114804, -11076);
+	private static final Location GLAKIAS_RESIDENCE = new Location(113479, -114804, -11076);
 	
 	public static final int UNDERCOVER_AGENT = 34230; // Teleport npc
 	public static final int CRYSTAL_ENERGY = 34232; // Teleport npc
 	
 	// Zones
-	
 	private static final ZoneType[] ZONES =
 	{
 		ZoneManager.getInstance().getZoneByName("frost_castle_zone"),
@@ -94,7 +93,6 @@ public class FrostLordCastleZone extends AbstractNpcAI
 	};
 	
 	// Timings
-	
 	private static final int[] DAYS_OF_WEEK =
 	{
 		Calendar.TUESDAY,
@@ -113,7 +111,7 @@ public class FrostLordCastleZone extends AbstractNpcAI
 	
 	private static final long DESPAWN_DELAY = 16 * 60 * 60 * 1000;
 	
-	private static Npc _TeleportchargedCrystal = null;
+	private static Npc _teleportchargedCrystal = null;
 	
 	private static final String SCRIPT_BYPASS = "Quest FrostLordCastleZone ";
 	
@@ -138,148 +136,73 @@ public class FrostLordCastleZone extends AbstractNpcAI
 		{
 			case "Crossroad":
 			{
-				TeleportCheck(player, 1);
+				teleportCheck(player, 1);
 				break;
 			}
-			
 			case "Northern_Secret_Passage":
 			{
-				TeleportCheck(player, 2);
+				teleportCheck(player, 2);
 				break;
 			}
-			
 			case "The_north_eastern_entrance":
 			{
-				TeleportCheck(player, 3);
+				teleportCheck(player, 3);
 				break;
 			}
-			
 			case "The_south_eastern_entrance":
 			{
-				TeleportCheck(player, 4);
+				teleportCheck(player, 4);
 				break;
 			}
-			
 			case "The_north_western_entrance":
 			{
-				TeleportCheck(player, 5);
+				teleportCheck(player, 5);
 				break;
 			}
-			
 			case "The_south_western_entrance":
 			{
-				TeleportCheck(player, 6);
+				teleportCheck(player, 6);
 				break;
 			}
-			
 			case "Crystal_Energy_Teleport":
 			{
-				player.teleToLocation(Glakias_House);
+				player.teleToLocation(GLAKIAS_RESIDENCE);
 				break;
 			}
-			
 			case "FIRST_RAID_SPAWN":
 			{
 				int id = Rnd.get(100) < 7 ? SLICING : REGGIESYS;
 				addSpawn(id, REGGIESYS_SLICING_SPAWN_LOC, false, DESPAWN_DELAY);
 				break;
 			}
-			
 			case "SECOND_RAID_SPAWN":
 			{
 				addSpawn(TIRON, TIRON_SPAWN_LOC, false, DESPAWN_DELAY);
 				break;
 			}
-			
-			default:
-			{
-				break;
-			}
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
 	
-	private void scheduleFirstRaid()
-	{
-		long time = Long.MAX_VALUE;
-		
-		for (int day : DAYS_OF_WEEK)
-		{
-			long nextDateMillis = getNextDateMilis(day, FIRST_RAID_TIME[0], FIRST_RAID_TIME[1]);
-			if (nextDateMillis < time)
-			{
-				time = nextDateMillis;
-			}
-		}
-		
-		startQuestTimer("FIRST_RAID_SPAWN", time - System.currentTimeMillis(), null, null);
-	}
-	
-	private void scheduleSecondRaid()
-	{
-		long time = Long.MAX_VALUE;
-		for (int day : DAYS_OF_WEEK)
-		{
-			long temp = getNextDateMilis(day, SECOND_RAID_TIME[0], SECOND_RAID_TIME[1]);
-			if (temp < time)
-			{
-				time = temp;
-			}
-		}
-		startQuestTimer("SECOND_RAID_SPAWN", time - System.currentTimeMillis(), null, null);
-		
-	}
-	
-	private long getNextDateMilis(int dayOfWeek, int hour, int minute)
-	{
-		Calendar c = Calendar.getInstance();
-		c.set(Calendar.HOUR_OF_DAY, hour);
-		c.set(Calendar.MINUTE, minute);
-		c.set(Calendar.SECOND, 0);
-		for (int i = 0; i < 7; i++)
-		{
-			if ((c.get(Calendar.DAY_OF_WEEK) == dayOfWeek) && (c.getTimeInMillis() > System.currentTimeMillis()))
-			{
-				return c.getTimeInMillis();
-			}
-			c.add(Calendar.DAY_OF_WEEK, 1);
-		}
-		return c.getTimeInMillis();
-	}
-	
 	@Override
-	public String onKill(Npc npc, Player killer, boolean isSummon)
+	public String onFirstTalk(Npc npc, Player player)
 	{
-		switch (npc.getId())
+		if (npc.getId() == CRYSTAL_ENERGY)
 		{
-			case REGGIESYS:
-			{
-				addSpawn(REGGIESYS_GLAKIAS[Rnd.get(0, REGGIESYS_GLAKIAS.length - 1)], GLAKIAS_SPAWN_LOC, false, DESPAWN_DELAY);
-				
-				SPAWN_BATTLE_MOBS.set(SpawnData.getInstance().getSpawnByName("glakias_mobs_pretorian"));
-				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::despawnAll);
-				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::spawnAll);
-				
-				break;
-			}
-			case SLICING:
-			{
-				addSpawn(SLICING_GLAKIAS[Rnd.get(0, SLICING_GLAKIAS.length - 1)], GLAKIAS_SPAWN_LOC, false, DESPAWN_DELAY);
-				
-				SPAWN_BATTLE_MOBS.set(SpawnData.getInstance().getSpawnByName("glakias_mobs_pretorian"));
-				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::despawnAll);
-				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::spawnAll);
-				
-				break;
-			}
-			case TIRON:
-			{
-				_TeleportchargedCrystal = addSpawn(CHARGED_CRYSTAL, CHARGED_CRYSTAL_SPAWN_LOC, false, DESPAWN_DELAY);
-				break;
-			}
+			return getHtm(player, "34232.htm");
 		}
-		DeleteGlakiasSpawns(npc);
-		return super.onKill(npc, killer, false);
+		
+		if (npc.getId() == UNDERCOVER_AGENT)
+		{
+			if ((_teleportchargedCrystal != null) && _teleportchargedCrystal.isSpawned())
+			{
+				return getHtm(player, "34230-full.htm");
+			}
+			
+			return getHtm(player, "34230.htm");
+		}
+		
+		return null;
 	}
 	
 	@Override
@@ -325,47 +248,133 @@ public class FrostLordCastleZone extends AbstractNpcAI
 		}
 	}
 	
-	public void TeleportCheck(Player player, int locNum)
+	@Override
+	public String onKill(Npc npc, Player killer, boolean isSummon)
+	{
+		switch (npc.getId())
+		{
+			case REGGIESYS:
+			{
+				addSpawn(REGGIESYS_GLAKIAS[Rnd.get(0, REGGIESYS_GLAKIAS.length - 1)], GLAKIAS_SPAWN_LOC, false, DESPAWN_DELAY);
+				SPAWN_BATTLE_MOBS.set(SpawnData.getInstance().getSpawnByName("glakias_mobs_pretorian"));
+				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::despawnAll);
+				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::spawnAll);
+				break;
+			}
+			case SLICING:
+			{
+				addSpawn(SLICING_GLAKIAS[Rnd.get(0, SLICING_GLAKIAS.length - 1)], GLAKIAS_SPAWN_LOC, false, DESPAWN_DELAY);
+				SPAWN_BATTLE_MOBS.set(SpawnData.getInstance().getSpawnByName("glakias_mobs_pretorian"));
+				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::despawnAll);
+				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::spawnAll);
+				break;
+			}
+			case TIRON:
+			{
+				_teleportchargedCrystal = addSpawn(CHARGED_CRYSTAL, CHARGED_CRYSTAL_SPAWN_LOC, false, DESPAWN_DELAY);
+				break;
+			}
+		}
+		deleteGlakiasSpawns(npc);
+		return super.onKill(npc, killer, false);
+	}
+	
+	@RegisterEvent(EventType.ON_PLAYER_BYPASS)
+	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
+	public void onPlayerBypass(OnPlayerBypass event)
+	{
+		final Player player = event.getPlayer();
+		if (event.getCommand().startsWith(SCRIPT_BYPASS))
+		{
+			notifyEvent(event.getCommand().replace(SCRIPT_BYPASS, ""), null, player);
+		}
+	}
+	
+	private void scheduleFirstRaid()
+	{
+		long time = Long.MAX_VALUE;
+		for (int day : DAYS_OF_WEEK)
+		{
+			final long nextDateMillis = getNextDateMilis(day, FIRST_RAID_TIME[0], FIRST_RAID_TIME[1]);
+			if (nextDateMillis < time)
+			{
+				time = nextDateMillis;
+			}
+		}
+		startQuestTimer("FIRST_RAID_SPAWN", time - System.currentTimeMillis(), null, null);
+	}
+	
+	private void scheduleSecondRaid()
+	{
+		long time = Long.MAX_VALUE;
+		for (int day : DAYS_OF_WEEK)
+		{
+			final long nextDateMillis = getNextDateMilis(day, SECOND_RAID_TIME[0], SECOND_RAID_TIME[1]);
+			if (nextDateMillis < time)
+			{
+				time = nextDateMillis;
+			}
+		}
+		startQuestTimer("SECOND_RAID_SPAWN", time - System.currentTimeMillis(), null, null);
+	}
+	
+	private long getNextDateMilis(int dayOfWeek, int hour, int minute)
+	{
+		final Calendar calendar = Calendar.getInstance();
+		calendar.set(Calendar.HOUR_OF_DAY, hour);
+		calendar.set(Calendar.MINUTE, minute);
+		calendar.set(Calendar.SECOND, 0);
+		for (int i = 0; i < 7; i++)
+		{
+			if ((calendar.get(Calendar.DAY_OF_WEEK) == dayOfWeek) && (calendar.getTimeInMillis() > System.currentTimeMillis()))
+			{
+				return calendar.getTimeInMillis();
+			}
+			calendar.add(Calendar.DAY_OF_WEEK, 1);
+		}
+		return calendar.getTimeInMillis();
+	}
+	
+	public void teleportCheck(Player player, int locationId)
 	{
 		int requiredMoney = 0;
 		Location teleportLocation = null;
-		
-		switch (locNum)
+		switch (locationId)
 		{
 			case 1:
 			{
 				requiredMoney = 100000;
-				teleportLocation = Crossroad;
+				teleportLocation = CROSSROAD;
 				break;
 			}
 			case 2:
 			{
 				requiredMoney = 100000;
-				teleportLocation = Northern_Secret_Passage;
+				teleportLocation = NOTHERN_SECRET_PASSAGE;
 				break;
 			}
 			case 3:
 			{
 				requiredMoney = 500000;
-				teleportLocation = The_north_eastern_entrance;
+				teleportLocation = NORTH_EASTERN_ENTRANCE;
 				break;
 			}
 			case 4:
 			{
 				requiredMoney = 500000;
-				teleportLocation = The_south_eastern_entrance;
+				teleportLocation = SOUTH_EASTERN_ENTRANCE;
 				break;
 			}
 			case 5:
 			{
 				requiredMoney = 500000;
-				teleportLocation = The_north_western_entrance;
+				teleportLocation = NORTH_WESTERN_ENTRANCE;
 				break;
 			}
 			case 6:
 			{
 				requiredMoney = 500000;
-				teleportLocation = The_south_western_entrance;
+				teleportLocation = SOUTH_WESTERN_ENTRANCE;
 				break;
 			}
 			default:
@@ -383,33 +392,7 @@ public class FrostLordCastleZone extends AbstractNpcAI
 		player.teleToLocation(teleportLocation);
 	}
 	
-	@Override
-	public String onFirstTalk(Npc npc, Player player)
-	{
-		String html;
-		if (npc.getId() == CRYSTAL_ENERGY)
-		{
-			html = getHtm(player, "34232.htm");
-			return html;
-		}
-		
-		if (npc.getId() == UNDERCOVER_AGENT)
-		{
-			if ((_TeleportchargedCrystal != null) && _TeleportchargedCrystal.isSpawned())
-			{
-				html = getHtm(player, "34230-full.htm");
-			}
-			else
-			{
-				html = getHtm(player, "34230.htm");
-			}
-			
-			return html;
-		}
-		return null;
-	}
-	
-	private void DeleteGlakiasSpawns(Npc npc)
+	private void deleteGlakiasSpawns(Npc npc)
 	{
 		int npcId = npc.getId();
 		if ((npcId == REGGIESYS_GLAKIAS[0]) || (npcId == REGGIESYS_GLAKIAS[1]) || (npcId == SLICING_GLAKIAS[0]) || (npcId == SLICING_GLAKIAS[1]))
@@ -418,19 +401,8 @@ public class FrostLordCastleZone extends AbstractNpcAI
 		}
 	}
 	
-	@RegisterEvent(EventType.ON_PLAYER_BYPASS)
-	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void onPlayerBypass(OnPlayerBypass event)
-	{
-		final Player player = event.getPlayer();
-		if (event.getCommand().startsWith(SCRIPT_BYPASS))
-		{
-			notifyEvent(event.getCommand().replace(SCRIPT_BYPASS, ""), null, player);
-		}
-	}
-	
 	public static void main(String[] args)
 	{
 		new FrostLordCastleZone();
 	}
-}
\ No newline at end of file
+}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 5b501b1f1b..bcc74a8afe 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -254,6 +255,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/EffectMasterHandler.java
index b59d11ec8d..01bc847ec6 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -43,6 +43,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AgathionSlot", AgathionSlot::new);
@@ -176,6 +178,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("GiveFame", GiveFame::new);
 		EffectHandler.getInstance().registerHandler("GiveHonorCoins", GiveHonorCoins::new);
 		EffectHandler.getInstance().registerHandler("GiveItemByExp", GiveItemByExp::new);
+		EffectHandler.getInstance().registerHandler("GivePetXp", GivePetXp::new);
 		EffectHandler.getInstance().registerHandler("GiveRecommendation", GiveRecommendation::new);
 		EffectHandler.getInstance().registerHandler("GiveSp", GiveSp::new);
 		EffectHandler.getInstance().registerHandler("GiveXp", GiveXp::new);
@@ -199,6 +202,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("HpRegen", HpRegen::new);
 		EffectHandler.getInstance().registerHandler("HpToOwner", HpToOwner::new);
 		EffectHandler.getInstance().registerHandler("IgnoreDeath", IgnoreDeath::new);
+		EffectHandler.getInstance().registerHandler("IgnoreReduceDamage", IgnoreReduceDamage::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageBonus", ImmobileDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageResist", ImmobileDamageResist::new);
 		EffectHandler.getInstance().registerHandler("ImmobilePetBuff", ImmobilePetBuff::new);
@@ -240,7 +244,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtkByPAtk", MAtkByPAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyBeastPoints", ModifyBeastPoints::new);
 		EffectHandler.getInstance().registerHandler("ModifyCraftPoints", ModifyCraftPoints::new);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/MasterHandler.java
index 3308643dd5..d62fc6e372 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/MasterHandler.java
@@ -148,6 +148,7 @@ import handlers.bypasshandlers.Link;
 import handlers.bypasshandlers.Multisell;
 import handlers.bypasshandlers.NpcViewMod;
 import handlers.bypasshandlers.Observation;
+import handlers.bypasshandlers.PetExtractWindow;
 import handlers.bypasshandlers.PlayerHelp;
 import handlers.bypasshandlers.PrivateWarehouse;
 import handlers.bypasshandlers.QuestLink;
@@ -468,6 +469,7 @@ public class MasterHandler
 			Multisell.class,
 			NpcViewMod.class,
 			Observation.class,
+			PetExtractWindow.class,
 			QuestLink.class,
 			PlayerHelp.class,
 			PrivateWarehouse.class,
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/bypasshandlers/PetExtractWindow.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/bypasshandlers/PetExtractWindow.java
new file mode 100644
index 0000000000..446334c464
--- /dev/null
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/bypasshandlers/PetExtractWindow.java
@@ -0,0 +1,56 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.bypasshandlers;
+
+import org.l2jmobius.gameserver.handler.IBypassHandler;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.network.serverpackets.pet.ShowPetExtractSystem;
+
+/**
+ * @author Geremy
+ */
+public class PetExtractWindow implements IBypassHandler
+{
+	private static final String[] COMMANDS =
+	{
+		"pet_extract_window",
+	};
+	
+	@Override
+	public boolean useBypass(String command, Player player, Creature target)
+	{
+		if (!target.isNpc())
+		{
+			return false;
+		}
+		
+		if (command.toLowerCase().startsWith(COMMANDS[0]))
+		{
+			player.sendPacket(ShowPetExtractSystem.STATIC_PACKET);
+			return true;
+		}
+		
+		return false;
+	}
+	
+	@Override
+	public String[] getBypassList()
+	{
+		return COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java
index 2e18f88163..b4e115ac3b 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java
@@ -113,7 +113,7 @@ public class MonsterDailyMissionHandler extends AbstractDailyMissionHandler
 		
 		final Player player = event.getAttacker();
 		final int monsterLevel = monster.getLevel();
-		if ((_minLevel > 0) && ((monsterLevel < _minLevel) || (monsterLevel > _maxLevel) || ((player.getLevel() - monsterLevel) > 5)))
+		if ((_minLevel > 0) && ((monsterLevel < _minLevel) || (monsterLevel > _maxLevel) || ((player.getLevel() - monsterLevel) > 15)))
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index 53461fa88c..d2642e05ab 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/GivePetXp.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/GivePetXp.java
new file mode 100644
index 0000000000..c9801b6d42
--- /dev/null
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/GivePetXp.java
@@ -0,0 +1,53 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.skill.Skill;
+
+/**
+ * @author Geremy
+ */
+public class GivePetXp extends AbstractEffect
+{
+	private final int _xp;
+	
+	public GivePetXp(StatSet params)
+	{
+		_xp = params.getInt("xp", 0);
+	}
+	
+	@Override
+	public boolean isInstant()
+	{
+		return true;
+	}
+	
+	@Override
+	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		if (!effector.hasPet())
+		{
+			return;
+		}
+		
+		effected.getActingPlayer().getPet().addExpAndSp(_xp, 0);
+	}
+}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
new file mode 100644
index 0000000000..5405ccd4be
--- /dev/null
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class IgnoreReduceDamage extends AbstractStatEffect
+{
+	public IgnoreReduceDamage(StatSet params)
+	{
+		super(params, Stat.IGNORE_REDUCE_DAMAGE);
+	}
+}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
deleted file mode 100644
index c99b060259..0000000000
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/MaxMagicCriticalRate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.effecthandlers;
-
-import org.l2jmobius.gameserver.model.StatSet;
-import org.l2jmobius.gameserver.model.stats.Stat;
-
-/**
- * @author Mobius
- */
-public class MaxMagicCriticalRate extends AbstractStatEffect
-{
-	public MaxMagicCriticalRate(StatSet params)
-	{
-		super(params, Stat.MAX_MAGIC_CRITICAL_RATE);
-	}
-}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
index 951002a2c2..35bfbcb6bc 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.enums.StatModifierType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener;
 import org.l2jmobius.gameserver.model.events.returns.DamageReturn;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author Sdw
@@ -32,10 +34,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 public class ReduceDamage extends AbstractEffect
 {
 	private final double _amount;
+	private final StatModifierType _mode;
 	
 	public ReduceDamage(StatSet params)
 	{
 		_amount = params.getDouble("amount");
+		_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
 	}
 	
 	private DamageReturn onDamageReceivedEvent(OnCreatureDamageReceived event)
@@ -46,7 +50,15 @@ public class ReduceDamage extends AbstractEffect
 			return null;
 		}
 		
-		final double newDamage = event.getDamage() * (_amount / 100);
+		final double newDamage;
+		if (_mode == StatModifierType.PER)
+		{
+			newDamage = event.getDamage() - (event.getDamage() * (_amount / 100));
+		}
+		else // DIFF
+		{
+			newDamage = event.getDamage() - Math.max((_amount - event.getAttacker().getStat().getAdd(Stat.IGNORE_REDUCE_DAMAGE)), 0.0);
+		}
 		
 		return new DamageReturn(false, true, false, newDamage);
 	}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index 7e02e79abc..bff5a1734b 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -210,6 +210,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()) || _renewDuration)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 289fc39e34..658d88fe0a 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
index 70789354f3..fd41f09a9a 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
@@ -17,7 +17,13 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author Sero
@@ -28,4 +34,46 @@ public class WeaponBonusMAtk extends AbstractStatAddEffect
 	{
 		super(params, Stat.WEAPON_BONUS_MAGIC_ATTACK);
 	}
+	
+	@Override
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
index df05ef8607..b36b10a92e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
@@ -17,7 +17,13 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author Sero
@@ -28,4 +34,46 @@ public class WeaponBonusPAtk extends AbstractStatAddEffect
 	{
 		super(params, Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
 	}
+	
+	@Override
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 184f7d7c57..37f9d00f2a 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,61 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_SATIETY_REACHES_0_YOU_CANNOT_CONTROL_IT);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetHold.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetHold.java
index 6965c0d0b5..48627f4566 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetHold.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetHold.java
@@ -52,4 +52,10 @@ public class PetHold implements IPlayerActionHandler
 			((SummonAI) pet.getAI()).notifyFollowStatusChange();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetMove.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetMove.java
index 32f4053f45..d62690a655 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetMove.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetMove.java
@@ -53,4 +53,10 @@ public class PetMove implements IPlayerActionHandler
 			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, player.getTarget().getLocation());
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
index 3dc74de1c2..c8059bf358 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
@@ -77,4 +77,10 @@ public class PetSkillUse implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetStop.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetStop.java
index 9fa6da5ad9..3ed527ecd8 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetStop.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/PetStop.java
@@ -51,4 +51,10 @@ public class PetStop implements IPlayerActionHandler
 			pet.cancelAction();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 71d72e95b5..3e0acb89bd 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,52 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorHold.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
index 7b0ec565e4..41ecb77132 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
@@ -48,4 +48,10 @@ public class ServitorHold implements IPlayerActionHandler
 			((SummonAI) s.getAI()).notifyFollowStatusChange();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorMode.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
index be6205b0f9..2b5a8f1e82 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
@@ -68,4 +68,10 @@ public class ServitorMode implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorMove.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
index d119886221..6254d3db05 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
@@ -56,4 +56,10 @@ public class ServitorMove implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
index 36aa372909..7fa7f0a45c 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
@@ -62,4 +62,10 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			}
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorStop.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
index 41b3dd19f2..4f91147611 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
@@ -47,4 +47,10 @@ public class ServitorStop implements IPlayerActionHandler
 			s.cancelAction();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
index 6a502a1f73..70384d677c 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
@@ -62,4 +62,10 @@ public class UnsummonPet implements IPlayerActionHandler
 			pet.unSummon(player);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
index a408928a04..f305fd2787 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
@@ -69,4 +69,10 @@ public class UnsummonServitor implements IPlayerActionHandler
 			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 57ebb3bb4c..fffb222021 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index 18c4d64dbc..58cf8bd50e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
index 068f5dc60f..bf71fda5e1 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
@@ -20,20 +20,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.l2jmobius.gameserver.data.xml.SkillData;
-import org.l2jmobius.gameserver.enums.ChatType;
-import org.l2jmobius.gameserver.enums.SkillFinishType;
+import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
-import org.l2jmobius.gameserver.instancemanager.ZoneManager;
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.model.skill.Skill;
-import org.l2jmobius.gameserver.model.skill.SkillCaster;
 import org.l2jmobius.gameserver.model.zone.ZoneType;
 import org.l2jmobius.gameserver.network.NpcStringId;
 import org.l2jmobius.gameserver.network.serverpackets.ExSendUIEvent;
@@ -47,8 +42,12 @@ import instances.AbstractInstance;
  */
 public class DwellingOfSpirits extends AbstractInstance
 {
+	private static final int PORTAL_OPEN_CHANCE = 40;
+	
 	// CRITICAL NPCs
 	private static final int RUIP = 22273;
+	private static final int FAIRY_C1 = 22271;
+	private static final int FAIRY_C2 = 22272;
 	private static final int SEALSTONE = 34178;
 	private static final int ANIMAEL = 34176;
 	private static final int PORTAL_EVENT_FIRE = 15969;
@@ -56,46 +55,10 @@ public class DwellingOfSpirits extends AbstractInstance
 	private static final int PORTAL_EVENT_EARTH = 15972;
 	private static final int PORTAL_EVENT_WIND = 15971;
 	
-	// PROCELLA BOSS WIND
 	private static final int KING_PROCELLA = 29107;
-	private static final int PROCELLA_GUARDIAN_1 = 29112;
-	private static final int PROCELLA_STORM = 29115;
-	
-	private static final SkillHolder HURRICANE_SUMMON = new SkillHolder(50042, 1);
-	private static final int HURRICANE_BOLT = 50043;
-	private static final SkillHolder HURRICANE_BOLT_LV_1 = new SkillHolder(50043, 1);
-	private static final int STORM_MAX_COUNT = 20; //
-	
-	// PETRAM BOSS EARTH
 	private static final int KING_PETRAM = 29108;
-	private static final int PETRAM_PIECE = 29116;
-	private static final int PETRAM_FRAGMENT = 29117;
-	// Skills
-	private static final SkillHolder EARTH_ENERGY = new SkillHolder(50066, 1);
-	private static final SkillHolder EARTH_FURY = new SkillHolder(50059, 1);
-	private static final SkillHolder TEST = new SkillHolder(5712, 1);
-	
-	// IGNIS BOSS FIRE
-	// NPCs
 	private static final int KING_IGNIS = 29105;
-	// Skills
-	private static final SkillHolder FIRE_RAG_2 = new SkillHolder(50050, 2);
-	private static final SkillHolder FIRE_RAG_4 = new SkillHolder(50050, 4);
-	private static final SkillHolder FIRE_RAG_6 = new SkillHolder(50050, 6);
-	private static final SkillHolder FIRE_RAG_8 = new SkillHolder(50050, 8);
-	
-	// NEBULA BOSS WATER
-	// NPCs
 	private static final int KING_NEBULA = 29106;
-	private static final int WATER_SLIME = 29111;
-	// Skills
-	private static final int AQUA_RAGE = 50036;
-	private static final SkillHolder AQUA_RAGE_1 = new SkillHolder(AQUA_RAGE, 1);
-	private static final SkillHolder AQUA_RAGE_2 = new SkillHolder(AQUA_RAGE, 2);
-	private static final SkillHolder AQUA_RAGE_3 = new SkillHolder(AQUA_RAGE, 3);
-	private static final SkillHolder AQUA_RAGE_4 = new SkillHolder(AQUA_RAGE, 4);
-	private static final SkillHolder AQUA_RAGE_5 = new SkillHolder(AQUA_RAGE, 5);
-	private static final SkillHolder AQUA_SUMMON = new SkillHolder(50037, 1);
 	
 	// Entrace Portal Triggers
 	private static final int WIND_FIRST_TRIGGER_1 = 16158880;
@@ -107,38 +70,86 @@ public class DwellingOfSpirits extends AbstractInstance
 	private static final int WATER_FIRST_TRIGGER_1 = 16157770;
 	private static final int WATER_FIRST_TRIGGER_2 = 16157772;
 	
-	// Statue Kill Indicator Triggers
-	private static final int KILL_INDICATOR_TRIGGER_1 = 16159990;
-	private static final int KILL_INDICATOR_TRIGGER_2 = 16159994;
-	private static final int KILL_INDICATOR_TRIGGER_3 = 16159996;
-	private static final int KILL_INDICATOR_TRIGGER_4 = 16159998;
-	private static final int KILL_INDICATOR_TRIGGER_5 = 16159992;
+	// @formatter:off
+	private static final int[][] PORTAL_TRIGGER_IDS = 
+	{
+	    { 16158880, 16158882 },
+	    { 16156660, 16156662 },
+	    { 16155550, 16155552 },
+	    { 16157770, 16157772 }
+	};
+	
+	private static final Location IGNIS_FIRE_L = new Location(202374, 168153, -15485);
+	private static final Location PETRAM_EARTH_L = new Location(222081, 190538, -15485);
+	private static final Location NEBULA_WATER_L = new Location(222149, 168087, -15485);
+	private static final Location PROCELLA_WIN_L = new Location(212884, 178847, -15485);
+	
+	private static final Location PETRAM_EARTH_RETURN_L = new Location(-114321, -77262, -11445);
+	private static final Location IGNIS_FIRE_RETURN_L = new Location(-114322, -77262, -11445);
+	private static final Location NEBULA_WATER_RETURN_L = new Location(-114323, -77262, -11445);
+	private static final Location PROCELLA_WIN_RETURN_L = new Location(-114324, -77262, -11445);
+	
+	private static final int[][][] portalConfigs = 
+	{
+	    {{EARTH_FIRST_TRIGGER_1, EARTH_FIRST_TRIGGER_2, KING_PETRAM}},
+	    {{FIRE_FIRST_TRIGGER_1, FIRE_FIRST_TRIGGER_2, KING_IGNIS}},
+	    {{WATER_FIRST_TRIGGER_1, WATER_FIRST_TRIGGER_2, KING_NEBULA}},
+	    {{WIND_FIRST_TRIGGER_1, WIND_FIRST_TRIGGER_2, KING_PROCELLA}}
+	};
+
+	private static final int[][] portalSpawnCoordinates = 
+	{
+	    {222063, 191514, -15486, 50142},  
+	    {202350, 169121, -15484, 48103},  
+	    {222127, 169057, -15486, 48730},  
+	    {212862, 179828, -15489, 48103}   
+	};
+	// @formatter:on
 	
 	private static final int TEMPLATE_ID = 214;
 	
 	private static final Map<Integer, NpcStringId> PORTAL_MSG = new HashMap<>();
 	static
 	{
-		PORTAL_MSG.put(1, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_EARTH_IS_OPEN);
+		PORTAL_MSG.put(0, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_EARTH_IS_OPEN);
+		PORTAL_MSG.put(1, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_FIRE_IS_OPEN);
 		PORTAL_MSG.put(2, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_WATER_IS_OPEN);
 		PORTAL_MSG.put(3, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_WIND_IS_OPEN);
-		PORTAL_MSG.put(4, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_FIRE_IS_OPEN);
-		PORTAL_MSG.put(5, NpcStringId.SEAL_STONE_DISAPPEARS_AFTER_RESONATING_WITH_THE_STATUE);
+		PORTAL_MSG.put(4, NpcStringId.SEAL_STONE_DISAPPEARS_AFTER_RESONATING_WITH_THE_STATUE);
 	}
 	
+	// Zone
+	private static final int DWELLING_CENTRAL = 21400000;
+	
+	private static final int IGNIS_PORTAL_ENTER_ID = 202201;
+	private static final int PETRAM_PORTAL_ENTER_ID = 202202;
+	private static final int NEBULA_PORTAL_ENTER_ID = 202203;
+	private static final int PROCELLA_PORTAL_ENTER_ID = 202204;
+	
+	// Portals return IDs
+	private static final int IGNIS_PORTAL_RETURN_ID = 202205;
+	private static final int PETRAM_PORTAL_RETURN_ID = 202206;
+	private static final int NEBULA_PORTAL_RETURN_ID = 202207;
+	private static final int PROCELLA_PORTAL_RETURN_ID = 202208;
+	
 	public DwellingOfSpirits()
 	{
 		super(TEMPLATE_ID);
 		addKillId(KING_PETRAM, KING_NEBULA, KING_PROCELLA, KING_IGNIS);
-		addKillId(PROCELLA_GUARDIAN_1);
-		addKillId(PETRAM_PIECE, PETRAM_FRAGMENT);
-		addKillId(WATER_SLIME);
+		addKillId(FAIRY_C1, FAIRY_C2, RUIP);
 		addAttackId(KING_PETRAM, KING_NEBULA, KING_PROCELLA, KING_IGNIS);
 		addSpawnId(KING_NEBULA);
 		addFirstTalkId(ANIMAEL, SEALSTONE);
 		addTalkId(ANIMAEL);
 		addStartNpc(SEALSTONE);
-		addCreatureSeeId(RUIP, ANIMAEL);
+		addCreatureSeeId(ANIMAEL);
+		addEnterZoneId(DWELLING_CENTRAL);
+		addEnterZoneId(IGNIS_PORTAL_ENTER_ID, IGNIS_PORTAL_RETURN_ID);
+		addEnterZoneId(PETRAM_PORTAL_ENTER_ID, PETRAM_PORTAL_RETURN_ID);
+		addEnterZoneId(NEBULA_PORTAL_ENTER_ID, NEBULA_PORTAL_RETURN_ID);
+		addEnterZoneId(PROCELLA_PORTAL_ENTER_ID, PROCELLA_PORTAL_RETURN_ID);
+		addInstanceEnterId(TEMPLATE_ID);
+		addInstanceLeaveId(TEMPLATE_ID);
 	}
 	
 	@Override
@@ -179,779 +190,106 @@ public class DwellingOfSpirits extends AbstractInstance
 			}
 			case "TELEPORT":
 			{
-				player.teleToLocation(TeleportWhereType.TOWN, null);
-				return null;
-			}
-			//////////////// BOSS PROCELLA WIND ACTION /////////////
-			case "SPAWN_MINION_PROCELLA":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if ((world != null) && (npc.getId() == KING_PROCELLA))
+				final Instance instance = player.getInstanceWorld();
+				if (instance != null)
 				{
-					world.setParameter("minion1", addSpawn(PROCELLA_GUARDIAN_1, 212663, 179421, -15486, 31011, true, 0, true, npc.getInstanceId()));
-					world.setParameter("minion2", addSpawn(PROCELLA_GUARDIAN_1, 213258, 179822, -15486, 12001, true, 0, true, npc.getInstanceId()));
-					world.setParameter("minion3", addSpawn(PROCELLA_GUARDIAN_1, 212558, 179974, -15486, 12311, true, 0, true, npc.getInstanceId()));
-					startQuestTimer("HIDE_PROCELLA", 1000, world.getNpc(KING_PROCELLA), player);
+					instance.finishInstance();
+					player.teleToLocation(TeleportWhereType.TOWN, null);
 				}
-				break;
-			}
-			case "SPAWN_STORM_PROCELLA":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if ((world != null) && (world.getParameters().getInt("stormCount", 0) < STORM_MAX_COUNT))
-				{
-					world.getNpc(KING_PROCELLA).doCast(HURRICANE_SUMMON.getSkill());
-					final Npc procellaStorm = addSpawn(PROCELLA_STORM, world.getNpc(KING_PROCELLA).getX() + getRandom(-500, 500), world.getNpc(KING_PROCELLA).getY() + getRandom(-500, 500), world.getNpc(KING_PROCELLA).getZ(), 31011, true, 0, true, npc.getInstanceId());
-					procellaStorm.setRandomWalking(true);
-					world.getParameters().increaseInt("stormCount", 1);
-					startQuestTimer("SPAWN_STORM_PROCELLA", 30000, world.getNpc(KING_PROCELLA), player);
-					startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA", 100, procellaStorm, player);
-				}
-				break;
-			}
-			case "HIDE_PROCELLA":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world.getAliveNpcCount(PROCELLA_GUARDIAN_1) >= 1)
-				{
-					world.getNpc(KING_PROCELLA).setInvisible(true);
-				}
-				else if (world.getAliveNpcCount(PROCELLA_GUARDIAN_1) == 0)
-				{
-					world.getNpc(KING_PROCELLA).setInvisible(false);
-					startQuestTimer("SPAWN_MINION_PROCELLA", 90000 + getRandom(-15000, 11000), world.getNpc(KING_PROCELLA), player);
-				}
-				break;
-			}
-			case "CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world != null)
-				{
-					final Player plr = world.getPlayers().stream().findAny().orElse(null);
-					if ((plr != null) && (plr.isInsideRadius3D(npc, 200)))
-					{
-						npc.abortAttack();
-						npc.abortCast();
-						npc.setTarget(plr);
-						if (plr.getAffectedSkillLevel(HURRICANE_BOLT) == 1)
-						{
-							npc.abortCast();
-							startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA", 100, npc, player);
-						}
-						else
-						{
-							if (SkillCaster.checkUseConditions(npc, HURRICANE_BOLT_LV_1.getSkill()))
-							{
-								npc.doCast(HURRICANE_BOLT_LV_1.getSkill());
-							}
-						}
-						startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA", 100, npc, player);
-					}
-					else
-					{
-						startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA", 100, npc, player);
-					}
-				}
-				break;
-			}
-			//////////////// BOSS PETRAM EARTH ACTION /////////////
-			case "SPAWN_MINION":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world.getAliveNpcCount(PETRAM_FRAGMENT) == 0)
-				{
-					npc.doCast(EARTH_ENERGY.getSkill());
-					
-					if (!world.getParameters().getBoolean("spawnedMinions", false))
-					{
-						world.getParameters().set("spawnedMinions", true);
-						
-						final int stage = world.getParameters().getInt("stage", 0);
-						world.getParameters().set("stage", stage + 1);
-						
-						world.setParameter("minionpetram1", addSpawn(npc, PETRAM_FRAGMENT, 221543, 191530, -15486, 1131, false, -1, true, npc.getInstanceId()));
-						world.setParameter("minionpetram2", addSpawn(npc, PETRAM_FRAGMENT, 222069, 192019, -15486, 49364, false, -1, true, npc.getInstanceId()));
-						world.setParameter("minionpetram3", addSpawn(npc, PETRAM_FRAGMENT, 222595, 191479, -15486, 34013, false, -1, true, npc.getInstanceId()));
-						world.setParameter("minionpetram4", addSpawn(npc, PETRAM_FRAGMENT, 222077, 191017, -15486, 16383, false, -1, true, npc.getInstanceId()));
-						
-						npc.setInvul(true);
-						npc.broadcastSay(ChatType.NPC_SHOUT, "HaHahaha, fighters lets kill them. Now Im invul!!!");
-					}
-					
-					startQuestTimer("SUPPORT_PETRAM", 3000, npc, player);
-				}
-				break;
-			}
-			case "UNSPAWN_MINION":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world.getAliveNpcCount(PETRAM_FRAGMENT) == 0)
-				{
-					world.getParameters().set("spawnedMinions", false);
-					
-					npc.setInvul(false);
-					npc.broadcastSay(ChatType.NPC_SHOUT, "Nooooo... Nooooo...");
-				}
-				break;
-			}
-			case "SUPPORT_PETRAM":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world != null)
-				{
-					final Npc m1 = world.getParameters().getObject("minionpetram1", Npc.class);
-					final Npc m2 = world.getParameters().getObject("minionpetram2", Npc.class);
-					final Npc m3 = world.getParameters().getObject("minionpetram3", Npc.class);
-					final Npc m4 = world.getParameters().getObject("minionpetram4", Npc.class);
-					if (!m1.isDead())
-					{
-						m1.setTarget(world.getNpc(KING_PETRAM));
-						m1.doCast(TEST.getSkill());
-					}
-					if (!m2.isDead())
-					{
-						m2.setTarget(world.getNpc(KING_PETRAM));
-						m2.doCast(TEST.getSkill());
-					}
-					if (!m3.isDead())
-					{
-						m3.setTarget(world.getNpc(KING_PETRAM));
-						m3.doCast(TEST.getSkill());
-					}
-					if (!m4.isDead())
-					{
-						m4.setTarget(world.getNpc(KING_PETRAM));
-						m4.doCast(TEST.getSkill());
-					}
-					
-					startQuestTimer("SUPPORT_PETRAM", 10100, npc, player);
-				}
-				break;
-			}
-			case "EARTH_FURY":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world != null)
-				{
-					npc.doCast(EARTH_FURY.getSkill());
-				}
-				break;
-			}
-			//////////////// BOSS IGNIS ACTION /////////////
-			case "CAST_FIRE_RAGE_1":
-			{
-				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_2.getSkill()))
-				{
-					npc.doCast(FIRE_RAG_2.getSkill());
-				}
-				break;
-			}
-			case "CAST_FIRE_RAGE_2":
-			{
-				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_4.getSkill()))
-				{
-					npc.doCast(FIRE_RAG_4.getSkill());
-				}
-				break;
-			}
-			case "CAST_FIRE_RAGE_3":
-			{
-				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_6.getSkill()))
-				{
-					npc.doCast(FIRE_RAG_6.getSkill());
-				}
-				break;
-			}
-			case "CAST_FIRE_RAGE_4":
-			{
-				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_8.getSkill()))
-				{
-					npc.doCast(FIRE_RAG_8.getSkill());
-				}
-				break;
-			}
-			//////////////// BOSS NEBULA ACTION /////////////
-			case "SPAWN_WATER_SLIME":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world != null)
-				{
-					final Player plr = world.getPlayers().stream().findAny().get();
-					if (plr != null)
-					{
-						startQuestTimer("CAST_AQUA_RAGE", 30000 + getRandom(-15000, 15000), npc, plr);
-					}
-					if (npc.getId() == KING_NEBULA)
-					{
-						npc.doCast(AQUA_SUMMON.getSkill());
-						for (int i = 0; i < getRandom(4, 6); i++)
-						{
-							addSpawn(npc, WATER_SLIME, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, -1, true, npc.getInstanceId());
-							startQuestTimer("SPAWN_WATER_SLIME", 80000, npc, null);
-						}
-					}
-				}
-				break;
-			}
-			case "PLAYER_PARA":
-			{
-				if (player.getAffectedSkillLevel(AQUA_RAGE) == 5)
-				{
-					player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.FROZEN_PILLAR);
-					player.setImmobilized(true);
-					startQuestTimer("PLAYER_UNPARA", 5000, npc, player);
-				}
-				break;
-			}
-			case "PLAYER_UNPARA":
-			{
-				player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, AQUA_RAGE_5.getSkill());
-				player.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.FROZEN_PILLAR);
-				player.setImmobilized(false);
-				break;
-			}
-			case "CAST_AQUA_RAGE":
-			{
-				startQuestTimer("CAST_AQUA_RAGE", 5000, npc, player);
-				if ((player.isInsideRadius3D(npc, 1000)))
-				{
-					if (player.getAffectedSkillLevel(AQUA_RAGE) == 1)
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_2.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_2.getSkill());
-						}
-					}
-					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 2)
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_3.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_3.getSkill());
-						}
-					}
-					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 3)
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_4.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_4.getSkill());
-						}
-					}
-					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 4)
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_5.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_5.getSkill());
-							startQuestTimer("PLAYER_PARA", 100, npc, player);
-						}
-					}
-					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 5)
-					{
-						npc.abortCast();
-					}
-					else
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_1.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_1.getSkill());
-						}
-					}
-				}
-				break;
-			}
-			case "check_status":
-			{
-				final Instance world = player.getInstanceWorld();
-				if (!isInInstance(world))
-				{
-					return null;
-				}
-				
-				switch (world.getStatus())
-				{
-					case 0:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(1);
-							world.despawnGroup("sealstone");
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 1:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(2);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_1, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 2:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(3);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_2, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_3, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 3:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(4);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_4, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_5, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 4:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(5);
-							player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(3), null));
-							addSpawn(KING_PROCELLA, 212862, 179828, -15489, 48103, false, 0, false, world.getId());
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 5: // Dummy stage pause, u need defeat boss to continue.
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 6:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(7);
-							world.spawnGroup("ruipwave_1");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_1, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 7:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(8);
-							world.spawnGroup("NormalMobs");
-							world.spawnGroup("ruipwave_1");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_2, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_3, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 8:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(9);
-							world.spawnGroup("NormalMobs");
-							world.spawnGroup("ruipwave_2");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_4, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_5, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 9:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(10);
-							player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(1), null));
-							addSpawn(KING_PETRAM, 222063, 191514, -15486, 50142, false, 0, false, world.getId());
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 10: // Dummy stage pause, u need defeat boss to continue.
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 11:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 1)
-						{
-							world.setStatus(12);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_1, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 12:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 1)
-						{
-							world.setStatus(13);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_2, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_3, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 13:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 1)
-						{
-							world.setStatus(14);
-							world.spawnGroup("ruipwave_2");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_4, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_5, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 14:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 1)
-						{
-							world.setStatus(15);
-							player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(4), null));
-							addSpawn(KING_IGNIS, 202350, 169121, -15484, 48103, false, 0, false, world.getId());
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 15: // Dummy stage pause, u need defeat boss for continue.
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 16:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(17);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_1, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 17:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(18);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_2, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_3, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 18:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(19);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_4, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_5, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 19: // need defeat boss for finish.
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						
-						{
-							world.setStatus(20);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(2), null));
-							addSpawn(KING_NEBULA, 222127, 169057, -15486, 48730, false, 0, false, world.getId());
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 20:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.getParameters().set("DwellingOfSpiritsFinished", true);
-							world.setStatus(21);
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-				}
-				
-				return null;
 			}
 		}
 		
 		return super.onAdvEvent(event, npc, player);
-		
-	}
-	
-	@Override
-	public String onSpawn(Npc npc)
-	{
-		startQuestTimer("SPAWN_WATER_SLIME", 40000, npc, null);
-		return super.onSpawn(npc);
-	}
-	
-	@Override
-	public String onAttack(Npc npc, Player player, int damage, boolean isSummon, Skill skill)
-	{
-		final Instance world = npc.getInstanceWorld();
-		if (world == null)
-		{
-			return null;
-		}
-		
-		switch (npc.getId())
-		{
-			case KING_PROCELLA:
-			{
-				if (npc.getCurrentHp() < (npc.getMaxHp() * 0.90))
-				{
-					startQuestTimer("SPAWN_MINION_PROCELLA", 80000 + getRandom(-15000, 15000), npc, player);
-					startQuestTimer("SPAWN_STORM_PROCELLA", 4000, npc, player);
-					world.setParameter("stormCount", 0);
-				}
-				break;
-			}
-			case KING_PETRAM:
-			{
-				if (npc.getCurrentHp() < (npc.getMaxHp() * 0.80))
-				{
-					startQuestTimer("EARTH_FURY", 1000, npc, player);
-					if ((world.getParameters().getInt("stage", 0) == 0) || (npc.getCurrentHp() < (npc.getMaxHp() * 0.50)))
-					{
-						startQuestTimer("SPAWN_MINION", 1000, npc, player);
-					}
-				}
-				break;
-			}
-			case KING_IGNIS:
-			{
-				if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.90)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.70)))
-				{
-					startQuestTimer("CAST_FIRE_RAGE_1", 1000, npc, null);
-				}
-				else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.70)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.50)))
-				{
-					startQuestTimer("CAST_FIRE_RAGE_2", 1000, npc, null);
-				}
-				else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.50)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.40)))
-				{
-					startQuestTimer("CAST_FIRE_RAGE_3", 1000, npc, null);
-				}
-				else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.40)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.25)))
-				{
-					startQuestTimer("CAST_FIRE_RAGE_4", 1000, npc, null);
-				}
-				break;
-			}
-		}
-		
-		return null;
-	}
-	
-	@Override
-	public String onCreatureSee(Npc npc, Creature creature)
-	{
-		if (creature.isPlayer())
-		{
-			final Instance world = creature.getInstanceWorld();
-			if (world.getStatus() >= 5)
-			{
-				enableZoneWind();
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(WIND_FIRST_TRIGGER_1, true));
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(WIND_FIRST_TRIGGER_2, true));
-			}
-			else if (world.getStatus() >= 10)
-			{
-				enableZoneEarth();
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(EARTH_FIRST_TRIGGER_1, true));
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(EARTH_FIRST_TRIGGER_2, true));
-			}
-			else if (world.getStatus() >= 15)
-			{
-				enableZoneFire();
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(FIRE_FIRST_TRIGGER_1, true));
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(FIRE_FIRST_TRIGGER_2, true));
-			}
-			else if (world.getStatus() >= 20)
-			{
-				enableZoneWater();
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(WATER_FIRST_TRIGGER_1, true));
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(WATER_FIRST_TRIGGER_2, true));
-			}
-			else if (world.getStatus() >= 21)
-			{
-				world.despawnGroup("ruipwave_1");
-				world.despawnGroup("ruipwave_2");
-				world.despawnGroup("NormalMobs");
-				world.finishInstance();
-			}
-		}
-		
-		return super.onCreatureSee(npc, creature);
 	}
 	
 	@Override
 	public String onKill(Npc npc, Player player, boolean isSummon)
 	{
 		final Instance instance = npc.getInstanceWorld();
+		final StatSet worldParameters = instance.getParameters();
+		
+		int totalBossDefeatCount = worldParameters.getInt("totalBossDefeatCount", 0);
 		
 		switch (npc.getId())
 		{
-			case KING_PETRAM:
+			case RUIP:
+			case FAIRY_C1:
+			case FAIRY_C2:
 			{
-				final Npc portal = addSpawn(PORTAL_EVENT_EARTH, 222065, 192767, -15488, 16384, false, 0, false, instance.getId());
-				portal.setDisplayEffect(1); // set the portal visible
-				player.getVariables().set("DSIGNIS", 1);
-				setActive(true);
-				enableZoneEarthExit();
-				cancelQuestTimer("SPAWN_MINION", npc, player);
-				instance.setStatus(12);
-				final Instance world = npc.getInstanceWorld();
-				for (Npc spawn : world.getNpcs(PETRAM_FRAGMENT))
+				if (Rnd.get(100) <= PORTAL_OPEN_CHANCE)
 				{
-					spawn.deleteMe();
-				}
-				break;
-			}
-			case KING_NEBULA:
-			{
-				final Npc portal = addSpawn(PORTAL_EVENT_WATER, 222127, 170488, -15488, 16384, false, 0, false, instance.getId());
-				portal.setDisplayEffect(1);
-				player.getVariables().set("DSIGNIS", 1);
-				player.sendPacket(new ExSendUIEvent(player, false, false, 0, 0, NpcStringId.TIME_LEFT));
-				setActive(true);
-				enableZoneWindExit();
-				instance.setStatus(21);
-				instance.spawnGroup("animael");
-				break;
-			}
-			case KING_IGNIS:
-			{
-				final Npc portal = addSpawn(PORTAL_EVENT_FIRE, 202349, 170533, -15488, 16384, false, 0, false, instance.getId());
-				portal.setDisplayEffect(1);
-				player.getVariables().set("DSIGNIS", 1);
-				setActive(true);
-				enableZoneFireExit();
-				instance.setStatus(17);
-				break;
-			}
-			case KING_PROCELLA:
-			{
-				final Npc portal = addSpawn(PORTAL_EVENT_WIND, 212863, 181090, -15487, 16384, false, 0, false, instance.getId());
-				portal.setDisplayEffect(1);
-				player.getVariables().set("DSIGNIS", 1);
-				setActive(true);
-				enableZoneWaterExit();
-				instance.setStatus(7);
-				final Instance world = npc.getInstanceWorld();
-				for (Npc spawn : world.getNpcs(PROCELLA_GUARDIAN_1))
-				{
-					spawn.deleteMe();
-				}
-				break;
-			}
-			case PETRAM_FRAGMENT:
-			{
-				startQuestTimer("UNSPAWN_MINION", 1000, instance.getNpc(KING_PETRAM), player);
-				break;
-			}
-			case PROCELLA_GUARDIAN_1:
-			{
-				
-				startQuestTimer("HIDE_PROCELLA", 1000, instance.getNpc(KING_PROCELLA), player);
-				break;
-			}
-			case WATER_SLIME:
-			{
-				if (getRandomBoolean())
-				{
-					switch (player.getAffectedSkillLevel(AQUA_RAGE))
+					int portalId = Rnd.get(4);
+					boolean isPortalOpened = worldParameters.getBoolean("portal" + portalId + "Opened", false);
+					
+					if (!isPortalOpened)
 					{
-						case 1:
+						if (instance.getStatus() > totalBossDefeatCount)
 						{
-							player.stopSkillEffects(AQUA_RAGE_1.getSkill());
-							break;
-						}
-						case 2:
-						{
-							player.stopSkillEffects(AQUA_RAGE_2.getSkill());
-							final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 1);
-							skill.applyEffects(player, player);
-							break;
-						}
-						case 3:
-						{
-							player.stopSkillEffects(AQUA_RAGE_3.getSkill());
-							final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 2);
-							skill.applyEffects(player, player);
-							break;
-						}
-						case 4:
-						{
-							player.stopSkillEffects(AQUA_RAGE_4.getSkill());
-							final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 3);
-							skill.applyEffects(player, player);
-							break;
+							return super.onKill(npc, player, isSummon);
 						}
+						instance.setStatus(instance.getStatus() + 1);
+						openPortal(player, portalId, instance);
+						worldParameters.set("portal" + portalId + "Opened", true);
 					}
 				}
 				break;
 			}
+			
+			case KING_PETRAM:
+			case KING_PROCELLA:
+			case KING_IGNIS:
+			case KING_NEBULA:
+			{
+				spawnExitPortal(instance, player, npc.getId());
+				CheckGeneralResidenceStages(npc, instance);
+				
+				break;
+			}
 		}
 		
 		return super.onKill(npc, player, isSummon);
 	}
 	
+	@Override
+	public String onEnterZone(Creature creature, ZoneType zone)
+	{
+		Instance instance = creature.getInstanceWorld();
+		if ((instance != null) && creature.isPlayer())
+		{
+			
+			final StatSet worldParameters = instance.getParameters();
+			
+			if (zone.getId() == DWELLING_CENTRAL)
+			{
+				worldParameters.set("InsideResidence", true);
+				handleCentralZone(instance, worldParameters);
+			}
+			
+			int portalId = getPortalIdByZone(zone.getId());
+			Location[] locations = getLocationsForPortal(portalId);
+			
+			if ((portalId >= 0) && (locations[0] != null))
+			{
+				boolean isPortalOpened = worldParameters.getBoolean("portal" + portalId + "Opened", false);
+				boolean isPortalExitOpened = worldParameters.getBoolean("portalExit" + portalId, false);
+				boolean InsideResidence = worldParameters.getBoolean("InsideResidence", false);
+				
+				if (isPortalOpened && (InsideResidence))
+				{
+					creature.teleToLocation(locations[0], instance);
+					worldParameters.set("InsideResidence", false);
+				}
+				
+				if (isPortalExitOpened && (!InsideResidence))
+				{
+					creature.teleToLocation(locations[1], instance);
+				}
+			}
+			
+		}
+		return null;
+	}
+	
 	@Override
 	public String onFirstTalk(Npc npc, Player player)
 	{
@@ -970,87 +308,251 @@ public class DwellingOfSpirits extends AbstractInstance
 		return super.onFirstTalk(npc, player);
 	}
 	
-	// PORTALS
-	private void enableZoneWind()
+	private void openPortal(Player player, int id, Instance instance)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("dwelling_portal_wind");
-		if (zone != null)
+		
+		if ((id >= 0) && (id < portalSpawnCoordinates.length))
 		{
-			zone.setEnabled(true);
+			int[] coordinates = portalSpawnCoordinates[id];
+			int trigger1 = portalConfigs[id][0][0];
+			int trigger2 = portalConfigs[id][0][1];
+			int kingId = portalConfigs[id][0][2];
+			
+			if ((id >= 0) && (id < PORTAL_MSG.size()))
+			{
+				NpcStringId portalMessage = PORTAL_MSG.get(id);
+				player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, portalMessage, null));
+			}
+			addSpawn(kingId, coordinates[0], coordinates[1], coordinates[2], coordinates[3], false, 0, false, instance.getId());
+			
+			instance.setParameter("TRIGGER_1_" + id, trigger1);
+			instance.setParameter("TRIGGER_2_" + id, trigger2);
+			
+			instance.broadcastPacket(new OnEventTrigger(trigger1, true));
+			instance.broadcastPacket(new OnEventTrigger(trigger2, true));
+			
 		}
 	}
 	
-	private void enableZoneEarth()
+	private void spawnExitPortal(Instance instance, Player player, int bossId)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("dwelling_portal_earth");
-		if (zone != null)
+		Npc portal;
+		int portalId;
+		Location portalLocation;
+		
+		final StatSet worldParameters = instance.getParameters();
+		worldParameters.set("portalExit" + getPortalByBossId(bossId), true);
+		
+		switch (bossId)
 		{
-			zone.setEnabled(true);
+			case KING_PROCELLA:
+			{
+				portalId = PORTAL_EVENT_WIND;
+				portalLocation = new Location(212863, 181090, -15487);
+				break;
+			}
+			case KING_PETRAM:
+			{
+				portalId = PORTAL_EVENT_EARTH;
+				portalLocation = new Location(222065, 192767, -15488);
+				break;
+			}
+			case KING_IGNIS:
+			{
+				portalId = PORTAL_EVENT_FIRE;
+				portalLocation = new Location(202349, 170533, -15488);
+				break;
+			}
+			case KING_NEBULA:
+			{
+				portalId = PORTAL_EVENT_WATER;
+				portalLocation = new Location(222127, 170488, -15488);
+				break;
+			}
+			default:
+			{
+				return;
+			}
+		}
+		portal = addSpawn(portalId, portalLocation, false, 0, false, instance.getId());
+		
+		if (portal != null)
+		{
+			portal.setDisplayEffect(1);
+		}
+		
+	}
+	
+	private int getPortalByBossId(int bossId)
+	{
+		switch (bossId)
+		{
+			case KING_PETRAM:
+			{
+				return 0;
+			}
+			case KING_IGNIS:
+			{
+				return 1;
+			}
+			case KING_NEBULA:
+			{
+				return 2;
+			}
+			case KING_PROCELLA:
+			{
+				return 3;
+			}
+			default:
+				return -1;
 		}
 	}
 	
-	private void enableZoneFire()
+	private int getPortalIdByZone(int zoneId)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("dwelling_portal_fire");
-		if (zone != null)
+		switch (zoneId)
 		{
-			zone.setEnabled(true);
+			case PETRAM_PORTAL_ENTER_ID:
+			case PETRAM_PORTAL_RETURN_ID:
+			{
+				return 0;
+			}
+			case IGNIS_PORTAL_ENTER_ID:
+			case IGNIS_PORTAL_RETURN_ID:
+			{
+				return 1;
+			}
+			case NEBULA_PORTAL_ENTER_ID:
+			case NEBULA_PORTAL_RETURN_ID:
+			{
+				return 2;
+			}
+			case PROCELLA_PORTAL_ENTER_ID:
+			case PROCELLA_PORTAL_RETURN_ID:
+			{
+				return 3;
+			}
+			default:
+			{
+				return -1;
+			}
 		}
 	}
 	
-	private void enableZoneWater()
+	private Location[] getLocationsForPortal(int portalId)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("dwelling_portal_water");
-		if (zone != null)
+		Location[] locations = new Location[2];
+		
+		switch (portalId)
 		{
-			zone.setEnabled(true);
+			case 0:
+			{
+				locations[0] = PETRAM_EARTH_L;
+				locations[1] = PETRAM_EARTH_RETURN_L;
+				break;
+			}
+			case 1:
+			{
+				locations[0] = IGNIS_FIRE_L;
+				locations[1] = IGNIS_FIRE_RETURN_L;
+				break;
+			}
+			case 2:
+			{
+				locations[0] = NEBULA_WATER_L;
+				locations[1] = NEBULA_WATER_RETURN_L;
+				break;
+			}
+			case 3:
+			{
+				locations[0] = PROCELLA_WIN_L;
+				locations[1] = PROCELLA_WIN_RETURN_L;
+				break;
+			}
+		}
+		
+		return locations;
+	}
+	
+	private void CheckGeneralResidenceStages(Npc npc, Instance instance)
+	{
+		final StatSet worldParameters = instance.getParameters();
+		
+		int portalId = getPortalByBossId(npc.getId());
+		
+		if ((portalId >= 0) && (portalId < portalConfigs.length))
+		{
+			String bossDefeatCountKey = "bossOfPortal_" + portalId + "_defeat_count";
+			int currentDefeatCount = worldParameters.getInt(bossDefeatCountKey, 0);
+			int newDefeatCount = currentDefeatCount + 1;
+			
+			worldParameters.set(bossDefeatCountKey, newDefeatCount);
+		}
+		
+		int totalBossDefeatCount = 0;
+		
+		for (int i = 0; i < portalConfigs.length; i++)
+		{
+			String bossDefeatCountKey = "bossOfPortal_" + i + "_defeat_count";
+			totalBossDefeatCount += worldParameters.getInt(bossDefeatCountKey, 0);
+		}
+		
+		worldParameters.set("totalBossDefeatCount", totalBossDefeatCount);
+		
+		if (totalBossDefeatCount >= 4)
+		{
+			instance.spawnGroup("animael");
+			instance.despawnGroup("ruipwave_1");
+			instance.despawnGroup("NormalMobs");
 		}
 	}
 	
-	private void enableZoneWindExit()
+	private void handleCentralZone(Instance instance, StatSet worldParameters)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("return_portal_procella");
-		if (zone != null)
+		for (int id = 0; id < PORTAL_TRIGGER_IDS.length; id++)
 		{
-			zone.setEnabled(true);
-		}
-	}
-	
-	private void enableZoneEarthExit()
-	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("return_portal_petram");
-		if (zone != null)
-		{
-			zone.setEnabled(true);
-		}
-	}
-	
-	private void enableZoneFireExit()
-	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("return_portal_ignis");
-		if (zone != null)
-		{
-			zone.setEnabled(true);
-		}
-	}
-	
-	private void enableZoneWaterExit()
-	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("return_portal_nebula");
-		if (zone != null)
-		{
-			zone.setEnabled(true);
+			int trigger1 = worldParameters.getInt("TRIGGER_1_" + id, -1);
+			int trigger2 = worldParameters.getInt("TRIGGER_2_" + id, -1);
+			
+			if ((trigger1 != -1) && (trigger2 != -1))
+			{
+				instance.broadcastPacket(new OnEventTrigger(trigger1, true));
+				instance.broadcastPacket(new OnEventTrigger(trigger2, true));
+			}
 		}
 	}
 	
 	private void startEvent(Npc npc, Player player)
 	{
-		if (!player.getInstanceWorld().getParameters().getBoolean("DwellingOfSpiritsFinished", false))
+		final Instance instance = player.getInstanceWorld();
+		instance.setParameter("Running", true);
+		player.getInstanceWorld().broadcastPacket(new ExSendUIEvent(player, false, false, (int) (instance.getRemainingTime() / 1000), 0, NpcStringId.TIME_LEFT));
+		player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(4), null));
+		instance.spawnGroup("ruipwave_1");
+		instance.spawnGroup("NormalMobs");
+		
+		if (npc.getId() == SEALSTONE)
 		{
-			player.sendPacket(new ExSendUIEvent(player, false, false, 1800, 2, NpcStringId.TIME_LEFT));
-			player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(5), null));
-			startQuestTimer("check_status", 1000, null, player);
+			instance.despawnGroup("sealstone");
 		}
+		
+	}
+	
+	@Override
+	public void onInstanceEnter(Player player, Instance instance)
+	{
+		boolean Running = instance.getParameters().getBoolean("Running", false);
+		if ((instance.getRemainingTime() > 0) && Running)
+		{
+			player.sendPacket(new ExSendUIEvent(player, false, false, (int) (instance.getRemainingTime() / 1000), 0, NpcStringId.TIME_LEFT));
+		}
+	}
+	
+	@Override
+	public void onInstanceLeave(Player player, Instance instance)
+	{
+		
+		player.sendPacket(new ExSendUIEvent(player, false, false, 0, 0, NpcStringId.TIME_LEFT));
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
index fb970cd7bd..9d62f7945d 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.ai.AttackableAI;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.instancemanager.InstanceManager;
@@ -60,6 +61,8 @@ public class TimedHunting extends AbstractInstance
 	private static final int DEBBIE = 34126; // War-Torn Plains 70-79
 	// Skill
 	private static final int BUFF = 45197;
+	private static final int BUFF_FOR_KAMAEL = 45198;
+	
 	// Misc
 	private static final int[] TEMPLATES =
 	{
@@ -201,7 +204,14 @@ public class TimedHunting extends AbstractInstance
 		}
 		
 		npc.setTarget(player);
-		if (!player.getEffectList().isAffectedBySkill(BUFF))
+		if (player.getRace() == Race.KAMAEL)
+		{
+			if (!player.getEffectList().isAffectedBySkill(BUFF_FOR_KAMAEL))
+			{
+				npc.doCast(new SkillHolder(BUFF_FOR_KAMAEL, 1).getSkill());
+			}
+		}
+		else if (!player.getEffectList().isAffectedBySkill(BUFF))
 		{
 			npc.doCast(new SkillHolder(BUFF, 1).getSkill());
 		}
@@ -276,6 +286,7 @@ public class TimedHunting extends AbstractInstance
 		player.sendPacket(new TimedHuntingZoneExit(108)); // Training Zone id.
 		
 		player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, BUFF);
+		player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, BUFF_FOR_KAMAEL);
 		instance.setParameter("PlayerIsOut", true);
 		
 		// Restore normal skills.
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/augmentation/options/50100-50199.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/augmentation/options/50100-50199.xml
index 5c8d127857..2ee06e3d5b 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/augmentation/options/50100-50199.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/augmentation/options/50100-50199.xml
@@ -677,38 +677,38 @@
 	</option>
 	<option id="50188" name="o_s_cl_deliverance">
 		<!-- <Arcane Deliverance>\nWhen triggered: Recovers 6000 HP, 1000 MP and 3000 CP when HP is lower than 20%. -->
-		<passive_skill id="39325" level="2" /> <!-- unknown skill -->
+		<passive_skill id="39325" level="1" /> <!-- Arcane Deliverance -->
 	</option>
 	<option id="50189" name="o_s_cl_speed">
 		<!-- <Arcane Speed>\nWhen triggered: Atk. Spd. +100, Casting Spd. +150, Speed +10. -->
-		<passive_skill id="39326" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39326" level="1" /> <!-- Arcane Speed -->
 	</option>
 	<option id="50190" name="o_s_cl_barrier">
 		<!-- <Arcane Barrier>\nWhen triggered: Absorbs 4000 damage. -->
-		<passive_skill id="39327" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39327" level="1" /> <!-- Arcane Barrier -->
 	</option>
 	<option id="50191" name="o_s_cl_immunity">
 		<!-- <Arcane Immunity>\nWhen triggered: Grants immunity to debuffs. -->
-		<passive_skill id="39328" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39328" level="1" /> <!-- Arcane Immunity -->
 	</option>
 	<option id="50192" name="o_s_cl_protection">
 		<!-- <Arcane Protection>\nWhen triggered: P. Def. +3000, M. Def. +2100. -->
-		<passive_skill id="39329" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39329" level="1" /> <!-- Arcane Protection -->
 	</option>
 	<option id="50193" name="o_s_cl_paralysis">
 		<!-- <Arcane Paralysis>\nWhen triggered: Paralyzes the target. -->
-		<passive_skill id="39330" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39330" level="1" /> <!-- Arcane Paralysis -->
 	</option>
 	<option id="50194" name="o_s_cl_silence">
 		<!-- <Arcane Silence>\nWhen triggered: Inflicts Silence on the target. -->
-		<passive_skill id="39331" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39331" level="1" /> <!-- Arcane Silence -->
 	</option>
 	<option id="50195" name="o_s_cl_sense">
 		<!-- <Arcane Critical Sense>\nAll Critical Rate +3%, All Critical Damage +150 -->
-		<passive_skill id="39332" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39332" level="1" /> <!-- Arcane Critical Sense -->
 	</option>
 	<option id="50196" name="o_s_cl_power">
 		<!-- <Arcane Power>\nP. Atk. +350, M. Atk. +500 -->
-		<passive_skill id="39333" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39333" level="1" /> <!-- Arcane Power -->
 	</option>
 </list>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/49400-49499.xml
index 13470e5417..62ddd060fd 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/49400-49499.xml
@@ -1430,13 +1430,23 @@
 	<item id="49489" name="Chest of Enchant Scroll's Parts" additionalName="Not Available" type="EtcItem">
 		<!-- Double-click to get more information about the contents. -->
 		<set name="icon" val="icon.etc_ertheia2" />
-		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="default_action" val="PEEL" />
 		<set name="material" val="FISH" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="49474" min="1" max="1" chance="20" /> <!-- Scroll Part: Enchant Weapon -->
+			<item id="49475" min="1" max="1" chance="50" /> <!-- Scroll Part: Enchant Armor -->
+			<item id="49476" min="1" max="1" chance="2" /> <!-- Refined Scroll Part: Enchant Weapon -->
+			<item id="49478" min="1" max="1" chance="13" /> <!-- Refined Scroll Part: Enchant Armor -->
+			<item id="49479" min="1" max="1" chance="2" /> <!-- Solid Scroll Part: Enchant Weapon -->
+			<item id="49480" min="1" max="1" chance="13" /> <!-- Solid Scroll Part: Enchant Armor -->
+		</capsuled_items>
 	</item>
 	<item id="49490" name="Fishing Kit" additionalName="Sealed" type="EtcItem">
 		<!-- Double-click to get more information about the contents. -->
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/49500-49599.xml
index cfd7f6feaa..767974f422 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/49500-49599.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/49500-49599.xml
@@ -386,6 +386,8 @@
 		<!-- Momentarily recovers 600 HP. If HP is full, CP is recovered. -->
 		<set name="icon" val="icon.etc_potion_red_i00" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="LIQUID" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
@@ -441,6 +443,12 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="is_event_restricted" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<skills>
+			<skill id="39103" level="1" /> <!-- Quick Hero Healing Potion -->
+		</skills>
 	</item>
 	<item id="49534" name="Hero's Cube" additionalName="7-day" type="EtcItem">
 		<!-- Available for 7 days. Required level: 20. Double-click to obtain Soulshot Ticket, Buff Scroll Chest, Hero's Top-grade HP Replenishing Potion, Hero's HP Recovery Potion, Angel Cat's Blessing, Improved Scroll of Resurrection, Chest of Enchant Scroll's Parts, Fishing Kit, Box of Scroll of Escape to Base, Blade Spirit, Spellbook Chest. Can be used only once a day. -->
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/49800-49899.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/49800-49899.xml
index 5eb62c0868..5a63678960 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/49800-49899.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/49800-49899.xml
@@ -789,6 +789,10 @@
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="time" val="10080" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39199" level="1" /> <!-- Hero's Wondrous Cubic -->
+		</skills>
 	</item>
 	<item id="49861" name="Life Stone - Tester" additionalName="Not Available" type="EtcItem">
 		<!-- The item is not available. Test. -->
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/94100-94199.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/94100-94199.xml
index 7390ec16e0..d8281a3f52 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/94100-94199.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/94100-94199.xml
@@ -292,6 +292,16 @@
 		<cond msgId="113" addName="1">
 			<player level="60" />
 		</cond>
+		<skills>
+			<skill id="35020" level="1" type="ON_EQUIP" /> <!-- Equip Talisman - Baium -->
+			<skill id="35021" level="1" type="ON_UNEQUIP" /> <!-- Unequip Talisman - Baium -->
+			<skill id="35017" level="7" /> <!-- Equip Talisman - Baium -->
+			<skill id="50191" level="1" type="ON_ENCHANT" type_value="1" /> <!-- Enchant Effect: +1 Talisman of Baium -->
+			<skill id="50191" level="2" type="ON_ENCHANT" type_value="2" /> <!-- Enchant Effect: +2 Talisman of Baium -->
+			<skill id="50191" level="3" type="ON_ENCHANT" type_value="3" /> <!-- Enchant Effect: +3 Talisman of Baium -->
+			<skill id="50191" level="4" type="ON_ENCHANT" type_value="4" /> <!-- Enchant Effect: +4 Talisman of Baium -->
+			<skill id="50191" level="5" type="ON_ENCHANT" type_value="5" /> <!-- Enchant Effect: +5 Talisman of Baium -->
+		</skills>
 	</item>
 	<item id="94120" name="Package: Talisman of Baium" additionalName="Sealed" type="EtcItem">
 		<!-- Double-click to get more information about the contents. -->
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/94400-94499.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/94400-94499.xml
index 0ff4305f22..4c521c5978 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/94400-94499.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/94400-94499.xml
@@ -1232,7 +1232,10 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="40238" level="1" /> <!-- XP +100,000,000 -->
+		</skills>
 	</item>
 	<item id="94481" name="Clan XP" additionalName="Sealed" type="EtcItem">
 		<!-- Clan XP is granted as a reward. -->
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/94500-94599.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/94500-94599.xml
index 38d37c2962..d60a5bf585 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/94500-94599.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/94500-94599.xml
@@ -190,7 +190,10 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="40241" level="1" />
+		</skills>
 	</item>
 	<item id="94518" name="Amber Lv. 5" additionalName="Sealed" type="Armor">
 		<!-- <Active skill>. Interrupts the target's skill casting. <PvP effect>. Ignores CP and deals 2000 fixed damage. Effects of two identical jewels do not stack, the higher-level jewel takes precedence. -->
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/94600-94699.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/94600-94699.xml
index b2f5a20ac9..de83d24ef2 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/94600-94699.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/items/94600-94699.xml
@@ -604,7 +604,10 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="40250" level="1" /> <!-- XP +100,000,000 -->
+		</skills>
 	</item>
 	<item id="94636" name="Pet's XP Growth Scroll" additionalName="Sealed" type="EtcItem">
 		<!-- Applies a buff when used. <Buff effect>. A pet's acquired XP +30%. Duration: 20 min. Cooldown: 1 min. The effect disappears when a pet dies or is unsummoned. -->
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/npcs/29100-29199.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/npcs/29100-29199.xml
index d2dfc2f8a1..2c03e87d53 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/npcs/29100-29199.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/npcs/29100-29199.xml
@@ -3201,7 +3201,7 @@
 				<walk ground="40" />
 				<run ground="180" />
 			</speed>
-			<attack physical="3611" magical="2465" critical="4" attackSpeed="250" range="40" />
+			<attack physical="3611" magical="2465" critical="4" attackSpeed="253" range="40" />
 			<defence physical="2383" magical="1045" />
 		</stats>
 		<status attackable="false" />
@@ -3365,7 +3365,7 @@
 				<walk ground="40" />
 				<run ground="180" />
 			</speed>
-			<attack physical="3611" magical="2465" critical="4" attackSpeed="250" range="40" />
+			<attack physical="3611" magical="2465" critical="4" attackSpeed="253" range="40" />
 			<defence physical="2383" magical="1045" />
 		</stats>
 		<status attackable="false" />
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/pets/16079_BuffaloCalt.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/pets/16079_BuffaloCalf.xml
similarity index 97%
rename from L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/pets/16079_BuffaloCalt.xml
rename to L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/pets/16079_BuffaloCalf.xml
index 55e3ace585..661b584e16 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/pets/16079_BuffaloCalt.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/pets/16079_BuffaloCalf.xml
@@ -1,1721 +1,1721 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/PetData.xsd">
-	<pet id="16079" itemId="93961" index="10" evolveLevel="None" type="13">
-		<set name="food" val="93966" />
-		<set name="hungry_limit" val="50" />
-		<set name="load" val="45540" />
-		<skills>
-			<skill minLevel="1" skillId="6618" skillLevel="1" />
-			<skill minLevel="60" skillId="6618" skillLevel="2" />
-			<skill minLevel="65" skillId="6618" skillLevel="3" />
-			<skill minLevel="70" skillId="6618" skillLevel="4" />
-			<skill minLevel="75" skillId="6618" skillLevel="5" />
-			<skill minLevel="80" skillId="6618" skillLevel="6" />
-			<skill minLevel="85" skillId="6618" skillLevel="7" />
-			<skill minLevel="60" skillId="6681" skillLevel="1" />
-			<skill minLevel="60" skillId="6683" skillLevel="1" />
-		</skills>
-		<stats>
-			<stat level="1">
-				<set name="max_meal" val="3000" />
-				<set name="exp" val="0" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="12" />
-				<set name="consume_meal_in_normal" val="2" />
-				<set name="org_pattack" val="167.83" />
-				<set name="org_pdefend" val="81" />
-				<set name="org_mattack" val="109.93" />
-				<set name="org_mdefend" val="36" />
-				<set name="org_hp" val="94" />
-				<set name="org_mp" val="30" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="2">
-				<set name="max_meal" val="3090" />
-				<set name="exp" val="68" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="12" />
-				<set name="consume_meal_in_normal" val="2" />
-				<set name="org_pattack" val="169.7" />
-				<set name="org_pdefend" val="81.9" />
-				<set name="org_mattack" val="111.15" />
-				<set name="org_mdefend" val="36.4" />
-				<set name="org_hp" val="107.65" />
-				<set name="org_mp" val="35.46" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="3">
-				<set name="max_meal" val="3183" />
-				<set name="exp" val="364" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="13" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="171.56" />
-				<set name="org_pdefend" val="82.8" />
-				<set name="org_mattack" val="112.37" />
-				<set name="org_mdefend" val="36.8" />
-				<set name="org_hp" val="121.45" />
-				<set name="org_mp" val="40.98" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="4">
-				<set name="max_meal" val="3278" />
-				<set name="exp" val="1169" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="13" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="173.43" />
-				<set name="org_pdefend" val="83.7" />
-				<set name="org_mattack" val="113.59" />
-				<set name="org_mdefend" val="37.2" />
-				<set name="org_hp" val="135.4" />
-				<set name="org_mp" val="46.56" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="5">
-				<set name="max_meal" val="3376" />
-				<set name="exp" val="2885" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="14" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="175.29" />
-				<set name="org_pdefend" val="84.6" />
-				<set name="org_mattack" val="114.82" />
-				<set name="org_mdefend" val="37.6" />
-				<set name="org_hp" val="149.5" />
-				<set name="org_mp" val="52.2" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="6">
-				<set name="max_meal" val="3477" />
-				<set name="exp" val="6039" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="15" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="177.16" />
-				<set name="org_pdefend" val="85.5" />
-				<set name="org_mattack" val="116.04" />
-				<set name="org_mdefend" val="38" />
-				<set name="org_hp" val="163.75" />
-				<set name="org_mp" val="57.9" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="7">
-				<set name="max_meal" val="3581" />
-				<set name="exp" val="11288" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="15" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="179.02" />
-				<set name="org_pdefend" val="86.4" />
-				<set name="org_mattack" val="117.26" />
-				<set name="org_mdefend" val="38.4" />
-				<set name="org_hp" val="178.15" />
-				<set name="org_mp" val="63.66" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="8">
-				<set name="max_meal" val="3688" />
-				<set name="exp" val="19424" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="16" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="180.89" />
-				<set name="org_pdefend" val="87.3" />
-				<set name="org_mattack" val="118.48" />
-				<set name="org_mdefend" val="38.8" />
-				<set name="org_hp" val="192.7" />
-				<set name="org_mp" val="69.48" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="9">
-				<set name="max_meal" val="3799" />
-				<set name="exp" val="31379" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="16" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="182.75" />
-				<set name="org_pdefend" val="88.2" />
-				<set name="org_mattack" val="119.7" />
-				<set name="org_mdefend" val="39.2" />
-				<set name="org_hp" val="207.4" />
-				<set name="org_mp" val="75.36" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="10">
-				<set name="max_meal" val="3913" />
-				<set name="exp" val="48230" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="17" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="184.62" />
-				<set name="org_pdefend" val="89.1" />
-				<set name="org_mattack" val="120.92" />
-				<set name="org_mdefend" val="39.6" />
-				<set name="org_hp" val="222.25" />
-				<set name="org_mp" val="81.3" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="11">
-				<set name="max_meal" val="4030" />
-				<set name="exp" val="71203" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="18" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="186.48" />
-				<set name="org_pdefend" val="90" />
-				<set name="org_mattack" val="122.14" />
-				<set name="org_mdefend" val="40" />
-				<set name="org_hp" val="237.25" />
-				<set name="org_mp" val="87.3" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="12">
-				<set name="max_meal" val="4151" />
-				<set name="exp" val="101678" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="18" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="188.34" />
-				<set name="org_pdefend" val="90.9" />
-				<set name="org_mattack" val="123.37" />
-				<set name="org_mdefend" val="40.4" />
-				<set name="org_hp" val="252.4" />
-				<set name="org_mp" val="93.36" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="13">
-				<set name="max_meal" val="4276" />
-				<set name="exp" val="141194" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="19" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="190.21" />
-				<set name="org_pdefend" val="91.8" />
-				<set name="org_mattack" val="124.59" />
-				<set name="org_mdefend" val="40.8" />
-				<set name="org_hp" val="267.7" />
-				<set name="org_mp" val="99.48" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="14">
-				<set name="max_meal" val="4404" />
-				<set name="exp" val="191455" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="20" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="192.07" />
-				<set name="org_pdefend" val="92.7" />
-				<set name="org_mattack" val="125.81" />
-				<set name="org_mdefend" val="41.2" />
-				<set name="org_hp" val="283.15" />
-				<set name="org_mp" val="105.66" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="15">
-				<set name="max_meal" val="4536" />
-				<set name="exp" val="254331" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="21" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="193.94" />
-				<set name="org_pdefend" val="93.6" />
-				<set name="org_mattack" val="127.03" />
-				<set name="org_mdefend" val="41.6" />
-				<set name="org_hp" val="298.75" />
-				<set name="org_mp" val="111.9" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="16">
-				<set name="max_meal" val="4672" />
-				<set name="exp" val="331868" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="22" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="195.8" />
-				<set name="org_pdefend" val="94.5" />
-				<set name="org_mattack" val="128.25" />
-				<set name="org_mdefend" val="42" />
-				<set name="org_hp" val="314.5" />
-				<set name="org_mp" val="118.2" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="17">
-				<set name="max_meal" val="4812" />
-				<set name="exp" val="426289" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="22" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="197.67" />
-				<set name="org_pdefend" val="95.4" />
-				<set name="org_mattack" val="129.47" />
-				<set name="org_mdefend" val="42.4" />
-				<set name="org_hp" val="330.4" />
-				<set name="org_mp" val="124.56" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="18">
-				<set name="max_meal" val="4956" />
-				<set name="exp" val="540001" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="23" />
-				<set name="consume_meal_in_normal" val="5" />
-				<set name="org_pattack" val="199.53" />
-				<set name="org_pdefend" val="96.3" />
-				<set name="org_mattack" val="130.69" />
-				<set name="org_mdefend" val="42.8" />
-				<set name="org_hp" val="346.45" />
-				<set name="org_mp" val="130.98" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="19">
-				<set name="max_meal" val="5105" />
-				<set name="exp" val="675597" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="24" />
-				<set name="consume_meal_in_normal" val="5" />
-				<set name="org_pattack" val="201.4" />
-				<set name="org_pdefend" val="97.2" />
-				<set name="org_mattack" val="131.92" />
-				<set name="org_mdefend" val="43.2" />
-				<set name="org_hp" val="362.65" />
-				<set name="org_mp" val="137.46" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="20">
-				<set name="max_meal" val="5258" />
-				<set name="exp" val="835864" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="25" />
-				<set name="consume_meal_in_normal" val="5" />
-				<set name="org_pattack" val="203.26" />
-				<set name="org_pdefend" val="98.1" />
-				<set name="org_mattack" val="133.14" />
-				<set name="org_mdefend" val="43.6" />
-				<set name="org_hp" val="379" />
-				<set name="org_mp" val="144" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="21">
-				<set name="max_meal" val="5416" />
-				<set name="exp" val="1020171" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="26" />
-				<set name="consume_meal_in_normal" val="5" />
-				<set name="org_pattack" val="205.13" />
-				<set name="org_pdefend" val="99" />
-				<set name="org_mattack" val="134.36" />
-				<set name="org_mdefend" val="44" />
-				<set name="org_hp" val="414.2" />
-				<set name="org_mp" val="153.9" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="22">
-				<set name="max_meal" val="5578" />
-				<set name="exp" val="1232124" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="27" />
-				<set name="consume_meal_in_normal" val="5" />
-				<set name="org_pattack" val="206.99" />
-				<set name="org_pdefend" val="99.9" />
-				<set name="org_mattack" val="135.58" />
-				<set name="org_mdefend" val="44.4" />
-				<set name="org_hp" val="449.72" />
-				<set name="org_mp" val="163.89" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="23">
-				<set name="max_meal" val="5745" />
-				<set name="exp" val="1475870" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="28" />
-				<set name="consume_meal_in_normal" val="6" />
-				<set name="org_pattack" val="208.86" />
-				<set name="org_pdefend" val="100.8" />
-				<set name="org_mattack" val="136.8" />
-				<set name="org_mdefend" val="44.8" />
-				<set name="org_hp" val="485.56" />
-				<set name="org_mp" val="173.97" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="24">
-				<set name="max_meal" val="5917" />
-				<set name="exp" val="1756178" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="30" />
-				<set name="consume_meal_in_normal" val="6" />
-				<set name="org_pattack" val="210.72" />
-				<set name="org_pdefend" val="101.7" />
-				<set name="org_mattack" val="138.02" />
-				<set name="org_mdefend" val="45.2" />
-				<set name="org_hp" val="521.72" />
-				<set name="org_mp" val="184.14" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="25">
-				<set name="max_meal" val="6095" />
-				<set name="exp" val="2078532" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="31" />
-				<set name="consume_meal_in_normal" val="6" />
-				<set name="org_pattack" val="212.59" />
-				<set name="org_pdefend" val="102.6" />
-				<set name="org_mattack" val="139.24" />
-				<set name="org_mdefend" val="45.6" />
-				<set name="org_hp" val="558.2" />
-				<set name="org_mp" val="194.4" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="26">
-				<set name="max_meal" val="6278" />
-				<set name="exp" val="2452463" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="32" />
-				<set name="consume_meal_in_normal" val="6" />
-				<set name="org_pattack" val="214.45" />
-				<set name="org_pdefend" val="103.5" />
-				<set name="org_mattack" val="140.47" />
-				<set name="org_mdefend" val="46" />
-				<set name="org_hp" val="595" />
-				<set name="org_mp" val="204.75" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="27">
-				<set name="max_meal" val="6466" />
-				<set name="exp" val="2886223" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="33" />
-				<set name="consume_meal_in_normal" val="7" />
-				<set name="org_pattack" val="216.32" />
-				<set name="org_pdefend" val="104.4" />
-				<set name="org_mattack" val="141.69" />
-				<set name="org_mdefend" val="46.4" />
-				<set name="org_hp" val="632.12" />
-				<set name="org_mp" val="215.19" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="28">
-				<set name="max_meal" val="6660" />
-				<set name="exp" val="3389384" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="35" />
-				<set name="consume_meal_in_normal" val="7" />
-				<set name="org_pattack" val="218.18" />
-				<set name="org_pdefend" val="105.3" />
-				<set name="org_mattack" val="142.91" />
-				<set name="org_mdefend" val="46.8" />
-				<set name="org_hp" val="669.56" />
-				<set name="org_mp" val="225.72" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="29">
-				<set name="max_meal" val="6860" />
-				<set name="exp" val="3973052" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="36" />
-				<set name="consume_meal_in_normal" val="7" />
-				<set name="org_pattack" val="220.05" />
-				<set name="org_pdefend" val="106.2" />
-				<set name="org_mattack" val="144.13" />
-				<set name="org_mdefend" val="47.2" />
-				<set name="org_hp" val="707.32" />
-				<set name="org_mp" val="236.34" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="30">
-				<set name="max_meal" val="7066" />
-				<set name="exp" val="4650105" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="37" />
-				<set name="consume_meal_in_normal" val="7" />
-				<set name="org_pattack" val="221.91" />
-				<set name="org_pdefend" val="107.1" />
-				<set name="org_mattack" val="145.35" />
-				<set name="org_mdefend" val="47.6" />
-				<set name="org_hp" val="745.4" />
-				<set name="org_mp" val="247.05" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="31">
-				<set name="max_meal" val="7278" />
-				<set name="exp" val="5442259" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="39" />
-				<set name="consume_meal_in_normal" val="8" />
-				<set name="org_pattack" val="223.78" />
-				<set name="org_pdefend" val="108" />
-				<set name="org_mattack" val="146.57" />
-				<set name="org_mdefend" val="48" />
-				<set name="org_hp" val="783.8" />
-				<set name="org_mp" val="257.85" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="32">
-				<set name="max_meal" val="7496" />
-				<set name="exp" val="6369078" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="40" />
-				<set name="consume_meal_in_normal" val="8" />
-				<set name="org_pattack" val="225.64" />
-				<set name="org_pdefend" val="108.9" />
-				<set name="org_mattack" val="147.79" />
-				<set name="org_mdefend" val="48.4" />
-				<set name="org_hp" val="822.52" />
-				<set name="org_mp" val="268.74" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="33">
-				<set name="max_meal" val="7721" />
-				<set name="exp" val="7453456" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="42" />
-				<set name="consume_meal_in_normal" val="8" />
-				<set name="org_pattack" val="227.51" />
-				<set name="org_pdefend" val="109.8" />
-				<set name="org_mattack" val="149.02" />
-				<set name="org_mdefend" val="48.8" />
-				<set name="org_hp" val="861.56" />
-				<set name="org_mp" val="279.72" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="34">
-				<set name="max_meal" val="7953" />
-				<set name="exp" val="8722179" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="44" />
-				<set name="consume_meal_in_normal" val="9" />
-				<set name="org_pattack" val="229.37" />
-				<set name="org_pdefend" val="110.7" />
-				<set name="org_mattack" val="150.24" />
-				<set name="org_mdefend" val="49.2" />
-				<set name="org_hp" val="900.92" />
-				<set name="org_mp" val="290.79" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="35">
-				<set name="max_meal" val="8192" />
-				<set name="exp" val="10206584" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="46" />
-				<set name="consume_meal_in_normal" val="9" />
-				<set name="org_pattack" val="231.24" />
-				<set name="org_pdefend" val="111.6" />
-				<set name="org_mattack" val="151.46" />
-				<set name="org_mdefend" val="49.6" />
-				<set name="org_hp" val="940.6" />
-				<set name="org_mp" val="301.95" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="36">
-				<set name="max_meal" val="8438" />
-				<set name="exp" val="11958183" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="47" />
-				<set name="consume_meal_in_normal" val="9" />
-				<set name="org_pattack" val="233.1" />
-				<set name="org_pdefend" val="112.5" />
-				<set name="org_mattack" val="152.68" />
-				<set name="org_mdefend" val="50" />
-				<set name="org_hp" val="980.6" />
-				<set name="org_mp" val="313.2" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="37">
-				<set name="max_meal" val="8691" />
-				<set name="exp" val="14025069" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="49" />
-				<set name="consume_meal_in_normal" val="10" />
-				<set name="org_pattack" val="234.96" />
-				<set name="org_pdefend" val="113.4" />
-				<set name="org_mattack" val="153.9" />
-				<set name="org_mdefend" val="50.4" />
-				<set name="org_hp" val="1020.92" />
-				<set name="org_mp" val="324.54" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="38">
-				<set name="max_meal" val="8952" />
-				<set name="exp" val="16463995" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="51" />
-				<set name="consume_meal_in_normal" val="10" />
-				<set name="org_pattack" val="236.83" />
-				<set name="org_pdefend" val="114.3" />
-				<set name="org_mattack" val="155.12" />
-				<set name="org_mdefend" val="50.8" />
-				<set name="org_hp" val="1061.56" />
-				<set name="org_mp" val="335.97" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="39">
-				<set name="max_meal" val="9221" />
-				<set name="exp" val="19341927" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="53" />
-				<set name="consume_meal_in_normal" val="11" />
-				<set name="org_pattack" val="238.69" />
-				<set name="org_pdefend" val="115.2" />
-				<set name="org_mattack" val="156.34" />
-				<set name="org_mdefend" val="51.2" />
-				<set name="org_hp" val="1102.52" />
-				<set name="org_mp" val="347.49" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="40">
-				<set name="max_meal" val="9498" />
-				<set name="exp" val="22737888" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="55" />
-				<set name="consume_meal_in_normal" val="11" />
-				<set name="org_pattack" val="240.56" />
-				<set name="org_pdefend" val="116.1" />
-				<set name="org_mattack" val="157.57" />
-				<set name="org_mdefend" val="51.6" />
-				<set name="org_hp" val="1143.8" />
-				<set name="org_mp" val="359.1" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="41">
-				<set name="max_meal" val="9783" />
-				<set name="exp" val="26779080" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="58" />
-				<set name="consume_meal_in_normal" val="12" />
-				<set name="org_pattack" val="242.42" />
-				<set name="org_pdefend" val="117" />
-				<set name="org_mattack" val="158.79" />
-				<set name="org_mdefend" val="52" />
-				<set name="org_hp" val="1198.4" />
-				<set name="org_mp" val="378.6" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="42">
-				<set name="max_meal" val="10076" />
-				<set name="exp" val="31588100" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="60" />
-				<set name="consume_meal_in_normal" val="12" />
-				<set name="org_pattack" val="244.29" />
-				<set name="org_pdefend" val="117.9" />
-				<set name="org_mattack" val="160.01" />
-				<set name="org_mdefend" val="52.4" />
-				<set name="org_hp" val="1253.42" />
-				<set name="org_mp" val="398.25" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="43">
-				<set name="max_meal" val="10378" />
-				<set name="exp" val="37310833" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="62" />
-				<set name="consume_meal_in_normal" val="12" />
-				<set name="org_pattack" val="246.15" />
-				<set name="org_pdefend" val="118.8" />
-				<set name="org_mattack" val="161.23" />
-				<set name="org_mdefend" val="52.8" />
-				<set name="org_hp" val="1308.86" />
-				<set name="org_mp" val="418.05" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="44">
-				<set name="max_meal" val="10689" />
-				<set name="exp" val="44120885" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="65" />
-				<set name="consume_meal_in_normal" val="13" />
-				<set name="org_pattack" val="248.02" />
-				<set name="org_pdefend" val="119.7" />
-				<set name="org_mattack" val="162.45" />
-				<set name="org_mdefend" val="53.2" />
-				<set name="org_hp" val="1364.72" />
-				<set name="org_mp" val="438" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="45">
-				<set name="max_meal" val="11010" />
-				<set name="exp" val="52224847" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="67" />
-				<set name="consume_meal_in_normal" val="13" />
-				<set name="org_pattack" val="249.88" />
-				<set name="org_pdefend" val="120.6" />
-				<set name="org_mattack" val="163.67" />
-				<set name="org_mdefend" val="53.6" />
-				<set name="org_hp" val="1421" />
-				<set name="org_mp" val="458.1" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="46">
-				<set name="max_meal" val="11340" />
-				<set name="exp" val="61949602" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="70" />
-				<set name="consume_meal_in_normal" val="14" />
-				<set name="org_pattack" val="251.75" />
-				<set name="org_pdefend" val="121.5" />
-				<set name="org_mattack" val="164.89" />
-				<set name="org_mdefend" val="54" />
-				<set name="org_hp" val="1477.7" />
-				<set name="org_mp" val="478.35" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="47">
-				<set name="max_meal" val="11680" />
-				<set name="exp" val="73619307" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="73" />
-				<set name="consume_meal_in_normal" val="15" />
-				<set name="org_pattack" val="253.61" />
-				<set name="org_pdefend" val="122.4" />
-				<set name="org_mattack" val="166.12" />
-				<set name="org_mdefend" val="54.4" />
-				<set name="org_hp" val="1534.82" />
-				<set name="org_mp" val="498.75" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="48">
-				<set name="max_meal" val="12030" />
-				<set name="exp" val="87622954" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="76" />
-				<set name="consume_meal_in_normal" val="15" />
-				<set name="org_pattack" val="255.48" />
-				<set name="org_pdefend" val="123.3" />
-				<set name="org_mattack" val="167.34" />
-				<set name="org_mdefend" val="54.8" />
-				<set name="org_hp" val="1592.36" />
-				<set name="org_mp" val="519.3" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="49">
-				<set name="max_meal" val="12391" />
-				<set name="exp" val="104427330" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="79" />
-				<set name="consume_meal_in_normal" val="16" />
-				<set name="org_pattack" val="257.34" />
-				<set name="org_pdefend" val="124.2" />
-				<set name="org_mattack" val="168.56" />
-				<set name="org_mdefend" val="55.2" />
-				<set name="org_hp" val="1650.32" />
-				<set name="org_mp" val="540" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="50">
-				<set name="max_meal" val="12763" />
-				<set name="exp" val="124592581" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="82" />
-				<set name="consume_meal_in_normal" val="16" />
-				<set name="org_pattack" val="259.21" />
-				<set name="org_pdefend" val="125.1" />
-				<set name="org_mattack" val="169.78" />
-				<set name="org_mdefend" val="55.6" />
-				<set name="org_hp" val="1708.7" />
-				<set name="org_mp" val="560.85" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="51">
-				<set name="max_meal" val="13146" />
-				<set name="exp" val="148790883" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="85" />
-				<set name="consume_meal_in_normal" val="17" />
-				<set name="org_pattack" val="261.07" />
-				<set name="org_pdefend" val="126" />
-				<set name="org_mattack" val="171" />
-				<set name="org_mdefend" val="56" />
-				<set name="org_hp" val="1767.5" />
-				<set name="org_mp" val="581.85" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="52">
-				<set name="max_meal" val="13540" />
-				<set name="exp" val="177828845" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="89" />
-				<set name="consume_meal_in_normal" val="18" />
-				<set name="org_pattack" val="262.94" />
-				<set name="org_pdefend" val="126.9" />
-				<set name="org_mattack" val="172.22" />
-				<set name="org_mdefend" val="56.4" />
-				<set name="org_hp" val="1826.72" />
-				<set name="org_mp" val="603" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="53">
-				<set name="max_meal" val="13946" />
-				<set name="exp" val="212674399" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="92" />
-				<set name="consume_meal_in_normal" val="18" />
-				<set name="org_pattack" val="264.8" />
-				<set name="org_pdefend" val="127.8" />
-				<set name="org_mattack" val="173.44" />
-				<set name="org_mdefend" val="56.8" />
-				<set name="org_hp" val="1886.36" />
-				<set name="org_mp" val="624.3" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="54">
-				<set name="max_meal" val="14364" />
-				<set name="exp" val="254489064" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="96" />
-				<set name="consume_meal_in_normal" val="19" />
-				<set name="org_pattack" val="266.67" />
-				<set name="org_pdefend" val="128.7" />
-				<set name="org_mattack" val="174.67" />
-				<set name="org_mdefend" val="57.2" />
-				<set name="org_hp" val="1946.42" />
-				<set name="org_mp" val="645.75" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="55">
-				<set name="max_meal" val="14795" />
-				<set name="exp" val="304666662" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="100" />
-				<set name="consume_meal_in_normal" val="20" />
-				<set name="org_pattack" val="268.53" />
-				<set name="org_pdefend" val="129.6" />
-				<set name="org_mattack" val="175.89" />
-				<set name="org_mdefend" val="57.6" />
-				<set name="org_hp" val="2006.9" />
-				<set name="org_mp" val="667.35" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="56">
-				<set name="max_meal" val="15239" />
-				<set name="exp" val="364879780" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="104" />
-				<set name="consume_meal_in_normal" val="21" />
-				<set name="org_pattack" val="270.4" />
-				<set name="org_pdefend" val="130.5" />
-				<set name="org_mattack" val="177.11" />
-				<set name="org_mdefend" val="58" />
-				<set name="org_hp" val="2067.8" />
-				<set name="org_mp" val="689.1" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="57">
-				<set name="max_meal" val="15696" />
-				<set name="exp" val="437135521" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="108" />
-				<set name="consume_meal_in_normal" val="22" />
-				<set name="org_pattack" val="272.26" />
-				<set name="org_pdefend" val="131.4" />
-				<set name="org_mattack" val="178.33" />
-				<set name="org_mdefend" val="58.4" />
-				<set name="org_hp" val="2129.12" />
-				<set name="org_mp" val="711" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="58">
-				<set name="max_meal" val="16167" />
-				<set name="exp" val="523842410" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="112" />
-				<set name="consume_meal_in_normal" val="22" />
-				<set name="org_pattack" val="274.13" />
-				<set name="org_pdefend" val="132.3" />
-				<set name="org_mattack" val="179.55" />
-				<set name="org_mdefend" val="58.8" />
-				<set name="org_hp" val="2190.86" />
-				<set name="org_mp" val="733.05" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="59">
-				<set name="max_meal" val="16652" />
-				<set name="exp" val="627890678" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="117" />
-				<set name="consume_meal_in_normal" val="23" />
-				<set name="org_pattack" val="275.99" />
-				<set name="org_pdefend" val="133.2" />
-				<set name="org_mattack" val="180.77" />
-				<set name="org_mdefend" val="59.2" />
-				<set name="org_hp" val="2253.02" />
-				<set name="org_mp" val="755.25" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="60">
-				<set name="max_meal" val="17152" />
-				<set name="exp" val="752748598" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="121" />
-				<set name="consume_meal_in_normal" val="24" />
-				<set name="org_pattack" val="277.86" />
-				<set name="org_pdefend" val="134.1" />
-				<set name="org_mattack" val="182" />
-				<set name="org_mdefend" val="59.6" />
-				<set name="org_hp" val="2315.6" />
-				<set name="org_mp" val="777.6" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="61">
-				<set name="max_meal" val="17667" />
-				<set name="exp" val="902578103" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="126" />
-				<set name="consume_meal_in_normal" val="25" />
-				<set name="org_pattack" val="279.72" />
-				<set name="org_pdefend" val="135" />
-				<set name="org_mattack" val="183.22" />
-				<set name="org_mdefend" val="60" />
-				<set name="org_hp" val="2378.6" />
-				<set name="org_mp" val="800.1" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="62">
-				<set name="max_meal" val="18197" />
-				<set name="exp" val="1082373509" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="131" />
-				<set name="consume_meal_in_normal" val="26" />
-				<set name="org_pattack" val="281.58" />
-				<set name="org_pdefend" val="135.9" />
-				<set name="org_mattack" val="184.44" />
-				<set name="org_mdefend" val="60.4" />
-				<set name="org_hp" val="2442.02" />
-				<set name="org_mp" val="822.75" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="63">
-				<set name="max_meal" val="18743" />
-				<set name="exp" val="1298127996" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="137" />
-				<set name="consume_meal_in_normal" val="27" />
-				<set name="org_pattack" val="283.45" />
-				<set name="org_pdefend" val="136.8" />
-				<set name="org_mattack" val="185.66" />
-				<set name="org_mdefend" val="60.8" />
-				<set name="org_hp" val="2505.86" />
-				<set name="org_mp" val="845.55" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="64">
-				<set name="max_meal" val="19305" />
-				<set name="exp" val="1557033381" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="142" />
-				<set name="consume_meal_in_normal" val="28" />
-				<set name="org_pattack" val="285.31" />
-				<set name="org_pdefend" val="137.7" />
-				<set name="org_mattack" val="186.88" />
-				<set name="org_mdefend" val="61.2" />
-				<set name="org_hp" val="2570.12" />
-				<set name="org_mp" val="868.5" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="65">
-				<set name="max_meal" val="19884" />
-				<set name="exp" val="1867719842" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="148" />
-				<set name="consume_meal_in_normal" val="30" />
-				<set name="org_pattack" val="287.18" />
-				<set name="org_pdefend" val="138.6" />
-				<set name="org_mattack" val="188.1" />
-				<set name="org_mdefend" val="61.6" />
-				<set name="org_hp" val="2634.8" />
-				<set name="org_mp" val="891.6" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="66">
-				<set name="max_meal" val="20481" />
-				<set name="exp" val="2240543596" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="154" />
-				<set name="consume_meal_in_normal" val="31" />
-				<set name="org_pattack" val="289.04" />
-				<set name="org_pdefend" val="139.5" />
-				<set name="org_mattack" val="189.32" />
-				<set name="org_mdefend" val="62" />
-				<set name="org_hp" val="2699.9" />
-				<set name="org_mp" val="914.85" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="67">
-				<set name="max_meal" val="21095" />
-				<set name="exp" val="2687932100" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="160" />
-				<set name="consume_meal_in_normal" val="32" />
-				<set name="org_pattack" val="290.91" />
-				<set name="org_pdefend" val="140.4" />
-				<set name="org_mattack" val="190.55" />
-				<set name="org_mdefend" val="62.4" />
-				<set name="org_hp" val="2765.42" />
-				<set name="org_mp" val="938.25" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="68">
-				<set name="max_meal" val="21728" />
-				<set name="exp" val="3229272190" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="166" />
-				<set name="consume_meal_in_normal" val="33" />
-				<set name="org_pattack" val="292.77" />
-				<set name="org_pdefend" val="141.3" />
-				<set name="org_mattack" val="191.77" />
-				<set name="org_mdefend" val="62.8" />
-				<set name="org_hp" val="2831.36" />
-				<set name="org_mp" val="961.8" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="69">
-				<set name="max_meal" val="22380" />
-				<set name="exp" val="3884293700" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="173" />
-				<set name="consume_meal_in_normal" val="35" />
-				<set name="org_pattack" val="294.64" />
-				<set name="org_pdefend" val="142.2" />
-				<set name="org_mattack" val="192.99" />
-				<set name="org_mdefend" val="63.2" />
-				<set name="org_hp" val="2897.72" />
-				<set name="org_mp" val="985.5" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="70">
-				<set name="max_meal" val="23051" />
-				<set name="exp" val="4683419941" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="180" />
-				<set name="consume_meal_in_normal" val="36" />
-				<set name="org_pattack" val="296.5" />
-				<set name="org_pdefend" val="143.1" />
-				<set name="org_mattack" val="194.21" />
-				<set name="org_mdefend" val="63.6" />
-				<set name="org_hp" val="2964.5" />
-				<set name="org_mp" val="1009.35" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="71">
-				<set name="max_meal" val="23743" />
-				<set name="exp" val="5666345218" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="187" />
-				<set name="consume_meal_in_normal" val="37" />
-				<set name="org_pattack" val="298.37" />
-				<set name="org_pdefend" val="144" />
-				<set name="org_mattack" val="195.43" />
-				<set name="org_mdefend" val="64" />
-				<set name="org_hp" val="3031.7" />
-				<set name="org_mp" val="1033.35" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="72">
-				<set name="max_meal" val="24455" />
-				<set name="exp" val="6885172561" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="194" />
-				<set name="consume_meal_in_normal" val="39" />
-				<set name="org_pattack" val="300.23" />
-				<set name="org_pdefend" val="144.9" />
-				<set name="org_mattack" val="196.65" />
-				<set name="org_mdefend" val="64.4" />
-				<set name="org_hp" val="3099.32" />
-				<set name="org_mp" val="1057.5" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="73">
-				<set name="max_meal" val="25189" />
-				<set name="exp" val="8408706740" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="202" />
-				<set name="consume_meal_in_normal" val="40" />
-				<set name="org_pattack" val="302.1" />
-				<set name="org_pdefend" val="145.8" />
-				<set name="org_mattack" val="197.87" />
-				<set name="org_mdefend" val="64.8" />
-				<set name="org_hp" val="3167.36" />
-				<set name="org_mp" val="1081.8" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="74">
-				<set name="max_meal" val="25945" />
-				<set name="exp" val="10328359805" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="210" />
-				<set name="consume_meal_in_normal" val="42" />
-				<set name="org_pattack" val="303.96" />
-				<set name="org_pdefend" val="146.7" />
-				<set name="org_mattack" val="199.1" />
-				<set name="org_mdefend" val="65.2" />
-				<set name="org_hp" val="3235.82" />
-				<set name="org_mp" val="1106.25" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="75">
-				<set name="max_meal" val="26723" />
-				<set name="exp" val="12766319199" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="219" />
-				<set name="consume_meal_in_normal" val="44" />
-				<set name="org_pattack" val="305.83" />
-				<set name="org_pdefend" val="147.6" />
-				<set name="org_mattack" val="200.32" />
-				<set name="org_mdefend" val="65.6" />
-				<set name="org_hp" val="3304.7" />
-				<set name="org_mp" val="1130.85" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="76">
-				<set name="max_meal" val="27257" />
-				<set name="exp" val="15886907222" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="227" />
-				<set name="consume_meal_in_normal" val="45" />
-				<set name="org_pattack" val="307.69" />
-				<set name="org_pdefend" val="148.5" />
-				<set name="org_mattack" val="201.54" />
-				<set name="org_mdefend" val="66" />
-				<set name="org_hp" val="3387.31" />
-				<set name="org_mp" val="1159.12" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="77">
-				<set name="max_meal" val="27802" />
-				<set name="exp" val="19943671652" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="232" />
-				<set name="consume_meal_in_normal" val="46" />
-				<set name="org_pattack" val="309.56" />
-				<set name="org_pdefend" val="149.4" />
-				<set name="org_mattack" val="202.76" />
-				<set name="org_mdefend" val="66.4" />
-				<set name="org_hp" val="3471.99" />
-				<set name="org_mp" val="1188.09" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="78">
-				<set name="max_meal" val="28358" />
-				<set name="exp" val="25420303633" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="237" />
-				<set name="consume_meal_in_normal" val="47" />
-				<set name="org_pattack" val="311.42" />
-				<set name="org_pdefend" val="150.3" />
-				<set name="org_mattack" val="203.98" />
-				<set name="org_mdefend" val="66.8" />
-				<set name="org_hp" val="3558.78" />
-				<set name="org_mp" val="1217.79" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="79">
-				<set name="max_meal" val="28925" />
-				<set name="exp" val="33087588407" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="241" />
-				<set name="consume_meal_in_normal" val="48" />
-				<set name="org_pattack" val="313.29" />
-				<set name="org_pdefend" val="151.2" />
-				<set name="org_mattack" val="205.2" />
-				<set name="org_mdefend" val="67.2" />
-				<set name="org_hp" val="3647.74" />
-				<set name="org_mp" val="1248.23" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="80">
-				<set name="max_meal" val="29504" />
-				<set name="exp" val="44588515567" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="246" />
-				<set name="consume_meal_in_normal" val="49" />
-				<set name="org_pattack" val="315.15" />
-				<set name="org_pdefend" val="152.1" />
-				<set name="org_mattack" val="206.42" />
-				<set name="org_mdefend" val="67.6" />
-				<set name="org_hp" val="3738.93" />
-				<set name="org_mp" val="1279.43" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="81">
-				<set name="max_meal" val="30094" />
-				<set name="exp" val="61839906307" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="251" />
-				<set name="consume_meal_in_normal" val="50" />
-				<set name="org_pattack" val="317.02" />
-				<set name="org_pdefend" val="153" />
-				<set name="org_mattack" val="207.65" />
-				<set name="org_mdefend" val="68" />
-				<set name="org_hp" val="3851.09" />
-				<set name="org_mp" val="1317.81" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="82">
-				<set name="max_meal" val="30696" />
-				<set name="exp" val="87716992417" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="256" />
-				<set name="consume_meal_in_normal" val="51" />
-				<set name="org_pattack" val="318.88" />
-				<set name="org_pdefend" val="153.9" />
-				<set name="org_mattack" val="208.87" />
-				<set name="org_mdefend" val="68.4" />
-				<set name="org_hp" val="3966.62" />
-				<set name="org_mp" val="1357.34" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="83">
-				<set name="max_meal" val="31310" />
-				<set name="exp" val="126532621582" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="261" />
-				<set name="consume_meal_in_normal" val="52" />
-				<set name="org_pattack" val="320.75" />
-				<set name="org_pdefend" val="154.8" />
-				<set name="org_mattack" val="210.09" />
-				<set name="org_mdefend" val="68.8" />
-				<set name="org_hp" val="4085.61" />
-				<set name="org_mp" val="1398.06" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="84">
-				<set name="max_meal" val="31936" />
-				<set name="exp" val="184756065330" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="266" />
-				<set name="consume_meal_in_normal" val="53" />
-				<set name="org_pattack" val="322.61" />
-				<set name="org_pdefend" val="155.7" />
-				<set name="org_mattack" val="211.31" />
-				<set name="org_mdefend" val="69.2" />
-				<set name="org_hp" val="4208.17" />
-				<set name="org_mp" val="1440" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="85">
-				<set name="max_meal" val="32575" />
-				<set name="exp" val="272091230951" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="272" />
-				<set name="consume_meal_in_normal" val="54" />
-				<set name="org_pattack" val="324.48" />
-				<set name="org_pdefend" val="156.6" />
-				<set name="org_mattack" val="212.53" />
-				<set name="org_mdefend" val="69.6" />
-				<set name="org_hp" val="4334.41" />
-				<set name="org_mp" val="1483.2" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="86">
-				<set name="max_meal" val="33227" />
-				<set name="exp" val="403093979383" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="277" />
-				<set name="consume_meal_in_normal" val="55" />
-				<set name="org_pattack" val="326.34" />
-				<set name="org_pdefend" val="157.5" />
-				<set name="org_mattack" val="213.75" />
-				<set name="org_mdefend" val="70" />
-				<set name="org_hp" val="4464.44" />
-				<set name="org_mp" val="1527.69" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="87">
-				<set name="max_meal" val="33892" />
-				<set name="exp" val="599598102032" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="283" />
-				<set name="consume_meal_in_normal" val="57" />
-				<set name="org_pattack" val="328.2" />
-				<set name="org_pdefend" val="158.4" />
-				<set name="org_mattack" val="214.97" />
-				<set name="org_mdefend" val="70.4" />
-				<set name="org_hp" val="4598.37" />
-				<set name="org_mp" val="1573.52" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="88">
-				<set name="max_meal" val="34570" />
-				<set name="exp" val="953305522799" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="288" />
-				<set name="consume_meal_in_normal" val="58" />
-				<set name="org_pattack" val="330.07" />
-				<set name="org_pdefend" val="159.3" />
-				<set name="org_mattack" val="216.2" />
-				<set name="org_mdefend" val="70.8" />
-				<set name="org_hp" val="4736.32" />
-				<set name="org_mp" val="1620.72" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="89">
-				<set name="max_meal" val="35261" />
-				<set name="exp" val="1660720364334" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="294" />
-				<set name="consume_meal_in_normal" val="59" />
-				<set name="org_pattack" val="331.93" />
-				<set name="org_pdefend" val="160.2" />
-				<set name="org_mattack" val="217.42" />
-				<set name="org_mdefend" val="71.2" />
-				<set name="org_hp" val="4878.4" />
-				<set name="org_mp" val="1669.34" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="90">
-				<set name="max_meal" val="35966" />
-				<set name="exp" val="3775890740522" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="300" />
-				<set name="consume_meal_in_normal" val="60" />
-				<set name="org_pattack" val="333.8" />
-				<set name="org_pdefend" val="161.1" />
-				<set name="org_mattack" val="218.64" />
-				<set name="org_mdefend" val="71.6" />
-				<set name="org_hp" val="5024.75" />
-				<set name="org_mp" val="1719.42" />
-				<set name="org_hp_regen" val="7" />
-				<set name="org_mp_regen" val="3.6" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="91">
-				<set name="max_meal" val="36685" />
-				<set name="exp" val="14351742621463" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="306" />
-				<set name="consume_meal_in_normal" val="61" />
-				<set name="org_pattack" val="335.66" />
-				<set name="org_pdefend" val="162" />
-				<set name="org_mattack" val="219.86" />
-				<set name="org_mdefend" val="72" />
-				<set name="org_hp" val="5175.49" />
-				<set name="org_mp" val="1771" />
-				<set name="org_hp_regen" val="7.1" />
-				<set name="org_mp_regen" val="3.63" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="92">
-				<set name="max_meal" val="37419" />
-				<set name="exp" val="60885490897603" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="312" />
-				<set name="consume_meal_in_normal" val="62" />
-				<set name="org_pattack" val="337.53" />
-				<set name="org_pdefend" val="162.9" />
-				<set name="org_mattack" val="221.08" />
-				<set name="org_mdefend" val="72.4" />
-				<set name="org_hp" val="5330.75" />
-				<set name="org_mp" val="1824.13" />
-				<set name="org_hp_regen" val="7.2" />
-				<set name="org_mp_regen" val="3.66" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="93">
-				<set name="max_meal" val="38167" />
-				<set name="exp" val="265633983312619" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="318" />
-				<set name="consume_meal_in_normal" val="64" />
-				<set name="org_pattack" val="339.39" />
-				<set name="org_pdefend" val="163.8" />
-				<set name="org_mattack" val="222.3" />
-				<set name="org_mdefend" val="72.8" />
-				<set name="org_hp" val="5490.67" />
-				<set name="org_mp" val="1878.85" />
-				<set name="org_hp_regen" val="7.3" />
-				<set name="org_mp_regen" val="3.69" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="94">
-				<set name="max_meal" val="38930" />
-				<set name="exp" val="1166527349938690" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="325" />
-				<set name="consume_meal_in_normal" val="65" />
-				<set name="org_pattack" val="341.26" />
-				<set name="org_pdefend" val="164.7" />
-				<set name="org_mattack" val="223.52" />
-				<set name="org_mdefend" val="73.2" />
-				<set name="org_hp" val="5655.39" />
-				<set name="org_mp" val="1935.21" />
-				<set name="org_hp_regen" val="7.4" />
-				<set name="org_mp_regen" val="3.72" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="95">
-				<set name="max_meal" val="39709" />
-				<set name="exp" val="5130458163093410" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="331" />
-				<set name="consume_meal_in_normal" val="66" />
-				<set name="org_pattack" val="343.12" />
-				<set name="org_pdefend" val="165.6" />
-				<set name="org_mattack" val="224.75" />
-				<set name="org_mdefend" val="73.6" />
-				<set name="org_hp" val="5825.05" />
-				<set name="org_mp" val="1993.26" />
-				<set name="org_hp_regen" val="7.5" />
-				<set name="org_mp_regen" val="3.75" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="96">
-				<set name="max_meal" val="40503" />
-				<set name="exp" val="28914043042021700" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="338" />
-				<set name="consume_meal_in_normal" val="68" />
-				<set name="org_pattack" val="344.99" />
-				<set name="org_pdefend" val="166.5" />
-				<set name="org_mattack" val="225.97" />
-				<set name="org_mdefend" val="74" />
-				<set name="org_hp" val="5999.8" />
-				<set name="org_mp" val="2053.05" />
-				<set name="org_hp_regen" val="7.6" />
-				<set name="org_mp_regen" val="3.78" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="97">
-				<set name="max_meal" val="41313" />
-				<set name="exp" val="143075250460878000" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="345" />
-				<set name="consume_meal_in_normal" val="69" />
-				<set name="org_pattack" val="346.85" />
-				<set name="org_pdefend" val="167.4" />
-				<set name="org_mattack" val="227.19" />
-				<set name="org_mdefend" val="74.4" />
-				<set name="org_hp" val="6179.79" />
-				<set name="org_mp" val="2114.64" />
-				<set name="org_hp_regen" val="7.7" />
-				<set name="org_mp_regen" val="3.81" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="98">
-				<set name="max_meal" val="42139" />
-				<set name="exp" val="691049046071386000" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="351" />
-				<set name="consume_meal_in_normal" val="70" />
-				<set name="org_pattack" val="348.72" />
-				<set name="org_pdefend" val="168.3" />
-				<set name="org_mattack" val="228.41" />
-				<set name="org_mdefend" val="74.8" />
-				<set name="org_hp" val="6365.18" />
-				<set name="org_mp" val="2178.07" />
-				<set name="org_hp_regen" val="7.8" />
-				<set name="org_mp_regen" val="3.84" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="99">
-				<set name="max_meal" val="42982" />
-				<set name="exp" val="3321323265001830000" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="358" />
-				<set name="consume_meal_in_normal" val="72" />
-				<set name="org_pattack" val="350.58" />
-				<set name="org_pdefend" val="169.2" />
-				<set name="org_mattack" val="229.63" />
-				<set name="org_mdefend" val="75.2" />
-				<set name="org_hp" val="6556.13" />
-				<set name="org_mp" val="2243.41" />
-				<set name="org_hp_regen" val="7.9" />
-				<set name="org_mp_regen" val="3.87" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="100">
-				<set name="max_meal" val="43842" />
-				<set name="exp" val="3321323265001870000" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="366" />
-				<set name="consume_meal_in_normal" val="73" />
-				<set name="org_pattack" val="500" />
-				<set name="org_pdefend" val="500" />
-				<set name="org_mattack" val="500" />
-				<set name="org_mdefend" val="500" />
-				<set name="org_hp" val="6752.81" />
-				<set name="org_mp" val="2310.71" />
-				<set name="org_hp_regen" val="8.5" />
-				<set name="org_mp_regen" val="4" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-		</stats>
-	</pet>
-</pets>
+<?xml version="1.0" encoding="UTF-8"?>
+<pets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/PetData.xsd">
+	<pet id="16079" itemId="93961" index="10" evolveLevel="None" type="13">
+		<set name="food" val="93966" />
+		<set name="hungry_limit" val="50" />
+		<set name="load" val="45540" />
+		<skills>
+			<skill minLevel="1" skillId="6618" skillLevel="1" />
+			<skill minLevel="60" skillId="6618" skillLevel="2" />
+			<skill minLevel="65" skillId="6618" skillLevel="3" />
+			<skill minLevel="70" skillId="6618" skillLevel="4" />
+			<skill minLevel="75" skillId="6618" skillLevel="5" />
+			<skill minLevel="80" skillId="6618" skillLevel="6" />
+			<skill minLevel="85" skillId="6618" skillLevel="7" />
+			<skill minLevel="60" skillId="6681" skillLevel="1" />
+			<skill minLevel="60" skillId="6683" skillLevel="1" />
+		</skills>
+		<stats>
+			<stat level="1">
+				<set name="max_meal" val="3000" />
+				<set name="exp" val="0" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="12" />
+				<set name="consume_meal_in_normal" val="2" />
+				<set name="org_pattack" val="167.83" />
+				<set name="org_pdefend" val="81" />
+				<set name="org_mattack" val="109.93" />
+				<set name="org_mdefend" val="36" />
+				<set name="org_hp" val="94" />
+				<set name="org_mp" val="30" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="2">
+				<set name="max_meal" val="3090" />
+				<set name="exp" val="68" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="12" />
+				<set name="consume_meal_in_normal" val="2" />
+				<set name="org_pattack" val="169.7" />
+				<set name="org_pdefend" val="81.9" />
+				<set name="org_mattack" val="111.15" />
+				<set name="org_mdefend" val="36.4" />
+				<set name="org_hp" val="107.65" />
+				<set name="org_mp" val="35.46" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="3">
+				<set name="max_meal" val="3183" />
+				<set name="exp" val="364" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="13" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="171.56" />
+				<set name="org_pdefend" val="82.8" />
+				<set name="org_mattack" val="112.37" />
+				<set name="org_mdefend" val="36.8" />
+				<set name="org_hp" val="121.45" />
+				<set name="org_mp" val="40.98" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="4">
+				<set name="max_meal" val="3278" />
+				<set name="exp" val="1169" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="13" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="173.43" />
+				<set name="org_pdefend" val="83.7" />
+				<set name="org_mattack" val="113.59" />
+				<set name="org_mdefend" val="37.2" />
+				<set name="org_hp" val="135.4" />
+				<set name="org_mp" val="46.56" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="5">
+				<set name="max_meal" val="3376" />
+				<set name="exp" val="2885" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="14" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="175.29" />
+				<set name="org_pdefend" val="84.6" />
+				<set name="org_mattack" val="114.82" />
+				<set name="org_mdefend" val="37.6" />
+				<set name="org_hp" val="149.5" />
+				<set name="org_mp" val="52.2" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="6">
+				<set name="max_meal" val="3477" />
+				<set name="exp" val="6039" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="15" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="177.16" />
+				<set name="org_pdefend" val="85.5" />
+				<set name="org_mattack" val="116.04" />
+				<set name="org_mdefend" val="38" />
+				<set name="org_hp" val="163.75" />
+				<set name="org_mp" val="57.9" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="7">
+				<set name="max_meal" val="3581" />
+				<set name="exp" val="11288" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="15" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="179.02" />
+				<set name="org_pdefend" val="86.4" />
+				<set name="org_mattack" val="117.26" />
+				<set name="org_mdefend" val="38.4" />
+				<set name="org_hp" val="178.15" />
+				<set name="org_mp" val="63.66" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="8">
+				<set name="max_meal" val="3688" />
+				<set name="exp" val="19424" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="16" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="180.89" />
+				<set name="org_pdefend" val="87.3" />
+				<set name="org_mattack" val="118.48" />
+				<set name="org_mdefend" val="38.8" />
+				<set name="org_hp" val="192.7" />
+				<set name="org_mp" val="69.48" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="9">
+				<set name="max_meal" val="3799" />
+				<set name="exp" val="31379" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="16" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="182.75" />
+				<set name="org_pdefend" val="88.2" />
+				<set name="org_mattack" val="119.7" />
+				<set name="org_mdefend" val="39.2" />
+				<set name="org_hp" val="207.4" />
+				<set name="org_mp" val="75.36" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="10">
+				<set name="max_meal" val="3913" />
+				<set name="exp" val="48230" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="17" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="184.62" />
+				<set name="org_pdefend" val="89.1" />
+				<set name="org_mattack" val="120.92" />
+				<set name="org_mdefend" val="39.6" />
+				<set name="org_hp" val="222.25" />
+				<set name="org_mp" val="81.3" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="11">
+				<set name="max_meal" val="4030" />
+				<set name="exp" val="71203" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="18" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="186.48" />
+				<set name="org_pdefend" val="90" />
+				<set name="org_mattack" val="122.14" />
+				<set name="org_mdefend" val="40" />
+				<set name="org_hp" val="237.25" />
+				<set name="org_mp" val="87.3" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="12">
+				<set name="max_meal" val="4151" />
+				<set name="exp" val="101678" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="18" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="188.34" />
+				<set name="org_pdefend" val="90.9" />
+				<set name="org_mattack" val="123.37" />
+				<set name="org_mdefend" val="40.4" />
+				<set name="org_hp" val="252.4" />
+				<set name="org_mp" val="93.36" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="13">
+				<set name="max_meal" val="4276" />
+				<set name="exp" val="141194" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="19" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="190.21" />
+				<set name="org_pdefend" val="91.8" />
+				<set name="org_mattack" val="124.59" />
+				<set name="org_mdefend" val="40.8" />
+				<set name="org_hp" val="267.7" />
+				<set name="org_mp" val="99.48" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="14">
+				<set name="max_meal" val="4404" />
+				<set name="exp" val="191455" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="20" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="192.07" />
+				<set name="org_pdefend" val="92.7" />
+				<set name="org_mattack" val="125.81" />
+				<set name="org_mdefend" val="41.2" />
+				<set name="org_hp" val="283.15" />
+				<set name="org_mp" val="105.66" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="15">
+				<set name="max_meal" val="4536" />
+				<set name="exp" val="254331" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="21" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="193.94" />
+				<set name="org_pdefend" val="93.6" />
+				<set name="org_mattack" val="127.03" />
+				<set name="org_mdefend" val="41.6" />
+				<set name="org_hp" val="298.75" />
+				<set name="org_mp" val="111.9" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="16">
+				<set name="max_meal" val="4672" />
+				<set name="exp" val="331868" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="22" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="195.8" />
+				<set name="org_pdefend" val="94.5" />
+				<set name="org_mattack" val="128.25" />
+				<set name="org_mdefend" val="42" />
+				<set name="org_hp" val="314.5" />
+				<set name="org_mp" val="118.2" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="17">
+				<set name="max_meal" val="4812" />
+				<set name="exp" val="426289" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="22" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="197.67" />
+				<set name="org_pdefend" val="95.4" />
+				<set name="org_mattack" val="129.47" />
+				<set name="org_mdefend" val="42.4" />
+				<set name="org_hp" val="330.4" />
+				<set name="org_mp" val="124.56" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="18">
+				<set name="max_meal" val="4956" />
+				<set name="exp" val="540001" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="23" />
+				<set name="consume_meal_in_normal" val="5" />
+				<set name="org_pattack" val="199.53" />
+				<set name="org_pdefend" val="96.3" />
+				<set name="org_mattack" val="130.69" />
+				<set name="org_mdefend" val="42.8" />
+				<set name="org_hp" val="346.45" />
+				<set name="org_mp" val="130.98" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="19">
+				<set name="max_meal" val="5105" />
+				<set name="exp" val="675597" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="24" />
+				<set name="consume_meal_in_normal" val="5" />
+				<set name="org_pattack" val="201.4" />
+				<set name="org_pdefend" val="97.2" />
+				<set name="org_mattack" val="131.92" />
+				<set name="org_mdefend" val="43.2" />
+				<set name="org_hp" val="362.65" />
+				<set name="org_mp" val="137.46" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="20">
+				<set name="max_meal" val="5258" />
+				<set name="exp" val="835864" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="25" />
+				<set name="consume_meal_in_normal" val="5" />
+				<set name="org_pattack" val="203.26" />
+				<set name="org_pdefend" val="98.1" />
+				<set name="org_mattack" val="133.14" />
+				<set name="org_mdefend" val="43.6" />
+				<set name="org_hp" val="379" />
+				<set name="org_mp" val="144" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="21">
+				<set name="max_meal" val="5416" />
+				<set name="exp" val="1020171" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="26" />
+				<set name="consume_meal_in_normal" val="5" />
+				<set name="org_pattack" val="205.13" />
+				<set name="org_pdefend" val="99" />
+				<set name="org_mattack" val="134.36" />
+				<set name="org_mdefend" val="44" />
+				<set name="org_hp" val="414.2" />
+				<set name="org_mp" val="153.9" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="22">
+				<set name="max_meal" val="5578" />
+				<set name="exp" val="1232124" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="27" />
+				<set name="consume_meal_in_normal" val="5" />
+				<set name="org_pattack" val="206.99" />
+				<set name="org_pdefend" val="99.9" />
+				<set name="org_mattack" val="135.58" />
+				<set name="org_mdefend" val="44.4" />
+				<set name="org_hp" val="449.72" />
+				<set name="org_mp" val="163.89" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="23">
+				<set name="max_meal" val="5745" />
+				<set name="exp" val="1475870" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="28" />
+				<set name="consume_meal_in_normal" val="6" />
+				<set name="org_pattack" val="208.86" />
+				<set name="org_pdefend" val="100.8" />
+				<set name="org_mattack" val="136.8" />
+				<set name="org_mdefend" val="44.8" />
+				<set name="org_hp" val="485.56" />
+				<set name="org_mp" val="173.97" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="24">
+				<set name="max_meal" val="5917" />
+				<set name="exp" val="1756178" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="30" />
+				<set name="consume_meal_in_normal" val="6" />
+				<set name="org_pattack" val="210.72" />
+				<set name="org_pdefend" val="101.7" />
+				<set name="org_mattack" val="138.02" />
+				<set name="org_mdefend" val="45.2" />
+				<set name="org_hp" val="521.72" />
+				<set name="org_mp" val="184.14" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="25">
+				<set name="max_meal" val="6095" />
+				<set name="exp" val="2078532" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="31" />
+				<set name="consume_meal_in_normal" val="6" />
+				<set name="org_pattack" val="212.59" />
+				<set name="org_pdefend" val="102.6" />
+				<set name="org_mattack" val="139.24" />
+				<set name="org_mdefend" val="45.6" />
+				<set name="org_hp" val="558.2" />
+				<set name="org_mp" val="194.4" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="26">
+				<set name="max_meal" val="6278" />
+				<set name="exp" val="2452463" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="32" />
+				<set name="consume_meal_in_normal" val="6" />
+				<set name="org_pattack" val="214.45" />
+				<set name="org_pdefend" val="103.5" />
+				<set name="org_mattack" val="140.47" />
+				<set name="org_mdefend" val="46" />
+				<set name="org_hp" val="595" />
+				<set name="org_mp" val="204.75" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="27">
+				<set name="max_meal" val="6466" />
+				<set name="exp" val="2886223" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="33" />
+				<set name="consume_meal_in_normal" val="7" />
+				<set name="org_pattack" val="216.32" />
+				<set name="org_pdefend" val="104.4" />
+				<set name="org_mattack" val="141.69" />
+				<set name="org_mdefend" val="46.4" />
+				<set name="org_hp" val="632.12" />
+				<set name="org_mp" val="215.19" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="28">
+				<set name="max_meal" val="6660" />
+				<set name="exp" val="3389384" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="35" />
+				<set name="consume_meal_in_normal" val="7" />
+				<set name="org_pattack" val="218.18" />
+				<set name="org_pdefend" val="105.3" />
+				<set name="org_mattack" val="142.91" />
+				<set name="org_mdefend" val="46.8" />
+				<set name="org_hp" val="669.56" />
+				<set name="org_mp" val="225.72" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="29">
+				<set name="max_meal" val="6860" />
+				<set name="exp" val="3973052" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="36" />
+				<set name="consume_meal_in_normal" val="7" />
+				<set name="org_pattack" val="220.05" />
+				<set name="org_pdefend" val="106.2" />
+				<set name="org_mattack" val="144.13" />
+				<set name="org_mdefend" val="47.2" />
+				<set name="org_hp" val="707.32" />
+				<set name="org_mp" val="236.34" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="30">
+				<set name="max_meal" val="7066" />
+				<set name="exp" val="4650105" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="37" />
+				<set name="consume_meal_in_normal" val="7" />
+				<set name="org_pattack" val="221.91" />
+				<set name="org_pdefend" val="107.1" />
+				<set name="org_mattack" val="145.35" />
+				<set name="org_mdefend" val="47.6" />
+				<set name="org_hp" val="745.4" />
+				<set name="org_mp" val="247.05" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="31">
+				<set name="max_meal" val="7278" />
+				<set name="exp" val="5442259" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="39" />
+				<set name="consume_meal_in_normal" val="8" />
+				<set name="org_pattack" val="223.78" />
+				<set name="org_pdefend" val="108" />
+				<set name="org_mattack" val="146.57" />
+				<set name="org_mdefend" val="48" />
+				<set name="org_hp" val="783.8" />
+				<set name="org_mp" val="257.85" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="32">
+				<set name="max_meal" val="7496" />
+				<set name="exp" val="6369078" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="40" />
+				<set name="consume_meal_in_normal" val="8" />
+				<set name="org_pattack" val="225.64" />
+				<set name="org_pdefend" val="108.9" />
+				<set name="org_mattack" val="147.79" />
+				<set name="org_mdefend" val="48.4" />
+				<set name="org_hp" val="822.52" />
+				<set name="org_mp" val="268.74" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="33">
+				<set name="max_meal" val="7721" />
+				<set name="exp" val="7453456" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="42" />
+				<set name="consume_meal_in_normal" val="8" />
+				<set name="org_pattack" val="227.51" />
+				<set name="org_pdefend" val="109.8" />
+				<set name="org_mattack" val="149.02" />
+				<set name="org_mdefend" val="48.8" />
+				<set name="org_hp" val="861.56" />
+				<set name="org_mp" val="279.72" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="34">
+				<set name="max_meal" val="7953" />
+				<set name="exp" val="8722179" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="44" />
+				<set name="consume_meal_in_normal" val="9" />
+				<set name="org_pattack" val="229.37" />
+				<set name="org_pdefend" val="110.7" />
+				<set name="org_mattack" val="150.24" />
+				<set name="org_mdefend" val="49.2" />
+				<set name="org_hp" val="900.92" />
+				<set name="org_mp" val="290.79" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="35">
+				<set name="max_meal" val="8192" />
+				<set name="exp" val="10206584" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="46" />
+				<set name="consume_meal_in_normal" val="9" />
+				<set name="org_pattack" val="231.24" />
+				<set name="org_pdefend" val="111.6" />
+				<set name="org_mattack" val="151.46" />
+				<set name="org_mdefend" val="49.6" />
+				<set name="org_hp" val="940.6" />
+				<set name="org_mp" val="301.95" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="36">
+				<set name="max_meal" val="8438" />
+				<set name="exp" val="11958183" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="47" />
+				<set name="consume_meal_in_normal" val="9" />
+				<set name="org_pattack" val="233.1" />
+				<set name="org_pdefend" val="112.5" />
+				<set name="org_mattack" val="152.68" />
+				<set name="org_mdefend" val="50" />
+				<set name="org_hp" val="980.6" />
+				<set name="org_mp" val="313.2" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="37">
+				<set name="max_meal" val="8691" />
+				<set name="exp" val="14025069" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="49" />
+				<set name="consume_meal_in_normal" val="10" />
+				<set name="org_pattack" val="234.96" />
+				<set name="org_pdefend" val="113.4" />
+				<set name="org_mattack" val="153.9" />
+				<set name="org_mdefend" val="50.4" />
+				<set name="org_hp" val="1020.92" />
+				<set name="org_mp" val="324.54" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="38">
+				<set name="max_meal" val="8952" />
+				<set name="exp" val="16463995" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="51" />
+				<set name="consume_meal_in_normal" val="10" />
+				<set name="org_pattack" val="236.83" />
+				<set name="org_pdefend" val="114.3" />
+				<set name="org_mattack" val="155.12" />
+				<set name="org_mdefend" val="50.8" />
+				<set name="org_hp" val="1061.56" />
+				<set name="org_mp" val="335.97" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="39">
+				<set name="max_meal" val="9221" />
+				<set name="exp" val="19341927" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="53" />
+				<set name="consume_meal_in_normal" val="11" />
+				<set name="org_pattack" val="238.69" />
+				<set name="org_pdefend" val="115.2" />
+				<set name="org_mattack" val="156.34" />
+				<set name="org_mdefend" val="51.2" />
+				<set name="org_hp" val="1102.52" />
+				<set name="org_mp" val="347.49" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="40">
+				<set name="max_meal" val="9498" />
+				<set name="exp" val="22737888" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="55" />
+				<set name="consume_meal_in_normal" val="11" />
+				<set name="org_pattack" val="240.56" />
+				<set name="org_pdefend" val="116.1" />
+				<set name="org_mattack" val="157.57" />
+				<set name="org_mdefend" val="51.6" />
+				<set name="org_hp" val="1143.8" />
+				<set name="org_mp" val="359.1" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="41">
+				<set name="max_meal" val="9783" />
+				<set name="exp" val="26779080" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="58" />
+				<set name="consume_meal_in_normal" val="12" />
+				<set name="org_pattack" val="242.42" />
+				<set name="org_pdefend" val="117" />
+				<set name="org_mattack" val="158.79" />
+				<set name="org_mdefend" val="52" />
+				<set name="org_hp" val="1198.4" />
+				<set name="org_mp" val="378.6" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="42">
+				<set name="max_meal" val="10076" />
+				<set name="exp" val="31588100" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="60" />
+				<set name="consume_meal_in_normal" val="12" />
+				<set name="org_pattack" val="244.29" />
+				<set name="org_pdefend" val="117.9" />
+				<set name="org_mattack" val="160.01" />
+				<set name="org_mdefend" val="52.4" />
+				<set name="org_hp" val="1253.42" />
+				<set name="org_mp" val="398.25" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="43">
+				<set name="max_meal" val="10378" />
+				<set name="exp" val="37310833" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="62" />
+				<set name="consume_meal_in_normal" val="12" />
+				<set name="org_pattack" val="246.15" />
+				<set name="org_pdefend" val="118.8" />
+				<set name="org_mattack" val="161.23" />
+				<set name="org_mdefend" val="52.8" />
+				<set name="org_hp" val="1308.86" />
+				<set name="org_mp" val="418.05" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="44">
+				<set name="max_meal" val="10689" />
+				<set name="exp" val="44120885" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="65" />
+				<set name="consume_meal_in_normal" val="13" />
+				<set name="org_pattack" val="248.02" />
+				<set name="org_pdefend" val="119.7" />
+				<set name="org_mattack" val="162.45" />
+				<set name="org_mdefend" val="53.2" />
+				<set name="org_hp" val="1364.72" />
+				<set name="org_mp" val="438" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="45">
+				<set name="max_meal" val="11010" />
+				<set name="exp" val="52224847" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="67" />
+				<set name="consume_meal_in_normal" val="13" />
+				<set name="org_pattack" val="249.88" />
+				<set name="org_pdefend" val="120.6" />
+				<set name="org_mattack" val="163.67" />
+				<set name="org_mdefend" val="53.6" />
+				<set name="org_hp" val="1421" />
+				<set name="org_mp" val="458.1" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="46">
+				<set name="max_meal" val="11340" />
+				<set name="exp" val="61949602" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="70" />
+				<set name="consume_meal_in_normal" val="14" />
+				<set name="org_pattack" val="251.75" />
+				<set name="org_pdefend" val="121.5" />
+				<set name="org_mattack" val="164.89" />
+				<set name="org_mdefend" val="54" />
+				<set name="org_hp" val="1477.7" />
+				<set name="org_mp" val="478.35" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="47">
+				<set name="max_meal" val="11680" />
+				<set name="exp" val="73619307" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="73" />
+				<set name="consume_meal_in_normal" val="15" />
+				<set name="org_pattack" val="253.61" />
+				<set name="org_pdefend" val="122.4" />
+				<set name="org_mattack" val="166.12" />
+				<set name="org_mdefend" val="54.4" />
+				<set name="org_hp" val="1534.82" />
+				<set name="org_mp" val="498.75" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="48">
+				<set name="max_meal" val="12030" />
+				<set name="exp" val="87622954" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="76" />
+				<set name="consume_meal_in_normal" val="15" />
+				<set name="org_pattack" val="255.48" />
+				<set name="org_pdefend" val="123.3" />
+				<set name="org_mattack" val="167.34" />
+				<set name="org_mdefend" val="54.8" />
+				<set name="org_hp" val="1592.36" />
+				<set name="org_mp" val="519.3" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="49">
+				<set name="max_meal" val="12391" />
+				<set name="exp" val="104427330" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="79" />
+				<set name="consume_meal_in_normal" val="16" />
+				<set name="org_pattack" val="257.34" />
+				<set name="org_pdefend" val="124.2" />
+				<set name="org_mattack" val="168.56" />
+				<set name="org_mdefend" val="55.2" />
+				<set name="org_hp" val="1650.32" />
+				<set name="org_mp" val="540" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="50">
+				<set name="max_meal" val="12763" />
+				<set name="exp" val="124592581" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="82" />
+				<set name="consume_meal_in_normal" val="16" />
+				<set name="org_pattack" val="259.21" />
+				<set name="org_pdefend" val="125.1" />
+				<set name="org_mattack" val="169.78" />
+				<set name="org_mdefend" val="55.6" />
+				<set name="org_hp" val="1708.7" />
+				<set name="org_mp" val="560.85" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="51">
+				<set name="max_meal" val="13146" />
+				<set name="exp" val="148790883" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="85" />
+				<set name="consume_meal_in_normal" val="17" />
+				<set name="org_pattack" val="261.07" />
+				<set name="org_pdefend" val="126" />
+				<set name="org_mattack" val="171" />
+				<set name="org_mdefend" val="56" />
+				<set name="org_hp" val="1767.5" />
+				<set name="org_mp" val="581.85" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="52">
+				<set name="max_meal" val="13540" />
+				<set name="exp" val="177828845" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="89" />
+				<set name="consume_meal_in_normal" val="18" />
+				<set name="org_pattack" val="262.94" />
+				<set name="org_pdefend" val="126.9" />
+				<set name="org_mattack" val="172.22" />
+				<set name="org_mdefend" val="56.4" />
+				<set name="org_hp" val="1826.72" />
+				<set name="org_mp" val="603" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="53">
+				<set name="max_meal" val="13946" />
+				<set name="exp" val="212674399" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="92" />
+				<set name="consume_meal_in_normal" val="18" />
+				<set name="org_pattack" val="264.8" />
+				<set name="org_pdefend" val="127.8" />
+				<set name="org_mattack" val="173.44" />
+				<set name="org_mdefend" val="56.8" />
+				<set name="org_hp" val="1886.36" />
+				<set name="org_mp" val="624.3" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="54">
+				<set name="max_meal" val="14364" />
+				<set name="exp" val="254489064" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="96" />
+				<set name="consume_meal_in_normal" val="19" />
+				<set name="org_pattack" val="266.67" />
+				<set name="org_pdefend" val="128.7" />
+				<set name="org_mattack" val="174.67" />
+				<set name="org_mdefend" val="57.2" />
+				<set name="org_hp" val="1946.42" />
+				<set name="org_mp" val="645.75" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="55">
+				<set name="max_meal" val="14795" />
+				<set name="exp" val="304666662" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="100" />
+				<set name="consume_meal_in_normal" val="20" />
+				<set name="org_pattack" val="268.53" />
+				<set name="org_pdefend" val="129.6" />
+				<set name="org_mattack" val="175.89" />
+				<set name="org_mdefend" val="57.6" />
+				<set name="org_hp" val="2006.9" />
+				<set name="org_mp" val="667.35" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="56">
+				<set name="max_meal" val="15239" />
+				<set name="exp" val="364879780" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="104" />
+				<set name="consume_meal_in_normal" val="21" />
+				<set name="org_pattack" val="270.4" />
+				<set name="org_pdefend" val="130.5" />
+				<set name="org_mattack" val="177.11" />
+				<set name="org_mdefend" val="58" />
+				<set name="org_hp" val="2067.8" />
+				<set name="org_mp" val="689.1" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="57">
+				<set name="max_meal" val="15696" />
+				<set name="exp" val="437135521" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="108" />
+				<set name="consume_meal_in_normal" val="22" />
+				<set name="org_pattack" val="272.26" />
+				<set name="org_pdefend" val="131.4" />
+				<set name="org_mattack" val="178.33" />
+				<set name="org_mdefend" val="58.4" />
+				<set name="org_hp" val="2129.12" />
+				<set name="org_mp" val="711" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="58">
+				<set name="max_meal" val="16167" />
+				<set name="exp" val="523842410" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="112" />
+				<set name="consume_meal_in_normal" val="22" />
+				<set name="org_pattack" val="274.13" />
+				<set name="org_pdefend" val="132.3" />
+				<set name="org_mattack" val="179.55" />
+				<set name="org_mdefend" val="58.8" />
+				<set name="org_hp" val="2190.86" />
+				<set name="org_mp" val="733.05" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="59">
+				<set name="max_meal" val="16652" />
+				<set name="exp" val="627890678" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="117" />
+				<set name="consume_meal_in_normal" val="23" />
+				<set name="org_pattack" val="275.99" />
+				<set name="org_pdefend" val="133.2" />
+				<set name="org_mattack" val="180.77" />
+				<set name="org_mdefend" val="59.2" />
+				<set name="org_hp" val="2253.02" />
+				<set name="org_mp" val="755.25" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="60">
+				<set name="max_meal" val="17152" />
+				<set name="exp" val="752748598" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="121" />
+				<set name="consume_meal_in_normal" val="24" />
+				<set name="org_pattack" val="277.86" />
+				<set name="org_pdefend" val="134.1" />
+				<set name="org_mattack" val="182" />
+				<set name="org_mdefend" val="59.6" />
+				<set name="org_hp" val="2315.6" />
+				<set name="org_mp" val="777.6" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="61">
+				<set name="max_meal" val="17667" />
+				<set name="exp" val="902578103" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="126" />
+				<set name="consume_meal_in_normal" val="25" />
+				<set name="org_pattack" val="279.72" />
+				<set name="org_pdefend" val="135" />
+				<set name="org_mattack" val="183.22" />
+				<set name="org_mdefend" val="60" />
+				<set name="org_hp" val="2378.6" />
+				<set name="org_mp" val="800.1" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="62">
+				<set name="max_meal" val="18197" />
+				<set name="exp" val="1082373509" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="131" />
+				<set name="consume_meal_in_normal" val="26" />
+				<set name="org_pattack" val="281.58" />
+				<set name="org_pdefend" val="135.9" />
+				<set name="org_mattack" val="184.44" />
+				<set name="org_mdefend" val="60.4" />
+				<set name="org_hp" val="2442.02" />
+				<set name="org_mp" val="822.75" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="63">
+				<set name="max_meal" val="18743" />
+				<set name="exp" val="1298127996" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="137" />
+				<set name="consume_meal_in_normal" val="27" />
+				<set name="org_pattack" val="283.45" />
+				<set name="org_pdefend" val="136.8" />
+				<set name="org_mattack" val="185.66" />
+				<set name="org_mdefend" val="60.8" />
+				<set name="org_hp" val="2505.86" />
+				<set name="org_mp" val="845.55" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="64">
+				<set name="max_meal" val="19305" />
+				<set name="exp" val="1557033381" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="142" />
+				<set name="consume_meal_in_normal" val="28" />
+				<set name="org_pattack" val="285.31" />
+				<set name="org_pdefend" val="137.7" />
+				<set name="org_mattack" val="186.88" />
+				<set name="org_mdefend" val="61.2" />
+				<set name="org_hp" val="2570.12" />
+				<set name="org_mp" val="868.5" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="65">
+				<set name="max_meal" val="19884" />
+				<set name="exp" val="1867719842" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="148" />
+				<set name="consume_meal_in_normal" val="30" />
+				<set name="org_pattack" val="287.18" />
+				<set name="org_pdefend" val="138.6" />
+				<set name="org_mattack" val="188.1" />
+				<set name="org_mdefend" val="61.6" />
+				<set name="org_hp" val="2634.8" />
+				<set name="org_mp" val="891.6" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="66">
+				<set name="max_meal" val="20481" />
+				<set name="exp" val="2240543596" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="154" />
+				<set name="consume_meal_in_normal" val="31" />
+				<set name="org_pattack" val="289.04" />
+				<set name="org_pdefend" val="139.5" />
+				<set name="org_mattack" val="189.32" />
+				<set name="org_mdefend" val="62" />
+				<set name="org_hp" val="2699.9" />
+				<set name="org_mp" val="914.85" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="67">
+				<set name="max_meal" val="21095" />
+				<set name="exp" val="2687932100" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="160" />
+				<set name="consume_meal_in_normal" val="32" />
+				<set name="org_pattack" val="290.91" />
+				<set name="org_pdefend" val="140.4" />
+				<set name="org_mattack" val="190.55" />
+				<set name="org_mdefend" val="62.4" />
+				<set name="org_hp" val="2765.42" />
+				<set name="org_mp" val="938.25" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="68">
+				<set name="max_meal" val="21728" />
+				<set name="exp" val="3229272190" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="166" />
+				<set name="consume_meal_in_normal" val="33" />
+				<set name="org_pattack" val="292.77" />
+				<set name="org_pdefend" val="141.3" />
+				<set name="org_mattack" val="191.77" />
+				<set name="org_mdefend" val="62.8" />
+				<set name="org_hp" val="2831.36" />
+				<set name="org_mp" val="961.8" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="69">
+				<set name="max_meal" val="22380" />
+				<set name="exp" val="3884293700" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="173" />
+				<set name="consume_meal_in_normal" val="35" />
+				<set name="org_pattack" val="294.64" />
+				<set name="org_pdefend" val="142.2" />
+				<set name="org_mattack" val="192.99" />
+				<set name="org_mdefend" val="63.2" />
+				<set name="org_hp" val="2897.72" />
+				<set name="org_mp" val="985.5" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="70">
+				<set name="max_meal" val="23051" />
+				<set name="exp" val="4683419941" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="180" />
+				<set name="consume_meal_in_normal" val="36" />
+				<set name="org_pattack" val="296.5" />
+				<set name="org_pdefend" val="143.1" />
+				<set name="org_mattack" val="194.21" />
+				<set name="org_mdefend" val="63.6" />
+				<set name="org_hp" val="2964.5" />
+				<set name="org_mp" val="1009.35" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="71">
+				<set name="max_meal" val="23743" />
+				<set name="exp" val="5666345218" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="187" />
+				<set name="consume_meal_in_normal" val="37" />
+				<set name="org_pattack" val="298.37" />
+				<set name="org_pdefend" val="144" />
+				<set name="org_mattack" val="195.43" />
+				<set name="org_mdefend" val="64" />
+				<set name="org_hp" val="3031.7" />
+				<set name="org_mp" val="1033.35" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="72">
+				<set name="max_meal" val="24455" />
+				<set name="exp" val="6885172561" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="194" />
+				<set name="consume_meal_in_normal" val="39" />
+				<set name="org_pattack" val="300.23" />
+				<set name="org_pdefend" val="144.9" />
+				<set name="org_mattack" val="196.65" />
+				<set name="org_mdefend" val="64.4" />
+				<set name="org_hp" val="3099.32" />
+				<set name="org_mp" val="1057.5" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="73">
+				<set name="max_meal" val="25189" />
+				<set name="exp" val="8408706740" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="202" />
+				<set name="consume_meal_in_normal" val="40" />
+				<set name="org_pattack" val="302.1" />
+				<set name="org_pdefend" val="145.8" />
+				<set name="org_mattack" val="197.87" />
+				<set name="org_mdefend" val="64.8" />
+				<set name="org_hp" val="3167.36" />
+				<set name="org_mp" val="1081.8" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="74">
+				<set name="max_meal" val="25945" />
+				<set name="exp" val="10328359805" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="210" />
+				<set name="consume_meal_in_normal" val="42" />
+				<set name="org_pattack" val="303.96" />
+				<set name="org_pdefend" val="146.7" />
+				<set name="org_mattack" val="199.1" />
+				<set name="org_mdefend" val="65.2" />
+				<set name="org_hp" val="3235.82" />
+				<set name="org_mp" val="1106.25" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="75">
+				<set name="max_meal" val="26723" />
+				<set name="exp" val="12766319199" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="219" />
+				<set name="consume_meal_in_normal" val="44" />
+				<set name="org_pattack" val="305.83" />
+				<set name="org_pdefend" val="147.6" />
+				<set name="org_mattack" val="200.32" />
+				<set name="org_mdefend" val="65.6" />
+				<set name="org_hp" val="3304.7" />
+				<set name="org_mp" val="1130.85" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="76">
+				<set name="max_meal" val="27257" />
+				<set name="exp" val="15886907222" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="227" />
+				<set name="consume_meal_in_normal" val="45" />
+				<set name="org_pattack" val="307.69" />
+				<set name="org_pdefend" val="148.5" />
+				<set name="org_mattack" val="201.54" />
+				<set name="org_mdefend" val="66" />
+				<set name="org_hp" val="3387.31" />
+				<set name="org_mp" val="1159.12" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="77">
+				<set name="max_meal" val="27802" />
+				<set name="exp" val="19943671652" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="232" />
+				<set name="consume_meal_in_normal" val="46" />
+				<set name="org_pattack" val="309.56" />
+				<set name="org_pdefend" val="149.4" />
+				<set name="org_mattack" val="202.76" />
+				<set name="org_mdefend" val="66.4" />
+				<set name="org_hp" val="3471.99" />
+				<set name="org_mp" val="1188.09" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="78">
+				<set name="max_meal" val="28358" />
+				<set name="exp" val="25420303633" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="237" />
+				<set name="consume_meal_in_normal" val="47" />
+				<set name="org_pattack" val="311.42" />
+				<set name="org_pdefend" val="150.3" />
+				<set name="org_mattack" val="203.98" />
+				<set name="org_mdefend" val="66.8" />
+				<set name="org_hp" val="3558.78" />
+				<set name="org_mp" val="1217.79" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="79">
+				<set name="max_meal" val="28925" />
+				<set name="exp" val="33087588407" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="241" />
+				<set name="consume_meal_in_normal" val="48" />
+				<set name="org_pattack" val="313.29" />
+				<set name="org_pdefend" val="151.2" />
+				<set name="org_mattack" val="205.2" />
+				<set name="org_mdefend" val="67.2" />
+				<set name="org_hp" val="3647.74" />
+				<set name="org_mp" val="1248.23" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="80">
+				<set name="max_meal" val="29504" />
+				<set name="exp" val="44588515567" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="246" />
+				<set name="consume_meal_in_normal" val="49" />
+				<set name="org_pattack" val="315.15" />
+				<set name="org_pdefend" val="152.1" />
+				<set name="org_mattack" val="206.42" />
+				<set name="org_mdefend" val="67.6" />
+				<set name="org_hp" val="3738.93" />
+				<set name="org_mp" val="1279.43" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="81">
+				<set name="max_meal" val="30094" />
+				<set name="exp" val="61839906307" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="251" />
+				<set name="consume_meal_in_normal" val="50" />
+				<set name="org_pattack" val="317.02" />
+				<set name="org_pdefend" val="153" />
+				<set name="org_mattack" val="207.65" />
+				<set name="org_mdefend" val="68" />
+				<set name="org_hp" val="3851.09" />
+				<set name="org_mp" val="1317.81" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="82">
+				<set name="max_meal" val="30696" />
+				<set name="exp" val="87716992417" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="256" />
+				<set name="consume_meal_in_normal" val="51" />
+				<set name="org_pattack" val="318.88" />
+				<set name="org_pdefend" val="153.9" />
+				<set name="org_mattack" val="208.87" />
+				<set name="org_mdefend" val="68.4" />
+				<set name="org_hp" val="3966.62" />
+				<set name="org_mp" val="1357.34" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="83">
+				<set name="max_meal" val="31310" />
+				<set name="exp" val="126532621582" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="261" />
+				<set name="consume_meal_in_normal" val="52" />
+				<set name="org_pattack" val="320.75" />
+				<set name="org_pdefend" val="154.8" />
+				<set name="org_mattack" val="210.09" />
+				<set name="org_mdefend" val="68.8" />
+				<set name="org_hp" val="4085.61" />
+				<set name="org_mp" val="1398.06" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="84">
+				<set name="max_meal" val="31936" />
+				<set name="exp" val="184756065330" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="266" />
+				<set name="consume_meal_in_normal" val="53" />
+				<set name="org_pattack" val="322.61" />
+				<set name="org_pdefend" val="155.7" />
+				<set name="org_mattack" val="211.31" />
+				<set name="org_mdefend" val="69.2" />
+				<set name="org_hp" val="4208.17" />
+				<set name="org_mp" val="1440" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="85">
+				<set name="max_meal" val="32575" />
+				<set name="exp" val="272091230951" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="272" />
+				<set name="consume_meal_in_normal" val="54" />
+				<set name="org_pattack" val="324.48" />
+				<set name="org_pdefend" val="156.6" />
+				<set name="org_mattack" val="212.53" />
+				<set name="org_mdefend" val="69.6" />
+				<set name="org_hp" val="4334.41" />
+				<set name="org_mp" val="1483.2" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="86">
+				<set name="max_meal" val="33227" />
+				<set name="exp" val="403093979383" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="277" />
+				<set name="consume_meal_in_normal" val="55" />
+				<set name="org_pattack" val="326.34" />
+				<set name="org_pdefend" val="157.5" />
+				<set name="org_mattack" val="213.75" />
+				<set name="org_mdefend" val="70" />
+				<set name="org_hp" val="4464.44" />
+				<set name="org_mp" val="1527.69" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="87">
+				<set name="max_meal" val="33892" />
+				<set name="exp" val="599598102032" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="283" />
+				<set name="consume_meal_in_normal" val="57" />
+				<set name="org_pattack" val="328.2" />
+				<set name="org_pdefend" val="158.4" />
+				<set name="org_mattack" val="214.97" />
+				<set name="org_mdefend" val="70.4" />
+				<set name="org_hp" val="4598.37" />
+				<set name="org_mp" val="1573.52" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="88">
+				<set name="max_meal" val="34570" />
+				<set name="exp" val="953305522799" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="288" />
+				<set name="consume_meal_in_normal" val="58" />
+				<set name="org_pattack" val="330.07" />
+				<set name="org_pdefend" val="159.3" />
+				<set name="org_mattack" val="216.2" />
+				<set name="org_mdefend" val="70.8" />
+				<set name="org_hp" val="4736.32" />
+				<set name="org_mp" val="1620.72" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="89">
+				<set name="max_meal" val="35261" />
+				<set name="exp" val="1660720364334" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="294" />
+				<set name="consume_meal_in_normal" val="59" />
+				<set name="org_pattack" val="331.93" />
+				<set name="org_pdefend" val="160.2" />
+				<set name="org_mattack" val="217.42" />
+				<set name="org_mdefend" val="71.2" />
+				<set name="org_hp" val="4878.4" />
+				<set name="org_mp" val="1669.34" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="90">
+				<set name="max_meal" val="35966" />
+				<set name="exp" val="3775890740522" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="300" />
+				<set name="consume_meal_in_normal" val="60" />
+				<set name="org_pattack" val="333.8" />
+				<set name="org_pdefend" val="161.1" />
+				<set name="org_mattack" val="218.64" />
+				<set name="org_mdefend" val="71.6" />
+				<set name="org_hp" val="5024.75" />
+				<set name="org_mp" val="1719.42" />
+				<set name="org_hp_regen" val="7" />
+				<set name="org_mp_regen" val="3.6" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="91">
+				<set name="max_meal" val="36685" />
+				<set name="exp" val="14351742621463" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="306" />
+				<set name="consume_meal_in_normal" val="61" />
+				<set name="org_pattack" val="335.66" />
+				<set name="org_pdefend" val="162" />
+				<set name="org_mattack" val="219.86" />
+				<set name="org_mdefend" val="72" />
+				<set name="org_hp" val="5175.49" />
+				<set name="org_mp" val="1771" />
+				<set name="org_hp_regen" val="7.1" />
+				<set name="org_mp_regen" val="3.63" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="92">
+				<set name="max_meal" val="37419" />
+				<set name="exp" val="60885490897603" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="312" />
+				<set name="consume_meal_in_normal" val="62" />
+				<set name="org_pattack" val="337.53" />
+				<set name="org_pdefend" val="162.9" />
+				<set name="org_mattack" val="221.08" />
+				<set name="org_mdefend" val="72.4" />
+				<set name="org_hp" val="5330.75" />
+				<set name="org_mp" val="1824.13" />
+				<set name="org_hp_regen" val="7.2" />
+				<set name="org_mp_regen" val="3.66" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="93">
+				<set name="max_meal" val="38167" />
+				<set name="exp" val="265633983312619" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="318" />
+				<set name="consume_meal_in_normal" val="64" />
+				<set name="org_pattack" val="339.39" />
+				<set name="org_pdefend" val="163.8" />
+				<set name="org_mattack" val="222.3" />
+				<set name="org_mdefend" val="72.8" />
+				<set name="org_hp" val="5490.67" />
+				<set name="org_mp" val="1878.85" />
+				<set name="org_hp_regen" val="7.3" />
+				<set name="org_mp_regen" val="3.69" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="94">
+				<set name="max_meal" val="38930" />
+				<set name="exp" val="1166527349938690" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="325" />
+				<set name="consume_meal_in_normal" val="65" />
+				<set name="org_pattack" val="341.26" />
+				<set name="org_pdefend" val="164.7" />
+				<set name="org_mattack" val="223.52" />
+				<set name="org_mdefend" val="73.2" />
+				<set name="org_hp" val="5655.39" />
+				<set name="org_mp" val="1935.21" />
+				<set name="org_hp_regen" val="7.4" />
+				<set name="org_mp_regen" val="3.72" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="95">
+				<set name="max_meal" val="39709" />
+				<set name="exp" val="5130458163093410" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="331" />
+				<set name="consume_meal_in_normal" val="66" />
+				<set name="org_pattack" val="343.12" />
+				<set name="org_pdefend" val="165.6" />
+				<set name="org_mattack" val="224.75" />
+				<set name="org_mdefend" val="73.6" />
+				<set name="org_hp" val="5825.05" />
+				<set name="org_mp" val="1993.26" />
+				<set name="org_hp_regen" val="7.5" />
+				<set name="org_mp_regen" val="3.75" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="96">
+				<set name="max_meal" val="40503" />
+				<set name="exp" val="28914043042021700" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="338" />
+				<set name="consume_meal_in_normal" val="68" />
+				<set name="org_pattack" val="344.99" />
+				<set name="org_pdefend" val="166.5" />
+				<set name="org_mattack" val="225.97" />
+				<set name="org_mdefend" val="74" />
+				<set name="org_hp" val="5999.8" />
+				<set name="org_mp" val="2053.05" />
+				<set name="org_hp_regen" val="7.6" />
+				<set name="org_mp_regen" val="3.78" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="97">
+				<set name="max_meal" val="41313" />
+				<set name="exp" val="143075250460878000" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="345" />
+				<set name="consume_meal_in_normal" val="69" />
+				<set name="org_pattack" val="346.85" />
+				<set name="org_pdefend" val="167.4" />
+				<set name="org_mattack" val="227.19" />
+				<set name="org_mdefend" val="74.4" />
+				<set name="org_hp" val="6179.79" />
+				<set name="org_mp" val="2114.64" />
+				<set name="org_hp_regen" val="7.7" />
+				<set name="org_mp_regen" val="3.81" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="98">
+				<set name="max_meal" val="42139" />
+				<set name="exp" val="691049046071386000" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="351" />
+				<set name="consume_meal_in_normal" val="70" />
+				<set name="org_pattack" val="348.72" />
+				<set name="org_pdefend" val="168.3" />
+				<set name="org_mattack" val="228.41" />
+				<set name="org_mdefend" val="74.8" />
+				<set name="org_hp" val="6365.18" />
+				<set name="org_mp" val="2178.07" />
+				<set name="org_hp_regen" val="7.8" />
+				<set name="org_mp_regen" val="3.84" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="99">
+				<set name="max_meal" val="42982" />
+				<set name="exp" val="3321323265001830000" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="358" />
+				<set name="consume_meal_in_normal" val="72" />
+				<set name="org_pattack" val="350.58" />
+				<set name="org_pdefend" val="169.2" />
+				<set name="org_mattack" val="229.63" />
+				<set name="org_mdefend" val="75.2" />
+				<set name="org_hp" val="6556.13" />
+				<set name="org_mp" val="2243.41" />
+				<set name="org_hp_regen" val="7.9" />
+				<set name="org_mp_regen" val="3.87" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="100">
+				<set name="max_meal" val="43842" />
+				<set name="exp" val="3321323265001870000" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="366" />
+				<set name="consume_meal_in_normal" val="73" />
+				<set name="org_pattack" val="500" />
+				<set name="org_pdefend" val="500" />
+				<set name="org_mattack" val="500" />
+				<set name="org_mdefend" val="500" />
+				<set name="org_hp" val="6752.81" />
+				<set name="org_mp" val="2310.71" />
+				<set name="org_hp_regen" val="8.5" />
+				<set name="org_mp_regen" val="4" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+		</stats>
+	</pet>
+</pets>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/01800-01899.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/01800-01899.xml
index 212c794527..20af2f530f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/01800-01899.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/01800-01899.xml
@@ -1318,6 +1318,7 @@
 			<value level="1">1</value>
 			<value level="2">2</value>
 			<value level="3">3</value>
+			<value level="4">4</value>
 		</abnormalLevel>
 		<abnormalTime>3</abnormalTime>
 		<abnormalType>KNOCKDOWN</abnormalType>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/39100-39199.xml
index 56cd390a78..f709c55c8e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/39100-39199.xml
@@ -57,7 +57,19 @@
 	</skill>
 	<skill id="39103" toLevel="1" name="Hero's HP Recovery Potion">
 		<icon>icon.etc_reagent_white_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<amount>500</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39104" toLevel="1" name="Hero's Cube - 7 d.">
 		<icon>icon.sa_cube</icon>
@@ -2493,6 +2505,59 @@
 	</skill>
 	<skill id="39199" toLevel="1" name="Hero's Wondrous Cube - 7 d.">
 		<icon>icon.sa_cube</icon>
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<reuseDelay>-1</reuseDelay>
+		<hitTime>500</hitTime>
+		<coolTime>500</coolTime>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpEncumbered">
+				<weightPercent>20</weightPercent>
+				<slotsPercent>10</slotsPercent>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="RestorationRandom">
+				<items>
+					<item chance="16">
+						<item id="49487" count="2"/> <!-- Soulshot Ticket -->
+					</item>
+					<item chance="4">
+						<item id="49772" count="1"/> <!-- Scroll of Mood Melody -->
+					</item>
+					<item chance="16.49">
+						<item id="49488" count="5"/> <!-- Major Healing Potion -->
+					</item>
+					<item chance="20">
+						<item id="35669" count="1"/> <!-- Angel Cat's Blessing -->
+					</item>
+					<item chance="5">
+						<item id="49533" count="1"/> <!-- Quick Hero Healing Potion -->
+					</item>
+					<item chance="10">
+						<item id="49542" count="1"/> <!-- Improved Scroll of Resurrection -->
+					</item>
+					<item chance="14.5">
+						<item id="49536" count="1"/> <!-- Box of Scroll of Escape to the Base -->
+					</item>
+					<item chance="2">
+						<item id="49489" count="3"/> <!-- Parts of Enchantment Scrolls Chest -->
+					</item>
+					<item chance="10">
+						<item id="49416" count="1"/> <!-- Blade Spirit -->
+					</item>
+					<item chance="0.01">
+						<item id="49859" count="1"/> <!-- Weapon Exchange Coupon -->
+					</item>
+					<item chance="2">
+						<item id="49490" count="1"/> <!-- Fishing Kit -->
+					</item>
+				</items>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/39200-39299.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/39200-39299.xml
index e962f5884c..780f4da277 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/39200-39299.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/39200-39299.xml
@@ -2064,7 +2064,7 @@
 		<abnormalTime>1200</abnormalTime>
 		<abnormalLevel>
 			<value level="1">1</value>
-			<value level="1">2</value>
+			<value level="2">2</value>
 		</abnormalLevel>
 		<isMagic>4</isMagic>
 		<reuseDelay>60000</reuseDelay>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/39300-39399.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/39300-39399.xml
index 4a47932e1c..c9e8c54afb 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/39300-39399.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/39300-39399.xml
@@ -532,14 +532,14 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="39325" toLevel="3" name="Arcane Deliverance">
+	<skill id="39325" toLevel="1" name="Arcane Deliverance">
 		<!-- Recovers HP/ MP/ CP after an attack. (Triggers when Max HP is at 20% or lower.). (Cooldown: 300 sec.) -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
 		<hitTime>500</hitTime>
 		<reuseDelay>900000</reuseDelay>
 	</skill>
-	<skill id="39326" toLevel="3" name="Arcane Speed">
+	<skill id="39326" toLevel="1" name="Arcane Speed">
 		<!-- Temporarily increases Speed, Atk. Spd. and Casting Spd. after an attack. (Cooldown: 300 sec.) -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -547,7 +547,7 @@
 		<reuseDelay>900000</reuseDelay>
 		<effectPoint>100</effectPoint>
 	</skill>
-	<skill id="39327" toLevel="3" name="Arcane Barrier">
+	<skill id="39327" toLevel="1" name="Arcane Barrier">
 		<!-- Creates a time-limited barrier when hit. (Cooldown: 300 sec.) -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -555,7 +555,7 @@
 		<reuseDelay>900000</reuseDelay>
 		<effectPoint>100</effectPoint>
 	</skill>
-	<skill id="39328" toLevel="3" name="Arcane Immunity">
+	<skill id="39328" toLevel="1" name="Arcane Immunity">
 		<!-- Temporarily grants immunity to debuffs and anomalies when hit. (Cooldown: 300 sec.) -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -563,7 +563,7 @@
 		<reuseDelay>600000</reuseDelay>
 		<effectPoint>100</effectPoint>
 	</skill>
-	<skill id="39329" toLevel="3" name="Arcane Protection">
+	<skill id="39329" toLevel="1" name="Arcane Protection">
 		<!-- Temporarily increases P./ M. Def. when hit. (Cooldown: 300 sec.) -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -571,7 +571,7 @@
 		<reuseDelay>600000</reuseDelay>
 		<effectPoint>100</effectPoint>
 	</skill>
-	<skill id="39330" toLevel="3" name="Arcane Paralysis">
+	<skill id="39330" toLevel="1" name="Arcane Paralysis">
 		<!-- Temporarily paralyzes the enemy after an attack. (Cooldown: 300 sec.) -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -582,7 +582,7 @@
 		<reuseDelay>300000</reuseDelay>
 		<effectPoint>-100</effectPoint>
 	</skill>
-	<skill id="39331" toLevel="3" name="Arcane Silence">
+	<skill id="39331" toLevel="1" name="Arcane Silence">
 		<!-- Temporarily inflicts Silence on the enemy after an attack. (Cooldown: 300 sec.) -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -593,7 +593,7 @@
 		<reuseDelay>300000</reuseDelay>
 		<effectPoint>-100</effectPoint>
 	</skill>
-	<skill id="39332" toLevel="3" name="Arcane Critical Sense">
+	<skill id="39332" toLevel="1" name="Arcane Critical Sense">
 		<!-- All Critical Rate +3%. All Critical Damage +150 -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -604,7 +604,7 @@
 		<effectPoint>-671</effectPoint>
 		<mpConsume>43</mpConsume>
 	</skill>
-	<skill id="39333" toLevel="3" name="Arcane Power">
+	<skill id="39333" toLevel="1" name="Arcane Power">
 		<!-- P. Atk. +350. M. Atk. +500 -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/40200-40299.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/40200-40299.xml
index 98ffc51f35..0c3f2cacee 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/40200-40299.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/40200-40299.xml
@@ -620,11 +620,14 @@
 		<itemConsumeCount>1</itemConsumeCount>
 		<itemConsumeId>94480</itemConsumeId>
 		<magicCriticalRate>5</magicCriticalRate>
-		<hitCancelTime>0</hitCancelTime>
-		<magicLevel>1</magicLevel>
 		<reuseDelay>5</reuseDelay>
 		<targetType>PET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="GivePetXp">
+				<xp>100000000</xp>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="40239" toLevel="1" name="Pet Buff Scroll">
 		<!-- Max HP +1000. P. Def. +300. M. Def. +300. HP Recovery Rate +10 -->
@@ -642,12 +645,14 @@
 		<operateType>A1</operateType>
 		<itemConsumeCount>1</itemConsumeCount>
 		<itemConsumeId>94517</itemConsumeId>
-		<magicCriticalRate>5</magicCriticalRate>
-		<hitCancelTime>0</hitCancelTime>
-		<magicLevel>1</magicLevel>
 		<reuseDelay>5</reuseDelay>
 		<targetType>PET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="GivePetXp">
+				<xp>2000000000</xp>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="40242" toLevel="1" name="Sayha's Blessing Scroll">
 		<icon>icon.skill0000</icon>
@@ -836,6 +841,16 @@
 		<!-- Pet XP +1,000,000. -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>94635</itemConsumeId>
+		<reuseDelay>5</reuseDelay>
+		<targetType>PET</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="GivePetXp">
+				<xp>1000000</xp>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="40251" toLevel="1" name="Pet's XP Growth Scroll">
 		<!-- Pet's XP +30%. Removed when your pet dies or is unsummoned. -->
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/45100-45199.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/45100-45199.xml
index 151ae7c586..82c0a6adc2 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/45100-45199.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/45100-45199.xml
@@ -4463,10 +4463,11 @@
 	<skill id="45198" toLevel="1" name="Grand Master's Transcendent Blessing">
 		<!-- Grand Master's power has pushed you beyond the limits of your class. HP Recovery Potions' Effect +50. With a certain chance, absorbs 3% of the inflicted damage as MP. Note!. You can't consume Light Souls and Shadow Souls. -->
 		<icon>icon.skill_kamael_shadowside</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
 		<abnormalLevel>1</abnormalLevel>
 		<abnormalTime>600</abnormalTime>
-		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<abnormalType>KAMAEL_TRANSFORM</abnormalType>
+		<abnormalVisualEffect>KAMAEL_BLACK_TRANSFORM;LONG_RAPIER_BLACK_AVE;BLACK_STANCE_AVE</abnormalVisualEffect>
 		<isMagic>4</isMagic>
 		<magicLevel>
 			<value level="1">20</value>
@@ -4474,9 +4475,21 @@
 		</magicLevel>
 		<operateType>A2</operateType>
 		<effectPoint>1</effectPoint>
-		<abnormalVisualEffect>U_ER_WI_WINDHIDE_AVE</abnormalVisualEffect>
 		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="BlockAbnormalSlot">
+				<slot>TRANSFORM</slot>
+			</effect>
+			<effect name="AdditionalPotionHp">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MpVampiricAttack">
+				<amount>3</amount>
+				<chance>50</chance>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="45199" toLevel="24" name="Transcendent Power Strike">
 		<!-- The character prepares for making a destructive blow. Attacks the enemy with 45 power. The skill can be used only in the transcendent instance zones. -->
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/47000-47099.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/47000-47099.xml
index 290884f005..d2dcad7af5 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/47000-47099.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/47000-47099.xml
@@ -2137,6 +2137,7 @@
 			<value level="1">1</value>
 			<value level="2">2</value>
 			<value level="3">3</value>
+			<value level="4">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalLevel>
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>CHEAP_MAGIC</abnormalType>
@@ -2148,6 +2149,7 @@
 			<value level="1">20</value>
 			<value level="2">30</value>
 			<value level="3">40</value>
+			<value level="4">40</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</magicLevel>
 		<itemConsumeCount>3</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
@@ -2163,6 +2165,7 @@
 					<value level="1">-10</value>
 					<value level="2">-15</value>
 					<value level="3">-20</value>
+					<value level="4">-20</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 				</amount>
 				<mode>PER</mode>
 				<magicType>0</magicType>
@@ -2172,6 +2175,7 @@
 					<value level="1">-4</value>
 					<value level="2">-7</value>
 					<value level="3">-10</value>
+					<value level="4">-10</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 				</amount>
 				<mode>PER</mode>
 				<magicType>1</magicType>
@@ -2181,6 +2185,7 @@
 					<value level="1">-10</value>
 					<value level="2">-15</value>
 					<value level="3">-20</value>
+					<value level="4">-20</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 				</amount>
 				<mode>PER</mode>
 				<magicType>3</magicType>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/47200-47299.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/47200-47299.xml
index f32f682bd2..25b80b1c20 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/47200-47299.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/47200-47299.xml
@@ -1876,38 +1876,7 @@
 	</skill>
 	<skill id="47260" toLevel="3" name="Divine Recovery">
 		<icon>icon.s_saint_recovery</icon>
-		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
-		<magicLevel>76</magicLevel>
-		<effects>
-			<effect name="TriggerSkillByKill">
-				<!-- HP Drain -->
-				<chance>100</chance>
-				<skillId>47261</skillId> <!-- Divine Recovery -->
-				<skillLevel>
-					<value level="1">1</value>
-					<value level="2">2</value>
-					<value level="3">3</value>
-				</skillLevel>
-			</effect>
-			<effect name="TriggerSkillByKill">
-				<!-- HP Drain -->
-				<chance>100</chance>
-				<skillId>47262</skillId> <!-- Divine Recovery -->
-				<skillLevel>
-					<value level="1">1</value>
-					<value level="2">2</value>
-					<value level="3">3</value>
-				</skillLevel>
-			</effect>
-		</effects>
-	</skill>
-	<skill id="47261" toLevel="3" name="Divine Recovery">
-		<!-- Consumes the target's soul and recovers MP. (Trigger cooldown: 10 sec.). Recovers 96 MP after killing monsters. Recovers 768 MP after killing characters. -->
-		<icon>icon.s_saint_recovery</icon>
-		<castRange>600</castRange>
-		<effectRange>1100</effectRange>
-		<isMagic>1</isMagic> <!-- Magic Skill -->
+		<isTriggeredSkill>true</isTriggeredSkill>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
@@ -1922,10 +1891,35 @@
 			</effect>
 		</effects>
 	</skill>
+	<skill id="47261" toLevel="3" name="Divine Recovery">
+		<!-- Consumes the target's soul and recovers MP. (Trigger cooldown: 10 sec.) Recovers $s1 MP after killing monsters. Recovers $s2 MP after killing characters. -->
+		<icon>icon.s_saint_recovery</icon>
+		<operateType>P</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>76</magicLevel>
+		<effects>
+			<effect name="TriggerSkillByKill">
+				<chance>100</chance>
+				<skillId>47260</skillId> <!-- Divine Recovery -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+				</skillLevel>
+			</effect>
+			<effect name="TriggerSkillByKill">
+				<chance>100</chance>
+				<skillId>47262</skillId> <!-- Divine Recovery -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+				</skillLevel>
+			</effect>
+		</effects>
+	</skill>
 	<skill id="47262" toLevel="3" name="Divine Recovery">
 		<icon>icon.s_saint_recovery</icon>
-		<castRange>600</castRange>
-		<effectRange>1100</effectRange>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<operateType>A1</operateType>
 		<reuseDelay>60000</reuseDelay>
@@ -3921,7 +3915,7 @@
 				<attackerType>Creature</attackerType>
 				<minDamage>1</minDamage>
 				<chance>20</chance>
-				<targetType>TARGET</targetType>
+				<targetType>SELF</targetType>
 				<isCritical>false</isCritical>
 				<allowWeapons>ALL</allowWeapons>
 				<skillId>53007</skillId> <!-- Power Stance -->
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/50400-50499.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/50400-50499.xml
index bbf51c0ab1..186475c245 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/50400-50499.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/50400-50499.xml
@@ -165,8 +165,12 @@
 				<amount>80</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxPhysicalCriticalRate">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>50</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
@@ -266,8 +270,12 @@
 				<amount>150</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxPhysicalCriticalRate">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>50</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
@@ -306,8 +314,6 @@
 		<!-- All Critical Damage +200. Increases Max Critical Rate. -->
 		<icon>icon.bless_effect_enchant</icon>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
-		<magicLevel>1</magicLevel>
 		<effects>
 			<effect name="CriticalDamage">
 				<amount>200</amount>
@@ -321,8 +327,12 @@
 				<amount>200</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxPhysicalCriticalRate">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>50</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/50500-50599.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/50500-50599.xml
index a22c404d64..a3e62f21cb 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/50500-50599.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/50500-50599.xml
@@ -4324,6 +4324,7 @@
 					<value level="9">28</value>
 					<value level="10">30</value>
 					<value level="10">32</value>
+					<value level="11">32</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -4630,7 +4631,7 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="AbsorbDamage">
+			<effect name="IgnoreReduceDamage">
 				<amount>
 					<value fromLevel="1" toLevel="2">0</value>
 					<value level="3">50</value>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/55200-55299.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/55200-55299.xml
index 904bb257fc..5d3458b457 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/55200-55299.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/55200-55299.xml
@@ -500,7 +500,7 @@
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>ATTACK_TIME_DOWN</abnormalType>
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer’s Potion -->
+		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer's Potion -->
 		<mpConsume>75</mpConsume>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/documentation.txt
index 44d719518a..9908e3de29 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/skills/documentation.txt
@@ -12,6 +12,8 @@ AddHuntingTime: Add time for time limited hunting zones. (l2jmobius)
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -148,6 +150,7 @@ GiveExpAndSp: Gives a given amount of XP and SP. (l2jmobius)
 GiveFame: Gives a given amount of Fame. (l2jmobius)
 GiveHonorCoins: Gives a given amount of Honor Coins. (l2jmobius)
 GiveItemByExp: Gives an item when a certain amount of EXP is gathered. (l2jmobius)
+GivePetXp: Gives a given amount of XP to a pet. (l2jmobius)
 GiveRecommendation: Gives recommendations to a player. Blue name.
 GiveSp: Gives a given amount of SP.
 GiveXp: Gives a given amount of XP. (l2jmobius)
@@ -167,10 +170,11 @@ HpCpHealCritical: HpCp heal effects always trigger Magic Critical Hit.
 HpCpHeal: Increases current HP by a given amount. If the given amount exceeds maximum HP, it increases current CP with the rest value as well.
 HpDrain: Magical attack that absorbs given percentage of the damage inflicted as HP.
 Hp: Increases current HP by a static value.
-HpLimit: Increase a character's max hp limit (l2jmobius)
+HpLimit: Increase a character's max hp limit. (l2jmobius)
 HpRegen: HP Regeneration stat.
 HpToOwner: DOT effect that absorbs HP over time.
 IgnoreDeath: Become undying. Hp cannot decrease below 1.
+IgnoreReduceDamage: Ignore ReduceDamage effect implementation. (l2jmobius)
 ImmobileDamageBonus: Bonus damage to immobile targets. (l2jmobius)
 ImmobileDamageResist: Resist damage while immobile. (l2jmobius)
 ImmobilePetBuff: Causes your pet to become immobilized.
@@ -211,7 +215,6 @@ MAtk: M. Atk. stat.
 MAtkByPAtk: M. Atk. bonus from P. Atk stat. (l2jmobius)
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyBeastPoints: Modifies player Beast Point count. (l2jmobius)
 ModifyCraftPoints: Modifies player Craft Point count. (l2jmobius)
@@ -280,6 +283,7 @@ RearDamage: Multiplier for damage done from behind the target. (l2jmobius)
 RebalanceHP: Balances targets' current HP.
 RebalanceHPSummon: Balances targets' current HP for summons.
 RecoverVitalityInPeaceZone: Recover periodically vitality when player is in a peace zone. (l2jmobius)
+ReduceDamage: Reduce damage effect implementation.
 ReduceCancel: Magic skill casting interruption stat.
 ReduceDropPenalty: Reduces EXP lost and death penalty chance.
 ReflectMagic: Deflects magical damage back to the attacker.
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/xsd/DailyMission.xsd b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/xsd/DailyMission.xsd
index 35f2f6dc35..28d8ddeac4 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/xsd/DailyMission.xsd
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/xsd/DailyMission.xsd
@@ -33,8 +33,8 @@
 			<xs:element type="handlerType" name="handler" minOccurs="0" maxOccurs="unbounded" />
 			<xs:element type="itemsType" name="items" />
 		</xs:sequence>
-		<xs:attribute type="xs:short" name="id" />
-		<xs:attribute type="xs:short" name="reward_id" />
+		<xs:attribute type="xs:int" name="id" />
+		<xs:attribute type="xs:int" name="reward_id" />
 		<xs:attribute type="xs:string" name="name" />
 		<xs:attribute type="xs:int" name="requiredCompletion" />
 		<xs:attribute type="xs:boolean" name="dailyReset" />
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/xsd/LimitShop.xsd b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/xsd/LimitShop.xsd
index 02d5bc1963..56b8adce72 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/xsd/LimitShop.xsd
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/xsd/LimitShop.xsd
@@ -24,6 +24,7 @@
 											<xs:attribute type="xs:long" name="count" use="optional"/>
 											<xs:attribute type="xs:float" name="chance" use="optional"/>
 											<xs:attribute type="xs:boolean" name="announce" use="optional"/>
+											<xs:attribute type="xs:int" name="enchant" use="optional"/>
 											<xs:attribute type="xs:int" name="id2" use="optional"/>
 											<xs:attribute type="xs:long" name="count2" use="optional"/>
 											<xs:attribute type="xs:float" name="chance2" use="optional"/>
@@ -40,6 +41,7 @@
 											<xs:attribute type="xs:long" name="count5" use="optional"/>
 											<xs:attribute type="xs:boolean" name="announce5" use="optional"/>
 											<xs:attribute type="xs:int" name="accountDailyLimit" use="optional"/>
+											<xs:attribute type="xs:int" name="accountMontlyLimit" use="optional"/>
 											<xs:attribute type="xs:int" name="accountBuyLimit" use="optional"/>
 										</xs:extension>
 									</xs:simpleContent>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/xsd/PetExtractData.xsd b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/xsd/PetExtractData.xsd
new file mode 100644
index 0000000000..e9115b614a
--- /dev/null
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/xsd/PetExtractData.xsd
@@ -0,0 +1,24 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+	<xs:element name="list">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="extraction" maxOccurs="unbounded" minOccurs="0">
+					<xs:complexType>
+						<xs:simpleContent>
+							<xs:extension base="xs:string">
+								<xs:attribute type="xs:short" name="petId" />
+								<xs:attribute type="xs:int" name="petLevel" />
+								<xs:attribute type="xs:long" name="extractExp" />
+								<xs:attribute type="xs:int" name="extractItem"/>
+								<xs:attribute type="xs:int" name="defaultCostId" />
+								<xs:attribute type="xs:long" name="defaultCostCount" />
+								<xs:attribute type="xs:int" name="extractCostId" />
+								<xs:attribute type="xs:long" name="extractCostCount" />
+							</xs:extension>
+						</xs:simpleContent>
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/zones/no_landing.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/zones/no_landing.xml
index 4b280f64a8..88b454d0db 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/zones/no_landing.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/zones/no_landing.xml
@@ -58,4 +58,41 @@
 		<node X="-98296" Y="-262136" />
 		<node X="-65544" Y="-229384" />
 	</zone>
+	
+	<!-- Dwelling of Spirits zones -->
+	<zone id="202201" name="dwelling_portal_enter_fire" type="NoLandingZone" shape="Cuboid" minZ="-12209" maxZ="-10700">
+		<node X="-115236" Y="-77408" />
+		<node X="-115617" Y="-77631" />
+	</zone>
+	<zone id="202202" name="dwelling_portal_enter_earth" type="NoLandingZone" shape="Cuboid" minZ="-12209" maxZ="-10700">
+		<node X="-113417" Y="-77633" />
+		<node X="-113032" Y="-77411" />
+	</zone>
+	<zone id="202203" name="dwelling_portal_enter_water" type="NoLandingZone" shape="NPoly" minZ="-12209" maxZ="-10700">
+		<node X="-115160" Y="-79013" />
+		<node X="-115333" Y="-79182" />
+		<node X="-115216" Y="-79282" />
+		<node X="-115053" Y="-79121" />
+	</zone>
+	<zone id="202204" name="dwelling_portal_enter_wind" type="NoLandingZone" shape="NPoly" minZ="-12209" maxZ="-10700">
+		<node X="-113596" Y="-79120" />
+		<node X="-113436" Y="-79275" />
+		<node X="-113325" Y="-79176" />
+		<node X="-113490" Y="-79012" />
+	</zone>
+	<zone id="202205" name="dwelling_portal_return_fire" type="NoLandingZone" shape="Cylinder" minZ="-15515" maxZ="-15400" rad="230">
+		<node X="202349" Y="170533" />
+	</zone>
+	<zone id="202206" name="dwelling_portal_return_earth" type="NoLandingZone" shape="Cylinder" minZ="-15515" maxZ="-15400" rad="230">
+		<node X="222065" Y="192767" />
+	</zone>
+	<zone id="202207" name="dwelling_portal_return_water" type="NoLandingZone" shape="Cylinder" minZ="-15515" maxZ="-15400" rad="230">
+		<node X="222127" Y="170488" />
+	</zone>
+	<zone id="202208" name="dwelling_portal_return_wind" type="NoLandingZone" shape="Cylinder" minZ="-15515" maxZ="-15400" rad="230">
+		<node X="212855" Y="181242" />
+	</zone>
+	<zone id="21400000" name="dwelling_central" type="NoLandingZone" shape="Cylinder" minZ="-12209" maxZ="-10700" rad="1000">
+		<node X="-114339" Y="-78005" />
+	</zone>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/zones/teleportzones.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/zones/teleportzones.xml
index 19a95e0456..d0510c8833 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/zones/teleportzones.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/zones/teleportzones.xml
@@ -1,81 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/zones.xsd">
-	<zone name="dwelling_portal_earth" type="TeleportZone" shape="Cylinder" minZ="-11518" maxZ="-11218" rad="100">
-		<stat name="oustX" val="222086" />
-		<stat name="oustY" val="190539" />
-		<stat name="oustZ" val="-15488" />
-		<stat name="default_enabled" val="false" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="-113465" Y="-77520" />
-	</zone>
-	<zone name="dwelling_portal_wind" type="TeleportZone" shape="Cylinder" minZ="-11518" maxZ="-11218" rad="100">
-		<stat name="oustX" val="222151" />
-		<stat name="oustY" val="168077" />
-		<stat name="oustZ" val="-15488" />
-		<stat name="default_enabled" val="false" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="-115115" Y="-79080" />
-	</zone>
-	<zone name="dwelling_portal_water" type="TeleportZone" shape="Cylinder" minZ="-11518" maxZ="-11218" rad="100">
-		<stat name="oustX" val="212886" />
-		<stat name="oustY" val="178829" />
-		<stat name="oustZ" val="-15488" />
-		<stat name="instanceId" val="214" />
-		<stat name="default_enabled" val="true" /> <!-- Fixes a problem with the other portals. -->
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="-113529" Y="-79077" />
-	</zone>
-	<zone name="dwelling_portal_fire" type="TeleportZone" shape="Cylinder" minZ="-11518" maxZ="-11218" rad="100">
-		<stat name="oustX" val="202376" />
-		<stat name="oustY" val="168141" />
-		<stat name="oustZ" val="-15488" />
-		<stat name="default_enabled" val="false" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="-115202" Y="-77519" />
-	</zone>
-	<zone name="return_portal_petram" type="TeleportZone" shape="Cylinder" minZ="-15688" maxZ="-15218" rad="100">
-		<stat name="oustX" val="-114323" />
-		<stat name="oustY" val="-78292" />
-		<stat name="oustZ" val="-11433" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="222061" Y="192921" />
-	</zone>
-	<zone name="return_portal_nebula" type="TeleportZone" shape="Cylinder" minZ="-15688" maxZ="-15218" rad="100">
-		<stat name="oustX" val="-114323" />
-		<stat name="oustY" val="-78292" />
-		<stat name="oustZ" val="-11433" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="222127" Y="170488" />
-	</zone>
-	<zone name="return_portal_procella" type="TeleportZone" shape="Cylinder" minZ="-15688" maxZ="-15218" rad="100">
-		<stat name="oustX" val="-114323" />
-		<stat name="oustY" val="-78292" />
-		<stat name="oustZ" val="-11433" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="212855" Y="181242" />
-	</zone>
-	<zone name="return_portal_ignis" type="TeleportZone" shape="Cylinder" minZ="-15688" maxZ="-15218" rad="100">
-		<stat name="oustX" val="-114323" />
-		<stat name="oustY" val="-78292" />
-		<stat name="oustZ" val="-11433" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="202349" Y="170533" />
-	</zone>
 	<zone name="hellbound_tp_1" type="TeleportZone" shape="Cylinder" minZ="-3600" maxZ="-3300" rad="200">
 		<stat name="oustX" val="6736" />
 		<stat name="oustY" val="251024" />
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/Config.java
index 3596459291..253082732c 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/Config.java
@@ -646,6 +646,7 @@ public class Config
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean AUTO_PLAY_ATTACK_ACTION;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static AbnormalVisualEffect BLUE_TEAM_ABNORMAL_EFFECT;
 	public static AbnormalVisualEffect RED_TEAM_ABNORMAL_EFFECT;
 	public static int SHARING_LOCATION_COST;
@@ -1356,6 +1357,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2340,6 +2342,7 @@ public class Config
 			ENABLE_AUTO_ITEM = generalConfig.getBoolean("EnableAutoItem", true);
 			AUTO_PLAY_ATTACK_ACTION = generalConfig.getBoolean("AutoPlayAttackAction", true);
 			RESUME_AUTO_PLAY = generalConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = generalConfig.getBoolean("AssistLeader", false);
 			BLUE_TEAM_ABNORMAL_EFFECT = null;
 			final String blueTeamAve = generalConfig.getString("BlueTeamAbnormalEffect", "").trim();
 			if (!blueTeamAve.isEmpty())
@@ -3514,6 +3517,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/GameServer.java
index c03828630a..8bdaaf0c14 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/GameServer.java
@@ -98,6 +98,7 @@ import org.l2jmobius.gameserver.data.xml.NpcNameLocalisationData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
 import org.l2jmobius.gameserver.data.xml.PetAcquireList;
 import org.l2jmobius.gameserver.data.xml.PetDataTable;
+import org.l2jmobius.gameserver.data.xml.PetExtractData;
 import org.l2jmobius.gameserver.data.xml.PetSkillData;
 import org.l2jmobius.gameserver.data.xml.PetTypeData;
 import org.l2jmobius.gameserver.data.xml.PlayerTemplateData;
@@ -345,6 +346,8 @@ public class GameServer
 		CharInfoTable.getInstance();
 		AdminData.getInstance();
 		PetDataTable.getInstance();
+		PetTypeData.getInstance();
+		PetExtractData.getInstance();
 		CubicData.getInstance();
 		CharSummonTable.getInstance().init();
 		BeautyShopData.getInstance();
@@ -394,7 +397,6 @@ public class GameServer
 		CrestTable.getInstance();
 		TeleportListData.getInstance();
 		SharedTeleportManager.getInstance();
-		PetTypeData.getInstance();
 		TeleporterData.getInstance();
 		TimedHuntingZoneData.getInstance();
 		MatchingRoomManager.getInstance();
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/ai/SummonAI.java
index 96cef785c0..13ce9b1224 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index b364734ec8..b635c5088e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index 27860b8144..22da7987bd 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index 47ed7421e8..2995e359c4 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/LimitShopClanData.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/LimitShopClanData.java
index 251a0d3cbe..1368675c36 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/LimitShopClanData.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/LimitShopClanData.java
@@ -107,6 +107,7 @@ public class LimitShopClanData implements IXmlReader
 							ingredientEnchants[4] = 0;
 							int productionId = 0;
 							int accountDailyLimit = 0;
+							int accountMontlyLimit = 0;
 							int accountBuyLimit = 0;
 							for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling())
 							{
@@ -185,11 +186,12 @@ public class LimitShopClanData implements IXmlReader
 								{
 									productionId = parseInteger(attrs, "id");
 									accountDailyLimit = parseInteger(attrs, "accountDailyLimit", 0);
+									accountMontlyLimit = parseInteger(attrs, "accountMontlyLimit", 0);
 									accountBuyLimit = parseInteger(attrs, "accountBuyLimit", 0);
 								}
 							}
 							
-							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, 1, 100, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, false, accountDailyLimit, accountBuyLimit));
+							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, 1, 100, false, 0, 0, 0, 0, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, false, accountDailyLimit, accountMontlyLimit, accountBuyLimit));
 						}
 					}
 				}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java
index 60350c6209..48e31e400e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java
@@ -126,7 +126,9 @@ public class LimitShopCraftData implements IXmlReader
 							boolean announce3 = false;
 							boolean announce4 = false;
 							boolean announce5 = false;
+							int enchant = 0;
 							int accountDailyLimit = 0;
+							int accountMontlyLimit = 0;
 							int accountBuyLimit = 0;
 							for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling())
 							{
@@ -217,6 +219,7 @@ public class LimitShopCraftData implements IXmlReader
 									count = parseLong(attrs, "count", 1L);
 									chance = parseFloat(attrs, "chance", 100f);
 									announce = parseBoolean(attrs, "announce", false);
+									enchant = parseInteger(attrs, "enchant", 0);
 									productionId2 = parseInteger(attrs, "id2", 0);
 									count2 = parseLong(attrs, "count2", 1L);
 									chance2 = parseFloat(attrs, "chance2", 100f);
@@ -233,6 +236,7 @@ public class LimitShopCraftData implements IXmlReader
 									count5 = parseLong(attrs, "count5", 1L);
 									announce5 = parseBoolean(attrs, "announce5", false);
 									accountDailyLimit = parseInteger(attrs, "accountDailyLimit", 0);
+									accountMontlyLimit = parseInteger(attrs, "accountMontlyLimit", 0);
 									accountBuyLimit = parseInteger(attrs, "accountBuyLimit", 0);
 									
 									final ItemTemplate item = ItemTable.getInstance().getTemplate(productionId);
@@ -244,7 +248,7 @@ public class LimitShopCraftData implements IXmlReader
 								}
 							}
 							
-							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, count, chance, announce, productionId2, count2, chance2, announce2, productionId3, count3, chance3, announce3, productionId4, count4, chance4, announce4, productionId5, count5, announce5, accountDailyLimit, accountBuyLimit));
+							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, count, chance, announce, enchant, productionId2, count2, chance2, announce2, productionId3, count3, chance3, announce3, productionId4, count4, chance4, announce4, productionId5, count5, announce5, accountDailyLimit, accountMontlyLimit, accountBuyLimit));
 						}
 					}
 				}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
index 0bdd0c2ba5..49a8e17546 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
@@ -109,6 +109,7 @@ public class LimitShopData implements IXmlReader
 							ingredientEnchants[4] = 0;
 							int productionId = 0;
 							int accountDailyLimit = 0;
+							int accountMontlyLimit = 0;
 							int accountBuyLimit = 0;
 							for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling())
 							{
@@ -197,6 +198,7 @@ public class LimitShopData implements IXmlReader
 								{
 									productionId = parseInteger(attrs, "id");
 									accountDailyLimit = parseInteger(attrs, "accountDailyLimit", 0);
+									accountMontlyLimit = parseInteger(attrs, "accountMontlyLimit", 0);
 									accountBuyLimit = parseInteger(attrs, "accountBuyLimit", 0);
 									
 									final ItemTemplate item = ItemTable.getInstance().getTemplate(productionId);
@@ -208,7 +210,7 @@ public class LimitShopData implements IXmlReader
 								}
 							}
 							
-							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, 1, 100, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, false, accountDailyLimit, accountBuyLimit));
+							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, 1, 100, false, 0, 0, 0, 0, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, false, accountDailyLimit, accountMontlyLimit, accountBuyLimit));
 						}
 					}
 				}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/PetExtractData.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/PetExtractData.java
new file mode 100644
index 0000000000..e53f5ca3cd
--- /dev/null
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/PetExtractData.java
@@ -0,0 +1,107 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.data.xml;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.gameserver.model.holders.ItemHolder;
+import org.l2jmobius.gameserver.model.holders.PetExtractionHolder;
+
+/**
+ * @author Geremy
+ */
+public class PetExtractData implements IXmlReader
+{
+	private static final Logger LOGGER = Logger.getLogger(PetExtractData.class.getName());
+	// <Pet_Id, <Pet_Level, Cost>>
+	private final Map<Integer, Map<Integer, PetExtractionHolder>> _extractionData = new HashMap<>();
+	
+	protected PetExtractData()
+	{
+		load();
+	}
+	
+	@Override
+	public void load()
+	{
+		_extractionData.clear();
+		parseDatapackFile("data/PetExtractData.xml");
+		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extractionData.size() + " pet extraction data.");
+	}
+	
+	@Override
+	public void parseDocument(Document doc, File f)
+	{
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling())
+		{
+			if ("list".equalsIgnoreCase(n.getNodeName()))
+			{
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
+				{
+					if ("extraction".equalsIgnoreCase(d.getNodeName()))
+					{
+						final NamedNodeMap attrs = d.getAttributes();
+						final int petId = parseInteger(attrs, "petId");
+						final int petLevel = parseInteger(attrs, "petLevel");
+						final long extractExp = parseLong(attrs, "extractExp");
+						final int extractItem = parseInteger(attrs, "extractItem");
+						final int defaultCostId = parseInteger(attrs, "defaultCostId");
+						final int defaultCostCount = parseInteger(attrs, "defaultCostCount");
+						final int extractCostId = parseInteger(attrs, "extractCostId");
+						final int extractCostCount = parseInteger(attrs, "extractCostCount");
+						Map<Integer, PetExtractionHolder> data = _extractionData.get(petId);
+						if (data == null)
+						{
+							data = new HashMap<>();
+							_extractionData.put(petId, data);
+						}
+						data.put(petLevel, new PetExtractionHolder(petId, petLevel, extractExp, extractItem, new ItemHolder(defaultCostId, defaultCostCount), new ItemHolder(extractCostId, extractCostCount)));
+					}
+				}
+			}
+		}
+	}
+	
+	public PetExtractionHolder getExtraction(int petId, int petLevel)
+	{
+		final Map<Integer, PetExtractionHolder> map = _extractionData.get(petId);
+		if (map == null)
+		{
+			LOGGER.warning(getClass().getSimpleName() + ": Missing pet extraction data: [PetId: " + petId + "] [PetLevel: " + petLevel + "]");
+			return null;
+		}
+		return map.get(petLevel);
+	}
+	
+	public static PetExtractData getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final PetExtractData INSTANCE = new PetExtractData();
+	}
+}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index 7da7b6a28d..60e1308527 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -548,9 +548,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 58610a8de5..b608fff1f7 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/enums/CategoryType.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/enums/CategoryType.java
index cdae920634..1143f13786 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/enums/CategoryType.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/enums/CategoryType.java
@@ -36,6 +36,7 @@ public enum CategoryType
 	STRIDER,
 	WOLF_GROUP,
 	WYVERN_GROUP,
+	PET_GROUP,
 	SUBJOB_GROUP_KNIGHT,
 	HUMAN_FALL_CLASS,
 	HUMAN_MALL_CLASS,
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index 08704fdc13..2adc6400a8 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
index 40b4ea1c3d..ae43e8d744 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
@@ -25,4 +25,9 @@ import org.l2jmobius.gameserver.model.actor.Player;
 public interface IPlayerActionHandler
 {
 	void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed);
+	
+	default boolean isPetAction()
+	{
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index 316b882925..e7b09a8590 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -65,7 +65,7 @@ public class DailyTaskManager
 	private static final Set<Integer> RESET_SKILLS = new HashSet<>();
 	static
 	{
-		// No known skills.
+		RESET_SKILLS.add(39199); // Hero's Wondrous Cubic
 	}
 	public static final Set<Integer> RESET_ITEMS = new HashSet<>();
 	static
@@ -131,6 +131,11 @@ public class DailyTaskManager
 			resetHuntPass();
 		}
 		
+		if (calendar.get(Calendar.DAY_OF_MONTH) == 1)
+		{
+			resetMontlyLimitShopData();
+		}
+		
 		// Daily tasks.
 		resetClanBonus();
 		resetClanContributionList();
@@ -688,6 +693,31 @@ public class DailyTaskManager
 		LOGGER.info("LimitShopData has been resetted.");
 	}
 	
+	private void resetMontlyLimitShopData()
+	{
+		for (LimitShopProductHolder holder : LimitShopData.getInstance().getProducts())
+		{
+			// Update data for offline players.
+			try (Connection con = DatabaseFactory.getConnection();
+				PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?"))
+			{
+				ps.setString(1, AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + holder.getProductionId());
+				ps.executeUpdate();
+			}
+			catch (Exception e)
+			{
+				LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset LimitShopData: " + e);
+			}
+			// Update data for online players.
+			for (Player player : World.getInstance().getPlayers())
+			{
+				player.getAccountVariables().remove(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + holder.getProductionId());
+				player.getAccountVariables().storeMe();
+			}
+		}
+		LOGGER.info("LimitShopData has been resetted.");
+	}
+	
 	private void resetHuntPass()
 	{
 		// Update data for offline players.
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
index 96a825d4bc..c20c4d800a 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
@@ -100,6 +100,7 @@ public class IdManager
 				cleanCount += statement.executeUpdate("DELETE FROM character_shortcuts WHERE character_shortcuts.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_skills WHERE character_skills.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_skills_save WHERE character_skills_save.charId NOT IN (SELECT charId FROM characters);");
+				cleanCount += statement.executeUpdate("DELETE FROM character_spirits WHERE character_spirits.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_subclasses WHERE character_subclasses.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_instance_time WHERE character_instance_time.charId NOT IN (SELECT charId FROM characters);");
 				
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java
index bdb397e3e1..ea940b280d 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java
@@ -250,7 +250,7 @@ public class PurgeRankingManager
 			{
 			}
 		}
-		return top5.entrySet().stream().sorted(Map.Entry.<String, Integer> comparingByValue().reversed()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e2, LinkedHashMap::new));
+		return top5.entrySet().stream().sorted(Entry.<String, Integer> comparingByValue().reversed()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e2, LinkedHashMap::new));
 	}
 	
 	public SimpleEntry<Integer, Integer> getPlayerRating(int category, int charId)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 030cf75135..8e34eea3d6 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/ShortCuts.java
index 0c2f5d59de..0b7ad4e019 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -215,7 +215,7 @@ public class ShortCuts implements IRestorable
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
 				newsc.setAutoUse(sc.isAutoUse());
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Creature.java
index fbd73b2a2c..033090198a 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1318,7 +1318,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -2846,7 +2846,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2859,189 +2859,151 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
-								case ELEMENTAL_SPIRIT_EARTH_ATTACK:
-								case ELEMENTAL_SPIRIT_EARTH_DEFENSE:
-								case ELEMENTAL_SPIRIT_FIRE_ATTACK:
-								case ELEMENTAL_SPIRIT_FIRE_DEFENSE:
-								case ELEMENTAL_SPIRIT_WATER_ATTACK:
-								case ELEMENTAL_SPIRIT_WATER_DEFENSE:
-								case ELEMENTAL_SPIRIT_WIND_ATTACK:
-								case ELEMENTAL_SPIRIT_WIND_DEFENSE:
-								{
-									info.addComponentType(UserInfoType.ATT_SPIRITS);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
+							}
+							case ELEMENTAL_SPIRIT_EARTH_ATTACK:
+							case ELEMENTAL_SPIRIT_EARTH_DEFENSE:
+							case ELEMENTAL_SPIRIT_FIRE_ATTACK:
+							case ELEMENTAL_SPIRIT_FIRE_DEFENSE:
+							case ELEMENTAL_SPIRIT_WATER_ATTACK:
+							case ELEMENTAL_SPIRIT_WATER_DEFENSE:
+							case ELEMENTAL_SPIRIT_WIND_ATTACK:
+							case ELEMENTAL_SPIRIT_WIND_DEFENSE:
+							{
+								info.addComponentType(UserInfoType.ATT_SPIRITS);
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						sendPacket(info);
+					}
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Player.java
index f895785975..8635fdd25e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -393,7 +393,7 @@ import org.l2jmobius.gameserver.network.serverpackets.elementalspirits.Elemental
 import org.l2jmobius.gameserver.network.serverpackets.friend.FriendStatus;
 import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimeRestrictFieldDieLimitTime;
 import org.l2jmobius.gameserver.network.serverpackets.limitshop.ExBloodyCoinCount;
-import org.l2jmobius.gameserver.network.serverpackets.pet.PetInfo;
+import org.l2jmobius.gameserver.network.serverpackets.pet.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.surveillance.ExUserWatcherTargetStatus;
 import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipInfo;
 import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
@@ -4761,7 +4761,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -7141,7 +7141,11 @@ public class Player extends Playable
 			player.setOnlineStatus(true, false);
 			
 			PlayerAutoSaveTaskManager.getInstance().add(player);
-			player.getAchievementBox().restore();
+			
+			if (Config.ENABLE_ACHIEVEMENT_BOX)
+			{
+				player.getAchievementBox().restore();
+			}
 		}
 		catch (Exception e)
 		{
@@ -8784,9 +8788,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
@@ -11054,7 +11062,7 @@ public class Player extends Playable
 			_pet.setFollowStatus(true);
 			_pet.setInstance(getInstanceWorld());
 			_pet.updateAndBroadcastStatus(0);
-			sendPacket(new PetInfo(_pet, 0));
+			sendPacket(new PetSummonInfo(_pet, 0));
 		}
 		
 		getServitors().values().forEach(s ->
@@ -11065,7 +11073,7 @@ public class Player extends Playable
 			s.setFollowStatus(true);
 			s.setInstance(getInstanceWorld());
 			s.updateAndBroadcastStatus(0);
-			sendPacket(new PetInfo(s, 0));
+			sendPacket(new PetSummonInfo(s, 0));
 		});
 		
 		// Show movie if available.
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 0f727474f4..068dbe6a69 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -74,10 +74,10 @@ import org.l2jmobius.gameserver.network.serverpackets.TeleportToLocation;
 import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetSkillList;
 import org.l2jmobius.gameserver.network.serverpackets.pet.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.pet.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.pet.PetInventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.pet.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.pet.PetSummonInfo;
 import org.l2jmobius.gameserver.taskmanager.DecayTaskManager;
 
 public abstract class Summon extends Playable
@@ -134,7 +134,7 @@ public abstract class Summon extends Playable
 		{
 			if (isPet())
 			{
-				sendPacket(new PetInfo(this, 1));
+				sendPacket(new PetSummonInfo(this, 1));
 				sendPacket(new ExPetSkillList(true, (Pet) this));
 				if (getInventory() != null)
 				{
@@ -228,7 +228,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -392,7 +392,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		super.onDecay();
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -879,7 +879,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -900,7 +900,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -925,7 +932,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -933,7 +940,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -979,7 +993,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
@@ -1166,7 +1180,7 @@ public abstract class Summon extends Playable
 			{
 				owner.sendPacket(new PetItemList(getInventory().getItems()));
 			}
-			owner.sendPacket(new PetInfo(this, 1));
+			owner.sendPacket(new PetSummonInfo(this, 1));
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 9c506b6c6b..d737078f98 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index c8f288a792..66f84ae5fa 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index f4cc079630..f7e71e5136 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -873,15 +872,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -892,8 +889,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -902,7 +903,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -975,33 +976,6 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
@@ -1011,9 +985,17 @@ public class CreatureStat
 		// Notify recalculation to child classes.
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 9adda5dc3f..b728eedc21 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 6faefa8b48..fecc972ecc 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 0417bcbc41..18e9d5b27e 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
index 97397f753f..9d5faa0c61 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
@@ -57,7 +57,10 @@ public enum CommissionItemType
 	NECKLACE(31),
 	BELT(32),
 	BRACELET(33),
+	AGATHION(62),
 	HAIR_ACCESSORY(34),
+	BROOCH_JEWEL(63),
+	ARTIFACT(64),
 	// Supplies
 	POTION(35),
 	SCROLL_ENCHANT_WEAPON(36),
@@ -65,6 +68,7 @@ public enum CommissionItemType
 	SCROLL_OTHER(38),
 	SOULSHOT(39),
 	SPIRITSHOT(40),
+	OTHER_SUPPLIES(41),
 	// Pet Goods
 	PET_EQUIPMENT(42),
 	PET_SUPPLIES(43),
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
index eb10918430..3a194d1660 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
@@ -47,8 +47,8 @@ public enum CommissionTreeType
 		CommissionItemType.SPEAR,
 		CommissionItemType.OTHER_WEAPON),
 	ARMOR(1, CommissionItemType.HELMET, CommissionItemType.ARMOR_TOP, CommissionItemType.ARMOR_PANTS, CommissionItemType.FULL_BODY, CommissionItemType.GLOVES, CommissionItemType.FEET, CommissionItemType.SHIELD, CommissionItemType.SIGIL, CommissionItemType.UNDERWEAR, CommissionItemType.CLOAK),
-	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.HAIR_ACCESSORY),
-	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT),
+	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.AGATHION, CommissionItemType.HAIR_ACCESSORY, CommissionItemType.BROOCH_JEWEL, CommissionItemType.ARTIFACT),
+	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT, CommissionItemType.OTHER_SUPPLIES),
 	PET_GOODS(4, CommissionItemType.PET_EQUIPMENT, CommissionItemType.PET_SUPPLIES),
 	MISC(
 		5,
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index a74b2b512b..88b2588f04 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2216,6 +2216,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java
index f72c9ddc4d..ac357b3fa1 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java
@@ -32,6 +32,7 @@ public class LimitShopProductHolder
 	private final long _count;
 	private final float _chance;
 	private final boolean _announce;
+	private final int _enchant;
 	private final int _productionId2;
 	private final long _count2;
 	private final float _chance2;
@@ -48,9 +49,10 @@ public class LimitShopProductHolder
 	private final long _count5;
 	private final boolean _announce5;
 	private final int _accountDailyLimit;
+	private final int _accountMontlyLimit;
 	private final int _accountBuyLimit;
 	
-	public LimitShopProductHolder(int id, int category, int minLevel, int maxLevel, int[] ingredientIds, long[] ingredientQuantities, int[] ingredientEnchants, int productionId, long count, float chance, boolean announce, int productionId2, long count2, float chance2, boolean announce2, int productionId3, long count3, float chance3, boolean announce3, int productionId4, long count4, float chance4, boolean announce4, int productionId5, long count5, boolean announce5, int accountDailyLimit, int accountBuyLimit)
+	public LimitShopProductHolder(int id, int category, int minLevel, int maxLevel, int[] ingredientIds, long[] ingredientQuantities, int[] ingredientEnchants, int productionId, long count, float chance, boolean announce, int enchant, int productionId2, long count2, float chance2, boolean announce2, int productionId3, long count3, float chance3, boolean announce3, int productionId4, long count4, float chance4, boolean announce4, int productionId5, long count5, boolean announce5, int accountDailyLimit, int accountMontlyLimit, int accountBuyLimit)
 	{
 		_id = id;
 		_category = category;
@@ -63,6 +65,7 @@ public class LimitShopProductHolder
 		_count = count;
 		_chance = chance;
 		_announce = announce;
+		_enchant = enchant;
 		_productionId2 = productionId2;
 		_count2 = count2;
 		_chance2 = chance2;
@@ -79,6 +82,7 @@ public class LimitShopProductHolder
 		_count5 = count5;
 		_announce5 = announce5;
 		_accountDailyLimit = accountDailyLimit;
+		_accountMontlyLimit = accountMontlyLimit;
 		_accountBuyLimit = accountBuyLimit;
 	}
 	
@@ -137,6 +141,11 @@ public class LimitShopProductHolder
 		return _announce;
 	}
 	
+	public int getEnchant()
+	{
+		return _enchant;
+	}
+	
 	public int getProductionId2()
 	{
 		return _productionId2;
@@ -217,6 +226,11 @@ public class LimitShopProductHolder
 		return _accountDailyLimit;
 	}
 	
+	public int getAccountMontlyLimit()
+	{
+		return _accountMontlyLimit;
+	}
+	
 	public int getAccountBuyLimit()
 	{
 		return _accountBuyLimit;
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/holders/PetExtractionHolder.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/holders/PetExtractionHolder.java
new file mode 100644
index 0000000000..bc54fd0c63
--- /dev/null
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/holders/PetExtractionHolder.java
@@ -0,0 +1,70 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.model.holders;
+
+/**
+ * @author Geremy
+ */
+public class PetExtractionHolder
+{
+	private final int _petId;
+	private final int _petLevel;
+	private final long _extractExp;
+	private final int _extractItem;
+	private final ItemHolder _defaultCost;
+	private final ItemHolder _extractCost;
+	
+	public PetExtractionHolder(int petId, int petLevel, long extractExp, int extractItem, ItemHolder defaultCost, ItemHolder extractCost)
+	{
+		_petId = petId;
+		_petLevel = petLevel;
+		_extractExp = extractExp;
+		_extractItem = extractItem;
+		_defaultCost = defaultCost;
+		_extractCost = extractCost;
+	}
+	
+	public int getPetId()
+	{
+		return _petId;
+	}
+	
+	public int getPetLevel()
+	{
+		return _petLevel;
+	}
+	
+	public long getExtractExp()
+	{
+		return _extractExp;
+	}
+	
+	public int getExtractItem()
+	{
+		return _extractItem;
+	}
+	
+	public ItemHolder getDefaultCost()
+	{
+		return _defaultCost;
+	}
+	
+	public ItemHolder getExtractCost()
+	{
+		return _extractCost;
+	}
+}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index 718fa3dfed..75a80ae15a 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -39,6 +39,7 @@ import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AgathionData;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -52,6 +53,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -72,12 +74,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPi
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
 import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -92,6 +96,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1641,7 +1646,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2575,6 +2582,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2604,6 +2616,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd(boolean announce)
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2653,6 +2667,124 @@ public class Item extends WorldObject
 		vars.storeMe();
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index cdf42e7a80..2399b7fc05 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -898,7 +898,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(playable, item, Item::getVisualId))
 				{
 					update = true;
@@ -1050,7 +1051,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(playable, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/siege/FortSiege.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/siege/FortSiege.java
index c128c12ecf..c16afcf700 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/siege/FortSiege.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/siege/FortSiege.java
@@ -268,7 +268,7 @@ public class FortSiege extends ListenersContainer implements Siegable
 					}
 					
 					ThreadPool.schedule(new ScheduleStartSiegeTask(nextTask), _initialDelayInMilliseconds - (nextTask * 1000)); // Prepare task for @nextTask minutes left.
-					LOGGER.info("scheduling " + nextTask + " in " + ((_initialDelayInMilliseconds / 1000) - nextTask) + " sec");
+					// LOGGER.info("scheduling " + nextTask + " in " + ((_initialDelayInMilliseconds / 1000) - nextTask) + " sec");
 				}
 				else if ((_time == 3600) && (_fortInst.getResidenceId() != FortManager.ORC_FORTRESS)) // 1hr remains
 				
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 4efe3e480c..3b05f1119d 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -691,7 +691,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -714,7 +714,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -749,7 +749,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 69f707fd5d..3db59fbfcd 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -97,6 +97,7 @@ public enum Stat
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
 	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
+	IGNORE_REDUCE_DAMAGE("ignoreReduceDamage"),
 	
 	// ELEMENTAL SPIRITS
 	ELEMENTAL_SPIRIT_FIRE_ATTACK("elementalSpiritFireAttack"),
@@ -150,7 +151,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	MAGIC_CRITICAL_RATE_BY_CRITICAL_RATE("mCritRateByRCrit", Stat::defaultValue, MathUtil::add, MathUtil::mul, 0, 0),
 	DEFENCE_CRITICAL_RATE("defCritRate"),
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index 647873dac0..6cc98e9690 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -44,7 +44,18 @@ public class MCritRateFinalizer implements IStatFunction
 		
 		final double physicalBonus = (creature.getStat().getMul(Stat.MAGIC_CRITICAL_RATE_BY_CRITICAL_RATE, 1) - 1) * creature.getStat().getCriticalHit();
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, (baseValue * witBonus * 10) + physicalBonus), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, (baseValue * witBonus * 10) + physicalBonus), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index c305987ba6..c29c9ba398 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -93,6 +93,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 8ab5a6ea58..c55b35b2ee 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index c5257ff589..1aff35bfd5 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java
index fc8fc5e8e6..cb7a29e736 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java
@@ -46,6 +46,7 @@ public class AccountVariables extends AbstractVariables
 	public static final String PRIME_SHOP_PRODUCT_DAILY_COUNT = "PSPDailyCount";
 	public static final String LCOIN_SHOP_PRODUCT_COUNT = "LCSCount";
 	public static final String LCOIN_SHOP_PRODUCT_DAILY_COUNT = "LCSDailyCount";
+	public static final String LCOIN_SHOP_PRODUCT_MONTLY_COUNT = "LCSMontlyCount";
 	public static final String VIP_POINTS = "VipPoints";
 	public static final String VIP_TIER = "VipTier";
 	public static final String VIP_EXPIRATION = "VipExpiration";
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
index ae0b7f5853..736f4f70d6 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
@@ -36,6 +36,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureZoneEnter;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureZoneExit;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.interfaces.ILocational;
+import org.l2jmobius.gameserver.network.SystemMessageId;
+import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 
 /**
@@ -215,6 +217,10 @@ public abstract class ZoneType extends ListenersContainer
 		// Check level
 		if ((creature.getLevel() < _minLevel) || (creature.getLevel() > _maxLevel))
 		{
+			if (creature.isPlayer())
+			{
+				creature.getActingPlayer().sendPacket(new ExShowScreenMessage(SystemMessageId.YOU_CANNOT_ENTER_AS_YOUR_LEVEL_DOESN_T_MEED_THE_REQUIREMENTS, ExShowScreenMessage.TOP_CENTER, 10000));
+			}
 			return false;
 		}
 		
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 535aabfa2d..1b32a7b69f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.zone.type;
 
+import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.zone.ZoneType;
@@ -32,6 +33,7 @@ public class TeleportZone extends ZoneType
 	public TeleportZone(int id)
 	{
 		super(id);
+		setTargetType(InstanceType.Player); // Default only player.
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/ExClientPackets.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/ExClientPackets.java
index 0e1343d7c3..1790841606 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/ExClientPackets.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/ExClientPackets.java
@@ -144,6 +144,7 @@ import org.l2jmobius.gameserver.network.clientpackets.newhenna.RequestNewHennaUn
 import org.l2jmobius.gameserver.network.clientpackets.pet.ExEvolvePet;
 import org.l2jmobius.gameserver.network.clientpackets.pet.ExPetEquipItem;
 import org.l2jmobius.gameserver.network.clientpackets.pet.ExPetUnequipItem;
+import org.l2jmobius.gameserver.network.clientpackets.pet.ExTryPetExtractSystem;
 import org.l2jmobius.gameserver.network.clientpackets.pet.RequestExAcquirePetSkill;
 import org.l2jmobius.gameserver.network.clientpackets.pledgeV3.RequestExPledgeEnemyDelete;
 import org.l2jmobius.gameserver.network.clientpackets.pledgeV3.RequestExPledgeEnemyInfoList;
@@ -705,7 +706,7 @@ public enum ExClientPackets
 	EX_PLEDGE_ENEMY_INFO_LIST(0x1C9, RequestExPledgeEnemyInfoList::new, ConnectionState.IN_GAME),
 	EX_PLEDGE_ENEMY_REGISTER(0x1CA, RequestExPledgeEnemyRegister::new, ConnectionState.IN_GAME),
 	EX_PLEDGE_ENEMY_DELETE(0x1CB, RequestExPledgeEnemyDelete::new, ConnectionState.IN_GAME),
-	EX_TRY_PET_EXTRACT_SYSTEM(0x1CC, null, ConnectionState.IN_GAME),
+	EX_TRY_PET_EXTRACT_SYSTEM(0x1CC, ExTryPetExtractSystem::new, ConnectionState.IN_GAME),
 	EX_PLEDGE_V3_SET_ANNOUNCE(0x1CD, RequestExPledgeV3SetAnnounce::new, ConnectionState.IN_GAME),
 	// 306
 	EX_RANKING_FESTIVAL_OPEN(0x1CE, null, ConnectionState.IN_GAME),
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index ba2c4213f5..a3b98e8c66 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -108,6 +108,11 @@ public class RequestAcquireSkill implements ClientPacket
 		
 		final int skillId = player.getReplacementSkill(_id);
 		final Skill existingSkill = player.getKnownSkill(skillId); // Mobius: Keep existing sublevel.
+		if ((_level > 65536000) && (existingSkill != null) && (existingSkill.getSubLevel() > 1000))
+		{
+			_level -= existingSkill.getSubLevel() * 65536;
+		}
+		
 		final Skill skill = SkillData.getInstance().getSkill(skillId, _level, existingSkill == null ? 0 : existingSkill.getSubLevel());
 		if (skill == null)
 		{
@@ -644,7 +649,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList();
 		player.updateShortCuts(_id, skill.getLevel(), skill.getSubLevel());
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendSkillList(skill.getId());
 		showSkillList(trainer, player);
 		
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 877179d829..ee724ce9ed 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 14c84055da..63f5c4a527 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -87,7 +87,7 @@ public class RequestShortCutReg implements ClientPacket
 		else if (_page == 23)
 		{
 			final Item item = player.getInventory().getItemByObjectId(_id);
-			if ((item != null) && !item.isPotion())
+			if (((item != null) && !item.isPotion()) || (_type == ShortcutType.ACTION))
 			{
 				return;
 			}
@@ -148,7 +148,7 @@ public class RequestShortCutReg implements ClientPacket
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		sc.setAutoUse(_active);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 		player.sendPacket(new ExActivateAutoShortcut(sc, _active));
 		
 		// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index e65beefde7..6e18092aa1 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -226,7 +226,7 @@ public class UseItem implements ClientPacket
 			}
 			
 			// Prevent Death Knight players to equip other weapons.
-			if (item.isWeapon() && (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, player.getClassId().getId())) && ((item.getWeaponItem().getItemType() != WeaponType.SWORD) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND)))
+			if (item.isWeapon() && CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, player.getClassId().getId()) && (item.getWeaponItem().getItemType() != WeaponType.FISHINGROD) && ((item.getWeaponItem().getItemType() != WeaponType.SWORD) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND)))
 			{
 				player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
 				return;
@@ -247,7 +247,7 @@ public class UseItem implements ClientPacket
 			}
 			
 			// Prevent Sylph players to equip other weapons.
-			if (item.isWeapon() && (player.getRace() == Race.SYLPH) && (item.getWeaponItem().getItemType() != WeaponType.PISTOLS))
+			if (item.isWeapon() && (player.getRace() == Race.SYLPH) && (item.getWeaponItem().getItemType() != WeaponType.FISHINGROD) && (item.getWeaponItem().getItemType() != WeaponType.PISTOLS))
 			{
 				player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
 				return;
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 20651eb32a..7309463ac0 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
index bb93eb975d..ddbe4f35f4 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
@@ -103,10 +103,6 @@ public class RequestEnchantItem implements ClientPacket
 			player.removeRequest(request.getClass());
 			return;
 		}
-		if (item.getEnchantLevel() != request.getEnchantLevel())
-		{
-			item.setEnchantLevel(request.getEnchantLevel());
-		}
 		
 		// Template for scroll.
 		final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java
index 6bab3000be..7881bcedc9 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java
@@ -112,26 +112,9 @@ public class RequestHuntPassReward implements ClientPacket
 			return;
 		}
 		
-		// Normal reward.
-		if (!huntPass.isPremium() && (rewardIndex <= HuntPassData.getInstance().getRewardsCount()))
-		{
-			rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
-			huntPass.setRewardStep(rewardIndex + 1);
-		}
-		// Premium reward.
-		else if (huntPass.isPremium())
-		{
-			if ((rewardIndex < HuntPassData.getInstance().getRewardsCount()) && (rewardIndex <= premiumRewardIndex))
-			{
-				rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
-				huntPass.setRewardStep(rewardIndex + 1);
-			}
-			else if ((premiumRewardIndex < rewardIndex) && (premiumRewardIndex <= HuntPassData.getInstance().getPremiumRewardsCount()))
-			{
-				rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex));
-				huntPass.setPremiumRewardStep(premiumRewardIndex + 1);
-			}
-		}
+		normalReward(player);
+		premiumReward(player);
+		huntPass.setRewardStep(rewardIndex + 1);
 		huntPass.setRewardAlert(false);
 		
 		player.sendPacket(new HuntPassInfo(player, _huntPassType));
@@ -157,4 +140,39 @@ public class RequestHuntPassReward implements ClientPacket
 			player.addItem("HuntPassReward", reward, player, true);
 		}
 	}
+	
+	private void premiumReward(Player player)
+	{
+		final HuntPass huntPass = player.getHuntPass();
+		final int premiumRewardIndex = huntPass.getPremiumRewardStep();
+		if (premiumRewardIndex >= HuntPassData.getInstance().getPremiumRewardsCount())
+		{
+			return;
+		}
+		
+		if (!huntPass.isPremium())
+		{
+			return;
+		}
+		
+		rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex));
+		huntPass.setPremiumRewardStep(premiumRewardIndex + 1);
+	}
+	
+	private void normalReward(Player player)
+	{
+		final HuntPass huntPass = player.getHuntPass();
+		final int rewardIndex = huntPass.getRewardStep();
+		if (rewardIndex >= HuntPassData.getInstance().getRewardsCount())
+		{
+			return;
+		}
+		
+		if (huntPass.isPremium() && ((huntPass.getPremiumRewardStep() < rewardIndex) || (huntPass.getPremiumRewardStep() >= HuntPassData.getInstance().getPremiumRewardsCount())))
+		{
+			return;
+		}
+		
+		rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
+	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassRewardAll.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassRewardAll.java
index d53d94114c..6547861f11 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassRewardAll.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassRewardAll.java
@@ -115,26 +115,9 @@ public class RequestHuntPassRewardAll implements ClientPacket
 				break REWARD_LOOP;
 			}
 			
-			// Normal reward.
-			if (!huntPass.isPremium() && (rewardIndex <= HuntPassData.getInstance().getRewardsCount()))
-			{
-				rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
-				huntPass.setRewardStep(rewardIndex + 1);
-			}
-			// Premium reward.
-			else if (huntPass.isPremium())
-			{
-				if ((rewardIndex < HuntPassData.getInstance().getRewardsCount()) && (rewardIndex <= premiumRewardIndex))
-				{
-					rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
-					huntPass.setRewardStep(rewardIndex + 1);
-				}
-				else if ((premiumRewardIndex < rewardIndex) && (premiumRewardIndex <= HuntPassData.getInstance().getPremiumRewardsCount()))
-				{
-					rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex));
-					huntPass.setPremiumRewardStep(premiumRewardIndex + 1);
-				}
-			}
+			normalReward(player);
+			premiumReward(player);
+			huntPass.setRewardStep(rewardIndex + 1);
 		}
 		
 		if (!inventoryLimitReached)
@@ -165,4 +148,39 @@ public class RequestHuntPassRewardAll implements ClientPacket
 			player.addItem("HuntPassReward", reward, player, true);
 		}
 	}
+	
+	private void premiumReward(Player player)
+	{
+		final HuntPass huntPass = player.getHuntPass();
+		final int premiumRewardIndex = huntPass.getPremiumRewardStep();
+		if (premiumRewardIndex >= HuntPassData.getInstance().getPremiumRewardsCount())
+		{
+			return;
+		}
+		
+		if (!huntPass.isPremium())
+		{
+			return;
+		}
+		
+		rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex));
+		huntPass.setPremiumRewardStep(premiumRewardIndex + 1);
+	}
+	
+	private void normalReward(Player player)
+	{
+		final HuntPass huntPass = player.getHuntPass();
+		final int rewardIndex = huntPass.getRewardStep();
+		if (rewardIndex >= HuntPassData.getInstance().getRewardsCount())
+		{
+			return;
+		}
+		
+		if (huntPass.isPremium() && ((huntPass.getPremiumRewardStep() < rewardIndex) || (huntPass.getPremiumRewardStep() >= HuntPassData.getInstance().getPremiumRewardsCount())))
+		{
+			return;
+		}
+		
+		rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
+	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
index f58d33cb4f..d619ffeb61 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
@@ -154,6 +154,25 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 				return;
 			}
 		}
+		else if (_product.getAccountMontlyLimit() > 0)
+		{
+			final long amount = _product.getAccountMontlyLimit() * _amount;
+			if (amount < 1)
+			{
+				player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+				player.removeRequest(PrimeShopRequest.class);
+				player.sendPacket(new ExPurchaseLimitShopItemResult(false, _shopIndex, _productId, 0, Collections.emptyList()));
+				return;
+			}
+			if (player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + _product.getProductionId(), 0) >= amount)
+			{
+				player.sendMessage("You have reached your montly limit.");
+				player.removeRequest(PrimeShopRequest.class);
+				player.sendPacket(new ExPurchaseLimitShopItemResult(false, _shopIndex, _productId, 0, Collections.emptyList()));
+				return;
+			}
+			
+		}
 		else if (_product.getAccountBuyLimit() > 0) // Count limit.
 		{
 			final long amount = _product.getAccountBuyLimit() * _amount;
@@ -175,7 +194,7 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 		}
 		
 		// Check existing items.
-		final int remainingInfo = Math.max(0, Math.max(_product.getAccountBuyLimit(), _product.getAccountDailyLimit()));
+		final int remainingInfo = Math.max(0, Math.max(_product.getAccountBuyLimit(), Math.max(_product.getAccountDailyLimit(), _product.getAccountMontlyLimit())));
 		for (int i = 0; i < _product.getIngredientIds().length; i++)
 		{
 			if (_product.getIngredientIds()[i] == 0)
@@ -326,7 +345,7 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 				if (Rnd.get(100) < _product.getChance())
 				{
 					rewards.computeIfAbsent(0, k -> new LimitShopRandomCraftReward(_product.getProductionId(), 0, 0)).getCount().addAndGet((int) _product.getCount());
-					final Item item = player.addItem("LCoinShop", _product.getProductionId(), _product.getCount(), player, true);
+					final Item item = player.addItem("LCoinShop", _product.getProductionId(), _product.getCount(), _product.getEnchant(), player, true);
 					if (_product.isAnnounce())
 					{
 						Broadcast.toAllOnlinePlayers(new ExItemAnnounce(player, item, ExItemAnnounce.SPECIAL_CREATION));
@@ -373,7 +392,7 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 		else if (Rnd.get(100) < _product.getChance())
 		{
 			rewards.put(0, new LimitShopRandomCraftReward(_product.getProductionId(), (int) (_product.getCount() * _amount), 0));
-			final Item item = player.addItem("LCoinShop", _product.getProductionId(), _product.getCount() * _amount, player, true);
+			final Item item = player.addItem("LCoinShop", _product.getProductionId(), _product.getCount() * _amount, _product.getEnchant(), player, true);
 			if (_product.isAnnounce())
 			{
 				Broadcast.toAllOnlinePlayers(new ExItemAnnounce(player, item, ExItemAnnounce.SPECIAL_CREATION));
@@ -385,6 +404,10 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 		{
 			player.getAccountVariables().set(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + _product.getProductionId(), player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + _product.getProductionId(), 0) + _amount);
 		}
+		if (_product.getAccountMontlyLimit() > 0)
+		{
+			player.getAccountVariables().set(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + _product.getProductionId(), player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + _product.getProductionId(), 0) + _amount);
+		}
 		else if (_product.getAccountBuyLimit() > 0)
 		{
 			player.getAccountVariables().set(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + _product.getProductionId(), player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + _product.getProductionId(), 0) + _amount);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
index 9db3b480e4..1c14350e13 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
@@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetSkillList;
-import org.l2jmobius.gameserver.network.serverpackets.pet.PetInfo;
+import org.l2jmobius.gameserver.network.serverpackets.pet.PetSummonInfo;
 
 /**
  * @author Berezkin Nikolay
@@ -230,7 +230,7 @@ public class ExPetEquipItem implements ClientPacket
 	private void sendInfos(Pet pet, Player player)
 	{
 		pet.getStat().recalculateStats(true);
-		player.sendPacket(new PetInfo(pet, 1));
+		player.sendPacket(new PetSummonInfo(pet, 1));
 		player.sendPacket(new ExPetSkillList(false, pet));
 	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
index 921c0695d5..26ac16dc19 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
@@ -17,7 +17,7 @@ import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetSkillList;
-import org.l2jmobius.gameserver.network.serverpackets.pet.PetInfo;
+import org.l2jmobius.gameserver.network.serverpackets.pet.PetSummonInfo;
 
 /**
  * @author Berezkin Nikolay
@@ -183,7 +183,7 @@ public class ExPetUnequipItem implements ClientPacket
 	private void sendInfos(Pet pet, Player player)
 	{
 		pet.getStat().recalculateStats(true);
-		player.sendPacket(new PetInfo(pet, 1));
+		player.sendPacket(new PetSummonInfo(pet, 1));
 		player.sendPacket(new ExPetSkillList(false, pet));
 	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExTryPetExtractSystem.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExTryPetExtractSystem.java
new file mode 100644
index 0000000000..6bb1753d14
--- /dev/null
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExTryPetExtractSystem.java
@@ -0,0 +1,115 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.clientpackets.pet;
+
+import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.gameserver.data.xml.NpcData;
+import org.l2jmobius.gameserver.data.xml.PetDataTable;
+import org.l2jmobius.gameserver.data.xml.PetExtractData;
+import org.l2jmobius.gameserver.model.PetData;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
+import org.l2jmobius.gameserver.model.holders.PetExtractionHolder;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.PetInventory;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
+import org.l2jmobius.gameserver.network.GameClient;
+import org.l2jmobius.gameserver.network.SystemMessageId;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
+import org.l2jmobius.gameserver.network.serverpackets.pet.ResultPetExtractSystem;
+
+/**
+ * @author Geremy
+ */
+public class ExTryPetExtractSystem implements ClientPacket
+{
+	private int _itemObjId;
+	
+	@Override
+	public void read(ReadablePacket packet)
+	{
+		_itemObjId = packet.readInt();
+	}
+	
+	@Override
+	public void run(GameClient client)
+	{
+		final Player player = client.getPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item petItem = player.getInventory().getItemByObjectId(_itemObjId);
+		if ((petItem == null) || ((player.getPet() != null) && (player.getPet().getControlItem() == petItem)))
+		{
+			player.sendPacket(new ResultPetExtractSystem(false));
+			return;
+		}
+		
+		final PetData petData = PetDataTable.getInstance().getPetDataByItemId(petItem.getId());
+		final NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(petData.getNpcId());
+		final Pet pet = new Pet(npcTemplate, player, petItem);
+		final PetInventory petInventory = pet.getInventory();
+		final PlayerInventory playerInventory = player.getInventory();
+		if ((petInventory == null) || (playerInventory == null))
+		{
+			player.sendPacket(new ResultPetExtractSystem(false));
+			return;
+		}
+		
+		if (!playerInventory.validateWeight(petInventory.getTotalWeight()) || !playerInventory.validateCapacity(petInventory.getSize()))
+		{
+			player.sendPacket(SystemMessageId.THERE_ARE_ITEMS_IN_THE_PET_S_INVENTORY_TAKE_THEM_OUT_FIRST);
+			player.sendPacket(new ResultPetExtractSystem(false));
+			return;
+		}
+		
+		petInventory.transferItemsToOwner();
+		
+		final Pet petInfo = Pet.restore(petItem, NpcData.getInstance().getTemplate(petData.getNpcId()), player);
+		final int petId = PetDataTable.getInstance().getPetDataByItemId(petItem.getId()).getType();
+		final int petLevel = petInfo.getLevel();
+		final PetExtractionHolder holder = PetExtractData.getInstance().getExtraction(petId, petLevel);
+		if (holder != null)
+		{
+			final int extractItemId = holder.getExtractItem();
+			final int extractItemCount = (int) (petInfo.getStat().getExp() / holder.getExtractExp());
+			final int extractCostId = holder.getExtractCost().getId();
+			final long extractCostCount = holder.getExtractCost().getCount() * extractItemCount;
+			final int defaultCostId = holder.getDefaultCost().getId();
+			final long defaultCostCount = holder.getDefaultCost().getCount();
+			if ((player.getInventory().getInventoryItemCount(extractCostId, -1) >= extractCostCount) && (player.getInventory().getInventoryItemCount(defaultCostId, -1) >= defaultCostCount))
+			{
+				if (player.destroyItemByItemId("Pet Extraction", extractCostId, extractCostCount, player, true) && player.destroyItemByItemId("Pet Extraction", defaultCostId, defaultCostCount, player, true) && player.destroyItem("Pet Extraction", petItem, player, true))
+				{
+					player.addItem("Pet Extraction", extractItemId, extractItemCount, player, true);
+					player.sendPacket(new ResultPetExtractSystem(true));
+				}
+			}
+			else
+			{
+				player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT);
+				player.sendPacket(new ResultPetExtractSystem(false));
+			}
+			return;
+		}
+		
+		player.sendPacket(new ResultPetExtractSystem(false));
+	}
+}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java
index 2cf1ef176b..0266b0eff5 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java
@@ -46,7 +46,7 @@ public class ExRequestRandomCraftExtract implements ClientPacket
 		{
 			final int objId = packet.readInt();
 			final long count = packet.readLong();
-			if (count > 1)
+			if (count > 0)
 			{
 				_items.put(objId, count);
 			}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGacha.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGacha.java
index 39ee21e7dd..64b279d2dc 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGacha.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGacha.java
@@ -48,6 +48,11 @@ public class RequestSubjugationGacha implements ClientPacket
 	@Override
 	public void run(GameClient client)
 	{
+		if ((_amount < 1) || ((_amount * 20000L) < 1))
+		{
+			return;
+		}
+		
 		final Player player = client.getPlayer();
 		if (player == null)
 		{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index a8f4142ab3..07ed7641a9 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,132 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 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, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 92, 93,
-		94, 96, 97, 98,
-		99, 100,
-		1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		1168, 1169, 1170, 1171,
-		1172, 1173,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015,
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
index a49f41ca7f..2e12fcbc85 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
@@ -167,7 +167,7 @@ public class FakePlayerInfo extends ServerPacket
 		writeByte(_npc.getTeam().getId());
 		writeInt(_clan != null ? _clan.getCrestLargeId() : 0);
 		writeByte(_fpcHolder.getNobleLevel());
-		writeByte(_fpcHolder.isHero());
+		writeByte(_fpcHolder.isHero() ? 2 : 0); // 152 - Value for enabled changed to 2
 		writeByte(_fpcHolder.isFishing());
 		writeInt(_fpcHolder.getBaitLocationX());
 		writeInt(_fpcHolder.getBaitLocationY());
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
index 936b64a402..4a9ed2717f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
@@ -118,7 +118,7 @@ public class MultiSellList extends AbstractItemPacket
 				}
 				writeLong(_list.getProductCount(product));
 				writeShort(product.getEnchantmentLevel() > 0 ? product.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
-				writeInt((int) product.getChance() * 1000000); // chance
+				writeInt((int) (product.getChance() * 1000000)); // chance
 				writeItemAugment(displayItemEnchantment);
 				writeItemElemental(displayItemEnchantment);
 				writeItemEnsoulOptions(displayItemEnchantment);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index 6ee1d5c660..db417bf89f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -170,7 +170,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -330,9 +330,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -350,11 +350,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -378,9 +378,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -410,7 +410,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 05aaedf2c5..46c9ccb5a9 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,20 +19,21 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
+		player.restoreAutoShortcutVisual();
 	}
 	
 	@Override
@@ -54,8 +55,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 944e376e63..851b53dc09 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -43,14 +49,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // item augment id
-				writeInt(0); // visual id
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 678f0f29e1..8e3bc2f155 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index bbd799b4a4..c14c273183 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -68,7 +68,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -149,7 +149,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -249,9 +249,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -269,11 +269,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -297,9 +297,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -330,7 +329,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
index 8e5c5f7765..22eb4ac7d4 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
@@ -83,6 +83,17 @@ public class ExPurchaseLimitShopItemListNew extends ServerPacket
 					writeInt(product.getAccountDailyLimit() - _player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + product.getProductionId(), 0));
 				}
 			}
+			else if (product.getAccountMontlyLimit() > 0)
+			{
+				if (_player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + product.getProductionId(), 0) >= product.getAccountMontlyLimit())
+				{
+					writeInt(0);
+				}
+				else
+				{
+					writeInt(product.getAccountMontlyLimit() - _player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + product.getProductionId(), 0));
+				}
+			}
 			else if (product.getAccountBuyLimit() > 0) // Count limit.
 			{
 				if (_player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + product.getProductionId(), 0) >= product.getAccountBuyLimit())
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java
index 69ec489ca4..0611f335b7 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java
@@ -68,7 +68,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -142,7 +142,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetSummonInfo.java
similarity index 98%
rename from L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java
rename to L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetSummonInfo.java
index bfe3bf45a8..56cbbf532b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetSummonInfo.java
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
 /**
  * 12 - wolf, 13 - buffalo, 14 - tiger, 15-kukkabara, 17 - hawk, 16 - dragon
  */
-public class PetInfo extends ServerPacket
+public class PetSummonInfo extends ServerPacket
 {
 	private final Summon _summon;
 	private final int _value;
@@ -49,7 +49,7 @@ public class PetInfo extends ServerPacket
 	private int _curFed;
 	private int _statusMask = 0;
 	
-	public PetInfo(Summon summon, int value)
+	public PetSummonInfo(Summon summon, int value)
 	{
 		_summon = summon;
 		_moveMultiplier = summon.getMovementSpeedMultiplier();
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/pet/ResultPetExtractSystem.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/pet/ResultPetExtractSystem.java
new file mode 100644
index 0000000000..0deca5b570
--- /dev/null
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/pet/ResultPetExtractSystem.java
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets.pet;
+
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
+
+/**
+ * @author Geremy
+ */
+public class ResultPetExtractSystem extends ServerPacket
+{
+	private final boolean _success;
+	
+	public ResultPetExtractSystem(boolean success)
+	{
+		_success = success;
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.EX_RESULT_PET_EXTRACT_SYSTEM.writeId(this);
+		writeInt(_success);
+	}
+}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/not_done/Q10906_ChasingTheLight.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/pet/ShowPetExtractSystem.java
similarity index 61%
rename from L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/not_done/Q10906_ChasingTheLight.java
rename to L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/pet/ShowPetExtractSystem.java
index 538344d77e..29683dc5a5 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/not_done/Q10906_ChasingTheLight.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/pet/ShowPetExtractSystem.java
@@ -1,36 +1,35 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package quests.not_done;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.model.quest.Quest;
-
-/**
- * @author Mobius
- */
-public class Q10906_ChasingTheLight extends Quest
-{
-	private static final int START_NPC = 34599;
-	
-	public Q10906_ChasingTheLight()
-	{
-		super(10906);
-		addStartNpc(START_NPC);
-		addTalkId(START_NPC);
-		addCondMinLevel(Config.PLAYER_MAXIMUM_LEVEL, getNoQuestMsg(null));
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets.pet;
+
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
+
+/**
+ * @author Geremy
+ */
+public class ShowPetExtractSystem extends ServerPacket
+{
+	public static final ShowPetExtractSystem STATIC_PACKET = new ShowPetExtractSystem();
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.EX_SHOW_PET_EXTRACT_SYSTEM.writeId(this);
+		writeInt(0);
+	}
+}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index d6e032a4c7..2bfee034a2 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -25,11 +26,13 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
@@ -42,9 +45,12 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
+	private static final Integer PET_ATTACK_ACTION = 16;
+	private static final Integer SUMMON_ATTACK_ACTION = 22;
 	
 	protected AutoPlayTaskManager()
 	{
@@ -94,6 +100,25 @@ public class AutoPlayTaskManager
 					}
 					else if ((creature.getTarget() == player) || (creature.getTarget() == null))
 					{
+						// Pet Attack.
+						final Pet pet = player.getPet();
+						if ((pet != null) && player.getAutoUseSettings().getAutoActions().contains(PET_ATTACK_ACTION) && pet.hasAI() && !pet.isMoving() && !pet.isDisabled() && (pet.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (pet.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+						{
+							pet.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+						}
+						
+						// Summon Attack.
+						if (player.hasSummon() && player.getAutoUseSettings().getAutoActions().contains(SUMMON_ATTACK_ACTION))
+						{
+							for (Summon summon : player.getServitors().values())
+							{
+								if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+								{
+									summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+								}
+							}
+						}
+						
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
@@ -122,23 +147,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -146,6 +180,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -180,32 +217,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) && (targetMode != 4 /* Counterattack */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) && (targetMode != 4 /* Counterattack */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -256,7 +316,7 @@ public class AutoPlayTaskManager
 				}
 				case 4: // Counterattack
 				{
-					return creature.isMonster() || (creature.isPlayable() && creature.isAutoAttackable(player));
+					return creature.isMonster() || (creature.isPlayer() && ((creature.getTarget() == player) && (creature.getActingPlayer().getEinhasadOverseeingLevel() >= 1)));
 				}
 				default: // Any Target
 				{
@@ -315,6 +375,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 574af07cdd..473fcb12a6 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -36,7 +36,9 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.effects.EffectType;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemUse;
@@ -47,12 +49,12 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.EffectScope;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -429,8 +431,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
@@ -442,7 +445,24 @@ public class AutoUseTaskManager
 							final IPlayerActionHandler actionHandler = PlayerActionHandler.getInstance().getHandler(actionHolder.getHandler());
 							if (actionHandler != null)
 							{
-								actionHandler.useAction(player, actionHolder, false, false);
+								if (!actionHandler.isPetAction())
+								{
+									actionHandler.useAction(player, actionHolder, false, false);
+								}
+								else
+								{
+									final Summon summon = player.getAnyServitor();
+									if ((summon != null) && !summon.isAlikeDead())
+									{
+										final Skill skill = summon.getKnownSkill(actionHolder.getOptionId());
+										if ((skill != null) && !canSummonCastSkill(player, summon, skill))
+										{
+											continue ACTIONS;
+										}
+										
+										actionHandler.useAction(player, actionHolder, false, false);
+									}
+								}
 							}
 						}
 					}
@@ -525,6 +545,59 @@ public class AutoUseTaskManager
 			
 			return !player.isSkillDisabled(skill) && skill.checkCondition(player, target, false);
 		}
+		
+		private boolean canSummonCastSkill(Player player, Summon summon, Skill skill)
+		{
+			if (skill.isBad() && (player.getTarget() == null))
+			{
+				return false;
+			}
+			
+			final int mpConsume = skill.getMpConsume() + skill.getMpInitialConsume();
+			if ((((mpConsume != 0) && (mpConsume > (int) Math.floor(summon.getCurrentMp()))) || ((skill.getHpConsume() != 0) && (skill.getHpConsume() > (int) Math.floor(summon.getCurrentHp())))))
+			{
+				return false;
+			}
+			
+			if (summon.isSkillDisabled(skill))
+			{
+				return false;
+			}
+			
+			if (((player.getTarget() != null) && !skill.checkCondition(summon, player.getTarget(), false)) || ((player.getTarget() == null) && !skill.checkCondition(summon, player, false)))
+			{
+				return false;
+			}
+			
+			if ((skill.getItemConsumeCount() > 0) && (summon.getInventory().getInventoryItemCount(skill.getItemConsumeId(), -1) < skill.getItemConsumeCount()))
+			{
+				return false;
+			}
+			
+			if (skill.getTargetType().equals(TargetType.SELF) || skill.getTargetType().equals(TargetType.SUMMON))
+			{
+				final BuffInfo summonInfo = summon.getEffectList().getBuffInfoBySkillId(skill.getId());
+				return (summonInfo != null) && (summonInfo.getTime() >= REUSE_MARGIN_TIME);
+			}
+			
+			if ((skill.getEffects(EffectScope.GENERAL) != null) && skill.getEffects(EffectScope.GENERAL).stream().anyMatch(a -> a.getEffectType().equals(EffectType.MANAHEAL_BY_LEVEL)) && (player.getCurrentMpPercent() > 80))
+			{
+				return false;
+			}
+			
+			final BuffInfo buffInfo = player.getEffectList().getBuffInfoBySkillId(skill.getId());
+			final BuffInfo abnormalBuffInfo = player.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
+			if (abnormalBuffInfo != null)
+			{
+				if (buffInfo != null)
+				{
+					return (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()));
+				}
+				return (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel()) || abnormalBuffInfo.isAbnormalType(AbnormalType.NONE);
+			}
+			
+			return true;
+		}
 	}
 	
 	public synchronized void startAutoUseTask(Player player)
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/util/Util.java
index c5f25272e9..7170f674d5 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_Essence_6.3_Crusader/readme.txt b/L2J_Mobius_Essence_6.3_Crusader/readme.txt
index 013241489d..53cc42c22c 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/readme.txt
+++ b/L2J_Mobius_Essence_6.3_Crusader/readme.txt
@@ -127,6 +127,7 @@ Fluffy Reinforcement: https://eu.4game.com/patchnotes/lineage2essence/204/
 
 Dwelling of Spirits: https://eu.4game.com/patchnotes/lineage2essence/261/
 -Transcendent hunting zones
+-Pet extraction system
 
 Sylph: https://eu.4game.com/patchnotes/lineage2essence/281/
 -Sylph creation support
@@ -160,6 +161,7 @@ Crusader: https://eu.4game.com/patchnotes/lineage2essence/416/
 -Magic Lamp Genie's quests
 -Valakas Temple instance
 
+
 Customs:
 -Newbie Helper NPC location info
 -Newbie Helper buff support until 40 level
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/account_gsdata.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/account_gsdata.sql
index b70d2eea0d..576cc18356 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/account_gsdata.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/account_gsdata.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_gsdata` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` text NOT NULL,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/account_premium.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/account_premium.sql
index b52e46ebca..3125e00443 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/account_premium.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/account_premium.sql
@@ -3,4 +3,4 @@ CREATE TABLE `account_premium` (
   `account_name` varchar(45) NOT NULL DEFAULT '',
   `enddate` decimal(20,0) NOT NULL DEFAULT '0',
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/achievement_box.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/achievement_box.sql
index c6830a6caf..63af6ce3ed 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/achievement_box.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/achievement_box.sql
@@ -15,4 +15,4 @@ CREATE TABLE IF NOT EXISTS `achievement_box` (
 `box_state_slot_4` INT NOT NULL DEFAULT 0,
 `boxtype_slot_4` INT NOT NULL DEFAULT 0,
 PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/airships.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/airships.sql
index e4f74d138a..28cc8a9610 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/airships.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/airships.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `airships` (
   `owner_id` INT, -- object id of the player or clan, owner of this airship
   `fuel` decimal(5,0) NOT NULL DEFAULT 600,
   PRIMARY KEY (`owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/announcements.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/announcements.sql
index eb86953965..1ff1b9ddd3 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/announcements.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/announcements.sql
@@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `announcements` (
   `author` text NOT NULL,
   `content` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
 (0, 'L2jMobius', 'Thanks for using L2jMobius!'),
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/auction_bid.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/auction_bid.sql
index 1afcf3ba88..bd42d75b3a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/auction_bid.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/auction_bid.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `auction_bid` (
   `time_bid` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY  (`auctionId`,`bidderId`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/bbs_favorites.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/bbs_favorites.sql
index d46500c1bb..9cb97e6682 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/bbs_favorites.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/bbs_favorites.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `bbs_favorites` (
 	`favAddDate` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	PRIMARY KEY (`favId`),
 	UNIQUE INDEX `favId_playerId` (`favId`, `playerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/bot_reported_char_data.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/bot_reported_char_data.sql
index 452d310e16..ddbda95b17 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/bot_reported_char_data.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/bot_reported_char_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `bot_reported_char_data` (
 	`reporterId` INT UNSIGNED NOT NULL DEFAULT 0,
 	`reportDate` BIGINT(13) unsigned NOT NULL DEFAULT '0',
 	PRIMARY KEY (`botId`, `reporterId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/buffer_schemes.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/buffer_schemes.sql
index 5e79fbfd22..61436e7354 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/buffer_schemes.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/buffer_schemes.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `buffer_schemes` (
   `scheme_name` VARCHAR(16) NOT NULL DEFAULT 'default',
   `skills` VARCHAR(200) NOT NULL,
     PRIMARY KEY (`object_id`,`scheme_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/buylists.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/buylists.sql
index a02ce044c8..8c89e22d90 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/buylists.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/buylists.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `buylists` (
 	`count` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	`next_restock_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
 	PRIMARY KEY (`buylist_id`, `item_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle.sql
index e6a5fcc566..d79bc9f41d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle` (
   `ticketBuyCount` smallint(3) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `castle` VALUES
 -- (1,'Gludio','NEUTRAL',0,0,'true',0,'false',0),
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_doorupgrade.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_doorupgrade.sql
index c66e5d0991..dc92b68a2f 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_doorupgrade.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_doorupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_doorupgrade` (
   `ratio` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `castleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_functions.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_functions.sql
index 14a51b2630..be7ac8630d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_functions.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`castle_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_manor_procure.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_manor_procure.sql
index eae8164dbd..dff0affeec 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_manor_procure.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_manor_procure.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_procure` (
  `reward_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`castle_id`,`crop_id`,`next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_manor_production.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_manor_production.sql
index ca51a24e35..7f09f6c1b0 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_manor_production.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_manor_production.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `castle_manor_production` (
  `price` INT(11) UNSIGNED NOT NULL DEFAULT '0',
  `next_period` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
  PRIMARY KEY (`castle_id`, `seed_id`, `next_period`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_siege_guards.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_siege_guards.sql
index 5352cfb249..ad7acac0a5 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_siege_guards.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_siege_guards.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `castle_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 -- Gludio Castle
 REPLACE INTO `castle_siege_guards` (`castleId`,`id`,`npcId`,`x`,`y`,`z`,`heading`,`respawnDelay`,`isHired`) VALUES
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_trapupgrade.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_trapupgrade.sql
index 63406a22f3..22f6071cb6 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_trapupgrade.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/castle_trapupgrade.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `castle_trapupgrade` (
   `towerIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`towerIndex`,`castleId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_contacts.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_contacts.sql
index 5e7c88bd1a..350ec43a14 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_contacts.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_contacts.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_contacts` (
   charId INT UNSIGNED NOT NULL DEFAULT 0,
   contactId INT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`contactId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_daily_rewards.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_daily_rewards.sql
index ed0bbff883..f0b9cf08f0 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_daily_rewards.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_daily_rewards.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_daily_rewards` (
   `progress`  int UNSIGNED NOT NULL DEFAULT 0 ,
   `lastCompleted`  bigint UNSIGNED NOT NULL ,
   PRIMARY KEY (`charId`, `rewardId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_friends.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_friends.sql
index cdce19820b..8b2dab1d25 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_friends.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_friends.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_friends` (
   `relation` INT UNSIGNED NOT NULL DEFAULT 0,
   `memo` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`charId`,`friendId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_hennas.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_hennas.sql
index 5225720259..806d3eb0ae 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_hennas.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_hennas.sql
@@ -5,4 +5,10 @@ CREATE TABLE IF NOT EXISTS `character_hennas` (
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_HENNAS, ADD_CHAR_HENNA, DELETE_CHAR_HENNAS
+CREATE INDEX idx_charId_classIndex ON character_hennas (charId, class_index);
+
+# DELETE_CHAR_HENNA
+CREATE INDEX idx_charId_slot_classIndex ON character_hennas (charId, slot, class_index);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_instance_time.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_instance_time.sql
index 412aecd168..f9307271bf 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_instance_time.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_instance_time.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `character_instance_time` (
   `instanceId` int(3) NOT NULL DEFAULT '0',
   `time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`instanceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_item_reuse_save.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_item_reuse_save.sql
index 90481cbf90..bdfc7d2385 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_item_reuse_save.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_item_reuse_save.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_item_reuse_save` (
   `reuseDelay` INT(8) NOT NULL DEFAULT 0,
   `systime` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`itemId`,`itemObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_macroses.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_macroses.sql
index 4647752208..d140fc9630 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_macroses.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_macroses.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_macroses` (
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(1255) ,
   PRIMARY KEY (`charId`,`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_mentees.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_mentees.sql
index 0ff6f45e08..48c7b48b41 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_mentees.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_mentees.sql
@@ -2,4 +2,4 @@ DROP TABLE IF EXISTS `character_mentees`;
 CREATE TABLE IF NOT EXISTS `character_mentees` (
   `charId` int(10) unsigned NOT NULL DEFAULT '0',
   `mentorId` int(10) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_offline_trade.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_offline_trade.sql
index 232f6ad468..2019801a3b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_offline_trade.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_offline_trade.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade` (
   `type` tinyint(4) NOT NULL DEFAULT '0',
   `title` varchar(50) DEFAULT NULL,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_offline_trade_items.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_offline_trade_items.sql
index e0c31f77e5..456b9c2231 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_offline_trade_items.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_offline_trade_items.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_offline_trade_items` (
   `price` bigint(20) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`),
   KEY `item` (`item`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_pet_skills_save.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_pet_skills_save.sql
index d6e7305dad..85dfb5c310 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_pet_skills_save.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_pet_skills_save.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_pet_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`petObjItemId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_potens.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_potens.sql
index 16b2a7bc7c..e8b138b33b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_potens.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_potens.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_potens` (
   `enchant_level` INT NOT NULL DEFAULT 0,
   `enchant_exp` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`slot_position`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_premium_items.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_premium_items.sql
index 0034ae985b..adcbc4e3f1 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_premium_items.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_premium_items.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `character_premium_items` (
   KEY `charId` (`charId`),
   KEY `itemNum` (`itemNum`),
   KEY `itemId` (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_purge.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_purge.sql
index fb186a0807..5cea267e6e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_purge.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_purge.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `character_purge` (
   `keys` int(10) UNSIGNED NOT NULL DEFAULT 0,
   `remainingKeys` int(10) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`category`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_quests.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_quests.sql
index 26f87fcefc..75a036b290 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_quests.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_quests.sql
@@ -5,4 +5,8 @@ CREATE TABLE IF NOT EXISTS `character_quests` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`charId`,`name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId_name ON character_quests (charId, name);
+CREATE INDEX idx_charId_var ON character_quests (charId, var);
+CREATE UNIQUE INDEX idx_charId_name_var ON character_quests (charId, name, var);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_random_craft.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_random_craft.sql
index 82a9d4166e..18175b321c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_random_craft.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_random_craft.sql
@@ -25,4 +25,4 @@ CREATE TABLE IF NOT EXISTS `character_random_craft` (
   `item_5_locked` TINYINT NOT NULL DEFAULT 0,
   `item_5_lock_left` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_ranking_history.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_ranking_history.sql
index 3f938ba850..d2da345dec 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_ranking_history.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_ranking_history.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_ranking_history` (
   `ranking` int(20) NOT NULL,
   `exp` bigint(20) NOT NULL,
   PRIMARY KEY (`charId`,`day`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_recipebook.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_recipebook.sql
index 259046c922..c4f1ff9e42 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_recipebook.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_recipebook.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipebook` (
   `classIndex` TINYINT NOT NULL DEFAULT 0,
   `type` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`charId`,`classIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_recipeshoplist.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_recipeshoplist.sql
index 384d5d2dec..97209515a1 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_recipeshoplist.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_recipeshoplist.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_recipeshoplist` (
   `price` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`recipeId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_reco_bonus.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_reco_bonus.sql
index d49289a9ef..d9f0fedb2d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_reco_bonus.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_reco_bonus.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `character_reco_bonus` (
   `rec_left` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `time_left` bigint(13) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_revenge_history.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_revenge_history.sql
index 2afdc80d1c..4f39f43623 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_revenge_history.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_revenge_history.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `character_revenge_history` (
   `shared_teleport_remaining` int NOT NULL DEFAULT 0,
   `kill_time` BIGINT(10) UNSIGNED NOT NULL,
   `share_time` BIGINT(10) UNSIGNED NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_shortcuts.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_shortcuts.sql
index a86b023f7c..577853fd57 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_shortcuts.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_shortcuts.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `character_shortcuts` (
   `class_index` int(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`charId`,`slot`,`page`,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_skills.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_skills.sql
index a5aec73e91..d27740e47d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_skills.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_skills.sql
@@ -6,4 +6,10 @@ CREATE TABLE IF NOT EXISTS `character_skills` (
   `skill_sub_level` INT(4) NOT NULL DEFAULT '0',
   `class_index` INT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_SKILLS_FOR_CHAR, DELETE_CHAR_SKILLS
+CREATE INDEX idx_charId_classIndex ON character_skills (charId, class_index);
+
+# UPDATE_CHARACTER_SKILL_LEVEL, ADD_NEW_SKILLS, DELETE_SKILL_FROM_CHAR
+CREATE INDEX idx_skillId_charId_classIndex ON character_skills (skill_id, charId, class_index);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_skills_save.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_skills_save.sql
index cce052032b..5ffb37487c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_skills_save.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_skills_save.sql
@@ -11,4 +11,10 @@ CREATE TABLE IF NOT EXISTS `character_skills_save` (
   `class_index` INT(1) NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`,`skill_id`,`skill_level`,`class_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# ADD_SKILL_SAVE, DELETE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex ON character_skills_save (charId, class_index);
+
+# RESTORE_SKILL_SAVE
+CREATE INDEX idx_charId_classIndex_buffIndex ON character_skills_save (charId, class_index, buff_index);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_spirits.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_spirits.sql
index ac73d8dbe3..bb4044039f 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_spirits.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_spirits.sql
@@ -11,6 +11,5 @@ CREATE TABLE `character_spirits`
     `crit_rate_points`   TINYINT      NOT NULL DEFAULT 0,
     `crit_damage_points` TINYINT      NOT NULL DEFAULT 0,
     `in_use`             BOOLEAN      NOT NULL DEFAULT FALSE,
-    PRIMARY KEY (`charId`, `type`),
-    FOREIGN KEY FK_CHARACTER_SPIRITS (`charId`) REFERENCES characters (`charId`) ON DELETE CASCADE
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+    PRIMARY KEY (`charId`, `type`)
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_subclasses.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_subclasses.sql
index 1dfd8b7197..e058480229 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_subclasses.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_subclasses.sql
@@ -9,4 +9,10 @@ CREATE TABLE IF NOT EXISTS `character_subclasses` (
   `class_index` int(1) NOT NULL DEFAULT 0,
   `dual_class` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`charId`,`class_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+# RESTORE_CHAR_SUBCLASSES, ADD_CHAR_SUBCLASS, UPDATE_CHAR_SUBCLASS, DELETE_CHAR_SUBCLASS
+CREATE INDEX idx_charId_classIndex ON character_subclasses (charId, class_index);
+
+# CharSelectionInfo
+CREATE INDEX idx_charId_classId ON character_subclasses (charId, class_id);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_summon_skills_save.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_summon_skills_save.sql
index 648e445c0a..c10b99bc5c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_summon_skills_save.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_summon_skills_save.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_summon_skills_save` (
   `remaining_time` INT NOT NULL DEFAULT 0,
   `buff_index` INT(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`ownerId`,`ownerClassIndex`,`summonSkillId`,`skill_id`,`skill_level`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_summons.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_summons.sql
index b57b1cce1c..d7128f1c29 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_summons.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_summons.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
   `curMp` int(9) unsigned DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_surveillances.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_surveillances.sql
index 49b3fdaa3d..734b714c5e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_surveillances.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_surveillances.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `character_surveillances` (
   `charId` INT UNSIGNED NOT NULL,
   `targetId` INT UNSIGNED NOT NULL,
   PRIMARY KEY (`charId`,`targetId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_tpbookmark.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_tpbookmark.sql
index 05678e5513..cde9ff3db3 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_tpbookmark.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_tpbookmark.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `character_tpbookmark` (
   `tag` varchar(50) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   PRIMARY KEY (`charId`,`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_variables.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_variables.sql
index 2b33040680..81530a3da5 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_variables.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/character_variables.sql
@@ -3,4 +3,7 @@ CREATE TABLE IF NOT EXISTS `character_variables` (
   `charId` int(10) UNSIGNED NOT NULL,
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_charId ON character_variables (charId);
+CREATE INDEX idx_var ON character_variables (var);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/characters.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/characters.sql
index 4df7d3f88c..f39a66c2db 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/characters.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/characters.sql
@@ -62,4 +62,15 @@ CREATE TABLE IF NOT EXISTS `characters` (
   KEY `char_name` (`char_name`),
   KEY `clanid` (`clanid`),
   KEY `online` (`online`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+# Common
+CREATE INDEX idx_charId ON characters (charId);
+CREATE INDEX idx_char_name ON characters (char_name);
+CREATE INDEX idx_account_name ON characters (account_name);
+
+# CharSelectionInfo
+CREATE INDEX idx_accountName_createDate ON characters (account_name, createDate);
+
+# TaskBirthday
+CREATE INDEX idx_createDate ON characters (createDate);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_data.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_data.sql
index bd55f0c7b0..b74795dc51 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_data.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_data.sql
@@ -24,4 +24,4 @@ CREATE TABLE IF NOT EXISTS `clan_data` (
   KEY `ally_id` (`ally_id`),
   KEY `leader_id` (`leader_id`),
   KEY `auction_bid_at` (`auction_bid_at`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_notices.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_notices.sql
index b8062eea96..61425ca510 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_notices.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_notices.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_notices` (
   `enabled` enum('true','false') DEFAULT 'false' NOT NULL,
   `notice` TEXT NOT NULL,
   PRIMARY KEY  (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_privs.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_privs.sql
index cc35c5862f..baca0444a8 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_privs.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_privs.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clan_privs` (
   `party` INT NOT NULL DEFAULT 0,
   `privs` INT NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan_id`,`rank`,`party`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_skills.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_skills.sql
index 298f710835..ddc8b0f819 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_skills.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_skills.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_skills` (
   `skill_name` varchar(26) DEFAULT NULL,
   `sub_pledge_id` INT NOT NULL DEFAULT '-2',
   PRIMARY KEY (`clan_id`,`skill_id`,`sub_pledge_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_subpledges.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_subpledges.sql
index b1ca14bf1a..5ede8982a6 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_subpledges.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_subpledges.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `clan_subpledges` (
   `leader_id` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`sub_pledge_id`),
   KEY `leader_id` (`leader_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_variables.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_variables.sql
index 2df52d0e90..44bf3fea53 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_variables.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_variables.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `clan_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `clanId` (`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_wars.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_wars.sql
index 1e02dfb225..3fcf58a2ad 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_wars.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clan_wars.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `clan_wars` (
   `endTime` bigint(13) NOT NULL DEFAULT 0,
   `state` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`clan1`,`clan2`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clanentry.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clanentry.sql
index 314f2fb6b8..91beee1ac3 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clanentry.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clanentry.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `pledge_applicant` (
   `karma` tinyint(1) NOT NULL,
   `message` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   PRIMARY KEY (`charId`,`clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_recruit`;
 CREATE TABLE IF NOT EXISTS `pledge_recruit` (
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `pledge_recruit` (
   `application_type` tinyint(1) NOT NULL,
   `recruit_type` tinyint(1) NOT NULL,
   PRIMARY KEY (`clan_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `pledge_waiting_list`;
 CREATE TABLE IF NOT EXISTS `pledge_waiting_list` (
   `char_id` int(10) NOT NULL,
   `karma` tinyint(1) NOT NULL,
   PRIMARY KEY (`char_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clanhall.sql
index 39e3deed5c..67e85d8f99 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clanhall.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clanhall.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall` (
   `paidUntil` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY `id` (`id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clanhall_auctions_bidders.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
index 298166e477..4c41da7fda 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/clanhall_auctions_bidders.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `clanhall_auctions_bidders` (
   `bid` BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `bidTime` BIGINT(13) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY( `clanHallId`, `clanId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/collection_favorites.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/collection_favorites.sql
index b08c0c4fd2..07c749c815 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/collection_favorites.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/collection_favorites.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `collection_favorites` (
   `accountName` VARCHAR(45) NOT NULL DEFAULT '',
   `collectionId` int(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`accountName`,`collectionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/collections.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/collections.sql
index 5814dfa284..8ff04209a6 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/collections.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/collections.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `collections` (
   `collectionId` int(3) UNSIGNED NOT NULL DEFAULT 0,
   `index` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`accountName`,`collectionId`,`index`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/commission_items.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/commission_items.sql
index 79601a9a4e..44a54d79f2 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/commission_items.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/commission_items.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `commission_items` (
 	`duration_in_days` TINYINT NOT NULL,
 	`discount_in_percentage` TINYINT NOT NULL,
 	PRIMARY KEY (`commission_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/crests.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/crests.sql
index 3c8a5540ff..c4bcbe76e2 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/crests.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/crests.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `crests` (
 	`data` VARBINARY(2176) NOT NULL,
 	`type` TINYINT NOT NULL,
 	PRIMARY KEY(`crest_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/cursed_weapons.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/cursed_weapons.sql
index 06ed9c9aa4..1e35c6d476 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/cursed_weapons.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/cursed_weapons.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`itemId`),
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/custom_mail.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/custom_mail.sql
index c05ac99727..312a5ae524 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/custom_mail.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/custom_mail.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `custom_mail` (
   `subject` TINYTEXT NOT NULL,
   `message` TEXT NOT NULL,
   `items` TEXT NOT NULL -- format: itemId1 count1;itemId2 count2;itemId3 count3...
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/custom_teleport.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/custom_teleport.sql
index 14f8570536..d7f658b250 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/custom_teleport.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/custom_teleport.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `custom_teleport` (
   `fornoble` tinyint(1) NOT NULL DEFAULT '0',
   `itemId` smallint(5) unsigned NOT NULL DEFAULT '57',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/enchant_challenge_points.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/enchant_challenge_points.sql
index 0cdbee7ee0..f6a80aaeed 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/enchant_challenge_points.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/enchant_challenge_points.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `enchant_challenge_points` (
   `groupId` INT NOT NULL,
   `points` INT NOT NULL,
   PRIMARY KEY (`charId`,`groupId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/enchant_challenge_points_recharges.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/enchant_challenge_points_recharges.sql
index 61bbd111af..612ed9c4de 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/enchant_challenge_points_recharges.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/enchant_challenge_points_recharges.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `enchant_challenge_points_recharges` (
   `optionIndex` INT NOT NULL,
   `count` INT NOT NULL,
   PRIMARY KEY (`charId`, `groupId`, `optionIndex`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/event_schedulers.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/event_schedulers.sql
index 0e91ede108..999126b47b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/event_schedulers.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/event_schedulers.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `event_schedulers` (
   `lastRun` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `eventName_schedulerName` (`eventName`,`schedulerName`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort.sql
index e1251c9bbf..acd8e63408 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `fort` (
   `supplyLvL` int(2) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `fort` VALUES
 -- (101,'Shanty',0,0,0,0,0,0,0),
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort_doorupgrade.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort_doorupgrade.sql
index 8b40b5ffe8..db6f1a278a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort_doorupgrade.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort_doorupgrade.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `fort_doorupgrade` (
   `pDef` int(11) NOT NULL DEFAULT '0',
   `mDef` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`doorId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort_functions.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort_functions.sql
index 76f3fa99a2..7feb890a15 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort_functions.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort_functions.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `fort_functions` (
   `rate` decimal(20,0) NOT NULL DEFAULT '0',
   `endTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`fort_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort_siege_guards.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort_siege_guards.sql
index 7f261ec8bc..a0a0b93ef4 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort_siege_guards.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort_siege_guards.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `fort_siege_guards` (
   `isHired` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort_spawnlist.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort_spawnlist.sql
index cd12e5fb31..8d7b95b1ad 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort_spawnlist.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fort_spawnlist.sql
@@ -11,4 +11,4 @@ CREATE TABLE `fort_spawnlist` (
   `castleId` tinyint(1) unsigned NOT NULL DEFAULT '0',  -- Castle ID for Special Envoys
   PRIMARY KEY (`id`),
   KEY `id` (`fortId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fortsiege_clans.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fortsiege_clans.sql
index b091192446..0c9ab1ba84 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fortsiege_clans.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/fortsiege_clans.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `fortsiege_clans` (
   `fort_id` int(1) NOT NULL DEFAULT '0',
   `clan_id` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`clan_id`,`fort_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/forums.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/forums.sql
index 0b82c19b72..bd2eeda97a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/forums.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/forums.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `forums` (
   `forum_owner_id` int(8) NOT NULL DEFAULT '0',
   PRIMARY KEY (`forum_id`),
   KEY `forum_owner_id` (`forum_owner_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT IGNORE INTO `forums` VALUES
 (1, 'NormalRoot', 0, 0, 0, 1, 0),
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/global_tasks.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/global_tasks.sql
index 8cd87cb650..51cab5ed2f 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/global_tasks.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/global_tasks.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `global_tasks` (
   `param2` varchar(100) NOT NULL DEFAULT '',
   `param3` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/global_variables.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/global_variables.sql
index 1721657eb2..e3e5348a1a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/global_variables.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/global_variables.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `global_variables` (
   `var`  VARCHAR(255) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/grandboss_data.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/grandboss_data.sql
index b4a1f552fd..7cf6d2865d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/grandboss_data.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/grandboss_data.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `grandboss_data` (
   `currentMP` decimal(30,15) NOT NULL,
   `status` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`boss_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT IGNORE INTO `grandboss_data` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`heading`,`currentHP`,`currentMP`) VALUES
 (29001, 93069, 8925, -3904, 0, 229898.48, 667.776), -- Queen Ant
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/heroes.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/heroes.sql
index 7691debf5f..6dd502dc65 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/heroes.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/heroes.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `heroes` (
   `claimed` ENUM('true','false') NOT NULL DEFAULT 'false',
   `message` varchar(300) NOT NULL DEFAULT '',
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/heroes_diary.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/heroes_diary.sql
index db45dce351..bb15483356 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/heroes_diary.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/heroes_diary.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `heroes_diary` (
   `action` tinyint(2) unsigned NOT NULL DEFAULT '0',
   `param` int(11) unsigned NOT NULL DEFAULT '0',
   KEY `charId` (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/huntpass.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/huntpass.sql
index f3ff3061ec..b45d73a32b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/huntpass.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/huntpass.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `huntpass` (
   `sayha_points_used` INT NOT NULL DEFAULT 0,
   `unclaimed_reward` BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`account_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_auction.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_auction.sql
index 3b7402da4c..0c5514d192 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_auction.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_auction.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_auction` (
   `endingTime` bigint(13) unsigned NOT NULL DEFAULT '0',
   `auctionStateId` tinyint(1) NOT NULL,
   PRIMARY KEY (`auctionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_auction_bid.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_auction_bid.sql
index a2fd42f3a1..984709481f 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_auction_bid.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_auction_bid.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `item_auction_bid` (
   `playerObjId` int(11) NOT NULL,
   `playerBid` bigint(20) NOT NULL,
   PRIMARY KEY (`auctionId`,`playerObjId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_elementals.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_elementals.sql
index 0c432dd172..8ff8322446 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_elementals.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_elementals.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_elementals` (
   `elemType` tinyint(1) NOT NULL DEFAULT -1,
   `elemValue` int(11) NOT NULL DEFAULT -1,
   PRIMARY KEY (`itemId`, `elemType`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId_elemType ON item_elementals (itemId, elemType);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_special_abilities.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_special_abilities.sql
index f38653c2b8..f0b9af4b51 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_special_abilities.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_special_abilities.sql
@@ -5,4 +5,6 @@ CREATE TABLE IF NOT EXISTS `item_special_abilities` (
   `optionId` int(10) unsigned NOT NULL,
   `position` tinyint(1) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`objectId`,`optionId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_objectId ON item_special_abilities (objectId);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_transaction_history.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_transaction_history.sql
index 7ec1d192f0..a08fe3b8fd 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_transaction_history.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_transaction_history.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `item_transaction_history` (
    `price` BIGINT UNSIGNED NOT NULL,
    `count` BIGINT UNSIGNED NOT NULL,
    PRIMARY KEY (`created_time`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_variables.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_variables.sql
index aa62996a80..8ed1389861 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_variables.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_variables.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variables` (
   `var` varchar(255) NOT NULL,
   `val` text NOT NULL,
   KEY `charId` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_id ON item_variables (id);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_variations.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_variations.sql
index cfbf0ca91e..36adc3d83f 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_variations.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/item_variations.sql
@@ -4,4 +4,6 @@ CREATE TABLE IF NOT EXISTS `item_variations` (
   `option1` INT(11) NOT NULL,
   `option2` INT(11) NOT NULL,
   PRIMARY KEY (`itemId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
+CREATE INDEX idx_itemId ON item_variations (itemId);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/items.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/items.sql
index 380faa715b..26f64fc7aa 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/items.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/items.sql
@@ -17,4 +17,12 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `item_id` (`item_id`),
   KEY `loc` (`loc`),
   KEY `time_of_use` (`time_of_use`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+CREATE INDEX idx_item_id ON items (item_id);
+CREATE INDEX idx_object_id ON items (object_id);
+CREATE INDEX idx_owner_id ON items (owner_id);
+CREATE INDEX idx_owner_id_loc ON items (owner_id, loc);
+CREATE INDEX idx_owner_id_item_id ON items (owner_id, item_id);
+CREATE INDEX idx_owner_id_loc_locdata ON items (owner_id, loc, loc_data);
+CREATE INDEX idx_owner_id_loc_locdata_enchant ON items (owner_id, loc, loc_data, enchant_level, item_id, object_id);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/itemsonground.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/itemsonground.sql
index 5725d56625..1891903f34 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/itemsonground.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/itemsonground.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `itemsonground` (
   `drop_time` bigint(13) NOT NULL DEFAULT '0',
   `equipable` int(1) DEFAULT '0',
   PRIMARY KEY (`object_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/mdt_bets.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/mdt_bets.sql
index 8d7d4cb738..295e97a717 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/mdt_bets.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/mdt_bets.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `mdt_bets` (
   `lane_id` INT(1) DEFAULT 0,
   `bet` INT DEFAULT 0,
   PRIMARY KEY (`lane_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
 
 INSERT INTO `mdt_bets` VALUES
 ('1','0'),
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/mdt_history.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/mdt_history.sql
index 06978f3377..a0bd0e009a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/mdt_history.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/mdt_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `mdt_history` (
   `second` INT(1) DEFAULT 0,
   `odd_rate` DOUBLE(10,2) DEFAULT 0,
   PRIMARY KEY (`race_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/merchant_lease.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/merchant_lease.sql
index 4c7e52d5e1..d8c5488c67 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/merchant_lease.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/merchant_lease.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `merchant_lease` (
   `type` int(11) NOT NULL DEFAULT 0,
   `player_name` varchar(35),
   PRIMARY KEY (`merchant_id`,`player_id`,`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/messages.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/messages.sql
index 41df84c7d6..162cea05e4 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/messages.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/messages.sql
@@ -18,4 +18,4 @@ CREATE TABLE IF NOT EXISTS `messages` (
   `enchantLvl` INT(3) NOT NULL DEFAULT '0',
   `elementals` VARCHAR(25),
   PRIMARY KEY (`messageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/npc_respawns.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/npc_respawns.sql
index b93a9f4128..77f93f18ef 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/npc_respawns.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/npc_respawns.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `npc_respawns` (
   `currentHp` double unsigned NOT NULL,
   `currentMp` double unsigned NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/olympiad_data.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/olympiad_data.sql
index fb3c7e28fa..d86b0a4e06 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/olympiad_data.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/olympiad_data.sql
@@ -7,4 +7,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_data` (
   `validation_end` bigint(13) unsigned NOT NULL DEFAULT '0',
   `next_weekly_change` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/olympiad_fights.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/olympiad_fights.sql
index 6b491f871d..b7a648c302 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/olympiad_fights.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/olympiad_fights.sql
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_fights` (
   `classed` tinyint(4) NOT NULL DEFAULT 0,
   KEY `charOneId` (`charOneId`),
   KEY `charTwoId` (`charTwoId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/olympiad_nobles.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/olympiad_nobles.sql
index a084f69e22..bbe3bc9bf5 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/olympiad_nobles.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/olympiad_nobles.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_done_week` tinyint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/olympiad_nobles_eom.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/olympiad_nobles_eom.sql
index 5f4ea7bc47..82578d73a8 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/olympiad_nobles_eom.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/olympiad_nobles_eom.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `olympiad_nobles_eom` (
   `competitions_lost` smallint(3) unsigned NOT NULL DEFAULT 0,
   `competitions_drawn` smallint(3) unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`charId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/party_matching_history.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/party_matching_history.sql
index e363987455..931f044fcd 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/party_matching_history.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/party_matching_history.sql
@@ -4,4 +4,4 @@ CREATE TABLE `party_matching_history` (
   `title` VARCHAR(21) DEFAULT NULL,
   `leader` VARCHAR(35) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/pet_evolves.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/pet_evolves.sql
index e825631c85..51fcd5eba8 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/pet_evolves.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/pet_evolves.sql
@@ -5,4 +5,4 @@ CREATE TABLE `pet_evolves` (
 	`level` int NOT NULL DEFAULT '0',
 	PRIMARY KEY  (`itemObjId`, `index`, `level`),
     UNIQUE KEY `pet_evolves` (`itemObjId`, `index`, `level`)
-) ENGINE=MyISAM;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/pet_skills.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/pet_skills.sql
index 2b502c7738..b680f21972 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/pet_skills.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/pet_skills.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `pet_skills` (
   `skillId` INT NOT NULL DEFAULT 0,
   `skillLevel` INT(3) NOT NULL DEFAULT 1,
   PRIMARY KEY (`petObjItemId`,`skillId`,`skillLevel`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/petition_feedback.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/petition_feedback.sql
index 55a1c41c22..a77f5730f2 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/petition_feedback.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/petition_feedback.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `petition_feedback` (
   `rate` TINYINT(1) UNSIGNED NOT NULL DEFAULT 2,
   `message` text NOT NULL,
   `date` bigint(13) unsigned NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/pets.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/pets.sql
index b6d916119a..e72bc97c1d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/pets.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/pets.sql
@@ -12,4 +12,4 @@ CREATE TABLE IF NOT EXISTS `pets` (
   `restore` enum('true','false') NOT NULL DEFAULT 'false',
   PRIMARY KEY (`item_obj_id`),
   KEY `ownerId` (`ownerId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/posts.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/posts.sql
index dbc8234412..3025ed14ac 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/posts.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/posts.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `posts` (
   `post_forum_id` int(8) NOT NULL DEFAULT '0',
   `post_txt` text NOT NULL,
   KEY `post_forum_id` (`post_forum_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/punishments.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/punishments.sql
index 286bfd6ca4..8df118acf1 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/punishments.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/punishments.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `punishments` (
   `reason` TEXT NOT NULL,
   `punishedBy` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/residence_functions.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/residence_functions.sql
index 9f948c65c0..a78d7aed7b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/residence_functions.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/residence_functions.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `residence_functions` (
   `expiration`  bigint NOT NULL ,
   `residenceId`  int NOT NULL ,
   PRIMARY KEY (`id`, `level`, `residenceId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/siege_clans.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/siege_clans.sql
index 3aa070529c..d88f155d0f 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/siege_clans.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/siege_clans.sql
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `siege_clans` (
    `type` int(1) DEFAULT NULL,
    `castle_owner` int(1) DEFAULT NULL,
    PRIMARY KEY (`clan_id`,`castle_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/topic.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/topic.sql
index 55fc74d214..b0af891b12 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/topic.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/topic.sql
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS `topic` (
   `topic_ownerid` int(8) NOT NULL DEFAULT '0',
   `topic_type` int(8) NOT NULL DEFAULT '0',
   `topic_reply` int(8) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/world_exchange_items.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/world_exchange_items.sql
index c994e04006..442405f40b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/world_exchange_items.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/game/world_exchange_items.sql
@@ -9,4 +9,4 @@ CREATE TABLE `world_exchange_items`  (
   `start_time` bigint(13) unsigned NOT NULL DEFAULT '0',
   `end_time` bigint(13) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`world_exchange_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/login/account_data.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/login/account_data.sql
index d5e81eb0c9..b09fbca191 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/login/account_data.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/login/account_data.sql
@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `account_data` (
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   PRIMARY KEY (`account_name`,`var`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/login/accounts.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/login/accounts.sql
index 790c39919c..a724eb54c6 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/login/accounts.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/login/accounts.sql
@@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `hop3` char(15) DEFAULT NULL,
   `hop4` char(15) DEFAULT NULL,
   PRIMARY KEY (`login`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/login/accounts_ipauth.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/login/accounts_ipauth.sql
index ea37ca029b..5c79e268f9 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/login/accounts_ipauth.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/login/accounts_ipauth.sql
@@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS `accounts_ipauth` (
   `login` varchar(45) NOT NULL,
   `ip` char(15) NOT NULL,
   `type` enum('deny','allow') NULL DEFAULT 'allow'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/login/gameservers.sql b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/login/gameservers.sql
index f9f75ef9fe..f2c43f0d90 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/login/gameservers.sql
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/db_installer/sql/login/gameservers.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS `gameservers` (
   `hexid` varchar(50) NOT NULL DEFAULT '',
   `host` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 INSERT INTO `gameservers` VALUES ('2', '-2ad66b3f483c22be097019f55c8abdf0', '');
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/config/Custom/FakePlayers.ini b/L2J_Mobius_Essence_7.1_Assassin/dist/game/config/Custom/FakePlayers.ini
index 314e1793b8..8de34755bb 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/config/Custom/FakePlayers.ini
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/config/Custom/FakePlayers.ini
@@ -17,6 +17,9 @@ FakePlayerKillsRewardPvP = True
 # Fake player kills apply karma rules.
 FakePlayerUnflaggedKillsKarma = True
 
+# Fake players can be attacked without PvP flagging.
+FakePlayerAutoAttackable = False
+
 # Aggressive AI fake players attack nearby monsters.
 FakePlayerAggroMonsters = True
 
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/config/General.ini b/L2J_Mobius_Essence_7.1_Assassin/dist/game/config/General.ini
index 01d27cf6f0..d0861daa05 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/config/General.ini
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/config/General.ini
@@ -436,8 +436,8 @@ ChatFilterChars = ^_^
 # NPC_SHOUT
 # NEW_TELL
 # WORLD (&)
-# Default: ALL;SHOUT;GLOBAL;TRADE;HERO_VOICE
-BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE
+# Default: GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE;WHISPER
+BanChatChannels = GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE;WHISPER
 
 
 # ---------------------------------------------------------------------------
@@ -646,6 +646,11 @@ AutoPlayAttackAction = True
 # Retail: False
 ResumeAutoPlay = False
 
+# Assist party leader.
+# When in party, target what the leader is targeting.
+# Retail: False
+AssistLeader = False
+
 
 # ---------------------------------------------------------------------------
 # Purge Settings
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/ActionData.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/ActionData.xml
index 0b3b3b5c9c..6dee41178c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/ActionData.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/ActionData.xml
@@ -2,45 +2,33 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ActionData.xsd">
 	<action id="0" handler="SitStand" /> <!-- Sit / Stand -->
 	<action id="1" handler="RunWalk" /> <!-- Walk / Run -->
-	<!-- Attack -->
-	<!-- Exchange -->
-	<!-- Next Target (Melee) -->
-	<!-- Pick Up -->
-	<!-- Help -->
-	<!-- Invite -->
-	<!-- Leave Party -->
-	<!-- Dismiss Party Member -->
-	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
-	<!-- Party Matching -->
+	<action id="2" handler="None" /> <!-- Attack -->
+	<action id="3" handler="None" /> <!-- Exchange -->
+	<action id="4" handler="None" /> <!-- Next Target (Melee) -->
+	<action id="5" handler="None" /> <!-- Pick Up -->
+	<action id="6" handler="None" /> <!-- Help -->
+	<action id="7" handler="None" /> <!-- Invite -->
+	<action id="8" handler="None" /> <!-- Leave Party -->
+	<action id="9" handler="None" /> <!-- Dismiss Party Member -->
+	<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store - Sell -->
 	<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
-	<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
-	<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
-	<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
 	<action id="16" handler="PetAttack" /> <!-- Pet's Attack -->
 	<action id="17" handler="PetStop" /> <!-- Stop Pet -->
-	<!-- Pick Up -->
 	<action id="19" handler="UnsummonPet" /> <!-- Recall Pet -->
-	<!-- Special skill -->
+	<action id="20" handler="None" /> <!-- Special skill -->
 	<action id="21" handler="ServitorHold" /> <!-- Change Servitor's Movement Mode -->
 	<action id="22" handler="ServitorAttack" /> <!-- Servitor's attack -->
 	<action id="23" handler="ServitorStop" /> <!-- Stop Servitor -->
-	<action id="24" handler="SocialAction" option="6" /> <!-- Yes -->
-	<action id="25" handler="SocialAction" option="5" /> <!-- No -->
 	<action id="26" handler="SocialAction" option="7" /> <!-- Bow -->
-	<!-- Special skill -->
+	<action id="27" handler="None" /> <!-- Special skill -->
 	<action id="28" handler="PrivateStore" option="3" /> <!-- Private Store - Buy -->
-	<action id="29" handler="SocialAction" option="8" /> <!-- Unaware -->
-	<action id="30" handler="SocialAction" option="9" /> <!-- Social Waiting -->
-	<action id="31" handler="SocialAction" option="10" /> <!-- Laugh -->
 	<action id="32" handler="ServitorSkillUse" option="4230" /> <!-- Switch Mode -->
-	<action id="33" handler="SocialAction" option="11" /> <!-- Applaud -->
 	<action id="34" handler="SocialAction" option="12" /> <!-- Dance -->
-	<action id="35" handler="SocialAction" option="13" /> <!-- Sorrow -->
 	<action id="36" handler="ServitorSkillUse" option="4259" /> <!-- Toxic Smoke -->
 	<action id="37" handler="PrivateStore" option="5" /> <!-- Dwarven Workshop -->
-	<!-- Mount/Dismount -->
-	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Soulless - Parasite Burst -->
-	<!-- Recommend -->
+	<action id="38" handler="Ride" /> <!-- Mount/Dismount -->
+	<action id="39" handler="ServitorSkillUse" option="4138" /> <!-- Parasite Burst -->
+	<action id="40" handler="None" /> <!-- Recommend -->
 	<action id="41" handler="ServitorSkillUse" option="4230" /> <!-- Wild Cannon -->
 	<action id="42" handler="ServitorSkillUse" option="4378" /> <!-- Personal Damage Shield -->
 	<action id="43" handler="ServitorSkillUse" option="4137" /> <!-- Water Pit -->
@@ -50,22 +38,11 @@
 	<action id="47" handler="ServitorSkillUse" option="4260" /> <!-- Steal Blood -->
 	<action id="48" handler="ServitorSkillUse" option="4068" /> <!-- Mechanical Cannon -->
 	<action id="49" handler="ServitorSkillUse" option="4032" /> <!-- Wild Temper -->
-	<!-- Change Party Leader -->
+	<action id="50" handler="None" /> <!-- Change Party Leader -->
 	<action id="52" handler="UnsummonServitor" /> <!-- Unsummon -->
 	<action id="53" handler="ServitorMove" /> <!-- Move -->
-	<action id="54" handler="PetMove" /> <!-- Move -->
-	<!-- Recording Replay On/Off -->
-	<!-- Command Channel Invite -->
-	<!-- Find Store -->
-	<!-- Duel -->
-	<!-- Cancel Duel -->
-	<!-- Party Duel -->
-	<action id="61" handler="PrivateStore" option="8" /> <!-- Private Store Package Sell -->
-	<action id="62" handler="SocialAction" option="14" /> <!-- Charm -->
-	<!-- Minigame -->
+	<action id="56" handler="None" /> <!-- Command Channel Invite -->
 	<action id="64" handler="TeleportBookmark" /> <!-- My Teleport -->
-	<action id="65" handler="BotReport" />
-	<action id="66" handler="SocialAction" option="15" /> <!-- Shyness -->
 	<action id="67" handler="AirshipAction" option="1" /> <!-- Steer -->
 	<action id="68" handler="AirshipAction" option="2" /> <!-- Cancel Control -->
 	<action id="69" handler="AirshipAction" option="3" /> <!-- Destination Map -->
@@ -73,30 +50,18 @@
 	<action id="71" handler="SocialAction" option="16" /> <!-- Exchange Bows -->
 	<action id="72" handler="SocialAction" option="17" /> <!-- High Five -->
 	<action id="73" handler="SocialAction" option="18" /> <!-- Couple Dance -->
-	<!-- Turn On/Off the Status Information -->
-	<!-- Invite Friends -->
-	<!-- Start/End Recording -->
-	<action id="78" handler="TacticalSignUse" option="1" /> <!-- Use of Token 1 -->
-	<action id="79" handler="TacticalSignUse" option="2" /> <!-- Use of Token 2 -->
-	<action id="80" handler="TacticalSignUse" option="3" /> <!-- Use of Token 3 -->
-	<action id="81" handler="TacticalSignUse" option="4" /> <!-- Use of Token 4 -->
-	<action id="82" handler="TacticalSignTarget" option="1" /> <!-- Target by Token 1 -->
-	<action id="83" handler="TacticalSignTarget" option="2" /> <!-- Target by Token 2 -->
-	<action id="84" handler="TacticalSignTarget" option="3" /> <!-- Target by Token 3 -->
-	<action id="85" handler="TacticalSignTarget" option="4" /> <!-- Target by Token 4 -->
 	<action id="87" handler="SocialAction" option="28" /> <!-- Propose -->
 	<action id="88" handler="SocialAction" option="29" /> <!-- Provoke -->
-	<action id="89" handler="SocialAction" option="30" /> <!-- Beauty Shop -->
-	<action id="90" handler="InstanceZoneInfo" /> <!-- Instance Zones -->
-	<!-- Next Target (Range) -->
-	<!-- Strike Back -->
-	<!-- Combat Mode -->
-	<!-- Dislike -->
-	<!-- Share Location -->
-	<!-- Party/Command Channel Request -->
-	<!-- Equipment Set Change -->
+	<action id="89" handler="SocialAction" option="30" /> <!-- Show Off -->
+	<action id="93" handler="None" /> <!-- Next Target (Range) -->
+	<action id="96" handler="None" /> <!-- Strike Back -->
+	<action id="97" handler="None" /> <!-- Combat Mode -->
+	<action id="98" handler="None" /> <!-- Dislike -->
+	<action id="99" handler="None" /> <!-- Share Location -->
+	<action id="100" handler="None" /> <!-- Party/Command Channel Request -->
+	<action id="101" handler="None" /> <!-- Equipment Set Change -->
 	<action id="1000" handler="ServitorSkillUse" option="4079" /> <!-- Siege Hammer -->
-	<!-- Ultimate Bombastic Buster -->
+	<action id="1001" handler="None" /> <!-- Ultimate Bombastic Buster -->
 	<action id="1002" handler="PetSkillUse" option="4123" /> <!-- Hostile Feeling -->
 	<action id="1003" handler="PetSkillUse" option="4710" /> <!-- Wild Stun -->
 	<action id="1004" handler="PetSkillUse" option="4711" /> <!-- Wild Defense -->
@@ -178,10 +143,6 @@
 	<action id="1077" handler="PetSkillUse" option="6051" /> <!-- Energy Burst -->
 	<action id="1078" handler="PetSkillUse" option="6052" /> <!-- Shock Wave -->
 	<action id="1079" handler="PetSkillUse" option="6053" /> <!-- Howl -->
-	<action id="1080" handler="ServitorSkillUse" option="6041" /> <!-- Phoenix Rush -->
-	<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
-	<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
-	<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
 	<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch Tactics -->
 	<action id="1085" handler="ServitorSkillUse" option="4707" /> <!-- Shadow's Sacrifice -->
 	<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/CategoryData.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/CategoryData.xml
index 72f3cbfa17..a65837abec 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/CategoryData.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/CategoryData.xml
@@ -411,6 +411,38 @@
 	<category name="WYVERN_GROUP">
 		<id>15955</id> <!-- wyvern -->
 	</category>
+	<category name="PET_GROUP">
+		<id>16079</id> <!-- Buffalo Calf -->
+		<id>16080</id> <!-- Black Buffalo -->
+		<id>16081</id> <!-- White Buffalo -->
+		<id>16082</id> <!-- Black Combat Buffalo -->
+		<id>16083</id> <!-- White Combat Buffalo -->
+		<id>16084</id> <!-- Tiger Cub -->
+		<id>16085</id> <!-- White Tiger -->
+		<id>16086</id> <!-- Tiger -->
+		<id>16087</id> <!-- White Sharp clawed Tiger -->
+		<id>16088</id> <!-- Steel Sharp clawed Tiger -->
+		<id>16089</id> <!-- Kookaburra Chick -->
+		<id>16090</id> <!-- Red Kookaburra -->
+		<id>16091</id> <!-- Blue Kookaburra -->
+		<id>16092</id> <!-- Red Combat Kookaburra -->
+		<id>16093</id> <!-- Blue Combat Kookaburra -->
+		<id>16094</id> <!-- Dragon Hatchling -->
+		<id>16095</id> <!-- Green Dragon -->
+		<id>16096</id> <!-- Red Dragon -->
+		<id>16097</id> <!-- Earth Dragon -->
+		<id>16098</id> <!-- Fire Dragon -->
+		<id>16099</id> <!-- Hawk Hatchling -->
+		<id>16100</id> <!-- Red Hawk -->
+		<id>16101</id> <!-- Blue Hawk -->
+		<id>16102</id> <!-- Red Combat Hawk -->
+		<id>16103</id> <!-- Blue Combat Hawk -->
+		<id>16104</id> <!-- Wolf Cub -->
+		<id>16105</id> <!-- Black Wolf -->
+		<id>16106</id> <!-- While Wolf -->
+		<id>16107</id> <!-- Black Steel Wolf -->
+		<id>16108</id> <!-- White Steel Wolf -->
+	</category>
 	<category name="SUBJOB_GROUP_KNIGHT">
 		<id>5</id> <!-- paladin -->
 		<id>6</id> <!-- dark_avenger -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/DailyMission.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/DailyMission.xml
index 703870da0e..8f6efcb266 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/DailyMission.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/DailyMission.xml
@@ -1,767 +1,573 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/DailyMission.xsd">
-	<reward id="2001" reward_id="2001" name="Daily Hunting I (Lv. 21-40)" requiredCompletion="30" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 30 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+	<reward id="2001" reward_id="2001" name="Daily Hunting (Lv. 21-40)" requiredCompletion="30" isOneTime="false">
+		<!-- Daily mission. A reward is given for killing any 30 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">21</param>
 			<param name="maxLevel">40</param>
 		</handler>
 		<items>
-			<item id="90907" count="3" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="10" /> <!-- Spirit Ore -->
-			<item id="91912" count="3" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="3" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="10" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="3" /> <!-- HP Potion -->
 		</items>
 	</reward>
-	<reward id="2002" reward_id="2002" name="Daily Hunting II (Lv. 21-40)" requiredCompletion="60" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 60 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
-		<handler name="monster">
-			<param name="minLevel">21</param>
-			<param name="maxLevel">40</param>
-		</handler>
-		<items>
-			<item id="90907" count="3" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="10" /> <!-- Spirit Ore -->
-			<item id="91912" count="3" /> <!-- Hp Potion (Exchangeable) -->
-		</items>
-	</reward>
-	<reward id="2003" reward_id="2003" name="Daily Hunting III (Lv. 21-40)" requiredCompletion="100" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 100 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
-		<handler name="monster">
-			<param name="minLevel">21</param>
-			<param name="maxLevel">40</param>
-		</handler>
-		<items>
-			<item id="90907" count="3" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="10" /> <!-- Spirit Ore -->
-			<item id="91912" count="3" /> <!-- Hp Potion (Exchangeable) -->
-		</items>
-	</reward>
-	<reward id="2004" reward_id="2004" name="Daily Hunting IV (Lv. 21-40)" requiredCompletion="130" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 130 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
-		<handler name="monster">
-			<param name="minLevel">21</param>
-			<param name="maxLevel">40</param>
-		</handler>
-		<items>
-			<item id="90907" count="3" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="10" /> <!-- Spirit Ore -->
-			<item id="91912" count="3" /> <!-- Hp Potion (Exchangeable) -->
-		</items>
-	</reward>
-	<reward id="2005" reward_id="2005" name="Daily Hunting V (Lv. 21-40)" requiredCompletion="160" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 160 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
-		<handler name="monster">
-			<param name="minLevel">21</param>
-			<param name="maxLevel">40</param>
-		</handler>
-		<items>
-			<item id="90907" count="3" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="10" /> <!-- Spirit Ore -->
-			<item id="91912" count="3" /> <!-- Hp Potion (Exchangeable) -->
-		</items>
-	</reward>
-	<reward id="2101" reward_id="2101" name="Daily Hunting I (Lv. 41-50)" requiredCompletion="40" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 40 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+	<reward id="2101" reward_id="2101" name="Daily Hunting (Lv. 41-50)" requiredCompletion="40" isOneTime="false">
+		<!-- Daily mission. A reward is given for killing any 40 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">41</param>
 			<param name="maxLevel">50</param>
 		</handler>
 		<items>
-			<item id="90907" count="4" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="4" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="4" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="4" /> <!-- HP Potion -->
 		</items>
 	</reward>
-	<reward id="2102" reward_id="2102" name="Daily Hunting II (Lv. 41-50)" requiredCompletion="80" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 80 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
-		<handler name="monster">
-			<param name="minLevel">41</param>
-			<param name="maxLevel">50</param>
-		</handler>
-		<items>
-			<item id="90907" count="4" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="4" /> <!-- Hp Potion (Exchangeable) -->
-		</items>
-	</reward>
-	<reward id="2103" reward_id="2103" name="Daily Hunting III (Lv. 41-50)" requiredCompletion="120" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 120 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
-		<handler name="monster">
-			<param name="minLevel">41</param>
-			<param name="maxLevel">50</param>
-		</handler>
-		<items>
-			<item id="90907" count="4" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="4" /> <!-- Hp Potion (Exchangeable) -->
-		</items>
-	</reward>
-	<reward id="2104" reward_id="2104" name="Daily Hunting IV (Lv. 41-50)" requiredCompletion="160" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 160 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
-		<handler name="monster">
-			<param name="minLevel">41</param>
-			<param name="maxLevel">50</param>
-		</handler>
-		<items>
-			<item id="90907" count="4" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="4" /> <!-- Hp Potion (Exchangeable) -->
-		</items>
-	</reward>
-	<reward id="2105" reward_id="2105" name="Daily Hunting V (Lv. 41-50)" requiredCompletion="200" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 200 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
-		<handler name="monster">
-			<param name="minLevel">41</param>
-			<param name="maxLevel">50</param>
-		</handler>
-		<items>
-			<item id="90907" count="4" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="4" /> <!-- Hp Potion (Exchangeable) -->
-		</items>
-	</reward>
-	<reward id="2201" reward_id="2201" name="Daily Hunting I (Lv. 51-60)" requiredCompletion="50" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 50 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+	<reward id="2201" reward_id="2201" name="Daily Hunting (Lv. 51-60)" requiredCompletion="50" isOneTime="false">
+		<!-- Daily mission. A reward is given for killing any 50 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">51</param>
 			<param name="maxLevel">60</param>
 		</handler>
 		<items>
-			<item id="90907" count="5" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="5" /> <!-- Hp Potion (Exchangeable) -->
-		</items>
-	</reward>
-	<reward id="2202" reward_id="2202" name="Daily Hunting II (Lv. 51-60)" requiredCompletion="100" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 100 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
-		<handler name="monster">
-			<param name="minLevel">51</param>
-			<param name="maxLevel">60</param>
-		</handler>
-		<items>
-			<item id="90907" count="5" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="5" /> <!-- Hp Potion (Exchangeable) -->
-		</items>
-	</reward>
-	<reward id="2203" reward_id="2203" name="Daily Hunting III (Lv. 51-60)" requiredCompletion="150" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 150 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
-		<handler name="monster">
-			<param name="minLevel">51</param>
-			<param name="maxLevel">60</param>
-		</handler>
-		<items>
-			<item id="90907" count="5" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="5" /> <!-- Hp Potion (Exchangeable) -->
-		</items>
-	</reward>
-	<reward id="2204" reward_id="2204" name="Daily Hunting IV (Lv. 51-60)" requiredCompletion="200" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 200 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
-		<handler name="monster">
-			<param name="minLevel">51</param>
-			<param name="maxLevel">60</param>
-		</handler>
-		<items>
-			<item id="90907" count="5" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="5" /> <!-- Hp Potion (Exchangeable) -->
-		</items>
-	</reward>
-	<reward id="2205" reward_id="2205" name="Daily Hunting V (Lv. 51-60)" requiredCompletion="250" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 250 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
-		<handler name="monster">
-			<param name="minLevel">51</param>
-			<param name="maxLevel">60</param>
-		</handler>
-		<items>
-			<item id="90907" count="5" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="5" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="5" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="5" /> <!-- HP Potion -->
 		</items>
 	</reward>
 	<reward id="2301" reward_id="2301" name="Daily Hunting I (Lv. 61-70)" requiredCompletion="60" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 60 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 60 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">61</param>
 			<param name="maxLevel">70</param>
 		</handler>
 		<items>
-			<item id="90907" count="6" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="6" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="6" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="6" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2302" reward_id="2302" name="Daily Hunting II (Lv. 61-70)" requiredCompletion="120" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 120 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 120 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">61</param>
 			<param name="maxLevel">70</param>
 		</handler>
 		<items>
-			<item id="90907" count="6" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="6" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="6" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="6" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2303" reward_id="2303" name="Daily Hunting III (Lv. 61-70)" requiredCompletion="180" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 180 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 180 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">61</param>
 			<param name="maxLevel">70</param>
 		</handler>
 		<items>
-			<item id="90907" count="6" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="6" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="6" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="6" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2304" reward_id="2304" name="Daily Hunting IV (Lv. 61-70)" requiredCompletion="240" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 240 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 240 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">61</param>
 			<param name="maxLevel">70</param>
 		</handler>
 		<items>
-			<item id="90907" count="6" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="6" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="6" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="6" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2305" reward_id="2305" name="Daily Hunting V (Lv. 61-70)" requiredCompletion="300" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 300 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 300 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">61</param>
 			<param name="maxLevel">70</param>
 		</handler>
 		<items>
-			<item id="90907" count="6" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="20" /> <!-- Spirit Ore -->
-			<item id="91912" count="6" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="6" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="20" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="6" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2401" reward_id="2401" name="Daily Hunting I (Lv. 71-75)" requiredCompletion="80" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 80 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 80 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">71</param>
 			<param name="maxLevel">75</param>
 		</handler>
 		<items>
-			<item id="90907" count="7" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="30" /> <!-- Spirit Ore -->
-			<item id="91912" count="7" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="7" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="30" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="7" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2402" reward_id="2402" name="Daily Hunting II (Lv. 71-75)" requiredCompletion="150" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 150 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 150 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">71</param>
 			<param name="maxLevel">75</param>
 		</handler>
 		<items>
-			<item id="90907" count="7" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="30" /> <!-- Spirit Ore -->
-			<item id="91912" count="7" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="7" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="30" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="7" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2403" reward_id="2403" name="Daily Hunting III (Lv. 71-75)" requiredCompletion="200" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 200 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 200 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">71</param>
 			<param name="maxLevel">75</param>
 		</handler>
 		<items>
-			<item id="90907" count="7" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="30" /> <!-- Spirit Ore -->
-			<item id="91912" count="7" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="7" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="30" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="7" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2404" reward_id="2404" name="Daily Hunting IV (Lv. 71-75)" requiredCompletion="300" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 300 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 300 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">71</param>
 			<param name="maxLevel">75</param>
 		</handler>
 		<items>
-			<item id="90907" count="7" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="30" /> <!-- Spirit Ore -->
-			<item id="91912" count="7" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="7" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="30" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="7" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2405" reward_id="2405" name="Daily Hunting V (Lv. 71-75)" requiredCompletion="400" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 400 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 400 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">71</param>
 			<param name="maxLevel">75</param>
 		</handler>
 		<items>
-			<item id="90907" count="7" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="30" /> <!-- Spirit Ore -->
-			<item id="91912" count="7" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="7" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="30" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="7" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2501" reward_id="2501" name="Daily Hunting I (Lv. 76+)" requiredCompletion="100" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 100 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 100 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="90907" count="8" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="40" /> <!-- Spirit Ore -->
-			<item id="91912" count="8" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="8" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="40" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="8" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2502" reward_id="2502" name="Daily Hunting II (Lv. 76+)" requiredCompletion="200" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 200 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 200 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="90907" count="8" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="40" /> <!-- Spirit Ore -->
-			<item id="91912" count="8" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="8" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="40" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="8" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2503" reward_id="2503" name="Daily Hunting III (Lv. 76+)" requiredCompletion="300" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 300 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 300 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="90907" count="8" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="40" /> <!-- Spirit Ore -->
-			<item id="91912" count="8" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="8" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="40" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="8" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="2504" reward_id="2504" name="Daily Hunting IV (Lv. 76+)" requiredCompletion="400" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 400 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 400 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="90907" count="8" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="40" /> <!-- Spirit Ore -->
-			<item id="91912" count="8" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="8" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="40" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="8" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
-			<item id="97145" count="30" /> <!-- Ancient Adena -->
+			<item id="97145" count="20" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
 	<reward id="2505" reward_id="2505" name="Daily Hunting V (Lv. 76+)" requiredCompletion="500" isOneTime="false">
-		<!-- Daily mission. A reward is given for killing any 500 monsters. Monsters whose level is lower than the character's for more than 10 levels do not count. -->
+		<!-- Daily mission. A reward is given for killing any 500 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
 		<handler name="monster">
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="90907" count="8" /> <!-- Soulshot Ticket -->
-			<item id="3031" count="40" /> <!-- Spirit Ore -->
-			<item id="91912" count="8" /> <!-- Hp Potion (Exchangeable) -->
+			<item id="90907" count="8" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="40" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="8" /> <!-- HP Potion -->
 			<item id="97224" count="10" /> <!-- Mission Points -->
 			<item id="97145" count="30" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
-	<reward id="1141" reward_id="827" name="Adventurer's Journey I (Lv. 20-30)" requiredCompletion="70" isOneTime="true">
-		<!-- Kill 70 monsters in the following hunting zones: Ruins of Agony, Abandoned Camp. -->
-		<handler name="monster">
-			<param name="minLevel">20</param>
-			<param name="maxLevel">30</param>
-		</handler>
-		<items>
-			<item id="91654" count="1" /> <!-- Adventurer's Mark Lv.1 -->
-		</items>
-	</reward>
-	<reward id="1142" reward_id="828" name="Adventurer's Journey II (Lv. 30-40)" requiredCompletion="150" isOneTime="true">
-		<!-- Kill 150 monsters in the following hunting zones: Gorgon Flower Garden, Death Pass. -->
-		<handler name="monster">
-			<param name="minLevel">30</param>
-			<param name="maxLevel">40</param>
-		</handler>
-		<items>
-			<item id="91655" count="1" /> <!-- Adventurer's Mark Lv.2 -->
-		</items>
-	</reward>
-	<reward id="1143" reward_id="829" name="Adventurer's Journey III (Lv. 40-60)" requiredCompletion="500" isOneTime="true">
-		<!-- Kill 500 monsters in the following hunting zones: Sea of Spores, Cemetery, Fields of Massacre. -->
-		<handler name="monster">
-			<param name="minLevel">40</param>
-			<param name="maxLevel">60</param>
-		</handler>
-		<items>
-			<item id="91656" count="1" /> <!-- Adventurer's Mark Lv.3 -->
-		</items>
-	</reward>
-	<reward id="1144" reward_id="830" name="Adventurer's Journey IV (Lv. 60-75" requiredCompletion="700" isOneTime="true">
-		<!-- Kill 700 monsters in the following hunting zones: Plains of Glory, War-Torn Plains, Silent Valley. -->
-		<handler name="monster">
-			<param name="minLevel">60</param>
-			<param name="maxLevel">75</param>
-		</handler>
-		<items>
-			<item id="91657" count="1" /> <!-- Adventurer's Mark Lv.4 -->
-		</items>
-	</reward>
-	<reward id="1145" reward_id="831" name="Adventurer's Journey V (Lv. 76+)" requiredCompletion="1000" isOneTime="true">
-		<!-- Kill 1000 monsters in the following hunting zones: Plains of the Lizardmen, Dragon Valley (west). -->
-		<handler name="monster">
-			<param name="minLevel">76</param>
-			<param name="maxLevel">99</param>
-		</handler>
-		<items>
-			<item id="91931" count="1" /> <!-- Adventurer's Mark Lv.5 -->
-		</items>
-	</reward>
 	<reward id="4001" reward_id="1078" name="Reach Level 20" requiredCompletion="20">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 20. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 20. -->
 		<handler name="level">
 			<param name="level">20</param>
 		</handler>
 		<items>
-			<item id="94269" count="2" /> <!-- Scroll: Boost Attack -->
+			<item id="94269" count="2" /> <!-- Scroll: Boost Attack - Sealed -->
 		</items>
 	</reward>
 	<reward id="4002" reward_id="1079" name="Reach Level 30" requiredCompletion="30">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 30. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 30. -->
 		<handler name="level">
 			<param name="level">30</param>
 		</handler>
 		<items>
-			<item id="94269" count="3" /> <!-- Scroll: Boost Attack -->
+			<item id="94269" count="3" /> <!-- Scroll: Boost Attack - Sealed -->
 		</items>
 	</reward>
 	<reward id="4003" reward_id="1080" name="Reach Level 40" requiredCompletion="40">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 40. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 40. -->
 		<handler name="level">
 			<param name="level">40</param>
 		</handler>
 		<items>
-			<item id="94269" count="4" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="1" /> <!-- Scroll: Boost Defense -->
+			<item id="94269" count="4" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="1" /> <!-- Scroll: Boost Defense - Sealed -->
 		</items>
 	</reward>
 	<reward id="4004" reward_id="1081" name="Reach Level 45" requiredCompletion="45">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 45. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 45. -->
 		<handler name="level">
 			<param name="level">45</param>
 		</handler>
 		<items>
-			<item id="94269" count="5" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="2" /> <!-- Scroll: Boost Defense -->
+			<item id="94269" count="5" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="2" /> <!-- Scroll: Boost Defense - Sealed -->
 		</items>
 	</reward>
 	<reward id="5011" reward_id="5011" name="Reach Level 46" requiredCompletion="46">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 46. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 46. Event. -->
 		<handler name="level">
 			<param name="level">46</param>
 		</handler>
 		<items>
-			<item id="91910" count="5" /> <!-- Sayha's Blessing - Lv. 1-75 -->
+			<item id="91910" count="5" /> <!-- Sayha's Blessing - Lv. 1-75 - Sealed -->
 		</items>
 	</reward>
 	<reward id="5012" reward_id="5012" name="Reach Level 47" requiredCompletion="47">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 47. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 47. Event. -->
 		<handler name="level">
 			<param name="level">47</param>
 		</handler>
 		<items>
-			<item id="91910" count="5" /> <!-- Sayha's Blessing - Lv. 1-75 -->
+			<item id="91910" count="5" /> <!-- Sayha's Blessing - Lv. 1-75 - Sealed -->
 		</items>
 	</reward>
 	<reward id="5013" reward_id="5013" name="Reach Level 48" requiredCompletion="48">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 48. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 48. Event. -->
 		<handler name="level">
 			<param name="level">48</param>
 		</handler>
 		<items>
-			<item id="91910" count="5" /> <!-- Sayha's Blessing - Lv. 1-75 -->
+			<item id="91910" count="5" /> <!-- Sayha's Blessing - Lv. 1-75 - Sealed -->
 		</items>
 	</reward>
 	<reward id="5014" reward_id="5014" name="Reach Level 49" requiredCompletion="49">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 49. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 49. Event. -->
 		<handler name="level">
 			<param name="level">49</param>
 		</handler>
 		<items>
-			<item id="91910" count="5" /> <!-- Sayha's Blessing - Lv. 1-75 -->
+			<item id="91910" count="5" /> <!-- Sayha's Blessing - Lv. 1-75 - Sealed -->
 		</items>
 	</reward>
 	<reward id="4005" reward_id="1082" name="Reach Level 50" requiredCompletion="50">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 50. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 50. -->
 		<handler name="level">
 			<param name="level">50</param>
 		</handler>
 		<items>
-			<item id="94269" count="6" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="3" /> <!-- Scroll: Boost Defense -->
+			<item id="94269" count="6" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="3" /> <!-- Scroll: Boost Defense - Sealed -->
 		</items>
 	</reward>
 	<reward id="4006" reward_id="1083" name="Reach Level 55" requiredCompletion="55">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 55. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 55. -->
 		<handler name="level">
 			<param name="level">55</param>
 		</handler>
 		<items>
-			<item id="94269" count="7" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="4" /> <!-- Scroll: Boost Defense -->
+			<item id="94269" count="7" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="4" /> <!-- Scroll: Boost Defense - Sealed -->
 		</items>
 	</reward>
 	<reward id="4007" reward_id="1084" name="Reach Level 60" requiredCompletion="60">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 60. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 60. -->
 		<handler name="level">
 			<param name="level">60</param>
 		</handler>
 		<items>
-			<item id="94269" count="8" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="5" /> <!-- Scroll: Boost Defense -->
+			<item id="94269" count="8" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="5" /> <!-- Scroll: Boost Defense - Sealed -->
 		</items>
 	</reward>
 	<reward id="4008" reward_id="1085" name="Reach Level 65" requiredCompletion="65">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 65. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 65. -->
 		<handler name="level">
 			<param name="level">65</param>
 		</handler>
 		<items>
-			<item id="94269" count="9" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="6" /> <!-- Scroll: Boost Defense -->
+			<item id="94269" count="9" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="6" /> <!-- Scroll: Boost Defense - Sealed -->
 		</items>
 	</reward>
 	<reward id="4009" reward_id="1086" name="Reach Level 68" requiredCompletion="68">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 68. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 68. -->
 		<handler name="level">
 			<param name="level">68</param>
 		</handler>
 		<items>
-			<item id="94269" count="10" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="7" /> <!-- Scroll: Boost Defense -->
+			<item id="94269" count="10" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="7" /> <!-- Scroll: Boost Defense - Sealed -->
 		</items>
 	</reward>
 	<reward id="4010" reward_id="1087" name="Reach Level 71" requiredCompletion="71">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 71. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 71. -->
 		<handler name="level">
 			<param name="level">71</param>
 		</handler>
 		<items>
-			<item id="94269" count="11" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="8" /> <!-- Scroll: Boost Defense -->
+			<item id="94269" count="11" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="8" /> <!-- Scroll: Boost Defense - Sealed -->
 		</items>
 	</reward>
 	<reward id="4011" reward_id="1088" name="Reach Level 74" requiredCompletion="74">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 74. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 74. -->
 		<handler name="level">
 			<param name="level">74</param>
 		</handler>
 		<items>
-			<item id="94269" count="12" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="9" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="2" /> <!-- XP Growth Scroll -->
+			<item id="94269" count="12" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="9" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="2" /> <!-- XP Growth Scroll - Sealed -->
 		</items>
 	</reward>
 	<reward id="4012" reward_id="1089" name="Reach Level 76" requiredCompletion="76">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 76. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 76. -->
 		<handler name="level">
 			<param name="level">76</param>
 		</handler>
 		<items>
-			<item id="94269" count="13" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="10" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="4" /> <!-- XP Growth Scroll -->
+			<item id="94269" count="13" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="10" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="4" /> <!-- XP Growth Scroll - Sealed -->
 		</items>
 	</reward>
 	<reward id="4013" reward_id="1090" name="Reach Level 78" requiredCompletion="78">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 78. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 78. -->
 		<handler name="level">
 			<param name="level">78</param>
 		</handler>
 		<items>
-			<item id="94269" count="14" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="11" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="6" /> <!-- XP Growth Scroll -->
+			<item id="94269" count="14" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="11" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="6" /> <!-- XP Growth Scroll - Sealed -->
 		</items>
 	</reward>
 	<reward id="4014" reward_id="1091" name="Reach Level 79" requiredCompletion="79">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 79. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 79. -->
 		<handler name="level">
 			<param name="level">79</param>
 		</handler>
 		<items>
-			<item id="94269" count="15" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="12" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="8" /> <!-- XP Growth Scroll -->
+			<item id="94269" count="15" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="12" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="8" /> <!-- XP Growth Scroll - Sealed -->
 		</items>
 	</reward>
 	<reward id="4015" reward_id="1092" name="Reach Level 80" requiredCompletion="80">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 80. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 80. -->
 		<handler name="level">
 			<param name="level">80</param>
 		</handler>
 		<items>
-			<item id="94269" count="16" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="13" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="10" /> <!-- XP Growth Scroll -->
+			<item id="94269" count="16" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="13" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="10" /> <!-- XP Growth Scroll - Sealed -->
 		</items>
 	</reward>
 	<reward id="4016" reward_id="1093" name="Reach Level 81" requiredCompletion="81">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 81. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 81. -->
 		<handler name="level">
 			<param name="level">81</param>
 		</handler>
 		<items>
-			<item id="94269" count="17" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="14" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="12" /> <!-- XP Growth Scroll -->
+			<item id="94269" count="17" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="14" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="12" /> <!-- XP Growth Scroll - Sealed -->
 		</items>
 	</reward>
 	<reward id="4017" reward_id="1094" name="Reach Level 82" requiredCompletion="82">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 82. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 82. -->
 		<handler name="level">
 			<param name="level">82</param>
 		</handler>
 		<items>
-			<item id="94269" count="18" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="15" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="14" /> <!-- XP Growth Scroll -->
+			<item id="94269" count="18" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="15" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="14" /> <!-- XP Growth Scroll - Sealed -->
 		</items>
 	</reward>
 	<reward id="4018" reward_id="1095" name="Reach Level 83" requiredCompletion="83">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 83. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 83. -->
 		<handler name="level">
 			<param name="level">83</param>
 		</handler>
 		<items>
-			<item id="94269" count="19" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="16" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="16" /> <!-- XP Growth Scroll -->
+			<item id="94269" count="19" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="16" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="16" /> <!-- XP Growth Scroll - Sealed -->
 		</items>
 	</reward>
 	<reward id="4019" reward_id="1096" name="Reach Level 84" requiredCompletion="84">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 84. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 84. -->
 		<handler name="level">
 			<param name="level">84</param>
 		</handler>
 		<items>
-			<item id="94269" count="20" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="17" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="18" /> <!-- XP Growth Scroll -->
+			<item id="94269" count="20" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="17" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="18" /> <!-- XP Growth Scroll - Sealed -->
 		</items>
 	</reward>
 	<reward id="4020" reward_id="1097" name="Reach Level 85" requiredCompletion="85">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 85. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 85. -->
 		<handler name="level">
 			<param name="level">85</param>
 		</handler>
 		<items>
-			<item id="94269" count="21" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="18" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="20" /> <!-- XP Growth Scroll -->
-			<item id="94777" count="1" /> <!-- Berserker's Scroll -->
-			<item id="93062" count="1" /> <!-- Hat of Glory -->
+			<item id="94269" count="21" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="18" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="20" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="94777" count="1" /> <!-- Berserker's Scroll - Sealed -->
+			<item id="93062" count="1" /> <!-- Hat of Glory - Sealed -->
 		</items>
 	</reward>
 	<reward id="4021" reward_id="1098" name="Reach Level 86" requiredCompletion="86">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 86. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 86. -->
 		<handler name="level">
 			<param name="level">86</param>
 		</handler>
 		<items>
-			<item id="94269" count="22" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="19" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="22" /> <!-- XP Growth Scroll -->
-			<item id="94777" count="2" /> <!-- Berserker's Scroll -->
-			<item id="93064" count="1" /> <!-- <Rare> Weight Limit Ticket of Glory -->
+			<item id="94269" count="22" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="19" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="22" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="94777" count="2" /> <!-- Berserker's Scroll - Sealed -->
+			<item id="93064" count="1" /> <!-- Weight Limit Coupon of Glory - Sealed -->
 		</items>
 	</reward>
 	<reward id="4022" reward_id="1099" name="Reach Level 87" requiredCompletion="87">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 87. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 87. -->
 		<handler name="level">
 			<param name="level">87</param>
 		</handler>
 		<items>
-			<item id="94269" count="23" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="20" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="24" /> <!-- XP Growth Scroll -->
-			<item id="94777" count="3" /> <!-- Berserker's Scroll -->
-			<item id="93059" count="1" /> <!-- <Rare> Spellbook: Mount Glory of Champion -->
+			<item id="94269" count="23" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="20" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="24" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="94777" count="3" /> <!-- Berserker's Scroll - Sealed -->
+			<item id="93059" count="1" /> <!-- Spellbook: Mount Glorious Steed - Sealed -->
 		</items>
 	</reward>
 	<reward id="4023" reward_id="1100" name="Reach Level 88" requiredCompletion="88">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 88. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 88. -->
 		<handler name="level">
 			<param name="level">88</param>
 		</handler>
 		<items>
-			<item id="94269" count="24" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="22" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="24" /> <!-- XP Growth Scroll -->
-			<item id="94777" count="4" /> <!-- Berserker's Scroll -->
-			<item id="93063" count="1" /> <!-- <Rare> Inventory Expansion Ticket of Glory -->
+			<item id="94269" count="24" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="22" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="24" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="94777" count="4" /> <!-- Berserker's Scroll - Sealed -->
+			<item id="93063" count="1" /> <!-- Inventory Expansion Coupon of Glory - Sealed -->
 		</items>
 	</reward>
 	<reward id="4024" reward_id="1101" name="Reach Level 89" requiredCompletion="89">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 89. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 89. -->
 		<handler name="level">
 			<param name="level">89</param>
 		</handler>
 		<items>
-			<item id="94269" count="24" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="24" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="24" /> <!-- XP Growth Scroll -->
-			<item id="94777" count="5" /> <!-- Berserker's Scroll -->
-			<item id="93061" count="1" /> <!-- <Rare> Spellbook: Mount Shining Lady -->
+			<item id="94269" count="24" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="24" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="24" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="94777" count="5" /> <!-- Berserker's Scroll - Sealed -->
+			<item id="93061" count="1" /> <!-- Spellbook: Mount Shining Lady - Sealed -->
 		</items>
 	</reward>
 	<reward id="4025" reward_id="1102" name="Reach Level 90" requiredCompletion="90">
-		<!-- One-time mission. A reward is given when the character reaches Lv. 90. -->
+		<!-- One-time mission. A reward is given when you reach Lv. 90. -->
 		<handler name="level">
 			<param name="level">90</param>
 		</handler>
 		<items>
-			<item id="94269" count="24" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="24" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="24" /> <!-- XP Growth Scroll -->
-			<item id="94777" count="5" /> <!-- Berserker's Scroll -->
-			<item id="94765" count="1" /> <!-- Lv. 90 Achievement Reward Box -->
+			<item id="94269" count="24" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="24" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="24" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="94777" count="5" /> <!-- Berserker's Scroll - Sealed -->
+			<item id="94765" count="1" /> <!-- Lv. 90 Achievement Reward Box - Sealed -->
 		</items>
 	</reward>
 	<reward id="4026" reward_id="4026" name="Reach Level 91" requiredCompletion="91">
-		<!-- One-time mission. A reward is given when you reach Lv. 91.-->
+		<!-- One-time mission. A reward is given when you reach Lv. 91. -->
 		<handler name="level">
 			<param name="level">91</param>
 		</handler>
 		<items>
-			<item id="94269" count="30" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="30" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="30" /> <!-- XP Growth Scroll -->
-			<item id="94777" count="6" /> <!-- Berserker's Scroll -->
-			<item id="95888" count="1" /> <!-- Lv. 91 Achievement Reward Box -->
+			<item id="94269" count="30" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="30" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="30" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="94777" count="6" /> <!-- Berserker's Scroll - Sealed -->
+			<item id="95888" count="1" /> <!-- Lv. 91 Achievement Reward Box - Sealed -->
 		</items>
 	</reward>
 	<reward id="4027" reward_id="4027" name="Reach Level 92" requiredCompletion="92">
-		<!-- One-time mission. A reward is given when you reach Lv. 92.-->
+		<!-- One-time mission. A reward is given when you reach Lv. 92. -->
 		<handler name="level">
 			<param name="level">92</param>
 		</handler>
 		<items>
-			<item id="94269" count="36" /> <!-- Scroll: Boost Attack -->
-			<item id="94271" count="36" /> <!-- Scroll: Boost Defense -->
-			<item id="49674" count="36" /> <!-- XP Growth Scroll -->
-			<item id="94777" count="7" /> <!-- Berserker's Scroll -->
-			<item id="95889" count="1" /> <!-- Lv. 92 Achievement Reward Box -->
+			<item id="94269" count="36" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="94271" count="36" /> <!-- Scroll: Boost Defense - Sealed -->
+			<item id="49674" count="36" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="94777" count="7" /> <!-- Berserker's Scroll - Sealed -->
+			<item id="95889" count="1" /> <!-- Lv. 92 Achievement Reward Box - Sealed -->
 		</items>
 	</reward>
 	<reward id="3007" reward_id="3007" name="Sayha's Blessing" requiredCompletion="10">
@@ -771,104 +577,134 @@
 			<param name="id">91910</param>
 		</handler>
 		<items>
-			<item id="94780" count="2" /> <!-- Growth Rune Fragment Sealed -->
-			<item id="97224" count="5" /> <!-- Mission Points -->
+			<item id="93274" count="10" /> <!-- Sayha's Cookie - Sealed -->
+			<item id="90907" count="30" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="500" /> <!-- Spirit Ore - Sealed -->
 		</items>
 	</reward>
 	<reward id="1500" reward_id="1500" name="Hunt in Transcendent Instance Zones" requiredCompletion="300">
 		<!-- Daily mission (once per account). A reward is given for killing 300 monsters in transcendent instance zones. -->
 		<handler name="monster">
-			<param name="minLevel">40</param>
+			<param name="minLevel">60</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">22107,22108,22109,22122,22331,22111,22110,22112,22123,22116,22117,22118,22124,22113,22114,22115,22147,22148,22149,22275,22276,22277,22278</param>
 		</handler>
 		<items>
-			<item id="93274" count="100" /> <!-- Sayha's Cookie Sealed -->
+			<item id="93274" count="100" /> <!-- Sayha's Cookie - Sealed -->
 			<item id="97224" count="20" /> <!-- Mission Points -->
 			<item id="97145" count="50" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
-	<reward id="3019" reward_id="3011" name="Difficult Assault on the Orc Fortress" requiredCompletion="1">
+	<reward id="3019" reward_id="3019" name="Difficult Assault on Orc Fortress" requiredCompletion="1">
 		<!-- A reward is given for killing titled monsters during the battle for the Orc Fortress. -->
 		<handler name="monster">
 			<param name="minLevel">60</param>
 			<param name="maxLevel">99</param>
+			<param name="ids">22156</param>
 		</handler>
 		<items>
-			<item id="93068" count="1" /> <!-- Red Lantern -->
-			<item id="49674" count="3" /> <!-- XP Growth Scroll -->
+			<item id="49674" count="3" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="93068" count="1" /> <!-- Red Lantern - 1st Place - Sealed -->
+			<item id="97145" count="50" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
-	<reward id="3020" reward_id="3012" name="Assault on Orc Fortress" requiredCompletion="50">
+	<reward id="3020" reward_id="3020" name="Assault on Orc Fortress" requiredCompletion="50">
 		<!-- A reward is given for killing titleless monsters during the battle for the Orc Fortress. -->
 		<handler name="monster">
 			<param name="minLevel">60</param>
 			<param name="maxLevel">99</param>
+			<param name="ids">22164,22165,22166,22167,22168,22169,22170,22171,22172,22173,22174,22175,22176,22177,22178,22179,22180,22181</param>
 		</handler>
 		<items>
-			<item id="93070" count="5" /> <!-- Blue Lantern -->
-			<item id="49674" count="2" /> <!-- XP Growth Scroll -->
+			<item id="49674" count="2" /> <!-- XP Growth Scroll - Sealed -->
+			<item id="93070" count="5" /> <!-- Blue Lantern - 3rd Place - Sealed -->
 		</items>
 	</reward>
-	<reward id="3013" reward_id="3013" name="3 vs 3 Olympiad Winner I" requiredCompletion="1">
-		<!-- One-time mission. A reward is given for winning a 3 vs 3 Olympiad match. Not available on Sundays. -->
-		<handler name="olympiad" />
+	<reward id="3021" reward_id="3021" name="Giran Relic's Defense - Hard Difficulty" requiredCompletion="20">
+		<!-- A reward is given for killing titled monsters during the Giran siege on the side of the Giran Relic defenders. -->
+		<handler name="monster">
+			<param name="minLevel">60</param>
+			<param name="maxLevel">99</param>
+			<param name="ids">29225</param>
+		</handler>
 		<items>
-			<item id="92991" count="3" /> <!-- Einhasad's Blessing Scroll -->
+			<item id="97415" count="5" /> <!-- Red Lantern (Time-limited) - Sealed -->
+			<item id="91712" count="10" /> <!-- Sayha's Storm - Sealed -->
+			<item id="97145" count="200" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
-	<reward id="3014" reward_id="3014" name="3 vs 3 Olympiad Winner II" requiredCompletion="2">
-		<!-- One-time mission. A reward is given for winning 2 of 3 vs 3 Olympiad matches. Not available on Sundays. -->
-		<handler name="olympiad" />
+	<reward id="3022" reward_id="3022" name="Giran Relic's Defense" requiredCompletion="200">
+		<!-- A reward is given for killing titleless monsters during the Giran siege on the side of the Giran Relic defenders. -->
+		<handler name="monster">
+			<param name="minLevel">60</param>
+			<param name="maxLevel">99</param>
+			<param name="ids">18891,18892,18894,18895</param>
+		</handler>
 		<items>
-			<item id="91690" count="50" /> <!-- Special HP Recovery Potion -->
+			<item id="97415" count="1" /> <!-- Red Lantern (Time-limited) - Sealed -->
+			<item id="91712" count="10" /> <!-- Sayha's Storm - Sealed -->
 		</items>
 	</reward>
-	<reward id="3015" reward_id="3015" name="3 vs 3 Olympiad Winner III" requiredCompletion="3">
-		<!-- One-time mission. A reward is given for winning 3 of 3 vs 3 Olympiad matches. Not available on Sundays. -->
+	<reward id="3013" reward_id="3013" name="Olympiad Winner I" requiredCompletion="1">
+		<!-- One-time mission. A reward is given for winning an Olympiad match. Available from Monday till Friday. -->
 		<handler name="olympiad" />
 		<items>
-			<item id="92991" count="5" /> <!-- Einhasad's Blessing Scroll -->
+			<item id="92991" count="3" /> <!-- Einhasad's Blessing Scroll - Sealed -->
+			<item id="91772" count="1" /> <!-- Scroll: PK - Sealed -->
 		</items>
 	</reward>
-	<reward id="3016" reward_id="3016" name="3 vs 3 Olympiad Winner IV" requiredCompletion="4">
-		<!-- One-time mission. A reward is given for winning 4 of 3 vs 3 Olympiad matches. Not available on Sundays. -->
+	<reward id="3014" reward_id="3014" name="Olympiad Winner II" requiredCompletion="2">
+		<!-- One-time mission. A reward is given for winning 2 Olympiad matches. Available from Monday till Friday. -->
 		<handler name="olympiad" />
 		<items>
-			<item id="91690" count="100" /> <!-- Special HP Recovery Potion -->
+			<item id="91690" count="50" /> <!-- Special HP Recovery Potion - Sealed -->
 		</items>
 	</reward>
-	<reward id="3017" reward_id="3017" name="3 vs 3 Olympiad Winner V" requiredCompletion="5">
-		<!-- One-time mission. A reward is given for winning 5 of 3 vs 3 Olympiad matches. Not available on Sundays. -->
+	<reward id="3015" reward_id="3015" name="Olympiad Winner III" requiredCompletion="3">
+		<!-- One-time mission. A reward is given for winning 3 Olympiad matches. Available from Monday till Friday. -->
 		<handler name="olympiad" />
 		<items>
-			<item id="93290" count="1" /> <!-- Victory Pack -->
+			<item id="92991" count="5" /> <!-- Einhasad's Blessing Scroll - Sealed -->
+		</items>
+	</reward>
+	<reward id="3016" reward_id="3016" name="Olympiad Winner IV" requiredCompletion="4">
+		<!-- One-time mission. A reward is given for winning 4 Olympiad matches. Available from Monday till Friday. -->
+		<handler name="olympiad" />
+		<items>
+			<item id="91690" count="100" /> <!-- Special HP Recovery Potion - Sealed -->
+		</items>
+	</reward>
+	<reward id="3017" reward_id="3017" name="Olympiad Winner V" requiredCompletion="5">
+		<!-- One-time mission. A reward is given for winning 5 Olympiad matches. Available from Monday till Friday. -->
+		<handler name="olympiad" />
+		<items>
+			<item id="95687" count="1" /> <!-- Olympiad Treasure Chest - Sealed -->
 		</items>
 	</reward>
 	<reward id="3018" reward_id="3018" name="Olympiad Competitor" requiredCompletion="50">
-		<!-- A reward is given when player will participating in 50 Olympiad matches in a month. Available from monday to friday. -->
+		<!-- A reward is given for participating in 50 Olympiad matches in a month. Available from Monday till Friday. -->
 		<handler name="olympiad" />
 		<items>
-			<item id="97224" count="150" /> <!-- Mission Points -->
-			<item id="95687" count="1" /> <!-- Olympiad Treasure Chest Sealed -->
+			<item id="95687" count="1" /> <!-- Olympiad Treasure Chest - Sealed -->
+			<item id="97224" count="50" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="1017" reward_id="117" name="In-game Weekend" requiredCompletion="1">
 		<!-- Weekly mission. A reward is given for playing the game on Saturday or Sunday. -->
 		<handler name="loginweekend" />
 		<items>
-			<item id="94269" count="1" /> <!--  -->
-			<item id="3031" count="50" /> <!--  -->
+			<item id="94269" count="1" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="3031" count="50" /> <!-- Spirit Ore - Sealed -->
 		</items>
 	</reward>
-	<reward id="1023" reward_id="501" name="Joining a Clan" requiredCompletion="1">
+	<reward id="1023" reward_id="501" name="Join a Clan" requiredCompletion="1">
 		<!-- One-time mission. A reward is given when joining a clan for the first time. -->
 		<handler name="joinclan">
 			<param name="minLevel">40</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="90768" count="1" /> <!-- Hair Accessory Coupon -->
+			<item id="90768" count="1" /> <!-- Head Accessory Coupon - Sealed -->
 		</items>
 	</reward>
 	<reward id="9001" reward_id="9001" name="Clan Raid Attack" requiredCompletion="1">
@@ -879,39 +715,41 @@
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="3031" count="150" /> <!-- Spirit Ore -->
-			<item id="94481" count="50" /> <!-- Clan XP -->
-			<item id="94269" count="3" /> <!-- Scroll: Boost Attack -->
+			<item id="94269" count="3" /> <!-- Scroll: Boost Attack - Sealed -->
+			<item id="3031" count="150" /> <!-- Spirit Ore - Sealed -->
+			<item id="94481" count="500" /> <!-- Clan XP - Sealed -->
 		</items>
 	</reward>
-	<reward id="9002" reward_id="9002" name="Dwelling of Spirits" requiredCompletion="50">
-		<!-- Weekly mission. A reward is given for defeating monsters during a clan raid to the Dwelling of Spirits. -->
+	<reward id="9002" reward_id="9002" name="Entrance to Dwelling of Spirits" requiredCompletion="50">
+		<!-- Weekly mission. A reward is given for defeating monsters during a command channel raid to the Dwelling of Spirits. -->
 		<handler name="monster">
 			<param name="ids">22271,22272,22273</param>
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
+			<item id="91830" count="5" /> <!-- Improved Fire Attack Potion -->
 			<item id="91831" count="5" /> <!-- Improved Water Attack Potion -->
 			<item id="91832" count="5" /> <!-- Improved Wind Attack Potion -->
 			<item id="91833" count="5" /> <!-- Improved Earth Attack Potion -->
-			<item id="91830" count="5" /> <!-- Improved Fire Attack Potion -->
-			<item id="94481" count="250" /> <!-- Clan XP Sealed -->
-			<item id="97224" count="10" /> <!-- Mission Points -->
+			<item id="94481" count="250" /> <!-- Clan XP - Sealed -->
+			<item id="97224" count="5" /> <!-- Mission Points -->
 		</items>
 	</reward>
-	<reward id="9003" reward_id="9003" name="Spirit Kings" requiredCompletion="1">
-		<!-- Weekly mission. A reward is given for defeating Ignis, Nebula, Procella or Petram during a clan raid to the Dwelling of Spirits. -->
+	<reward id="9003" reward_id="9003" name="Spirit Rulers" requiredCompletion="1">
+		<!-- Weekly mission. A reward is given for defeating Ignis, Nebula, Procella or Petram during a command channel raid to the Dwelling of Spirits. -->
 		<handler name="monster">
 			<param name="ids">29105,29106,29107,29108</param>
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
+			<item id="91830" count="5" /> <!-- Improved Fire Attack Potion -->
 			<item id="91831" count="5" /> <!-- Improved Water Attack Potion -->
 			<item id="91832" count="5" /> <!-- Improved Wind Attack Potion -->
 			<item id="91833" count="5" /> <!-- Improved Earth Attack Potion -->
-			<item id="91830" count="5" /> <!-- Improved Fire Attack Potion -->
+			<item id="94481" count="500" /> <!-- Clan XP - Sealed -->
+			<item id="97145" count="20" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
 	<reward id="9004" reward_id="9004" name="Battle with Frintezza" requiredCompletion="1">
@@ -922,108 +760,108 @@
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="90907" count="20" /> <!-- Soulshot Ticket Sealed -->
-			<item id="3031" count="200" /> <!-- Spirit Ore Sealed -->
-			<item id="94481" count="200" /> <!-- Clan XP Sealed -->
-			<item id="94879" count="300" /> <!-- Grace Potion Sealed -->
+			<item id="90907" count="20" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="200" /> <!-- Spirit Ore - Sealed -->
+			<item id="94481" count="500" /> <!-- Clan XP - Sealed -->
+			<item id="94879" count="300" /> <!-- Grace Potion - Sealed -->
+			<item id="97224" count="5" /> <!-- Mission Points -->
 			<item id="97145" count="20" /> <!-- Ancient Adena -->
-			<item id="97224" count="10" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="1112" reward_id="508" name="Fire Spirit Lv. 3" requiredCompletion="3">
-		<!-- One-time mission. A reward is given when evolving the Fire Spirit up to Lv. 3. -->
+		<!-- A reward is given when evolving the Fire Spirit up to Lv. 3. -->
 		<handler name="spiritevolve">
 			<param name="element">FIRE</param>
 		</handler>
 		<items>
-			<item id="91185" count="30" /> <!-- Mid-grade Spirit's Blessing -->
+			<item id="91185" count="30" /> <!-- Mid-grade Spirit's Blessing - Sealed -->
 		</items>
 	</reward>
 	<reward id="1113" reward_id="509" name="Water Spirit Lv. 3" requiredCompletion="3">
-		<!-- One-time mission. A reward is given when evolving the Water Spirit up to Lv. 3. -->
+		<!-- A reward is given when evolving the Water Spirit up to Lv. 3. -->
 		<handler name="spiritevolve">
 			<param name="element">WATER</param>
 		</handler>
 		<items>
-			<item id="91185" count="30" /> <!-- Mid-grade Spirit's Blessing -->
+			<item id="91185" count="30" /> <!-- Mid-grade Spirit's Blessing - Sealed -->
 		</items>
 	</reward>
 	<reward id="1114" reward_id="510" name="Wind Spirit Lv. 3" requiredCompletion="3">
-		<!-- One-time mission. A reward is given when evolving the Wind Spirit up to Lv. 3. -->
+		<!-- A reward is given when evolving the Wind Spirit up to Lv. 3. -->
 		<handler name="spiritevolve">
 			<param name="element">WIND</param>
 		</handler>
 		<items>
-			<item id="91185" count="30" /> <!-- Mid-grade Spirit's Blessing -->
+			<item id="91185" count="30" /> <!-- Mid-grade Spirit's Blessing - Sealed -->
 		</items>
 	</reward>
 	<reward id="1115" reward_id="511" name="Earth Spirit Lv. 3" requiredCompletion="3">
-		<!-- One-time mission. A reward is given when evolving the Earth Spirit up to Lv. 3. -->
+		<!-- A reward is given when evolving the Earth Spirit up to Lv. 3. -->
 		<handler name="spiritevolve">
 			<param name="element">EARTH</param>
 		</handler>
 		<items>
-			<item id="91185" count="30" /> <!-- Mid-grade Spirit's Blessing -->
+			<item id="91185" count="30" /> <!-- Mid-grade Spirit's Blessing - Sealed -->
 		</items>
 	</reward>
 	<reward id="1162" reward_id="2031" name="Fire Spirit Lv. 5" requiredCompletion="5">
-		<!-- One-time quest. A reward is given when evolving the Fire Spirit up to Lv. 5. -->
+		<!-- A reward is given when evolving the Fire Spirit up to Lv. 5. -->
 		<handler name="spiritevolve">
 			<param name="element">FIRE</param>
 		</handler>
 		<items>
-			<item id="91186" count="30" />
+			<item id="91186" count="30" /> <!-- High-grade Spirit's Blessing - Sealed -->
 		</items>
 	</reward>
 	<reward id="1163" reward_id="2032" name="Water Spirit Lv. 5" requiredCompletion="5">
-		<!-- One-time quest. A reward is given when evolving the Water Spirit up to Lv. 5. -->
+		<!-- A reward is given when evolving the Water Spirit up to Lv. 5. -->
 		<handler name="spiritevolve">
 			<param name="element">WATER</param>
 		</handler>
 		<items>
-			<item id="91186" count="30" />
+			<item id="91186" count="30" /> <!-- High-grade Spirit's Blessing - Sealed -->
 		</items>
 	</reward>
 	<reward id="1164" reward_id="2033" name="Wind Spirit Lv. 5" requiredCompletion="5">
-		<!-- One-time quest. A reward is given when evolving the Wind Spirit up to Lv. 5. -->
+		<!-- A reward is given when evolving the Wind Spirit up to Lv. 5. -->
 		<handler name="spiritevolve">
 			<param name="element">WIND</param>
 		</handler>
 		<items>
-			<item id="91186" count="30" />
+			<item id="91186" count="30" /> <!-- High-grade Spirit's Blessing - Sealed -->
 		</items>
 	</reward>
 	<reward id="1165" reward_id="2034" name="Earth Spirit Lv. 5" requiredCompletion="5">
-		<!-- One-time quest. A reward is given when evolving the Earth Spirit up to Lv. 5. -->
+		<!-- A reward is given when evolving the Earth Spirit up to Lv. 5. -->
 		<handler name="spiritevolve">
 			<param name="element">EARTH</param>
 		</handler>
 		<items>
-			<item id="91186" count="30" />
+			<item id="91186" count="30" /> <!-- High-grade Spirit's Blessing - Sealed -->
 		</items>
 	</reward>
-	<reward id="1116" reward_id="118" name="Attribute monsters hunting" requiredCompletion="1800">
-		<!-- A reward is given once a week for elemental monster hunting. -->
+	<reward id="1116" reward_id="118" name="Attribute Monster Hunting" requiredCompletion="1800">
+		<!-- Weekly mission. A reward is given for killing attribute monsters. -->
 		<handler name="monster">
 			<param name="ids">20792,20794,20795,20796,20797,20798,20799,20800,20801,20802,20803,20849,20995,21661,21662,21663,21664,21665,21666,21667,21668,21669,21670,21671,21672,21673,21674,21675,21676,21678,21685,21686,21761,21762,21763,21764,21765,21766,21767,21768,21769,21770,21771,21772,21773,21774,21775,21776,21777,21778,21779,21780,21781,21782,21783,21784,21785,21786,21787,21788,21789,21790,21791,21792,21793,21813,21814,21815,21816,21817,21818,21819,21820,21821,21822,21823,21824,21825,21826,21827,21828,21829,21830,21831,21832</param>
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
 		</handler>
 		<items>
-			<item id="91030" count="10" /> <!-- Blessed Soul -->
-			<item id="97224" count="10" /> <!-- Mission Points -->
+			<item id="91030" count="10" /> <!-- Blessed Soul - Sealed -->
+			<item id="97224" count="5" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="1503" reward_id="1503" name="Explore Primeval Isle" requiredCompletion="200">
 		<!-- A reward is given for killing 200 monsters on the Primeval Isle. -->
 		<handler name="monster">
-			<param name="minLevel">79</param>
+			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">22058,21969,22056,21962,21964,21966,21968,21974,22059,21976,21971</param>
 		</handler>
 		<items>
-			<item id="94879" count="50" /> <!-- Grace PotionSealed -->
-			<item id="97224" count="20" /> <!-- Mission Points -->
+			<item id="94879" count="50" /> <!-- Grace Potion - Sealed -->
+			<item id="97224" count="5" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="5036" reward_id="5036" name="Assault on Elmoreden Tower" requiredCompletion="50">
@@ -1034,9 +872,9 @@
 			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
 		</handler>
 		<items>
-			<item id="91671" count="1" /> <!--  -->
-			<item id="97247" count="1" /> <!--  -->
-			<item id="97224" count="20" /> <!--  -->
+			<item id="97418" count="1" /> <!-- Green Lantern (Time-limited) - Sealed -->
+			<item id="97247" count="1" /> <!-- Asofe - Sealed -->
+			<item id="97224" count="20" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="5037" reward_id="5037" name="Assault on Elmoreden Tower" requiredCompletion="50">
@@ -1047,9 +885,9 @@
 			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
 		</handler>
 		<items>
-			<item id="91670" count="1" /> <!--  -->
-			<item id="97247" count="3" /> <!--  -->
-			<item id="97224" count="20" /> <!--  -->
+			<item id="97417" count="1" /> <!-- Blue Lantern (Time-limited) - Sealed -->
+			<item id="97247" count="3" /> <!-- Asofe - Sealed -->
+			<item id="97224" count="20" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="5038" reward_id="5038" name="Assault on Elmoreden Tower" requiredCompletion="50">
@@ -1060,9 +898,9 @@
 			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
 		</handler>
 		<items>
-			<item id="91669" count="2" /> <!--  -->
-			<item id="97247" count="5" /> <!--  -->
-			<item id="97224" count="20" /> <!--  -->
+			<item id="97416" count="2" /> <!-- Purple Lantern (Time-limited) - Sealed -->
+			<item id="97247" count="5" /> <!-- Asofe - Sealed -->
+			<item id="97224" count="20" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="5039" reward_id="5039" name="Assault on Elmoreden Tower" requiredCompletion="50">
@@ -1073,99 +911,66 @@
 			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
 		</handler>
 		<items>
-			<item id="91668" count="2" /> <!--  -->
-			<item id="97247" count="7" /> <!--  -->
-			<item id="97224" count="20" /> <!--  -->
+			<item id="97415" count="2" /> <!-- Red Lantern (Time-limited) - Sealed -->
+			<item id="97247" count="7" /> <!-- Asofe - Sealed -->
+			<item id="97224" count="20" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="1505" reward_id="1505" name="Monster Purge" requiredCompletion="1">
 		<!-- A reward is given after receiving the reward for using the Purge system in the corresponding hunting zones. -->
 		<handler name="purge" />
 		<items>
-			<item id="94879" count="1" /> <!-- Aden Purge Crystal Sealed -->
+			<item id="95481" count="1" /> <!-- Aden Purge Crystal - Sealed -->
 			<item id="97224" count="20" /> <!-- Mission Points -->
 		</items>
 	</reward>
-	<reward id="1506" reward_id="1506" name="Forgotten Primeval Garden I" requiredCompletion="100">
-		<!-- A reward is given for killing 100 Swift Hunter monsters in Forgotten Primeval Garden. -->
+	<reward id="1509" reward_id="1509" name="Explore Dreamland" requiredCompletion="1">
+		<!-- A reward is given for killing one of the following monsters in the Dream Dungeon: Gustav, Gustav's Steward, Gabrielle, Gabrielle's Minion, Ventus, Rekario, Tiat, Baint. -->
 		<handler name="monster">
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">18678,18679,18680,18681,18682,18683,18684,18685</param>
 		</handler>
 		<items>
-			<item id="92459" count="1" /> <!--  -->
-			<item id="97246" count="5" /> <!--  -->
-		</items>
-	</reward>
-	<reward id="1507" reward_id="1507" name="Forgotten Primeval Garden II" requiredCompletion="300">
-		<!-- A reward is given for killing 300 Swift Hunter monsters in Forgotten Primeval Garden. -->
-		<handler name="monster">
-			<param name="minLevel">76</param>
-			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
-		</handler>
-		<items>
-			<item id="92459" count="2" /> <!--  -->
-		</items>
-	</reward>
-	<reward id="1508" reward_id="1508" name="Forgotten Primeval Garden III" requiredCompletion="1000">
-		<!-- A reward is given for killing 1000 Swift Hunter monsters in Forgotten Primeval Garden. -->
-		<handler name="monster">
-			<param name="minLevel">76</param>
-			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
-		</handler>
-		<items>
-			<item id="96787" count="4" /> <!--  -->
-			<item id="97145" count="100" /> <!--  -->
-		</items>
-	</reward>
-	<reward id="1509" reward_id="1509" name="Exploring Dreamland" requiredCompletion="1">
-		<!-- A reward is given for killing one of the following monsters in the Dream Dungeon: Gustav, Gustav's Steward, Gabrielle, Gabrielle's Minion, Ventus, Rekario, Tiat, Baint. / Kill 1 raid boss in one of the four dungeons. -->
-		<handler name="monster">
-			<param name="minLevel">76</param>
-			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
-		</handler>
-		<items>
-			<item id="96925" count="1" /> <!-- Dream Orb Sealed -->
-			<item id="93068" count="1" /> <!-- Red Lantern - 1st Place Sealed -->
+			<item id="96925" count="1" /> <!-- Dream Orb - Sealed -->
+			<item id="93068" count="2" /> <!-- Red Lantern - 1st Place - Sealed -->
 			<item id="97224" count="5" /> <!-- Mission Points -->
 			<item id="97145" count="100" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
-	<reward id="1510" reward_id="1510" name="Exploring Dreamland's Secret Places" requiredCompletion="1">
-		<!-- A reward is given for killing Feline King or Feline Queen in the Cat Guild's Lair of the Dream Dungeon. / Kill 1 raid boss in the Cat Guild's dungeon. -->
+	<reward id="1510" reward_id="1510" name="Explore Dreamland's Secret Places" requiredCompletion="1">
+		<!-- A reward is given for killing Feline King or Feline Queen in the Cat Guild's Lair of the Dream Dungeon. -->
 		<handler name="monster">
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">18686,18687</param>
 		</handler>
 		<items>
-			<item id="96925" count="1" /> <!-- Dream Orb Sealed -->
+			<item id="96925" count="1" /> <!-- Dream Orb - Sealed -->
 		</items>
 	</reward>
-	<reward id="1511" reward_id="1511" name="Exploring Alligator Island" requiredCompletion="100">
-		<!-- A reward is given for killing 100 Evolved monsters on Alligator Island. / Kill 100 Evolved monsters. -->
+	<reward id="1511" reward_id="1511" name="Explore Alligator Island" requiredCompletion="100">
+		<!-- A reward is given for killing 100 Evolved monsters on Alligator Island. -->
 		<handler name="monster">
 			<param name="minLevel">70</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">22192,22197</param>
 		</handler>
 		<items>
-			<item id="96925" count="1" /> <!-- Dream Orb Sealed -->
+			<item id="94780" count="2" /> <!-- Growth Rune Fragment - Sealed -->
+			<item id="97224" count="15" /> <!-- Mission Points -->
 		</items>
 	</reward>
 	<reward id="1512" reward_id="1512" name="Incessant Training" requiredCompletion="1">
-		<!-- A reward is given for killing one of the following monsters in the Training Zone: Boojudu, Petron, Kerion, Furious Tukhak, Rilva, Ryun, Chel. -->
+		<!-- A reward is given for killing one of the following monsters in the Training Zone: Boojudu, Petron, Kerion, Furious Tukhak, Rilva, Ryun, Chel, Susceptor Primo, Susceptor Prime, Lakarta, Bykant, Hacepsute. -->
 		<handler name="monster">
 			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">25952,25953,25954,25955,25961,25962,25963</param>
 		</handler>
 		<items>
-			<item id="97145" count="50" /> <!--  -->
+			<item id="97145" count="50" /> <!-- Ancient Adena -->
+			<item id="98209" count="1" /> <!-- Purge Equipment Newbie Pack - Sealed -->
 		</items>
 	</reward>
 	<reward id="1513" reward_id="1513" name="Combat on Balok Battleground" requiredCompletion="10">
@@ -1173,10 +978,10 @@
 		<handler name="monster">
 			<param name="minLevel">60</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">22413,22414,22415,22416,22417</param>
 		</handler>
 		<items>
-			<item id="97145" count="50" /> <!--  -->
+			<item id="97145" count="50" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
 	<reward id="1514" reward_id="1514" name="Explore Goddard" requiredCompletion="1000">
@@ -1184,10 +989,10 @@
 		<handler name="monster">
 			<param name="minLevel">85</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">22426,22427,22428,22429,22431,22432,22433,22434,22435,22436,22437,22438,22439,22440,22441,22442,22443,22445,22446</param>
 		</handler>
 		<items>
-			<item id="97145" count="100" /> <!--  -->
+			<item id="97145" count="100" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
 	<reward id="1515" reward_id="1515" name="Explore Antharas' Lair" requiredCompletion="300">
@@ -1195,10 +1000,10 @@
 		<handler name="monster">
 			<param name="minLevel">85</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">20761,21085,20627,20623,20621,20407,20626,20625,20624,20622,20620,21084,20405,21089,21087,21086,20629,20628,22500</param>
 		</handler>
 		<items>
-			<item id="97246" count="10" /> <!--  -->
+			<item id="97246" count="10" /> <!-- Enria - Sealed -->
 		</items>
 	</reward>
 	<reward id="1516" reward_id="1516" name="Explore Frost Lord's Castle" requiredCompletion="300">
@@ -1206,21 +1011,152 @@
 		<handler name="monster">
 			<param name="minLevel">85</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">22351,22346,22347,22345,22352,22349,22350,22348</param>
 		</handler>
 		<items>
-			<item id="97246" count="10" /> <!--  -->
+			<item id="97246" count="10" /> <!-- Enria - Sealed -->
 		</items>
 	</reward>
-	<reward id="5033" reward_id="5033" name="Ephemeral Frozen Canyon" requiredCompletion="50">
-		<!-- Daily mission (once per account). A reward is given for killing 50 monsters in the Frozen Canyon during the event. -->
+	<reward id="1517" reward_id="1517" name="Explore Valakas' Temple" requiredCompletion="1">
+		<!-- A reward is given for defeating any of the following monsters during the 'Explore Valakas' Temple' command channel raid: Ifrit, Ifrin, Iff, Blazing Dragon. -->
 		<handler name="monster">
-			<param name="minLevel">65</param>
+			<param name="minLevel">76</param>
 			<param name="maxLevel">99</param>
-			<param name="ids">22192,22193,22194,22195,22196,22197,22198,22199</param>
+			<param name="ids">25964,25965,25966,25967</param>
 		</handler>
 		<items>
-			<item id="95836" count="50" /> <!-- Dream Orb Sealed -->
+			<item id="93068" count="2" /> <!-- Red Lantern - 1st Place - Sealed -->
+			<item id="94481" count="500" /> <!-- Clan XP - Sealed -->
+			<item id="97224" count="5" /> <!-- Mission Points -->
+			<item id="97145" count="20" /> <!-- Ancient Adena -->
 		</items>
 	</reward>
-</list>
\ No newline at end of file
+	<reward id="1518" reward_id="1518" name="Explore the Primeval Garden" requiredCompletion="1000">
+		<!-- A reward is given for killing 1000 monsters titled 'Swift Hunter' in the Primeval Garden. -->
+		<handler name="monster">
+			<param name="minLevel">76</param>
+			<param name="maxLevel">99</param>
+			<param name="ids">22269,22270</param>
+		</handler>
+		<items>
+			<item id="93685" count="10" /> <!-- Enchant Kit: Talisman of Speed - Sealed -->
+			<item id="97145" count="100" /> <!-- Ancient Adena -->
+		</items>
+	</reward>
+	<reward id="1519" reward_id="1519" name="Explore the Garden of Eva" requiredCompletion="1000">
+		<!-- A reward is given for killing 1000 monsters titled 'Eva's Energy Reserve' in the Garden of Eva. -->
+		<handler name="monster">
+			<param name="minLevel">76</param>
+			<param name="maxLevel">99</param>
+			<param name="ids">22528,22523</param>
+		</handler>
+		<items>
+			<item id="92020" count="10" /> <!-- Enchant Kit: Talisman of Eva - Sealed -->
+			<item id="97145" count="100" /> <!-- Ancient Adena -->
+		</items>
+	</reward>
+	<!--
+	<reward id="1520" reward_id="1520" name="Daily Upgrade of Hidden Power" requiredCompletion="3">
+		Daily mission. A reward is given for 3 upgrades of the hidden power.
+		<handler name="monster">
+			<param name="minLevel">0</param>
+			<param name="maxLevel">0</param>
+		</handler>
+		<items>
+			<item id="97145" count="10" /> Ancient Adena
+		</items>
+	</reward>
+	<reward id="1521" reward_id="1521" name="Constant Upgrade of Hidden Power" requiredCompletion="30">
+		Weekly mission. A reward is given for 30 upgrades of the hidden power.
+		<handler name="monster">
+			<param name="minLevel">0</param>
+			<param name="maxLevel">0</param>
+		</handler>
+		<items>
+			<item id="97147" count="1" /> Hidden Power Booster - Sealed
+		</items>
+	</reward>
+	-->
+	<reward id="1522" reward_id="1522" name="Investigate the Primeval Garden" requiredCompletion="100">
+		<!-- Daily mission.\nA reward is given for killing 100 monsters titled 'Swift Hunter' in the Primeval Garden. -->
+		<handler name="monster">
+			<param name="minLevel">76</param>
+			<param name="maxLevel">99</param>
+			<param name="ids">22269,22270</param>
+		</handler>
+		<items>
+			<item id="93685" count="1" /> <!-- Enchant Kit: Talisman of Speed - Sealed -->
+		</items>
+	</reward>
+	<reward id="1523" reward_id="1523" name="Investigate the Garden of Eva" requiredCompletion="100">
+		<!-- Daily mission. A reward is given for killing 100 monsters titled 'Eva's Energy Reserve' in the Garden of Eva. -->
+		<handler name="monster">
+			<param name="minLevel">76</param>
+			<param name="maxLevel">99</param>
+			<param name="ids">22528,22523</param>
+		</handler>
+		<items>
+			<item id="92020" count="1" /> <!-- Enchant Kit: Talisman of Eva - Sealed -->
+		</items>
+	</reward>
+	<reward id="1525" reward_id="1525" name="Hunt in the Tower of Insolence" requiredCompletion="100">
+		<!-- A reward is given for killing 100 monsters titled 'Magic Slave' in the Tower of Insolence. -->
+		<handler name="monster">
+			<param name="minLevel">80</param>
+			<param name="maxLevel">99</param>
+			<param name="ids">22564,22569,22574,22579,22584,22589,22593,22597,22601,22605,22609,22613</param>
+		</handler>
+		<items>
+			<item id="98037" count="2" /> <!-- +0 ~ +4 Cloak of Protection Pack - Sealed -->
+		</items>
+	</reward>
+	<!--
+	<reward id="1526" reward_id="1526" name="Explore Kelbim's Fortress and Pagan Temple" requiredCompletion="300">
+		A reward is given for killing 300 monsters in the following session zones: Kelbim's Fortress and Pagan Temple.
+		<handler name="monster">
+			<param name="minLevel">85</param>
+			<param name="maxLevel">99</param>
+			TODO: ids
+		</handler>
+		<items>
+			<item id="98199" count="1" /> Kelbim's Fortress' Time Stone - Sealed
+			<item id="98214" count="1" /> Pagan Temple's Time Stone - Sealed
+		</items>
+	</reward>
+	-->
+	<reward id="1527" reward_id="1527" name="Explore the Garden of Authority" requiredCompletion="100">
+		<!-- Daily mission. A reward is given for killing 100 monsters titled 'Bearer of Sacred Power' in the Garden of Authority. -->
+		<handler name="monster">
+			<param name="minLevel">76</param>
+			<param name="maxLevel">99</param>
+			<param name="ids">22564,22569,22574,22579,22584,22589,22593,22597,22601,22605,22609,22613</param>
+		</handler>
+		<items>
+			<item id="93330" count="1" /> <!-- Enchant Kit: Talisman of Authority - Sealed -->
+		</items>
+	</reward>
+	<reward id="1528" reward_id="1528" name="Hunt in the Garden of Authority" requiredCompletion="1000">
+		<!-- A reward is given for killing 1000 monsters titled 'Bearer of Sacred Power' in the Garden of Authority. -->
+		<handler name="monster">
+			<param name="minLevel">76</param>
+			<param name="maxLevel">99</param>
+			<param name="ids">22564,22569,22574,22579,22584,22589,22593,22597,22601,22605,22609,22613</param>
+		</handler>
+		<items>
+			<item id="93330" count="10" /> <!-- Enchant Kit: Talisman of Authority - Sealed -->
+			<item id="97145" count="100" /> <!-- Ancient Adena -->
+		</items>
+	</reward>
+	<reward id="9999999" reward_id="9999999" name="Daily Hunting I (Lv. 21-40)" requiredCompletion="30">
+		<!-- Daily mission. A reward is given for killing any 30 monsters. Monsters that are lower than you for more than 15 levels do not count. -->
+		<handler name="monster">
+			<param name="minLevel">21</param>
+			<param name="maxLevel">40</param>
+		</handler>
+		<items>
+			<item id="90907" count="3" /> <!-- Soulshot Ticket - Sealed -->
+			<item id="3031" count="10" /> <!-- Spirit Ore - Sealed -->
+			<item id="91912" count="3" /> <!-- HP Potion -->
+		</items>
+	</reward>
+</list>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/EnchantItemData.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/EnchantItemData.xml
index 0d83f94027..dd685f6494 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/EnchantItemData.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/EnchantItemData.xsd">
 	<!-- Weapon scrolls -->
+	
+	<!-- Protecting Scroll: Enchant Weapon -->
+	<enchant id="6569" targetGrade="A" maxEnchant="16" safeEnchant="4" /> <!-- Protecting Scroll: Enchant A-grade Weapon -->
+	<enchant id="6571" targetGrade="B" maxEnchant="16" safeEnchant="4" /> <!-- Protecting Scroll: Enchant B-grade Weapon -->
+	<enchant id="6573" targetGrade="C" maxEnchant="16" safeEnchant="4" /> <!-- Protecting Scroll: Enchant C-grade Weapon -->
+	<enchant id="6575" targetGrade="D" maxEnchant="16" safeEnchant="4" /> <!-- Protecting Scroll: Enchant D-grade Weapon -->
+	
 	<!-- Scrolls: Enchant Weapon -->
 	<enchant id="729" targetGrade="A" maxEnchant="16" safeEnchant="4" />
 	<enchant id="93976" targetGrade="A" maxEnchant="16" safeEnchant="4" />
@@ -43,14 +50,48 @@
 		<item id="95691" /> <!-- Aden's Dual Swords -->
 	</enchant>
 	<!-- Scroll: Enchant Death Knight's Flame Sword -->
-	<enchant id="93931" targetGrade="A" maxEnchant="3" scrollGroupId="2">
+	<enchant id="93931" targetGrade="A" maxEnchant="5" scrollGroupId="2">
 		<item id="93864" /> <!-- Death Knight's Flame Sword -->
+		<item id="96927" /> <!-- Axe of Immortality -->
+		<item id="96928" /> <!-- Ancient Sword of Immortality -->
+		<item id="96929" /> <!-- Magic Blunt Weapon of Immortality -->
+		<item id="96930" /> <!-- Flame Fists of Immortality -->
+		<item id="96931" /> <!-- Pistols of Immortality -->
+		<item id="96932" /> <!-- Rapier of Immortality -->
+		<item id="96933" /> <!-- Staff of Immortality -->
+		<item id="96935" /> <!-- Dagger of Immortality -->
+		<item id="96938" /> <!-- Two-handed Sword of Immortality -->
+		<item id="96939" /> <!-- Spear of Immortality -->
+		<item id="96940" /> <!-- Bow of Immortality -->
+		<item id="97088" /> <!-- Sword of Immortality -->
+		<item id="97089" /> <!-- Dual Swords of Immortality-->
 	</enchant>
 	<!-- Sealed Scroll: Enchant Death Knight's Flame Sword -->
-	<enchant id="93932" targetGrade="A" maxEnchant="3" scrollGroupId="2">
+	<enchant id="93932" targetGrade="A" maxEnchant="5" scrollGroupId="2">
 		<item id="93864" /> <!-- Death Knight's Flame Sword -->
+		<item id="96927" /> <!-- Axe of Immortality -->
+		<item id="96928" /> <!-- Ancient Sword of Immortality -->
+		<item id="96929" /> <!-- Magic Blunt Weapon of Immortality -->
+		<item id="96930" /> <!-- Flame Fists of Immortality -->
+		<item id="96931" /> <!-- Pistols of Immortality -->
+		<item id="96932" /> <!-- Rapier of Immortality -->
+		<item id="96933" /> <!-- Staff of Immortality -->
+		<item id="96935" /> <!-- Dagger of Immortality -->
+		<item id="96938" /> <!-- Two-handed Sword of Immortality -->
+		<item id="96939" /> <!-- Spear of Immortality -->
+		<item id="96940" /> <!-- Bow of Immortality -->
+		<item id="97088" /> <!-- Sword of Immortality -->
+		<item id="97089" /> <!-- Dual Swords of Immortality-->
 	</enchant>
+	
 	<!-- Armor scrolls -->
+	
+	<!-- Protecting Scroll: Enchant Armor -->
+	<enchant id="6570" targetGrade="A" maxEnchant="16" safeEnchant="4" /> <!-- Protecting Scroll: Enchant A-grade Armor -->
+	<enchant id="6572" targetGrade="B" maxEnchant="16" safeEnchant="4" /> <!-- Protecting Scroll: Enchant B-grade Armor -->
+	<enchant id="6574" targetGrade="C" maxEnchant="16" safeEnchant="4" /> <!-- Protecting Scroll: Enchant C-grade Armor -->
+	<enchant id="6576" targetGrade="D" maxEnchant="16" safeEnchant="4" /> <!-- Protecting Scroll: Enchant D-grade Armor -->
+	
 	<!-- Scrolls: Enchant Armor -->
 	<enchant id="730" targetGrade="A" maxEnchant="10" safeEnchant="4" />
 	<enchant id="93977" targetGrade="A" maxEnchant="10" safeEnchant="4" />
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/EnchantItemGroups.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/EnchantItemGroups.xml
index d869eecf07..ad28a50626 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/EnchantItemGroups.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/EnchantItemGroups.xml
@@ -31,10 +31,12 @@
 		<current enchant="14" chance="55" />
 		<current enchant="15" chance="40" />
 	</enchantRateGroup>
-	<enchantRateGroup name="DK_FLAME_SWORD"> <!-- Death Knight's Flame Sword -->
-		<current enchant="0" chance="23" />
-		<current enchant="1" chance="13" />
-		<current enchant="2" chance="3" />
+	<enchantRateGroup name="WEAPON_OF_IMMORTALITY"> <!-- Death Knight's Flame Sword -->
+		<current enchant="0" chance="50" />
+		<current enchant="1" chance="40" />
+		<current enchant="2" chance="30" />
+		<current enchant="3" chance="20" />
+		<current enchant="4" chance="10" />
 	</enchantRateGroup>
 	<enchantRateGroup name="ADEN_WEAPON_GROUP">
 		<current enchant="0-3" chance="100" />
@@ -383,8 +385,21 @@
 	</enchantScrollGroup>
 	<!-- Death Knight's Flame Sword scrolls enchanting route line -->
 	<enchantScrollGroup id="2">
-		<enchantRate group="DK_FLAME_SWORD">
+		<enchantRate group="WEAPON_OF_IMMORTALITY">
 			<item itemId="93864" /> <!-- Death Knight's Flame Sword -->
+			<item itemId="96927" /> <!-- Axe of Immortality -->
+			<item itemId="96928" /> <!-- Ancient Sword of Immortality -->
+			<item itemId="96929" /> <!-- Magic Blunt Weapon of Immortality -->
+			<item itemId="96930" /> <!-- Flame Fists of Immortality -->
+			<item itemId="96931" /> <!-- Pistols of Immortality -->
+			<item itemId="96932" /> <!-- Rapier of Immortality -->
+			<item itemId="96933" /> <!-- Staff of Immortality -->
+			<item itemId="96935" /> <!-- Dagger of Immortality -->
+			<item itemId="96938" /> <!-- Two-handed Sword of Immortality -->
+			<item itemId="96939" /> <!-- Spear of Immortality -->
+			<item itemId="96940" /> <!-- Bow of Immortality -->
+			<item itemId="97088" /> <!-- Sword of Immortality -->
+			<item itemId="97089" /> <!-- Dual Swords of Immortality-->
 		</enchantRate>
 	</enchantScrollGroup>
 	<!-- Rare Accessories scrolls enchanting route line -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/LimitShopCraft.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/LimitShopCraft.xml
index ca9216796f..a36ae3effd 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/LimitShopCraft.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/LimitShopCraft.xml
@@ -3482,72 +3482,72 @@
 	<product id="3701" category="5">
 		<ingredient id="94166" enchant="4" count="1" /> <!-- +4 Circlet of Hero (Sealed) -->
 		<ingredient id="94166" enchant="4" count="1" /> <!-- +4 Circlet of Hero (Sealed) -->
-		<production id="98205" count="1" chance="100.0" /> <!-- Blessed Circlet of Hero +4 -->
+		<production id="98205" enchant="4" count="1" chance="100.0" /> <!-- Blessed Circlet of Hero +4 -->
 	</product>
 	<product id="3702" category="5">
 		<ingredient id="94166" enchant="5" count="1" /> <!-- +5 Circlet of Hero (Sealed) -->
 		<ingredient id="94166" enchant="5" count="1" /> <!-- +5 Circlet of Hero (Sealed) -->
-		<production id="98205" count="1" chance="100.0" /> <!-- Blessed Circlet of Hero +5 -->
+		<production id="98205" enchant="5" count="1" chance="100.0" /> <!-- Blessed Circlet of Hero +5 -->
 	</product>
 	<product id="3703" category="5">
 		<ingredient id="94166" enchant="6" count="1" /> <!-- +6 Circlet of Hero (Sealed) -->
 		<ingredient id="94166" enchant="6" count="1" /> <!-- +6 Circlet of Hero (Sealed) -->
-		<production id="98205" count="1" chance="100.0" /> <!-- Blessed Circlet of Hero +6 -->
+		<production id="98205" enchant="6" count="1" chance="100.0" /> <!-- Blessed Circlet of Hero +6 -->
 	</product>
 	<product id="3704" category="5">
 		<ingredient id="94166" enchant="7" count="1" /> <!-- +7 Circlet of Hero (Sealed) -->
 		<ingredient id="94166" enchant="7" count="1" /> <!-- +7 Circlet of Hero (Sealed) -->
-		<production id="98205" count="1" chance="100.0" /> <!-- Blessed Circlet of Hero +7 -->
+		<production id="98205" enchant="7" count="1" chance="100.0" /> <!-- Blessed Circlet of Hero +7 -->
 	</product>
 	<product id="3705" category="5">
 		<ingredient id="94166" enchant="8" count="1" /> <!-- +8 Circlet of Hero (Sealed) -->
 		<ingredient id="94166" enchant="8" count="1" /> <!-- +8 Circlet of Hero (Sealed) -->
-		<production id="98205" count="1" chance="100.0" /> <!-- Blessed Circlet of Hero +8 -->
+		<production id="98205" enchant="8" count="1" chance="100.0" /> <!-- Blessed Circlet of Hero +8 -->
 	</product>
 	<product id="3706" category="5">
 		<ingredient id="94166" enchant="9" count="1" /> <!-- +9 Circlet of Hero (Sealed) -->
 		<ingredient id="94166" enchant="9" count="1" /> <!-- +9 Circlet of Hero (Sealed) -->
-		<production id="98205" count="1" chance="100.0" /> <!-- Blessed Circlet of Hero +9 -->
+		<production id="98205" enchant="9" count="1" chance="100.0" /> <!-- Blessed Circlet of Hero +9 -->
 	</product>
 	<product id="3707" category="5">
 		<ingredient id="94166" enchant="10" count="1" /> <!-- +10 Circlet of Hero (Sealed) -->
 		<ingredient id="94166" enchant="10" count="1" /> <!-- +10 Circlet of Hero (Sealed) -->
-		<production id="98205" count="1" chance="100.0" /> <!-- +10 Blessed Circlet of Hero -->
+		<production id="98205" enchant="10" count="1" chance="100.0" /> <!-- +10 Blessed Circlet of Hero -->
 	</product>
 	<product id="1203" category="5">
 		<ingredient id="91862" enchant="4" count="1" /> <!-- +4 Dragon Belt (Sealed) -->
 		<ingredient id="91862" enchant="4" count="1" /> <!-- +4 Dragon Belt (Sealed) -->
-		<production id="94621" count="1" chance="100.0" /> <!-- +4 Blessed Dragon Belt -->
+		<production id="94621" enchant="4" count="1" chance="100.0" /> <!-- +4 Blessed Dragon Belt -->
 	</product>
 	<product id="1204" category="5">
 		<ingredient id="91862" enchant="5" count="1" /> <!-- +5 Dragon Belt (Sealed) -->
 		<ingredient id="91862" enchant="5" count="1" /> <!-- +5 Dragon Belt (Sealed) -->
-		<production id="94621" count="1" chance="100.0" /> <!-- +5 Blessed Dragon Belt -->
+		<production id="94621" enchant="5" count="1" chance="100.0" /> <!-- +5 Blessed Dragon Belt -->
 	</product>
 	<product id="1205" category="5">
 		<ingredient id="91862" enchant="6" count="1" /> <!-- +6 Dragon Belt (Sealed) -->
 		<ingredient id="91862" enchant="6" count="1" /> <!-- +6 Dragon Belt (Sealed) -->
-		<production id="94621" count="1" chance="100.0" /> <!-- +6 Blessed Dragon Belt -->
+		<production id="94621" enchant="6" count="1" chance="100.0" /> <!-- +6 Blessed Dragon Belt -->
 	</product>
 	<product id="1206" category="5">
 		<ingredient id="91862" enchant="7" count="1" /> <!-- +7 Dragon Belt (Sealed) -->
 		<ingredient id="91862" enchant="7" count="1" /> <!-- +7 Dragon Belt (Sealed) -->
-		<production id="94621" count="1" chance="100.0" /> <!-- +7 Blessed Dragon Belt -->
+		<production id="94621" enchant="7" count="1" chance="100.0" /> <!-- +7 Blessed Dragon Belt -->
 	</product>
 	<product id="1207" category="5">
 		<ingredient id="91862" enchant="8" count="1" /> <!-- +8 Dragon Belt (Sealed) -->
 		<ingredient id="91862" enchant="8" count="1" /> <!-- +8 Dragon Belt (Sealed) -->
-		<production id="94621" count="1" chance="100.0" /> <!-- +8 Blessed Dragon Belt -->
+		<production id="94621" enchant="8" count="1" chance="100.0" /> <!-- +8 Blessed Dragon Belt -->
 	</product>
 	<product id="1208" category="5">
 		<ingredient id="91862" enchant="9" count="1" /> <!-- +9 Dragon Belt (Sealed) -->
 		<ingredient id="91862" enchant="9" count="1" /> <!-- +9 Dragon Belt (Sealed) -->
-		<production id="94621" count="1" chance="100.0" /> <!-- +9 Blessed Dragon Belt -->
+		<production id="94621" enchant="9" count="1" chance="100.0" /> <!-- +9 Blessed Dragon Belt -->
 	</product>
 	<product id="1209" category="5">
 		<ingredient id="91862" enchant="10" count="1" /> <!-- +10 Dragon Belt (Sealed) -->
 		<ingredient id="91862" enchant="10" count="1" /> <!-- +10 Dragon Belt (Sealed) -->
-		<production id="94621" count="1" chance="100.0" /> <!-- +10 Blessed Dragon Belt -->
+		<production id="94621" enchant="10" count="1" chance="100.0" /> <!-- +10 Blessed Dragon Belt -->
 	</product>
 	<product id="2879" category="5">
 		<ingredient id="92403" enchant="4" count="1" /> <!-- +4 Talisman of Speed (Sealed) -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/PetExtractData.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/PetExtractData.xml
new file mode 100644
index 0000000000..db6643827e
--- /dev/null
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/PetExtractData.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/PetExtractData.xsd">
+	<extraction petLevel="50" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="12" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="12" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="13" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="13" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="14" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="14" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="15" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="15" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="16" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="16" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="50" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="51" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="52" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="53" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="54" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="55" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="56" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="57" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="58" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="59" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="60" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="61" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="62" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="63" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="64" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="65" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="66" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="67" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="68" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="69" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="70" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="71" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="72" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="73" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="74" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="75" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="76" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="77" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="78" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="79" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="80" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="81" petId="17" extractExp="120000000" extractItem="94480" defaultCostId="91663" defaultCostCount="1000" extractCostId="57" extractCostCount="300000" />
+	<extraction petLevel="82" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="83" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="84" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="85" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="86" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="87" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="88" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="89" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+	<extraction petLevel="90" petId="17" extractExp="2350000000" extractItem="94517" defaultCostId="57" defaultCostCount="200000000" extractCostId="91663" extractCostCount="28" />
+</list>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30731.htm b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30731.htm
index 7d5bb217c7..daf4f90fc3 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30731.htm
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30731.htm
@@ -9,7 +9,7 @@ The Pet Manager Association is always happy to assist you and your pet.<br>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/exchange.htm">"Here is a Pet Coupon. Give me a pet."</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30827.htm b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30827.htm
index 830447a916..1a6e7f97c6 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30827.htm
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30827.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30828.htm b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30828.htm
index 0a7f19fda4..81b47f5ca8 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30828.htm
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30828.htm
@@ -10,7 +10,7 @@ Pet Manager Waters:<br>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30829.htm b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30829.htm
index 61e46bf654..67f60c6f2e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30829.htm
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30829.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30830.htm b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30830.htm
index 6b1860ae08..26536da2b6 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30830.htm
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30830.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30831.htm b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30831.htm
index b707cd690d..04d1428ac0 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30831.htm
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/30831.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/31067.htm b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/31067.htm
index 9ff970708b..5963bbead2 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/31067.htm
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/31067.htm
@@ -9,7 +9,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/31265.htm b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/31265.htm
index 5de92941aa..acd3d39c17 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/31265.htm
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/31265.htm
@@ -10,7 +10,7 @@ Perhaps I should write a book, eh? "The Impact of Striders on the History of the
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/31309.htm b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/31309.htm
index 9487647c8a..3d6ff06a25 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/31309.htm
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/31309.htm
@@ -10,7 +10,7 @@ Oh, hello. Ah, you noticed my pure-bred black-striped Alpine Cougar, eh? It is n
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/31954.htm b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/31954.htm
index c8025dde3e..e0218b5231 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/31954.htm
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/31954.htm
@@ -10,7 +10,7 @@ As the number of people who interested in raising pets increases these days, the
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">"Can you tell me about the local lord and tax rate?"</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/33579.htm b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/33579.htm
index c67cae00f5..cafc07db04 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/33579.htm
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/html/petmanager/33579.htm
@@ -7,7 +7,7 @@
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">"I want to evolve a pet."</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/exchange.htm">"Here is a Pet Coupon. Give me a pet."</Button> -->
 The Pet Manager Association is always happy to assist you and your pet.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/evolve.htm">Pet Extraction</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_pet_extract_window">Pet Extraction</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 100">Buy pet and servitor equipment</Button>
 <Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link petmanager/instructions.htm">Learn about pets</Button>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/instances/DwellingOfSpirits.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/instances/DwellingOfSpirits.xml
index 2c601ff065..9dda438b1f 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/instances/DwellingOfSpirits.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/instances/DwellingOfSpirits.xml
@@ -35,13 +35,6 @@
 		<reset day="SUNDAY" hour="6" minute="30" />
 	</reenter>
 	<spawnlist>
-		<group name="ExitPortal" spawnByDefault="false">
-			<npc id="15970" x="-114343" y="-77747" z="-11442" heading="46786" /> <!-- Exit Portal -->
-			<npc id="15971" x="-114343" y="-77747" z="-11442" heading="46786" /> <!-- Exit Portal -->
-			<npc id="15972" x="-114343" y="-77720" z="-11442" heading="46786" /> <!-- Exit Portal -->
-			<npc id="15973" x="-114343" y="-77733" z="-11442" heading="46786" /> <!-- Exit Portal -->
-			<npc id="15974" x="-114343" y="-77755" z="-11442" heading="46786" /> <!-- Exit Portal -->
-		</group>
 		<group name="sealstone" spawnByDefault="true">
 			<npc id="34178" x="-114324" y="-78273" z="-11433" heading="15825" /> <!-- Seal Stone -->
 		</group>
@@ -49,77 +42,53 @@
 			<npc id="34176" x="-114324" y="-78273" z="-11433" heading="15474" /> <!-- Animael -->
 		</group>
 		<group name="NormalMobs" spawnByDefault="false">
-			<npc id="22272" x="-114091" y="-77461" z="-11443" heading="16383" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114048" y="-77429" z="-11443" heading="6673" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114045" y="-77406" z="-11443" heading="24645" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113837" y="-76943" z="-11443" heading="8327" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113945" y="-76923" z="-11443" heading="30858" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114859" y="-76897" z="-11443" heading="58120" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114785" y="-76841" z="-11443" heading="55942" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114711" y="-76987" z="-11443" heading="61107" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114699" y="-77113" z="-11443" heading="16383" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114723" y="-77045" z="-11443" heading="57831" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114852" y="-78363" z="-11443" heading="657" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114984" y="-78475" z="-11443" heading="1141" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114916" y="-78442" z="-11443" heading="65129" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114841" y="-78428" z="-11443" heading="63813" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114938" y="-78411" z="-11443" heading="9120" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113616" y="-78459" z="-11443" heading="30680" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113622" y="-78398" z="-11443" heading="28616" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113591" y="-78301" z="-11442" heading="37105" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113604" y="-78239" z="-11443" heading="35386" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113693" y="-78249" z="-11443" heading="29763" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113568" y="-78336" z="-11442" heading="28986" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113818" y="-78174" z="-11443" heading="55979" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-114618" y="-77313" z="-11443" heading="22097" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-113589" y="-78333" z="-11443" heading="30535" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-114840" y="-78561" z="-11443" heading="32322" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113933" y="-77703" z="-11443" heading="1785" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-113872" y="-77793" z="-11443" heading="60399" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114852" y="-77864" z="-11443" heading="13028" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114822" y="-77925" z="-11443" heading="17015" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-114554" y="-78998" z="-11443" heading="8750" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114193" y="-78871" z="-11441" heading="32032" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114105" y="-79053" z="-11443" heading="2811" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114456" y="-79050" z="-11443" heading="30111" /> <!-- Corrupted Fairy -->
-			<npc id="22272" x="-113845" y="-78477" z="-11443" heading="62467" /> <!-- Corrupted Fairy -->
-			<npc id="22271" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Corrupted Fairy -->
+			<npc id="22272" x="-114091" y="-77461" z="-11443" heading="16383" respawnTime="60sec" />
+			<npc id="22271" x="-114048" y="-77429" z="-11443" heading="6673" respawnTime="60sec" />
+			<npc id="22271" x="-114045" y="-77406" z="-11443" heading="24645" respawnTime="60sec" />
+			<npc id="22271" x="-113837" y="-76943" z="-11443" heading="8327" respawnTime="60sec" />
+			<npc id="22271" x="-113945" y="-76923" z="-11443" heading="30858" respawnTime="60sec" />
+			<npc id="22271" x="-114859" y="-76897" z="-11443" heading="58120" respawnTime="60sec" />
+			<npc id="22271" x="-114785" y="-76841" z="-11443" heading="55942" respawnTime="60sec" />
+			<npc id="22271" x="-114711" y="-76987" z="-11443" heading="61107" respawnTime="60sec" />
+			<npc id="22271" x="-114699" y="-77113" z="-11443" heading="16383" respawnTime="60sec" />
+			<npc id="22271" x="-114723" y="-77045" z="-11443" heading="57831" respawnTime="60sec" />
+			<npc id="22271" x="-114852" y="-78363" z="-11443" heading="657" respawnTime="60sec" />
+			<npc id="22271" x="-114984" y="-78475" z="-11443" heading="1141" respawnTime="60sec" />
+			<npc id="22271" x="-114916" y="-78442" z="-11443" heading="65129" respawnTime="60sec" />
+			<npc id="22271" x="-114841" y="-78428" z="-11443" heading="63813" respawnTime="60sec" />
+			<npc id="22271" x="-114938" y="-78411" z="-11443" heading="9120" respawnTime="60sec" />
+			<npc id="22271" x="-113616" y="-78459" z="-11443" heading="30680" respawnTime="60sec" />
+			<npc id="22271" x="-113622" y="-78398" z="-11443" heading="28616" respawnTime="60sec" />
+			<npc id="22271" x="-113591" y="-78301" z="-11442" heading="37105" respawnTime="60sec" />
+			<npc id="22271" x="-113604" y="-78239" z="-11443" heading="35386" respawnTime="60sec" />
+			<npc id="22271" x="-113693" y="-78249" z="-11443" heading="29763" respawnTime="60sec" />
+			<npc id="22271" x="-113568" y="-78336" z="-11442" heading="28986" respawnTime="60sec" />
+			<npc id="22271" x="-113818" y="-78174" z="-11443" heading="55979" respawnTime="60sec" />
+			<npc id="22272" x="-114618" y="-77313" z="-11443" heading="22097" respawnTime="60sec" />
+			<npc id="22272" x="-113589" y="-78333" z="-11443" heading="30535" respawnTime="60sec" />
+			<npc id="22272" x="-114840" y="-78561" z="-11443" heading="32322" respawnTime="60sec" />
+			<npc id="22271" x="-113933" y="-77703" z="-11443" heading="1785" respawnTime="60sec" />
+			<npc id="22271" x="-113872" y="-77793" z="-11443" heading="60399" respawnTime="60sec" />
+			<npc id="22271" x="-114852" y="-77864" z="-11443" heading="13028" respawnTime="60sec" />
+			<npc id="22271" x="-114822" y="-77925" z="-11443" heading="17015" respawnTime="60sec" />
+			<npc id="22272" x="-114554" y="-78998" z="-11443" heading="8750" respawnTime="60sec" />
+			<npc id="22271" x="-114193" y="-78871" z="-11441" heading="32032" respawnTime="60sec" />
+			<npc id="22271" x="-114105" y="-79053" z="-11443" heading="2811" respawnTime="60sec" />
+			<npc id="22271" x="-114456" y="-79050" z="-11443" heading="30111" respawnTime="60sec" />
+			<npc id="22272" x="-113845" y="-78477" z="-11443" heading="62467" respawnTime="60sec" />
+			<npc id="22271" x="-114676" y="-78345" z="-11439" heading="30937" respawnTime="60sec" />
 		</group>
 		<group name="ruipwave_1" spawnByDefault="false">
-			<npc id="22273" x="-113945" y="-76923" z="-11443" heading="30858" /> <!-- Ruip portal container-->
-			<npc id="22273" x="-114840" y="-78561" z="-11443" heading="32322" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114852" y="-77864" z="-11443" heading="13028" /> <!-- Ruip portal container-->
-			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113845" y="-78477" z="-11443" heading="62467" /> <!-- Ruip portal container-->
-			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113568" y="-78336" z="-11442" heading="28986" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113872" y="-77793" z="-11443" heading="60399" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113589" y="-78333" z="-11443" heading="30535" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-113818" y="-78174" z="-11443" heading="55979" /> <!-- Ruip portal container -->
-		</group>
-		<group name="ruipwave_2" spawnByDefault="false">
-			<npc id="22273" x="-113622" y="-78398" z="-11443" heading="28616" /> <!-- Ruip portal container-->
-			<npc id="22273" x="-113622" y="-78398" z="-11443" heading="28616" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114323" y="-78914" z="-11443" heading="13828" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114840" y="-78561" z="-11443" heading="32322" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114785" y="-76841" z="-11443" heading="55942" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114554" y="-78998" z="-11443" heading="8750" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114841" y="-78428" z="-11443" heading="63813" /> <!-- Ruip portal container -->
-			<npc id="22273" x="-114840" y="-78561" z="-11443" heading="32322" /> <!-- Ruip portal container -->
-		</group>
-		<group name="portalearth" spawnByDefault="false">
-			<npc id="15971" x="-113516" y="-77521" z="-11419" heading="8750" />
-		</group>
-		<group name="portalwind" spawnByDefault="false">
-			<npc id="15969" x="-114554" y="-78998" z="-11443" heading="8750" />
-		</group>
-		<group name="portalfire" spawnByDefault="false">
-			<npc id="15970" x="-114554" y="-78998" z="-11443" heading="8750" />
-		</group>
-		<group name="portalwater" spawnByDefault="false">
-			<npc id="15972" x="-114554" y="-78998" z="-11443" heading="8750" />
+			<npc id="22273" x="-113945" y="-76923" z="-11443" heading="30858" respawnTime="60sec" />
+			<npc id="22273" x="-114840" y="-78561" z="-11443" heading="32322" respawnTime="60sec" />
+			<npc id="22273" x="-114852" y="-77864" z="-11443" heading="13028" respawnTime="60sec" />
+			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" respawnTime="60sec" />
+			<npc id="22273" x="-113845" y="-78477" z="-11443" heading="62467" respawnTime="60sec" />
+			<npc id="22273" x="-114676" y="-78345" z="-11439" heading="30937" respawnTime="60sec" />
+			<npc id="22273" x="-113568" y="-78336" z="-11442" heading="28986" respawnTime="60sec" />
+			<npc id="22273" x="-113872" y="-77793" z="-11443" heading="60399" respawnTime="60sec" />
+			<npc id="22273" x="-113589" y="-78333" z="-11443" heading="30535" respawnTime="60sec" />
+			<npc id="22273" x="-113818" y="-78174" z="-11443" heading="55979" respawnTime="60sec" />
 		</group>
 	</spawnlist>
 </instance>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/multisell/10045.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/multisell/10045.xml
index 5b5ad57cb5..e3575f5f40 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/multisell/10045.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/multisell/10045.xml
@@ -6,50 +6,50 @@
 	<!-- Exchange +5 Special Armor Coupon -->
 	<item>
 		<ingredient count="1" id="98044" /> <!-- +5 Special Armor Coupon (Time-limited) - Sealed -->
-		<production count="1" enchantmentLevel="7" id="94084" /> <!-- Helmet of Mana - Sealed -->
+		<production count="1" enchantmentLevel="5" id="94084" /> <!-- Helmet of Mana - Sealed -->
 	</item>
 	<item>
 		<ingredient count="1" id="98044" /> <!-- +5 Special Armor Coupon (Time-limited) - Sealed -->
-		<production count="1" enchantmentLevel="7" id="94086" /> <!-- Boots of Evasion - Sealed -->
+		<production count="1" enchantmentLevel="5" id="94086" /> <!-- Boots of Evasion - Sealed -->
 	</item>
 	<item>
 		<ingredient count="1" id="98044" /> <!-- +5 Special Armor Coupon (Time-limited) - Sealed -->
-		<production count="1" enchantmentLevel="7" id="93141" /> <!-- Ice Crystal Breastplate - Sealed -->
+		<production count="1" enchantmentLevel="5" id="93141" /> <!-- Ice Crystal Breastplate - Sealed -->
 	</item>
 	<item>
 		<ingredient count="1" id="98044" /> <!-- +5 Special Armor Coupon (Time-limited) - Sealed -->
-		<production count="1" enchantmentLevel="7" id="93142" /> <!-- Ice Crystal Gaiters - Sealed -->
+		<production count="1" enchantmentLevel="5" id="93142" /> <!-- Ice Crystal Gaiters - Sealed -->
 	</item>
 	<item>
 		<ingredient count="1" id="98044" /> <!-- +5 Special Armor Coupon (Time-limited) - Sealed -->
-		<production count="1" enchantmentLevel="7" id="93317" /> <!-- Leather Armor of Lightning - Sealed -->
+		<production count="1" enchantmentLevel="5" id="93317" /> <!-- Leather Armor of Lightning - Sealed -->
 	</item>
 	<item>
 		<ingredient count="1" id="98044" /> <!-- +5 Special Armor Coupon (Time-limited) - Sealed -->
-		<production count="1" enchantmentLevel="7" id="93318" /> <!-- Leather Leggings of Lightning - Sealed -->
+		<production count="1" enchantmentLevel="5" id="93318" /> <!-- Leather Leggings of Lightning - Sealed -->
 	</item>
 	<item>
 		<ingredient count="1" id="98044" /> <!-- +5 Special Armor Coupon (Time-limited) - Sealed -->
-		<production count="1" enchantmentLevel="7" id="93735" /> <!-- Flaming Tunic - Sealed -->
+		<production count="1" enchantmentLevel="5" id="93735" /> <!-- Flaming Tunic - Sealed -->
 	</item>
 	<item>
 		<ingredient count="1" id="98044" /> <!-- +5 Special Armor Coupon (Time-limited) - Sealed -->
-		<production count="1" enchantmentLevel="7" id="93736" /> <!-- Flaming Stockings - Sealed -->
+		<production count="1" enchantmentLevel="5" id="93736" /> <!-- Flaming Stockings - Sealed -->
 	</item>
 	<item>
 		<ingredient count="1" id="98044" /> <!-- +5 Special Armor Coupon (Time-limited) - Sealed -->
-		<production count="1" enchantmentLevel="7" id="94264" /> <!-- Stun Gauntlets - Sealed -->
+		<production count="1" enchantmentLevel="5" id="94264" /> <!-- Stun Gauntlets - Sealed -->
 	</item>
 	<item>
 		<ingredient count="1" id="98044" /> <!-- +5 Special Armor Coupon (Time-limited) - Sealed -->
-		<production count="1" enchantmentLevel="7" id="93076" /> <!-- Gloves of Silence - Sealed -->
+		<production count="1" enchantmentLevel="5" id="93076" /> <!-- Gloves of Silence - Sealed -->
 	</item>
 	<item>
 		<ingredient count="1" id="98044" /> <!-- +5 Special Armor Coupon (Time-limited) - Sealed -->
-		<production count="1" enchantmentLevel="7" id="94302" /> <!-- Shield of Vengeance - Sealed -->
+		<production count="1" enchantmentLevel="5" id="94302" /> <!-- Shield of Vengeance - Sealed -->
 	</item>
 	<item>
 		<ingredient count="1" id="98044" /> <!-- +5 Special Armor Coupon (Time-limited) - Sealed -->
-		<production count="1" enchantmentLevel="7" id="94300" /> <!-- Sigil of Inevitability - Sealed -->
+		<production count="1" enchantmentLevel="5" id="94300" /> <!-- Sigil of Inevitability - Sealed -->
 	</item>
 </list>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/multisell/custom/600016.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/multisell/custom/600016.xml
index 8acf26eb84..c848b0d896 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/multisell/custom/600016.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/multisell/custom/600016.xml
@@ -5,19 +5,19 @@
 	</npcs>
 	<item>
 		<!-- Adena -->
-		<ingredient count="20119720" id="57" />
+		<ingredient count="2119720" id="57" />
 		<!-- Zubei's Helmet -->
 		<production count="1" id="503" />
 	</item>
 	<item>
 		<!-- Adena -->
-		<ingredient count="4319200" id="57" />
+		<ingredient count="2319200" id="57" />
 		<!-- Zubei's Breastplate -->
 		<production count="1" id="357" />
 	</item>
 	<item>
 		<!-- Adena -->
-		<ingredient count="20199540" id="57" />
+		<ingredient count="2199540" id="57" />
 		<!-- Zubei's Gaiters -->
 		<production count="1" id="383" />
 	</item>
@@ -35,13 +35,13 @@
 	</item>
 	<item>
 		<!-- Adena -->
-		<ingredient count="3239400" id="57" />
+		<ingredient count="2410000" id="57" />
 		<!-- Tunic of Zubei -->
 		<production count="1" id="2397" />
 	</item>
 	<item>
 		<!-- Adena -->
-		<ingredient count="2149660" id="57" />
+		<ingredient count="2995400" id="57" />
 		<!-- Stockings of Zubei -->
 		<production count="1" id="2402" />
 	</item>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/34414.htm b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/34414.htm
new file mode 100644
index 0000000000..51ace5fb0f
--- /dev/null
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/34414.htm
@@ -0,0 +1,7 @@
+<html><body>Siben:<br>
+<br>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AztacanArea The_Midway_Gate">The Midway Gate (Lv. 70-87) - 100,000 adena</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AztacanArea The_Eastern_Gate">The Eastern Gate (Lv. 88+) - 100,000 adena</button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AztacanArea The_Western_Gate">The Western Gate (Lv. 88) - 100,000 adena</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest AztacanArea Mineral_shop">Buy supplies and minerals</button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
new file mode 100644
index 0000000000..6606e36f7e
--- /dev/null
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingIgnis.java
@@ -0,0 +1,190 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.DwellingOfSpiritsResidence;
+
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.SkillHolder;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.SkillCaster;
+
+import ai.AbstractNpcAI;
+
+/**
+ * @author RobikBobik
+ */
+public class ResidenceOfKingIgnis extends AbstractNpcAI
+{
+	// NPCs
+	private static final int IGNIS = 29105;
+	// Skills
+	private static final SkillHolder FIRE_RAG_1 = new SkillHolder(50050, 1);
+	private static final SkillHolder FIRE_RAG_2 = new SkillHolder(50050, 2);
+	private static final SkillHolder FIRE_RAG_3 = new SkillHolder(50050, 3);
+	private static final SkillHolder FIRE_RAG_4 = new SkillHolder(50050, 4);
+	private static final SkillHolder FIRE_RAG_5 = new SkillHolder(50050, 5);
+	private static final SkillHolder FIRE_RAG_6 = new SkillHolder(50050, 6);
+	private static final SkillHolder FIRE_RAG_7 = new SkillHolder(50050, 7);
+	private static final SkillHolder FIRE_RAG_8 = new SkillHolder(50050, 8);
+	private static final SkillHolder FIRE_RAG_9 = new SkillHolder(50050, 9);
+	private static final SkillHolder FIRE_RAG_10 = new SkillHolder(50050, 10);
+	
+	public ResidenceOfKingIgnis()
+	{
+		addAttackId(IGNIS);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "CAST_FIRE_RAGE_1":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_1.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_1.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_2":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_2.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_2.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_3":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_3.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_3.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_4":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_4.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_4.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_5":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_5.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_5.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_6":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_6.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_6.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_7":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_7.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_7.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_8":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_8.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_8.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_9":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_9.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_9.getSkill());
+				}
+				break;
+			}
+			case "CAST_FIRE_RAGE_10":
+			{
+				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_10.getSkill()))
+				{
+					npc.doCast(FIRE_RAG_10.getSkill());
+				}
+				break;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
+	{
+		if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.99)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.70)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_1", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.70)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.50)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_2", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.50)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.40)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_3", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.40)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.25)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_4", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.25)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.15)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_5", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.15)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.10)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_6", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.10)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.7)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_7", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.7)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.5)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_8", 1000, npc, null);
+		}
+		else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.5)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.3)))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_9", 1000, npc, null);
+		}
+		else if (npc.getCurrentHp() < (npc.getMaxHp() * 0.3))
+		{
+			startQuestTimer("CAST_FIRE_RAGE_10", 1000, npc, null);
+		}
+		return super.onAttack(npc, attacker, damage, isSummon, skill);
+	}
+	
+	public static void main(String[] args)
+	{
+		new ResidenceOfKingIgnis();
+	}
+}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
new file mode 100644
index 0000000000..0bb5893075
--- /dev/null
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingPetram.java
@@ -0,0 +1,309 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.DwellingOfSpiritsResidence;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.l2jmobius.gameserver.enums.ChatType;
+import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.SkillHolder;
+import org.l2jmobius.gameserver.model.instancezone.Instance;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.model.skill.Skill;
+
+import ai.AbstractNpcAI;
+
+public class ResidenceOfKingPetram extends AbstractNpcAI
+{
+	// NPCs
+	private static final int PETRAM = 29108;
+	private static final int PETRAM_PIECE = 29116;
+	private static final int PETRAM_FRAGMENT = 29117;
+	// Skills
+	private static final SkillHolder EARTH_ENERGY = new SkillHolder(50066, 1);
+	private static final SkillHolder EARTH_FURY = new SkillHolder(50059, 1);
+	private static final SkillHolder TEST = new SkillHolder(5712, 1);
+	
+	public ResidenceOfKingPetram()
+	{
+		addKillId(PETRAM_PIECE, PETRAM_FRAGMENT);
+		addAttackId(PETRAM);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "SPAWN_MINION":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if (world != null)
+				{
+					final Npc petram = world.getNpc(PETRAM);
+					petram.doCast(EARTH_ENERGY.getSkill());
+					
+					petram.setInvul(true);
+					petram.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.EARTH_KING_BARRIER2_AVE);
+					petram.updateAbnormalVisualEffects();
+					petram.broadcastSay(ChatType.NPC_SHOUT, "HaHa, fighters lets kill them. Now Im invul!!!");
+					
+					final int stage = getHigherStage(world);
+					for (int minionIndex = 0; minionIndex < StageData.getMinionsStageData(stage).length; minionIndex++)
+					{
+						final MinionData minionData = StageData.getMinionsStageData(stage)[minionIndex];
+						final Location minionLocation = minionData.getMinionLocation();
+						world.setParameter("minion" + minionIndex, addSpawn(npc, minionData.getMinionId(), minionLocation.getX(), minionLocation.getY(), minionLocation.getZ(), minionLocation.getHeading(), false, -1, true, npc.getInstanceId()));
+					}
+					
+					startQuestTimer("SUPPORT_PETRAM", 200, npc, null);
+				}
+				break;
+			}
+			case "SUPPORT_PETRAM":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if ((world != null) && (world.getNpc(PETRAM) != null) && !world.getNpc(PETRAM).isDead())
+				{
+					final int stage = getHigherStage(world);
+					for (int minionIndex = 0; minionIndex < StageData.getMinionsStageData(stage).length; minionIndex++)
+					{
+						world.getParameters().getObject("minion" + minionIndex, Npc.class).setTarget(world.getNpc(PETRAM));
+						world.getParameters().getObject("minion" + minionIndex, Npc.class).doCast(TEST.getSkill());
+					}
+					startQuestTimer("SUPPORT_PETRAM", 10100, npc, null);
+				}
+				break;
+			}
+			case "REMOVE_INVUL":
+			{
+				if (npc != null)
+				{
+					final Instance world = npc.getInstanceWorld();
+					if (world != null)
+					{
+						final Npc petram = world.getNpc(PETRAM);
+						if (petram != null)
+						{
+							petram.doCast(EARTH_FURY.getSkill());
+							petram.setInvul(false);
+							petram.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.EARTH_KING_BARRIER2_AVE);
+							petram.updateAbnormalVisualEffects();
+							petram.broadcastSay(ChatType.NPC_SHOUT, "Nooooo... Nooooo...");
+						}
+						
+						for (int i = 0; i < 12; i++)
+						{
+							final Npc minion = world.getParameters().getObject("minion" + i, Npc.class);
+							if (minion != null)
+							{
+								minion.deleteMe();
+							}
+						}
+					}
+				}
+				break;
+			}
+		}
+		
+		return null;
+	}
+	
+	private int getHigherStage(Instance world)
+	{
+		for (int stage = StageData.getMinionsStageData().size() - 1; stage >= 0; stage--)
+		{
+			if (world.getParameters().getBoolean("stage" + stage, false))
+			{
+				return stage;
+			}
+		}
+		
+		return 0;
+	}
+	
+	@Override
+	public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill)
+	{
+		final Instance world = npc.getInstanceWorld();
+		synchronized (this)
+		{
+			for (int stage = 0; stage < StageData.getMinionsStageData().size(); stage++)
+			{
+				if ((npc.getCurrentHpPercent() < StageData.getHpPercents()[stage]) && !world.getParameters().getBoolean("stage" + stage, false))
+				{
+					world.setParameter("stage" + stage, true);
+					startQuestTimer("SPAWN_MINION", 100, npc, null);
+				}
+			}
+		}
+		
+		return super.onAttack(npc, attacker, damage, isSummon, skill);
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player player, boolean isSummon)
+	{
+		final Instance world = npc.getInstanceWorld();
+		if (world == null)
+		{
+			return null;
+		}
+		
+		final int stage = getHigherStage(world);
+		int aliveMinionsCount = 0;
+		for (int minionIndex = 0; minionIndex < StageData.getMinionsStageData(stage).length; minionIndex++)
+		{
+			if ((world.getParameters().getObject("minion" + minionIndex, Npc.class) != null) && !world.getParameters().getObject("minion" + minionIndex, Npc.class).isDead())
+			{
+				aliveMinionsCount++;
+			}
+		}
+		
+		boolean breakInvul = false;
+		switch (stage)
+		{
+			case 0:
+			{
+				if (aliveMinionsCount == 0)
+				{
+					breakInvul = true;
+				}
+				break;
+			}
+			case 1:
+			{
+				if (aliveMinionsCount <= 4)
+				{
+					breakInvul = true;
+				}
+				break;
+			}
+			case 2:
+			{
+				if (aliveMinionsCount <= 6)
+				{
+					breakInvul = true;
+				}
+				break;
+			}
+		}
+		
+		if (breakInvul)
+		{
+			startQuestTimer("REMOVE_INVUL", 500, world.getNpc(PETRAM), null);
+		}
+		
+		return super.onKill(npc, player, isSummon);
+	}
+	
+	private static class StageData
+	{
+		private static final int[] _hpPercents = new int[]
+		{
+			75,
+			50,
+			10
+		};
+		private static final Map<Integer, MinionData[]> _minionsStageData = new HashMap<>();
+		static
+		{
+			// Stage 1
+			_minionsStageData.put(0, new MinionData[]
+			{
+				new MinionData(PETRAM_FRAGMENT, new Location(221543, 191530, -15486, 1131)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222069, 192019, -15486, 49364)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222595, 191479, -15486, 34013)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222077, 191017, -15486, 16383))
+			});
+			
+			// Stage 2
+			_minionsStageData.put(1, new MinionData[]
+			{
+				new MinionData(PETRAM_FRAGMENT, new Location(221069, 191544, -15486, 2280)),
+				new MinionData(PETRAM_FRAGMENT, new Location(221366, 192223, -15486, 56731)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222067, 192508, -15486, 50632)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222765, 192216, -15486, 39607)),
+				new MinionData(PETRAM_FRAGMENT, new Location(223057, 191472, -15486, 33154)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222773, 190814, -15486, 25376)),
+				new MinionData(PETRAM_FRAGMENT, new Location(222063, 190516, -15486, 16383)),
+				new MinionData(PETRAM_FRAGMENT, new Location(221342, 190800, -15486, 10837))
+			});
+			// Stage 3
+			_minionsStageData.put(2, new MinionData[]
+			{
+				new MinionData(PETRAM_PIECE, new Location(221543, 191530, -15486, 1131)),
+				new MinionData(PETRAM_PIECE, new Location(222069, 192019, -15486, 49364)),
+				new MinionData(PETRAM_PIECE, new Location(222595, 191479, -15486, 34013)),
+				new MinionData(PETRAM_PIECE, new Location(222077, 191017, -15486, 16383)),
+				new MinionData(PETRAM_PIECE, new Location(221069, 191544, -15486, 2280)),
+				new MinionData(PETRAM_PIECE, new Location(221366, 192223, -15486, 56731)),
+				new MinionData(PETRAM_PIECE, new Location(222067, 192508, -15486, 50632)),
+				new MinionData(PETRAM_PIECE, new Location(222765, 192216, -15486, 39607)),
+				new MinionData(PETRAM_PIECE, new Location(223057, 191472, -15486, 33154)),
+				new MinionData(PETRAM_PIECE, new Location(222773, 190814, -15486, 25376)),
+				new MinionData(PETRAM_PIECE, new Location(222063, 190516, -15486, 16383)),
+				new MinionData(PETRAM_PIECE, new Location(221342, 190800, -15486, 10837))
+			});
+		}
+		
+		public static int[] getHpPercents()
+		{
+			return _hpPercents;
+		}
+		
+		public static Map<Integer, MinionData[]> getMinionsStageData()
+		{
+			return _minionsStageData;
+		}
+		
+		public static MinionData[] getMinionsStageData(int stage)
+		{
+			return _minionsStageData.get(stage);
+		}
+	}
+	
+	private static class MinionData
+	{
+		final int _minionId;
+		final Location _minionLocation;
+		
+		private MinionData(int minionId, Location minionLocation)
+		{
+			_minionId = minionId;
+			_minionLocation = minionLocation;
+		}
+		
+		public int getMinionId()
+		{
+			return _minionId;
+		}
+		
+		public Location getMinionLocation()
+		{
+			return _minionLocation;
+		}
+	}
+	
+	public static void main(String[] args)
+	{
+		new ResidenceOfKingPetram();
+	}
+}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
new file mode 100644
index 0000000000..e48f6b6b18
--- /dev/null
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfKingProcella.java
@@ -0,0 +1,179 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.DwellingOfSpiritsResidence;
+
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.SkillHolder;
+import org.l2jmobius.gameserver.model.instancezone.Instance;
+import org.l2jmobius.gameserver.model.skill.SkillCaster;
+
+import ai.AbstractNpcAI;
+
+/**
+ * @author RobikBobik, Mobius
+ */
+public class ResidenceOfKingProcella extends AbstractNpcAI
+{
+	// NPCs
+	private static final int PROCELLA = 29107;
+	private static final int PROCELLA_GUARDIAN_1 = 29112;
+	private static final int PROCELLA_GUARDIAN_2 = 29113;
+	private static final int PROCELLA_GUARDIAN_3 = 29114;
+	private static final int PROCELLA_STORM = 29115;
+	// Skills
+	private static final SkillHolder HURRICANE_SUMMON = new SkillHolder(50042, 1);
+	private static final int HURRICANE_BOLT = 50043;
+	private static final SkillHolder HURRICANE_BOLT_LV_1 = new SkillHolder(50043, 1);
+	// Misc
+	private static final int STORM_MAX_COUNT = 16;
+	
+	public ResidenceOfKingProcella()
+	{
+		addKillId(PROCELLA, PROCELLA_GUARDIAN_1, PROCELLA_GUARDIAN_2, PROCELLA_GUARDIAN_3);
+		addSpawnId(PROCELLA);
+	}
+	
+	@Override
+	public String onSpawn(Npc npc)
+	{
+		final Instance world = npc.getInstanceWorld();
+		if (world != null)
+		{
+			startQuestTimer("SPAWN_MINION", 300000 + getRandom(-15000, 15000), npc, null);
+			startQuestTimer("SPAWN_STORM", 5000, npc, null);
+			world.setParameter("stormCount", 0);
+		}
+		return null;
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "SPAWN_MINION":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if ((world != null) && (npc.getId() == PROCELLA))
+				{
+					world.setParameter("minion1", addSpawn(PROCELLA_GUARDIAN_1, 212663, 179421, -15486, 31011, true, 0, true, npc.getInstanceId()));
+					world.setParameter("minion2", addSpawn(PROCELLA_GUARDIAN_2, 213258, 179822, -15486, 12001, true, 0, true, npc.getInstanceId()));
+					world.setParameter("minion3", addSpawn(PROCELLA_GUARDIAN_3, 212558, 179974, -15486, 12311, true, 0, true, npc.getInstanceId()));
+					startQuestTimer("HIDE_PROCELLA", 1000, world.getNpc(PROCELLA), null);
+				}
+				break;
+			}
+			case "SPAWN_STORM":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if ((world != null) && (world.getParameters().getInt("stormCount", 0) < STORM_MAX_COUNT))
+				{
+					world.getNpc(PROCELLA).doCast(HURRICANE_SUMMON.getSkill());
+					final Npc procellaStorm = addSpawn(PROCELLA_STORM, world.getNpc(PROCELLA).getX() + getRandom(-500, 500), world.getNpc(PROCELLA).getY() + getRandom(-500, 500), world.getNpc(PROCELLA).getZ(), 31011, true, 0, true, npc.getInstanceId());
+					procellaStorm.setRandomWalking(true);
+					world.getParameters().increaseInt("stormCount", 1);
+					startQuestTimer("SPAWN_STORM", 60000, world.getNpc(PROCELLA), null);
+					startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", 100, procellaStorm, player);
+				}
+				break;
+			}
+			case "HIDE_PROCELLA":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if (world != null)
+				{
+					if (world.getNpc(PROCELLA).isInvisible())
+					{
+						world.getNpc(PROCELLA).setInvisible(false);
+					}
+					else
+					{
+						world.getNpc(PROCELLA).setInvisible(true);
+						startQuestTimer("SPAWN_MINION", 300000 + getRandom(-15000, 15000), world.getNpc(PROCELLA), player);
+					}
+				}
+				break;
+			}
+			case "CHECK_CHAR_INSIDE_RADIUS_NPC":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if (world != null)
+				{
+					final Player plr = world.getPlayers().stream().findAny().orElse(null); // Usamos orElse(null) para evitar el Optional vacΓ­o
+					if ((plr != null) && (plr.isInsideRadius3D(npc, 100)))
+					{
+						npc.abortAttack();
+						npc.abortCast();
+						npc.setTarget(plr);
+						
+						if (plr.getKnownSkill(HURRICANE_BOLT) != null) // Verificamos si el jugador tiene la habilidad
+						{
+							if (plr.getAffectedSkillLevel(HURRICANE_BOLT) == 1)
+							{
+								npc.abortCast();
+								startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", 100, npc, player);
+							}
+							else
+							{
+								if (SkillCaster.checkUseConditions(npc, HURRICANE_BOLT_LV_1.getSkill()))
+								{
+									npc.doCast(HURRICANE_BOLT_LV_1.getSkill());
+								}
+							}
+						}
+						startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", 100, npc, player);
+					}
+					else
+					{
+						startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", 100, npc, player);
+					}
+				}
+				break;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player player, boolean isSummon)
+	{
+		final Instance world = npc.getInstanceWorld();
+		if (world == null)
+		{
+			return null;
+		}
+		
+		if (npc.getId() == PROCELLA)
+		{
+			cancelQuestTimer("SPAWN_MINION", npc, player.getActingPlayer());
+			cancelQuestTimer("SPAWN_STORM", npc, player.getActingPlayer());
+			cancelQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC", npc, player.getActingPlayer());
+		}
+		else if ((world.getParameters().getObject("minion1", Npc.class).isDead()) && (world.getParameters().getObject("minion2", Npc.class).isDead()) && (world.getParameters().getObject("minion3", Npc.class).isDead()))
+		{
+			startQuestTimer("HIDE_PROCELLA", 1000, world.getNpc(PROCELLA), null);
+		}
+		
+		return super.onKill(npc, player, isSummon);
+	}
+	
+	public static void main(String[] args)
+	{
+		new ResidenceOfKingProcella();
+	}
+}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
new file mode 100644
index 0000000000..9c3c7ea37b
--- /dev/null
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/DwellingOfSpiritsResidence/ResidenceOfQueenNebula.java
@@ -0,0 +1,209 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.DwellingOfSpiritsResidence;
+
+import org.l2jmobius.gameserver.data.xml.SkillData;
+import org.l2jmobius.gameserver.enums.SkillFinishType;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.holders.SkillHolder;
+import org.l2jmobius.gameserver.model.instancezone.Instance;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.SkillCaster;
+
+import ai.AbstractNpcAI;
+
+/**
+ * @author RobikBobik
+ */
+public class ResidenceOfQueenNebula extends AbstractNpcAI
+{
+	// NPCs
+	private static final int NEBULA = 29106;
+	private static final int WATER_SLIME = 29111;
+	// Skills
+	private static final int AQUA_RAGE = 50036;
+	private static final SkillHolder AQUA_RAGE_1 = new SkillHolder(AQUA_RAGE, 1);
+	private static final SkillHolder AQUA_RAGE_2 = new SkillHolder(AQUA_RAGE, 2);
+	private static final SkillHolder AQUA_RAGE_3 = new SkillHolder(AQUA_RAGE, 3);
+	private static final SkillHolder AQUA_RAGE_4 = new SkillHolder(AQUA_RAGE, 4);
+	private static final SkillHolder AQUA_RAGE_5 = new SkillHolder(AQUA_RAGE, 5);
+	private static final SkillHolder AQUA_SUMMON = new SkillHolder(50037, 1);
+	
+	public ResidenceOfQueenNebula()
+	{
+		addKillId(NEBULA, WATER_SLIME);
+		addAttackId(NEBULA);
+		addSpawnId(NEBULA);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, Npc npc, Player player)
+	{
+		switch (event)
+		{
+			case "SPAWN_WATER_SLIME":
+			{
+				final Instance world = npc.getInstanceWorld();
+				if (world != null)
+				{
+					final Player plr = world.getPlayers().stream().findAny().get();
+					startQuestTimer("CAST_AQUA_RAGE", 60000 + getRandom(-15000, 15000), npc, plr);
+					if (npc.getId() == NEBULA)
+					{
+						npc.doCast(AQUA_SUMMON.getSkill());
+						for (int i = 0; i < getRandom(4, 6); i++)
+						{
+							addSpawn(npc, WATER_SLIME, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, -1, true, npc.getInstanceId());
+							startQuestTimer("SPAWN_WATER_SLIME", 300000, npc, null);
+						}
+					}
+				}
+				break;
+			}
+			case "PLAYER_PARA":
+			{
+				if (player.getAffectedSkillLevel(AQUA_RAGE) == 5)
+				{
+					player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.FROZEN_PILLAR);
+					player.setImmobilized(true);
+					startQuestTimer("PLAYER_UNPARA", 5000, npc, player);
+				}
+				break;
+			}
+			case "PLAYER_UNPARA":
+			{
+				player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, AQUA_RAGE_5.getSkill());
+				player.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.FROZEN_PILLAR);
+				player.setImmobilized(false);
+				break;
+			}
+			case "CAST_AQUA_RAGE":
+			{
+				startQuestTimer("CAST_AQUA_RAGE", 5000, npc, player);
+				if ((player.isInsideRadius3D(npc, 1000)))
+				{
+					if (player.getAffectedSkillLevel(AQUA_RAGE) == 1)
+					{
+						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_2.getSkill()))
+						{
+							npc.doCast(AQUA_RAGE_2.getSkill());
+						}
+					}
+					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 2)
+					{
+						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_3.getSkill()))
+						{
+							npc.doCast(AQUA_RAGE_3.getSkill());
+						}
+					}
+					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 3)
+					{
+						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_4.getSkill()))
+						{
+							npc.doCast(AQUA_RAGE_4.getSkill());
+						}
+					}
+					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 4)
+					{
+						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_5.getSkill()))
+						{
+							npc.doCast(AQUA_RAGE_5.getSkill());
+							startQuestTimer("PLAYER_PARA", 100, npc, player);
+						}
+					}
+					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 5)
+					{
+						npc.abortCast();
+					}
+					else if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_1.getSkill()))
+					{
+						npc.doCast(AQUA_RAGE_1.getSkill());
+					}
+				}
+				break;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public String onSpawn(Npc npc)
+	{
+		startQuestTimer("SPAWN_WATER_SLIME", 300000, npc, null);
+		return super.onSpawn(npc);
+	}
+	
+	@Override
+	public String onKill(Npc npc, Player player, boolean isSummon)
+	{
+		switch (npc.getId())
+		{
+			case NEBULA:
+			{
+				cancelQuestTimer("CAST_AQUA_RAGE", npc, player);
+				cancelQuestTimer("SPAWN_WATER_SLIME", npc, player);
+				break;
+			}
+			case WATER_SLIME:
+			{
+				if (player.getAffectedSkillLevel(AQUA_RAGE) == 1)
+				{
+					if (getRandomBoolean())
+					{
+						player.stopSkillEffects(AQUA_RAGE_1.getSkill());
+					}
+				}
+				else if (player.getAffectedSkillLevel(AQUA_RAGE) == 2)
+				{
+					if (getRandomBoolean())
+					{
+						player.stopSkillEffects(AQUA_RAGE_2.getSkill());
+						final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 1);
+						skill.applyEffects(player, player);
+					}
+				}
+				else if (player.getAffectedSkillLevel(AQUA_RAGE) == 3)
+				{
+					if (getRandomBoolean())
+					{
+						player.stopSkillEffects(AQUA_RAGE_3.getSkill());
+						final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 2);
+						skill.applyEffects(player, player);
+					}
+				}
+				else if (player.getAffectedSkillLevel(AQUA_RAGE) == 4)
+				{
+					if (getRandomBoolean())
+					{
+						player.stopSkillEffects(AQUA_RAGE_4.getSkill());
+						final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 3);
+						skill.applyEffects(player, player);
+					}
+				}
+				break;
+			}
+		}
+		return super.onKill(npc, player, isSummon);
+	}
+	
+	public static void main(String[] args)
+	{
+		new ResidenceOfQueenNebula();
+	}
+}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
index e9e2c539a0..b025542e79 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/ai/areas/FrostCastleZone/FrostLordCastleZone.java
@@ -54,12 +54,12 @@ public class FrostLordCastleZone extends AbstractNpcAI
 	private static final AtomicReference<SpawnTemplate> SPAWN_BATTLE_MOBS = new AtomicReference<>();
 	private static final AtomicReference<SpawnTemplate> SPAWN_ENCHANCED_MOBS = new AtomicReference<>();
 	
-	public static final int[] REGGIESYS_GLAKIAS =
+	protected static final int[] REGGIESYS_GLAKIAS =
 	{
 		29136,
 		29137
 	};
-	public static final int[] SLICING_GLAKIAS =
+	protected static final int[] SLICING_GLAKIAS =
 	{
 		29138,
 		29139
@@ -72,21 +72,20 @@ public class FrostLordCastleZone extends AbstractNpcAI
 	private static final Location GLAKIAS_SPAWN_LOC = new Location(114713, -114799, -11209, 33289);
 	
 	// Teleports
-	private static final Location The_north_eastern_entrance = new Location(-56255, 13537, -3336);
-	private static final Location The_south_eastern_entrance = new Location(-49550, 17189, -3016);
-	private static final Location The_north_western_entrance = new Location(-52849, 5272, -240);
-	private static final Location The_south_western_entrance = new Location(-52849, 5272, -240);
+	private static final Location NORTH_EASTERN_ENTRANCE = new Location(-56255, 13537, -3336);
+	private static final Location SOUTH_EASTERN_ENTRANCE = new Location(-49550, 17189, -3016);
+	private static final Location NORTH_WESTERN_ENTRANCE = new Location(-52849, 5272, -240);
+	private static final Location SOUTH_WESTERN_ENTRANCE = new Location(-52849, 5272, -240);
 	
-	private static final Location Crossroad = new Location(145598, 144091, -11789);
-	private static final Location Northern_Secret_Passage = new Location(149478, 147145, -12339);
+	private static final Location CROSSROAD = new Location(145598, 144091, -11789);
+	private static final Location NOTHERN_SECRET_PASSAGE = new Location(149478, 147145, -12339);
 	
-	private static final Location Glakias_House = new Location(113479, -114804, -11076);
+	private static final Location GLAKIAS_RESIDENCE = new Location(113479, -114804, -11076);
 	
 	public static final int UNDERCOVER_AGENT = 34230; // Teleport npc
 	public static final int CRYSTAL_ENERGY = 34232; // Teleport npc
 	
 	// Zones
-	
 	private static final ZoneType[] ZONES =
 	{
 		ZoneManager.getInstance().getZoneByName("frost_castle_zone"),
@@ -94,7 +93,6 @@ public class FrostLordCastleZone extends AbstractNpcAI
 	};
 	
 	// Timings
-	
 	private static final int[] DAYS_OF_WEEK =
 	{
 		Calendar.TUESDAY,
@@ -113,7 +111,7 @@ public class FrostLordCastleZone extends AbstractNpcAI
 	
 	private static final long DESPAWN_DELAY = 16 * 60 * 60 * 1000;
 	
-	private static Npc _TeleportchargedCrystal = null;
+	private static Npc _teleportchargedCrystal = null;
 	
 	private static final String SCRIPT_BYPASS = "Quest FrostLordCastleZone ";
 	
@@ -138,148 +136,73 @@ public class FrostLordCastleZone extends AbstractNpcAI
 		{
 			case "Crossroad":
 			{
-				TeleportCheck(player, 1);
+				teleportCheck(player, 1);
 				break;
 			}
-			
 			case "Northern_Secret_Passage":
 			{
-				TeleportCheck(player, 2);
+				teleportCheck(player, 2);
 				break;
 			}
-			
 			case "The_north_eastern_entrance":
 			{
-				TeleportCheck(player, 3);
+				teleportCheck(player, 3);
 				break;
 			}
-			
 			case "The_south_eastern_entrance":
 			{
-				TeleportCheck(player, 4);
+				teleportCheck(player, 4);
 				break;
 			}
-			
 			case "The_north_western_entrance":
 			{
-				TeleportCheck(player, 5);
+				teleportCheck(player, 5);
 				break;
 			}
-			
 			case "The_south_western_entrance":
 			{
-				TeleportCheck(player, 6);
+				teleportCheck(player, 6);
 				break;
 			}
-			
 			case "Crystal_Energy_Teleport":
 			{
-				player.teleToLocation(Glakias_House);
+				player.teleToLocation(GLAKIAS_RESIDENCE);
 				break;
 			}
-			
 			case "FIRST_RAID_SPAWN":
 			{
 				int id = Rnd.get(100) < 7 ? SLICING : REGGIESYS;
 				addSpawn(id, REGGIESYS_SLICING_SPAWN_LOC, false, DESPAWN_DELAY);
 				break;
 			}
-			
 			case "SECOND_RAID_SPAWN":
 			{
 				addSpawn(TIRON, TIRON_SPAWN_LOC, false, DESPAWN_DELAY);
 				break;
 			}
-			
-			default:
-			{
-				break;
-			}
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
 	
-	private void scheduleFirstRaid()
-	{
-		long time = Long.MAX_VALUE;
-		
-		for (int day : DAYS_OF_WEEK)
-		{
-			long nextDateMillis = getNextDateMilis(day, FIRST_RAID_TIME[0], FIRST_RAID_TIME[1]);
-			if (nextDateMillis < time)
-			{
-				time = nextDateMillis;
-			}
-		}
-		
-		startQuestTimer("FIRST_RAID_SPAWN", time - System.currentTimeMillis(), null, null);
-	}
-	
-	private void scheduleSecondRaid()
-	{
-		long time = Long.MAX_VALUE;
-		for (int day : DAYS_OF_WEEK)
-		{
-			long temp = getNextDateMilis(day, SECOND_RAID_TIME[0], SECOND_RAID_TIME[1]);
-			if (temp < time)
-			{
-				time = temp;
-			}
-		}
-		startQuestTimer("SECOND_RAID_SPAWN", time - System.currentTimeMillis(), null, null);
-		
-	}
-	
-	private long getNextDateMilis(int dayOfWeek, int hour, int minute)
-	{
-		Calendar c = Calendar.getInstance();
-		c.set(Calendar.HOUR_OF_DAY, hour);
-		c.set(Calendar.MINUTE, minute);
-		c.set(Calendar.SECOND, 0);
-		for (int i = 0; i < 7; i++)
-		{
-			if ((c.get(Calendar.DAY_OF_WEEK) == dayOfWeek) && (c.getTimeInMillis() > System.currentTimeMillis()))
-			{
-				return c.getTimeInMillis();
-			}
-			c.add(Calendar.DAY_OF_WEEK, 1);
-		}
-		return c.getTimeInMillis();
-	}
-	
 	@Override
-	public String onKill(Npc npc, Player killer, boolean isSummon)
+	public String onFirstTalk(Npc npc, Player player)
 	{
-		switch (npc.getId())
+		if (npc.getId() == CRYSTAL_ENERGY)
 		{
-			case REGGIESYS:
-			{
-				addSpawn(REGGIESYS_GLAKIAS[Rnd.get(0, REGGIESYS_GLAKIAS.length - 1)], GLAKIAS_SPAWN_LOC, false, DESPAWN_DELAY);
-				
-				SPAWN_BATTLE_MOBS.set(SpawnData.getInstance().getSpawnByName("glakias_mobs_pretorian"));
-				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::despawnAll);
-				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::spawnAll);
-				
-				break;
-			}
-			case SLICING:
-			{
-				addSpawn(SLICING_GLAKIAS[Rnd.get(0, SLICING_GLAKIAS.length - 1)], GLAKIAS_SPAWN_LOC, false, DESPAWN_DELAY);
-				
-				SPAWN_BATTLE_MOBS.set(SpawnData.getInstance().getSpawnByName("glakias_mobs_pretorian"));
-				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::despawnAll);
-				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::spawnAll);
-				
-				break;
-			}
-			case TIRON:
-			{
-				_TeleportchargedCrystal = addSpawn(CHARGED_CRYSTAL, CHARGED_CRYSTAL_SPAWN_LOC, false, DESPAWN_DELAY);
-				break;
-			}
+			return getHtm(player, "34232.htm");
 		}
-		DeleteGlakiasSpawns(npc);
-		return super.onKill(npc, killer, false);
+		
+		if (npc.getId() == UNDERCOVER_AGENT)
+		{
+			if ((_teleportchargedCrystal != null) && _teleportchargedCrystal.isSpawned())
+			{
+				return getHtm(player, "34230-full.htm");
+			}
+			
+			return getHtm(player, "34230.htm");
+		}
+		
+		return null;
 	}
 	
 	@Override
@@ -325,47 +248,133 @@ public class FrostLordCastleZone extends AbstractNpcAI
 		}
 	}
 	
-	public void TeleportCheck(Player player, int locNum)
+	@Override
+	public String onKill(Npc npc, Player killer, boolean isSummon)
+	{
+		switch (npc.getId())
+		{
+			case REGGIESYS:
+			{
+				addSpawn(REGGIESYS_GLAKIAS[Rnd.get(0, REGGIESYS_GLAKIAS.length - 1)], GLAKIAS_SPAWN_LOC, false, DESPAWN_DELAY);
+				SPAWN_BATTLE_MOBS.set(SpawnData.getInstance().getSpawnByName("glakias_mobs_pretorian"));
+				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::despawnAll);
+				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::spawnAll);
+				break;
+			}
+			case SLICING:
+			{
+				addSpawn(SLICING_GLAKIAS[Rnd.get(0, SLICING_GLAKIAS.length - 1)], GLAKIAS_SPAWN_LOC, false, DESPAWN_DELAY);
+				SPAWN_BATTLE_MOBS.set(SpawnData.getInstance().getSpawnByName("glakias_mobs_pretorian"));
+				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::despawnAll);
+				SPAWN_BATTLE_MOBS.get().getGroups().forEach(SpawnGroup::spawnAll);
+				break;
+			}
+			case TIRON:
+			{
+				_teleportchargedCrystal = addSpawn(CHARGED_CRYSTAL, CHARGED_CRYSTAL_SPAWN_LOC, false, DESPAWN_DELAY);
+				break;
+			}
+		}
+		deleteGlakiasSpawns(npc);
+		return super.onKill(npc, killer, false);
+	}
+	
+	@RegisterEvent(EventType.ON_PLAYER_BYPASS)
+	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
+	public void onPlayerBypass(OnPlayerBypass event)
+	{
+		final Player player = event.getPlayer();
+		if (event.getCommand().startsWith(SCRIPT_BYPASS))
+		{
+			notifyEvent(event.getCommand().replace(SCRIPT_BYPASS, ""), null, player);
+		}
+	}
+	
+	private void scheduleFirstRaid()
+	{
+		long time = Long.MAX_VALUE;
+		for (int day : DAYS_OF_WEEK)
+		{
+			final long nextDateMillis = getNextDateMilis(day, FIRST_RAID_TIME[0], FIRST_RAID_TIME[1]);
+			if (nextDateMillis < time)
+			{
+				time = nextDateMillis;
+			}
+		}
+		startQuestTimer("FIRST_RAID_SPAWN", time - System.currentTimeMillis(), null, null);
+	}
+	
+	private void scheduleSecondRaid()
+	{
+		long time = Long.MAX_VALUE;
+		for (int day : DAYS_OF_WEEK)
+		{
+			final long nextDateMillis = getNextDateMilis(day, SECOND_RAID_TIME[0], SECOND_RAID_TIME[1]);
+			if (nextDateMillis < time)
+			{
+				time = nextDateMillis;
+			}
+		}
+		startQuestTimer("SECOND_RAID_SPAWN", time - System.currentTimeMillis(), null, null);
+	}
+	
+	private long getNextDateMilis(int dayOfWeek, int hour, int minute)
+	{
+		final Calendar calendar = Calendar.getInstance();
+		calendar.set(Calendar.HOUR_OF_DAY, hour);
+		calendar.set(Calendar.MINUTE, minute);
+		calendar.set(Calendar.SECOND, 0);
+		for (int i = 0; i < 7; i++)
+		{
+			if ((calendar.get(Calendar.DAY_OF_WEEK) == dayOfWeek) && (calendar.getTimeInMillis() > System.currentTimeMillis()))
+			{
+				return calendar.getTimeInMillis();
+			}
+			calendar.add(Calendar.DAY_OF_WEEK, 1);
+		}
+		return calendar.getTimeInMillis();
+	}
+	
+	public void teleportCheck(Player player, int locationId)
 	{
 		int requiredMoney = 0;
 		Location teleportLocation = null;
-		
-		switch (locNum)
+		switch (locationId)
 		{
 			case 1:
 			{
 				requiredMoney = 100000;
-				teleportLocation = Crossroad;
+				teleportLocation = CROSSROAD;
 				break;
 			}
 			case 2:
 			{
 				requiredMoney = 100000;
-				teleportLocation = Northern_Secret_Passage;
+				teleportLocation = NOTHERN_SECRET_PASSAGE;
 				break;
 			}
 			case 3:
 			{
 				requiredMoney = 500000;
-				teleportLocation = The_north_eastern_entrance;
+				teleportLocation = NORTH_EASTERN_ENTRANCE;
 				break;
 			}
 			case 4:
 			{
 				requiredMoney = 500000;
-				teleportLocation = The_south_eastern_entrance;
+				teleportLocation = SOUTH_EASTERN_ENTRANCE;
 				break;
 			}
 			case 5:
 			{
 				requiredMoney = 500000;
-				teleportLocation = The_north_western_entrance;
+				teleportLocation = NORTH_WESTERN_ENTRANCE;
 				break;
 			}
 			case 6:
 			{
 				requiredMoney = 500000;
-				teleportLocation = The_south_western_entrance;
+				teleportLocation = SOUTH_WESTERN_ENTRANCE;
 				break;
 			}
 			default:
@@ -383,33 +392,7 @@ public class FrostLordCastleZone extends AbstractNpcAI
 		player.teleToLocation(teleportLocation);
 	}
 	
-	@Override
-	public String onFirstTalk(Npc npc, Player player)
-	{
-		String html;
-		if (npc.getId() == CRYSTAL_ENERGY)
-		{
-			html = getHtm(player, "34232.htm");
-			return html;
-		}
-		
-		if (npc.getId() == UNDERCOVER_AGENT)
-		{
-			if ((_TeleportchargedCrystal != null) && _TeleportchargedCrystal.isSpawned())
-			{
-				html = getHtm(player, "34230-full.htm");
-			}
-			else
-			{
-				html = getHtm(player, "34230.htm");
-			}
-			
-			return html;
-		}
-		return null;
-	}
-	
-	private void DeleteGlakiasSpawns(Npc npc)
+	private void deleteGlakiasSpawns(Npc npc)
 	{
 		int npcId = npc.getId();
 		if ((npcId == REGGIESYS_GLAKIAS[0]) || (npcId == REGGIESYS_GLAKIAS[1]) || (npcId == SLICING_GLAKIAS[0]) || (npcId == SLICING_GLAKIAS[1]))
@@ -418,19 +401,8 @@ public class FrostLordCastleZone extends AbstractNpcAI
 		}
 	}
 	
-	@RegisterEvent(EventType.ON_PLAYER_BYPASS)
-	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void onPlayerBypass(OnPlayerBypass event)
-	{
-		final Player player = event.getPlayer();
-		if (event.getCommand().startsWith(SCRIPT_BYPASS))
-		{
-			notifyEvent(event.getCommand().replace(SCRIPT_BYPASS, ""), null, player);
-		}
-	}
-	
 	public static void main(String[] args)
 	{
 		new FrostLordCastleZone();
 	}
-}
\ No newline at end of file
+}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 75f58f6ccd..0c9d01003c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Door;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath;
@@ -254,6 +255,8 @@ public class TvT extends Event
 				final InstanceManager manager = InstanceManager.getInstance();
 				final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
 				PVP_WORLD = manager.createInstance(template, null);
+				// Make sure doors are closed.
+				PVP_WORLD.getDoors().forEach(Door::closeMe);
 				// Randomize player list and separate teams.
 				final List<Player> playerList = new ArrayList<>(PLAYER_LIST.size());
 				playerList.addAll(PLAYER_LIST);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 5a1756e12d..95e41c1a8d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -44,6 +44,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("AdditionalPotionHp", AdditionalPotionHp::new);
 		EffectHandler.getInstance().registerHandler("AdditionalPotionMp", AdditionalPotionMp::new);
 		EffectHandler.getInstance().registerHandler("AddPcCafePoints", AddPcCafePoints::new);
+		EffectHandler.getInstance().registerHandler("AddMaxPhysicalCriticalRate", AddMaxPhysicalCriticalRate::new);
+		EffectHandler.getInstance().registerHandler("AddMaxMagicCriticalRate", AddMaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("AddSkillBySkill", AddSkillBySkill::new);
 		EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new);
 		EffectHandler.getInstance().registerHandler("AgathionSlot", AgathionSlot::new);
@@ -177,6 +179,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("GiveFame", GiveFame::new);
 		EffectHandler.getInstance().registerHandler("GiveHonorCoins", GiveHonorCoins::new);
 		EffectHandler.getInstance().registerHandler("GiveItemByExp", GiveItemByExp::new);
+		EffectHandler.getInstance().registerHandler("GivePetXp", GivePetXp::new);
 		EffectHandler.getInstance().registerHandler("GiveRecommendation", GiveRecommendation::new);
 		EffectHandler.getInstance().registerHandler("GiveSp", GiveSp::new);
 		EffectHandler.getInstance().registerHandler("GiveXp", GiveXp::new);
@@ -200,6 +203,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("HpRegen", HpRegen::new);
 		EffectHandler.getInstance().registerHandler("HpToOwner", HpToOwner::new);
 		EffectHandler.getInstance().registerHandler("IgnoreDeath", IgnoreDeath::new);
+		EffectHandler.getInstance().registerHandler("IgnoreReduceDamage", IgnoreReduceDamage::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageBonus", ImmobileDamageBonus::new);
 		EffectHandler.getInstance().registerHandler("ImmobileDamageResist", ImmobileDamageResist::new);
 		EffectHandler.getInstance().registerHandler("ImmobilePetBuff", ImmobilePetBuff::new);
@@ -241,7 +245,6 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("MAtkByPAtk", MAtkByPAtk::new);
 		EffectHandler.getInstance().registerHandler("MaxCp", MaxCp::new);
 		EffectHandler.getInstance().registerHandler("MaxHp", MaxHp::new);
-		EffectHandler.getInstance().registerHandler("MaxMagicCriticalRate", MaxMagicCriticalRate::new);
 		EffectHandler.getInstance().registerHandler("MaxMp", MaxMp::new);
 		EffectHandler.getInstance().registerHandler("ModifyAssassinationPoints", ModifyAssassinationPoints::new);
 		EffectHandler.getInstance().registerHandler("ModifyBeastPoints", ModifyBeastPoints::new);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/MasterHandler.java
index c194f9d23c..e6042b2512 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/MasterHandler.java
@@ -148,6 +148,7 @@ import handlers.bypasshandlers.Link;
 import handlers.bypasshandlers.Multisell;
 import handlers.bypasshandlers.NpcViewMod;
 import handlers.bypasshandlers.Observation;
+import handlers.bypasshandlers.PetExtractWindow;
 import handlers.bypasshandlers.PlayerHelp;
 import handlers.bypasshandlers.PrivateWarehouse;
 import handlers.bypasshandlers.QuestLink;
@@ -468,6 +469,7 @@ public class MasterHandler
 			Multisell.class,
 			NpcViewMod.class,
 			Observation.class,
+			PetExtractWindow.class,
 			QuestLink.class,
 			PlayerHelp.class,
 			PrivateWarehouse.class,
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/bypasshandlers/PetExtractWindow.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/bypasshandlers/PetExtractWindow.java
new file mode 100644
index 0000000000..446334c464
--- /dev/null
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/bypasshandlers/PetExtractWindow.java
@@ -0,0 +1,56 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.bypasshandlers;
+
+import org.l2jmobius.gameserver.handler.IBypassHandler;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.network.serverpackets.pet.ShowPetExtractSystem;
+
+/**
+ * @author Geremy
+ */
+public class PetExtractWindow implements IBypassHandler
+{
+	private static final String[] COMMANDS =
+	{
+		"pet_extract_window",
+	};
+	
+	@Override
+	public boolean useBypass(String command, Player player, Creature target)
+	{
+		if (!target.isNpc())
+		{
+			return false;
+		}
+		
+		if (command.toLowerCase().startsWith(COMMANDS[0]))
+		{
+			player.sendPacket(ShowPetExtractSystem.STATIC_PACKET);
+			return true;
+		}
+		
+		return false;
+	}
+	
+	@Override
+	public String[] getBypassList()
+	{
+		return COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java
index 6a724617a2..d1cc5cb90c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java
@@ -113,7 +113,7 @@ public class MonsterDailyMissionHandler extends AbstractDailyMissionHandler
 		
 		final Player player = event.getAttacker();
 		final int monsterLevel = monster.getLevel();
-		if ((_minLevel > 0) && ((monsterLevel < _minLevel) || (monsterLevel > _maxLevel) || ((player.getLevel() - monsterLevel) > 5)))
+		if ((_minLevel > 0) && ((monsterLevel < _minLevel) || (monsterLevel > _maxLevel) || ((player.getLevel() - monsterLevel) > 15)))
 		{
 			return;
 		}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
new file mode 100644
index 0000000000..4f72de76fa
--- /dev/null
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/AddMaxMagicCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxMagicCriticalRate extends AbstractStatEffect
+{
+	public AddMaxMagicCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_MAGIC_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
new file mode 100644
index 0000000000..84f20e491a
--- /dev/null
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/AddMaxPhysicalCriticalRate.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class AddMaxPhysicalCriticalRate extends AbstractStatEffect
+{
+	public AddMaxPhysicalCriticalRate(StatSet params)
+	{
+		super(params, Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE);
+	}
+}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
index faca7879c5..ec320c5082 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -26,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
 
 /**
  * Call Skill effect implementation.
@@ -58,7 +60,7 @@ public class CallSkill extends AbstractEffect
 			return;
 		}
 		
-		Skill triggerSkill = null;
+		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
 			// Mobius: Use 0 to trigger max effector learned skill level.
@@ -72,6 +74,7 @@ public class CallSkill extends AbstractEffect
 				else
 				{
 					LOGGER.warning("Player " + effector + " called unknown skill " + _skill + " triggered by " + skill + " CallSkill.");
+					return;
 				}
 			}
 			else
@@ -100,7 +103,21 @@ public class CallSkill extends AbstractEffect
 				return;
 			}
 			
-			SkillCaster.triggerCast(effector, effected, triggerSkill);
+			final int hitTime = triggerSkill.getHitTime();
+			if (hitTime > 0)
+			{
+				if (effector.isSkillDisabled(triggerSkill))
+				{
+					return;
+				}
+				
+				effector.broadcastPacket(new MagicSkillUse(effector, effected, triggerSkill.getDisplayId(), triggerSkill.getLevel(), hitTime, 0));
+				ThreadPool.schedule(() -> SkillCaster.triggerCast(effector, effected, triggerSkill), hitTime);
+			}
+			else
+			{
+				SkillCaster.triggerCast(effector, effected, triggerSkill);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/GivePetXp.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/GivePetXp.java
new file mode 100644
index 0000000000..c9801b6d42
--- /dev/null
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/GivePetXp.java
@@ -0,0 +1,53 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.skill.Skill;
+
+/**
+ * @author Geremy
+ */
+public class GivePetXp extends AbstractEffect
+{
+	private final int _xp;
+	
+	public GivePetXp(StatSet params)
+	{
+		_xp = params.getInt("xp", 0);
+	}
+	
+	@Override
+	public boolean isInstant()
+	{
+		return true;
+	}
+	
+	@Override
+	public void instant(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		if (!effector.hasPet())
+		{
+			return;
+		}
+		
+		effected.getActingPlayer().getPet().addExpAndSp(_xp, 0);
+	}
+}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
new file mode 100644
index 0000000000..5405ccd4be
--- /dev/null
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/IgnoreReduceDamage.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author fruit
+ */
+public class IgnoreReduceDamage extends AbstractStatEffect
+{
+	public IgnoreReduceDamage(StatSet params)
+	{
+		super(params, Stat.IGNORE_REDUCE_DAMAGE);
+	}
+}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/ModifyAssassinationPoints.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/ModifyAssassinationPoints.java
index 431c51423f..9704fc51ee 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/ModifyAssassinationPoints.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/ModifyAssassinationPoints.java
@@ -32,7 +32,7 @@ public class ModifyAssassinationPoints extends AbstractEffect
 	
 	public ModifyAssassinationPoints(StatSet params)
 	{
-		_amount = params.getInt("amount");
+		_amount = params.getInt("amount") * 10000;
 	}
 	
 	@Override
@@ -55,6 +55,6 @@ public class ModifyAssassinationPoints extends AbstractEffect
 			return;
 		}
 		
-		player.setBeastPoints(player.getAssassinationPoints() + _amount);
+		player.setAssassinationPoints(player.getAssassinationPoints() + _amount);
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
index 1f5992cc6a..efa3a0f694 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java
@@ -16,6 +16,7 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.gameserver.enums.StatModifierType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -25,6 +26,7 @@ import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener;
 import org.l2jmobius.gameserver.model.events.returns.DamageReturn;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author Sdw
@@ -32,10 +34,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 public class ReduceDamage extends AbstractEffect
 {
 	private final double _amount;
+	private final StatModifierType _mode;
 	
 	public ReduceDamage(StatSet params)
 	{
 		_amount = params.getDouble("amount");
+		_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
 	}
 	
 	private DamageReturn onDamageReceivedEvent(OnCreatureDamageReceived event)
@@ -46,7 +50,15 @@ public class ReduceDamage extends AbstractEffect
 			return null;
 		}
 		
-		final double newDamage = event.getDamage() * (_amount / 100);
+		final double newDamage;
+		if (_mode == StatModifierType.PER)
+		{
+			newDamage = event.getDamage() - (event.getDamage() * (_amount / 100));
+		}
+		else // DIFF
+		{
+			newDamage = event.getDamage() - Math.max((_amount - event.getAttacker().getStat().getAdd(Stat.IGNORE_REDUCE_DAMAGE)), 0.0);
+		}
 		
 		return new DamageReturn(false, true, false, newDamage);
 	}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java
index deead4a540..2ab5c27685 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java
@@ -16,6 +16,11 @@
  */
 package handlers.effecthandlers;
 
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
 import org.l2jmobius.gameserver.data.xml.ExperienceData;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.enums.Race;
@@ -33,11 +38,12 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
  * SummonMulti effect implementation.
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class SummonMulti extends AbstractEffect
 {
 	private final int _npcId;
+	private final Map<Integer, Integer> _levelTemplates;
 	private final float _expMultiplier;
 	private final ItemHolder _consumeItem;
 	private final int _lifeTime;
@@ -46,7 +52,21 @@ public class SummonMulti extends AbstractEffect
 	
 	public SummonMulti(StatSet params)
 	{
-		_npcId = params.getInt("npcId");
+		_npcId = params.getInt("npcId", 0);
+		if (_npcId > 0)
+		{
+			_levelTemplates = null;
+		}
+		else
+		{
+			final List<Integer> summonerLevels = params.getIntegerList("summonerLevels");
+			final List<Integer> npcIds = params.getIntegerList("npcIds");
+			_levelTemplates = new LinkedHashMap<>(npcIds.size());
+			for (int i = 0; i < npcIds.size(); i++)
+			{
+				_levelTemplates.put(summonerLevels.get(i), npcIds.get(i));
+			}
+		}
 		_expMultiplier = params.getFloat("expMultiplier", 1);
 		_consumeItem = new ItemHolder(params.getInt("consumeItemId", 0), params.getInt("consumeItemCount", 1));
 		_consumeItemInterval = params.getInt("consumeItemInterval", 0);
@@ -80,7 +100,31 @@ public class SummonMulti extends AbstractEffect
 			return;
 		}
 		
-		final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
+		final NpcTemplate template;
+		if (_npcId > 0)
+		{
+			template = NpcData.getInstance().getTemplate(_npcId);
+		}
+		else
+		{
+			Entry<Integer, Integer> levelTemplate = null;
+			for (Entry<Integer, Integer> entry : _levelTemplates.entrySet())
+			{
+				if ((levelTemplate == null) || (player.getLevel() >= entry.getKey()))
+				{
+					levelTemplate = entry;
+				}
+			}
+			if (levelTemplate != null)
+			{
+				template = NpcData.getInstance().getTemplate(levelTemplate.getValue());
+			}
+			else // Should never happen.
+			{
+				template = NpcData.getInstance().getTemplate(_levelTemplates.keySet().stream().findFirst().get());
+			}
+		}
+		
 		final Servitor summon = new Servitor(template, player);
 		final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
 		
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
index 1ae3ab2ae8..41fd35ba57 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java
@@ -210,6 +210,11 @@ public class TriggerSkillByAttack extends AbstractEffect
 			else
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getAttacker().isSkillDisabled(buffInfo.getSkill()))
+				{
+					return;
+				}
 			}
 			
 			if ((buffInfo == null) || (buffInfo.getSkill().getLevel() < triggerSkill.getLevel()) || _renewDuration)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByBaseStat.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByBaseStat.java
index 4e47c369a2..320ea1a78d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByBaseStat.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByBaseStat.java
@@ -34,6 +34,7 @@ public class TriggerSkillByBaseStat extends AbstractEffect
 	private final BaseStat _baseStat;
 	private final int _skillId;
 	private final int _skillLevel;
+	private final int _skillSubLevel;
 	private final int _min;
 	private final int _max;
 	
@@ -42,6 +43,7 @@ public class TriggerSkillByBaseStat extends AbstractEffect
 		_baseStat = params.getEnum("baseStat", BaseStat.class);
 		_skillId = params.getInt("skillId", 0);
 		_skillLevel = params.getInt("skillLevel", 1);
+		_skillSubLevel = params.getInt("skillSubLevel", 0);
 		_min = params.getInt("min", 0);
 		_max = params.getInt("max", 9999);
 	}
@@ -101,7 +103,7 @@ public class TriggerSkillByBaseStat extends AbstractEffect
 				{
 					if (!target.isAffectedBySkill(_skillId))
 					{
-						SkillCaster.triggerCast(target, target, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+						SkillCaster.triggerCast(target, target, SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel));
 					}
 				}
 				else
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index b58c80876e..9a802942ba 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -124,6 +124,15 @@ public class TriggerSkillBySkill extends AbstractEffect
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
+				
+				if (event.getCaster().isSkillDisabled(buffInfo.getSkill()))
+				{
+					if ((_replace) && (buffInfo.getSkill().getLevel() == _skillLevelScaleTo))
+					{
+						((Creature) target).stopSkillEffects(SkillFinishType.SILENT, triggerSkill.getId());
+					}
+					return;
+				}
 			}
 			else
 			{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByStat.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByStat.java
index b5416f6f10..a355ce9ed0 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByStat.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByStat.java
@@ -34,6 +34,7 @@ public class TriggerSkillByStat extends AbstractEffect
 	private final Stat _stat;
 	private final int _skillId;
 	private final int _skillLevel;
+	private final int _skillSubLevel;
 	private final int _min;
 	private final int _max;
 	
@@ -42,6 +43,7 @@ public class TriggerSkillByStat extends AbstractEffect
 		_stat = params.getEnum("stat", Stat.class);
 		_skillId = params.getInt("skillId", 0);
 		_skillLevel = params.getInt("skillLevel", 1);
+		_skillSubLevel = params.getInt("skillSubLevel", 0);
 		_min = params.getInt("min", 0);
 		_max = params.getInt("max", 9999);
 	}
@@ -63,7 +65,7 @@ public class TriggerSkillByStat extends AbstractEffect
 				{
 					if (!target.isAffectedBySkill(_skillId))
 					{
-						SkillCaster.triggerCast(target, target, SkillData.getInstance().getSkill(_skillId, _skillLevel));
+						SkillCaster.triggerCast(target, target, SkillData.getInstance().getSkill(_skillId, _skillLevel, _skillSubLevel));
 					}
 				}
 				else
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
index e6aca114c0..479f697dcf 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusMAtk.java
@@ -17,7 +17,13 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author Sero
@@ -28,4 +34,46 @@ public class WeaponBonusMAtk extends AbstractStatAddEffect
 	{
 		super(params, Stat.WEAPON_BONUS_MAGIC_ATTACK);
 	}
+	
+	@Override
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
index 52060ceef6..0909b1d0f6 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/effecthandlers/WeaponBonusPAtk.java
@@ -17,7 +17,13 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
+import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
 /**
  * @author Sero
@@ -28,4 +34,46 @@ public class WeaponBonusPAtk extends AbstractStatAddEffect
 	{
 		super(params, Stat.WEAPON_BONUS_PHYSICAL_ATTACK);
 	}
+	
+	@Override
+	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
+	
+	@Override
+	public void onExit(Creature effector, Creature effected, Skill skill)
+	{
+		final Player player = effected.getActingPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item weapon = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon == null)
+		{
+			return;
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(weapon);
+		player.sendInventoryUpdate(iu);
+		player.broadcastUserInfo();
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 9c6cd18230..1e3e138a80 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -16,39 +16,61 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Pet attack player action handler.
- * @author Nik
+ * @author Mobius
  */
 public class PetAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if ((player.getPet() == null) || !player.getPet().isPet())
+		final Pet pet = player.getPet();
+		if ((pet == null) || !pet.isPet())
 		{
 			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_PET);
 			return;
 		}
 		
-		final Pet pet = player.getPet();
 		if (pet.isUncontrollable())
 		{
 			player.sendPacket(SystemMessageId.WHEN_YOUR_PET_S_SATIETY_REACHES_0_YOU_CANNOT_CONTROL_IT);
+			return;
 		}
-		else if (pet.isBetrayed())
+		
+		if (pet.isBetrayed())
 		{
 			player.sendPacket(SystemMessageId.YOUR_SERVITOR_IS_UNRESPONSIVE_AND_WILL_NOT_OBEY_ANY_ORDERS);
+			return;
 		}
-		else if (pet.canAttack(player.getTarget(), ctrlPressed))
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
 		{
-			pet.doAttack(player.getTarget());
+			return;
+		}
+		
+		if (player.calculateDistance3D(target) > 3000)
+		{
+			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+		}
+		else if (pet.canAttack(target, ctrlPressed))
+		{
+			pet.doAttack(target);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetHold.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetHold.java
index a257b160d3..89ecaf607a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetHold.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetHold.java
@@ -52,4 +52,10 @@ public class PetHold implements IPlayerActionHandler
 			((SummonAI) pet.getAI()).notifyFollowStatusChange();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetMove.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetMove.java
index 3d0943335b..0d4aa61742 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetMove.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetMove.java
@@ -53,4 +53,10 @@ public class PetMove implements IPlayerActionHandler
 			pet.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, player.getTarget().getLocation());
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
index a33ae749ab..5eb78b7bdf 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java
@@ -77,4 +77,10 @@ public class PetSkillUse implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetStop.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetStop.java
index 846981df4b..1d2bff3611 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetStop.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/PetStop.java
@@ -51,4 +51,10 @@ public class PetStop implements IPlayerActionHandler
 			pet.cancelAction();
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 1a9adbd92c..e6ba7b9145 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -16,34 +16,52 @@
  */
 package handlers.playeractions;
 
+import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
  * Servitor Attack player action handler.
- * @author St3eT
+ * @author Mobius
  */
 public class ServitorAttack implements IPlayerActionHandler
 {
 	@Override
 	public void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
 	{
-		if (player.hasServitors())
-		{
-			for (Summon summon : player.getServitors().values())
-			{
-				if (summon.canAttack(player.getTarget(), ctrlPressed))
-				{
-					summon.doAttack(player.getTarget());
-				}
-			}
-		}
-		else
+		if (!player.hasServitors())
 		{
 			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
+			return;
+		}
+		
+		final WorldObject target = player.getTarget();
+		if (target == null)
+		{
+			return;
+		}
+		
+		final boolean targetOutOfRange = player.calculateDistance3D(target) > 3000;
+		for (Summon summon : player.getServitors().values())
+		{
+			if (targetOutOfRange)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			else if (summon.canAttack(target, ctrlPressed))
+			{
+				summon.doAttack(target);
+			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorHold.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
index cd17f52e29..d8c393f79a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorHold.java
@@ -48,4 +48,10 @@ public class ServitorHold implements IPlayerActionHandler
 			((SummonAI) s.getAI()).notifyFollowStatusChange();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorMode.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
index 9e9b5dfd4b..e229844cf2 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorMode.java
@@ -68,4 +68,10 @@ public class ServitorMode implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorMove.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
index 664b42eef9..2d4ced59fb 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorMove.java
@@ -56,4 +56,10 @@ public class ServitorMove implements IPlayerActionHandler
 			}
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
index 44ec6496dd..591d47685b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java
@@ -62,4 +62,10 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			}
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorStop.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
index 0e3e27182f..980ef5ef9e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/ServitorStop.java
@@ -47,4 +47,10 @@ public class ServitorStop implements IPlayerActionHandler
 			s.cancelAction();
 		});
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
index ec175a945f..981d23429a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/UnsummonPet.java
@@ -62,4 +62,10 @@ public class UnsummonPet implements IPlayerActionHandler
 			pet.unSummon(player);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
index 9790f27377..c39b5f4366 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/playeractions/UnsummonServitor.java
@@ -69,4 +69,10 @@ public class UnsummonServitor implements IPlayerActionHandler
 			player.sendPacket(SystemMessageId.YOU_DON_T_HAVE_A_SERVITOR);
 		}
 	}
+	
+	@Override
+	public boolean isPetAction()
+	{
+		return true;
+	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/skillconditionhandlers/AssassinationPointsSkillCondition.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/skillconditionhandlers/AssassinationPointsSkillCondition.java
index f96f1d5fdc..276d2d1614 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/skillconditionhandlers/AssassinationPointsSkillCondition.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/skillconditionhandlers/AssassinationPointsSkillCondition.java
@@ -31,7 +31,7 @@ public class AssassinationPointsSkillCondition implements ISkillCondition
 	
 	public AssassinationPointsSkillCondition(StatSet params)
 	{
-		_amount = params.getInt("amount");
+		_amount = params.getInt("amount") * 10000;
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
index 9785766b0f..a23a6139ad 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java
@@ -39,10 +39,11 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition
 	@Override
 	public boolean canUse(Creature caster, Skill skill, WorldObject target)
 	{
-		if (!target.isCreature())
+		if ((target == null) || !target.isCreature())
 		{
 			return false;
 		}
+		
 		final int skillLevel = ((Creature) target).getSkillLevel(_skillId);
 		return _hasLearned ? skillLevel != 0 : skillLevel == 0;
 	}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
index e836ebce13..acee337ee6 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/handlers/targethandlers/affectscope/PartyPledge.java
@@ -67,7 +67,7 @@ public class PartyPledge implements IAffectScopeHandler
 					return false;
 				}
 				
-				if ((p != player) && (p.getClanId() != clanId) && ((party == null) || (party != p.getParty())))
+				if ((p != player) && ((clanId == 0) || (p.getClanId() != clanId)) && ((party == null) || (party != p.getParty())))
 				{
 					return false;
 				}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
index fa92044392..7c8d6bbb87 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/DwellingOfSpirits/DwellingOfSpirits.java
@@ -20,20 +20,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.l2jmobius.gameserver.data.xml.SkillData;
-import org.l2jmobius.gameserver.enums.ChatType;
-import org.l2jmobius.gameserver.enums.SkillFinishType;
+import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.enums.TeleportWhereType;
-import org.l2jmobius.gameserver.instancemanager.ZoneManager;
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.model.skill.Skill;
-import org.l2jmobius.gameserver.model.skill.SkillCaster;
 import org.l2jmobius.gameserver.model.zone.ZoneType;
 import org.l2jmobius.gameserver.network.NpcStringId;
 import org.l2jmobius.gameserver.network.serverpackets.ExSendUIEvent;
@@ -47,8 +42,12 @@ import instances.AbstractInstance;
  */
 public class DwellingOfSpirits extends AbstractInstance
 {
+	private static final int PORTAL_OPEN_CHANCE = 40;
+	
 	// CRITICAL NPCs
 	private static final int RUIP = 22273;
+	private static final int FAIRY_C1 = 22271;
+	private static final int FAIRY_C2 = 22272;
 	private static final int SEALSTONE = 34178;
 	private static final int ANIMAEL = 34176;
 	private static final int PORTAL_EVENT_FIRE = 15969;
@@ -56,46 +55,10 @@ public class DwellingOfSpirits extends AbstractInstance
 	private static final int PORTAL_EVENT_EARTH = 15972;
 	private static final int PORTAL_EVENT_WIND = 15971;
 	
-	// PROCELLA BOSS WIND
 	private static final int KING_PROCELLA = 29107;
-	private static final int PROCELLA_GUARDIAN_1 = 29112;
-	private static final int PROCELLA_STORM = 29115;
-	
-	private static final SkillHolder HURRICANE_SUMMON = new SkillHolder(50042, 1);
-	private static final int HURRICANE_BOLT = 50043;
-	private static final SkillHolder HURRICANE_BOLT_LV_1 = new SkillHolder(50043, 1);
-	private static final int STORM_MAX_COUNT = 20; //
-	
-	// PETRAM BOSS EARTH
 	private static final int KING_PETRAM = 29108;
-	private static final int PETRAM_PIECE = 29116;
-	private static final int PETRAM_FRAGMENT = 29117;
-	// Skills
-	private static final SkillHolder EARTH_ENERGY = new SkillHolder(50066, 1);
-	private static final SkillHolder EARTH_FURY = new SkillHolder(50059, 1);
-	private static final SkillHolder TEST = new SkillHolder(5712, 1);
-	
-	// IGNIS BOSS FIRE
-	// NPCs
 	private static final int KING_IGNIS = 29105;
-	// Skills
-	private static final SkillHolder FIRE_RAG_2 = new SkillHolder(50050, 2);
-	private static final SkillHolder FIRE_RAG_4 = new SkillHolder(50050, 4);
-	private static final SkillHolder FIRE_RAG_6 = new SkillHolder(50050, 6);
-	private static final SkillHolder FIRE_RAG_8 = new SkillHolder(50050, 8);
-	
-	// NEBULA BOSS WATER
-	// NPCs
 	private static final int KING_NEBULA = 29106;
-	private static final int WATER_SLIME = 29111;
-	// Skills
-	private static final int AQUA_RAGE = 50036;
-	private static final SkillHolder AQUA_RAGE_1 = new SkillHolder(AQUA_RAGE, 1);
-	private static final SkillHolder AQUA_RAGE_2 = new SkillHolder(AQUA_RAGE, 2);
-	private static final SkillHolder AQUA_RAGE_3 = new SkillHolder(AQUA_RAGE, 3);
-	private static final SkillHolder AQUA_RAGE_4 = new SkillHolder(AQUA_RAGE, 4);
-	private static final SkillHolder AQUA_RAGE_5 = new SkillHolder(AQUA_RAGE, 5);
-	private static final SkillHolder AQUA_SUMMON = new SkillHolder(50037, 1);
 	
 	// Entrace Portal Triggers
 	private static final int WIND_FIRST_TRIGGER_1 = 16158880;
@@ -107,38 +70,86 @@ public class DwellingOfSpirits extends AbstractInstance
 	private static final int WATER_FIRST_TRIGGER_1 = 16157770;
 	private static final int WATER_FIRST_TRIGGER_2 = 16157772;
 	
-	// Statue Kill Indicator Triggers
-	private static final int KILL_INDICATOR_TRIGGER_1 = 16159990;
-	private static final int KILL_INDICATOR_TRIGGER_2 = 16159994;
-	private static final int KILL_INDICATOR_TRIGGER_3 = 16159996;
-	private static final int KILL_INDICATOR_TRIGGER_4 = 16159998;
-	private static final int KILL_INDICATOR_TRIGGER_5 = 16159992;
+	// @formatter:off
+	private static final int[][] PORTAL_TRIGGER_IDS = 
+	{
+	    { 16158880, 16158882 },
+	    { 16156660, 16156662 },
+	    { 16155550, 16155552 },
+	    { 16157770, 16157772 }
+	};
+	
+	private static final Location IGNIS_FIRE_L = new Location(202374, 168153, -15485);
+	private static final Location PETRAM_EARTH_L = new Location(222081, 190538, -15485);
+	private static final Location NEBULA_WATER_L = new Location(222149, 168087, -15485);
+	private static final Location PROCELLA_WIN_L = new Location(212884, 178847, -15485);
+	
+	private static final Location PETRAM_EARTH_RETURN_L = new Location(-114321, -77262, -11445);
+	private static final Location IGNIS_FIRE_RETURN_L = new Location(-114322, -77262, -11445);
+	private static final Location NEBULA_WATER_RETURN_L = new Location(-114323, -77262, -11445);
+	private static final Location PROCELLA_WIN_RETURN_L = new Location(-114324, -77262, -11445);
+	
+	private static final int[][][] portalConfigs = 
+	{
+	    {{EARTH_FIRST_TRIGGER_1, EARTH_FIRST_TRIGGER_2, KING_PETRAM}},
+	    {{FIRE_FIRST_TRIGGER_1, FIRE_FIRST_TRIGGER_2, KING_IGNIS}},
+	    {{WATER_FIRST_TRIGGER_1, WATER_FIRST_TRIGGER_2, KING_NEBULA}},
+	    {{WIND_FIRST_TRIGGER_1, WIND_FIRST_TRIGGER_2, KING_PROCELLA}}
+	};
+
+	private static final int[][] portalSpawnCoordinates = 
+	{
+	    {222063, 191514, -15486, 50142},  
+	    {202350, 169121, -15484, 48103},  
+	    {222127, 169057, -15486, 48730},  
+	    {212862, 179828, -15489, 48103}   
+	};
+	// @formatter:on
 	
 	private static final int TEMPLATE_ID = 214;
 	
 	private static final Map<Integer, NpcStringId> PORTAL_MSG = new HashMap<>();
 	static
 	{
-		PORTAL_MSG.put(1, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_EARTH_IS_OPEN);
+		PORTAL_MSG.put(0, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_EARTH_IS_OPEN);
+		PORTAL_MSG.put(1, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_FIRE_IS_OPEN);
 		PORTAL_MSG.put(2, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_WATER_IS_OPEN);
 		PORTAL_MSG.put(3, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_WIND_IS_OPEN);
-		PORTAL_MSG.put(4, NpcStringId.DIMENSIONAL_DOOR_TO_THE_SPIRIT_OF_FIRE_IS_OPEN);
-		PORTAL_MSG.put(5, NpcStringId.SEAL_STONE_DISAPPEARS_AFTER_RESONATING_WITH_THE_STATUE);
+		PORTAL_MSG.put(4, NpcStringId.SEAL_STONE_DISAPPEARS_AFTER_RESONATING_WITH_THE_STATUE);
 	}
 	
+	// Zone
+	private static final int DWELLING_CENTRAL = 21400000;
+	
+	private static final int IGNIS_PORTAL_ENTER_ID = 202201;
+	private static final int PETRAM_PORTAL_ENTER_ID = 202202;
+	private static final int NEBULA_PORTAL_ENTER_ID = 202203;
+	private static final int PROCELLA_PORTAL_ENTER_ID = 202204;
+	
+	// Portals return IDs
+	private static final int IGNIS_PORTAL_RETURN_ID = 202205;
+	private static final int PETRAM_PORTAL_RETURN_ID = 202206;
+	private static final int NEBULA_PORTAL_RETURN_ID = 202207;
+	private static final int PROCELLA_PORTAL_RETURN_ID = 202208;
+	
 	public DwellingOfSpirits()
 	{
 		super(TEMPLATE_ID);
 		addKillId(KING_PETRAM, KING_NEBULA, KING_PROCELLA, KING_IGNIS);
-		addKillId(PROCELLA_GUARDIAN_1);
-		addKillId(PETRAM_PIECE, PETRAM_FRAGMENT);
-		addKillId(WATER_SLIME);
+		addKillId(FAIRY_C1, FAIRY_C2, RUIP);
 		addAttackId(KING_PETRAM, KING_NEBULA, KING_PROCELLA, KING_IGNIS);
 		addSpawnId(KING_NEBULA);
 		addFirstTalkId(ANIMAEL, SEALSTONE);
 		addTalkId(ANIMAEL);
 		addStartNpc(SEALSTONE);
-		addCreatureSeeId(RUIP, ANIMAEL);
+		addCreatureSeeId(ANIMAEL);
+		addEnterZoneId(DWELLING_CENTRAL);
+		addEnterZoneId(IGNIS_PORTAL_ENTER_ID, IGNIS_PORTAL_RETURN_ID);
+		addEnterZoneId(PETRAM_PORTAL_ENTER_ID, PETRAM_PORTAL_RETURN_ID);
+		addEnterZoneId(NEBULA_PORTAL_ENTER_ID, NEBULA_PORTAL_RETURN_ID);
+		addEnterZoneId(PROCELLA_PORTAL_ENTER_ID, PROCELLA_PORTAL_RETURN_ID);
+		addInstanceEnterId(TEMPLATE_ID);
+		addInstanceLeaveId(TEMPLATE_ID);
 	}
 	
 	@Override
@@ -179,779 +190,106 @@ public class DwellingOfSpirits extends AbstractInstance
 			}
 			case "TELEPORT":
 			{
-				player.teleToLocation(TeleportWhereType.TOWN, null);
-				return null;
-			}
-			//////////////// BOSS PROCELLA WIND ACTION /////////////
-			case "SPAWN_MINION_PROCELLA":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if ((world != null) && (npc.getId() == KING_PROCELLA))
+				final Instance instance = player.getInstanceWorld();
+				if (instance != null)
 				{
-					world.setParameter("minion1", addSpawn(PROCELLA_GUARDIAN_1, 212663, 179421, -15486, 31011, true, 0, true, npc.getInstanceId()));
-					world.setParameter("minion2", addSpawn(PROCELLA_GUARDIAN_1, 213258, 179822, -15486, 12001, true, 0, true, npc.getInstanceId()));
-					world.setParameter("minion3", addSpawn(PROCELLA_GUARDIAN_1, 212558, 179974, -15486, 12311, true, 0, true, npc.getInstanceId()));
-					startQuestTimer("HIDE_PROCELLA", 1000, world.getNpc(KING_PROCELLA), player);
+					instance.finishInstance();
+					player.teleToLocation(TeleportWhereType.TOWN, null);
 				}
-				break;
-			}
-			case "SPAWN_STORM_PROCELLA":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if ((world != null) && (world.getParameters().getInt("stormCount", 0) < STORM_MAX_COUNT))
-				{
-					world.getNpc(KING_PROCELLA).doCast(HURRICANE_SUMMON.getSkill());
-					final Npc procellaStorm = addSpawn(PROCELLA_STORM, world.getNpc(KING_PROCELLA).getX() + getRandom(-500, 500), world.getNpc(KING_PROCELLA).getY() + getRandom(-500, 500), world.getNpc(KING_PROCELLA).getZ(), 31011, true, 0, true, npc.getInstanceId());
-					procellaStorm.setRandomWalking(true);
-					world.getParameters().increaseInt("stormCount", 1);
-					startQuestTimer("SPAWN_STORM_PROCELLA", 30000, world.getNpc(KING_PROCELLA), player);
-					startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA", 100, procellaStorm, player);
-				}
-				break;
-			}
-			case "HIDE_PROCELLA":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world.getAliveNpcCount(PROCELLA_GUARDIAN_1) >= 1)
-				{
-					world.getNpc(KING_PROCELLA).setInvisible(true);
-				}
-				else if (world.getAliveNpcCount(PROCELLA_GUARDIAN_1) == 0)
-				{
-					world.getNpc(KING_PROCELLA).setInvisible(false);
-					startQuestTimer("SPAWN_MINION_PROCELLA", 90000 + getRandom(-15000, 11000), world.getNpc(KING_PROCELLA), player);
-				}
-				break;
-			}
-			case "CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world != null)
-				{
-					final Player plr = world.getPlayers().stream().findAny().orElse(null);
-					if ((plr != null) && (plr.isInsideRadius3D(npc, 200)))
-					{
-						npc.abortAttack();
-						npc.abortCast();
-						npc.setTarget(plr);
-						if (plr.getAffectedSkillLevel(HURRICANE_BOLT) == 1)
-						{
-							npc.abortCast();
-							startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA", 100, npc, player);
-						}
-						else
-						{
-							if (SkillCaster.checkUseConditions(npc, HURRICANE_BOLT_LV_1.getSkill()))
-							{
-								npc.doCast(HURRICANE_BOLT_LV_1.getSkill());
-							}
-						}
-						startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA", 100, npc, player);
-					}
-					else
-					{
-						startQuestTimer("CHECK_CHAR_INSIDE_RADIUS_NPC_PROCELLA", 100, npc, player);
-					}
-				}
-				break;
-			}
-			//////////////// BOSS PETRAM EARTH ACTION /////////////
-			case "SPAWN_MINION":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world.getAliveNpcCount(PETRAM_FRAGMENT) == 0)
-				{
-					npc.doCast(EARTH_ENERGY.getSkill());
-					
-					if (!world.getParameters().getBoolean("spawnedMinions", false))
-					{
-						world.getParameters().set("spawnedMinions", true);
-						
-						final int stage = world.getParameters().getInt("stage", 0);
-						world.getParameters().set("stage", stage + 1);
-						
-						world.setParameter("minionpetram1", addSpawn(npc, PETRAM_FRAGMENT, 221543, 191530, -15486, 1131, false, -1, true, npc.getInstanceId()));
-						world.setParameter("minionpetram2", addSpawn(npc, PETRAM_FRAGMENT, 222069, 192019, -15486, 49364, false, -1, true, npc.getInstanceId()));
-						world.setParameter("minionpetram3", addSpawn(npc, PETRAM_FRAGMENT, 222595, 191479, -15486, 34013, false, -1, true, npc.getInstanceId()));
-						world.setParameter("minionpetram4", addSpawn(npc, PETRAM_FRAGMENT, 222077, 191017, -15486, 16383, false, -1, true, npc.getInstanceId()));
-						
-						npc.setInvul(true);
-						npc.broadcastSay(ChatType.NPC_SHOUT, "HaHahaha, fighters lets kill them. Now Im invul!!!");
-					}
-					
-					startQuestTimer("SUPPORT_PETRAM", 3000, npc, player);
-				}
-				break;
-			}
-			case "UNSPAWN_MINION":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world.getAliveNpcCount(PETRAM_FRAGMENT) == 0)
-				{
-					world.getParameters().set("spawnedMinions", false);
-					
-					npc.setInvul(false);
-					npc.broadcastSay(ChatType.NPC_SHOUT, "Nooooo... Nooooo...");
-				}
-				break;
-			}
-			case "SUPPORT_PETRAM":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world != null)
-				{
-					final Npc m1 = world.getParameters().getObject("minionpetram1", Npc.class);
-					final Npc m2 = world.getParameters().getObject("minionpetram2", Npc.class);
-					final Npc m3 = world.getParameters().getObject("minionpetram3", Npc.class);
-					final Npc m4 = world.getParameters().getObject("minionpetram4", Npc.class);
-					if (!m1.isDead())
-					{
-						m1.setTarget(world.getNpc(KING_PETRAM));
-						m1.doCast(TEST.getSkill());
-					}
-					if (!m2.isDead())
-					{
-						m2.setTarget(world.getNpc(KING_PETRAM));
-						m2.doCast(TEST.getSkill());
-					}
-					if (!m3.isDead())
-					{
-						m3.setTarget(world.getNpc(KING_PETRAM));
-						m3.doCast(TEST.getSkill());
-					}
-					if (!m4.isDead())
-					{
-						m4.setTarget(world.getNpc(KING_PETRAM));
-						m4.doCast(TEST.getSkill());
-					}
-					
-					startQuestTimer("SUPPORT_PETRAM", 10100, npc, player);
-				}
-				break;
-			}
-			case "EARTH_FURY":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world != null)
-				{
-					npc.doCast(EARTH_FURY.getSkill());
-				}
-				break;
-			}
-			//////////////// BOSS IGNIS ACTION /////////////
-			case "CAST_FIRE_RAGE_1":
-			{
-				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_2.getSkill()))
-				{
-					npc.doCast(FIRE_RAG_2.getSkill());
-				}
-				break;
-			}
-			case "CAST_FIRE_RAGE_2":
-			{
-				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_4.getSkill()))
-				{
-					npc.doCast(FIRE_RAG_4.getSkill());
-				}
-				break;
-			}
-			case "CAST_FIRE_RAGE_3":
-			{
-				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_6.getSkill()))
-				{
-					npc.doCast(FIRE_RAG_6.getSkill());
-				}
-				break;
-			}
-			case "CAST_FIRE_RAGE_4":
-			{
-				if (SkillCaster.checkUseConditions(npc, FIRE_RAG_8.getSkill()))
-				{
-					npc.doCast(FIRE_RAG_8.getSkill());
-				}
-				break;
-			}
-			//////////////// BOSS NEBULA ACTION /////////////
-			case "SPAWN_WATER_SLIME":
-			{
-				final Instance world = npc.getInstanceWorld();
-				if (world != null)
-				{
-					final Player plr = world.getPlayers().stream().findAny().get();
-					if (plr != null)
-					{
-						startQuestTimer("CAST_AQUA_RAGE", 30000 + getRandom(-15000, 15000), npc, plr);
-					}
-					if (npc.getId() == KING_NEBULA)
-					{
-						npc.doCast(AQUA_SUMMON.getSkill());
-						for (int i = 0; i < getRandom(4, 6); i++)
-						{
-							addSpawn(npc, WATER_SLIME, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, -1, true, npc.getInstanceId());
-							startQuestTimer("SPAWN_WATER_SLIME", 80000, npc, null);
-						}
-					}
-				}
-				break;
-			}
-			case "PLAYER_PARA":
-			{
-				if (player.getAffectedSkillLevel(AQUA_RAGE) == 5)
-				{
-					player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.FROZEN_PILLAR);
-					player.setImmobilized(true);
-					startQuestTimer("PLAYER_UNPARA", 5000, npc, player);
-				}
-				break;
-			}
-			case "PLAYER_UNPARA":
-			{
-				player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, AQUA_RAGE_5.getSkill());
-				player.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.FROZEN_PILLAR);
-				player.setImmobilized(false);
-				break;
-			}
-			case "CAST_AQUA_RAGE":
-			{
-				startQuestTimer("CAST_AQUA_RAGE", 5000, npc, player);
-				if ((player.isInsideRadius3D(npc, 1000)))
-				{
-					if (player.getAffectedSkillLevel(AQUA_RAGE) == 1)
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_2.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_2.getSkill());
-						}
-					}
-					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 2)
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_3.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_3.getSkill());
-						}
-					}
-					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 3)
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_4.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_4.getSkill());
-						}
-					}
-					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 4)
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_5.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_5.getSkill());
-							startQuestTimer("PLAYER_PARA", 100, npc, player);
-						}
-					}
-					else if (player.getAffectedSkillLevel(AQUA_RAGE) == 5)
-					{
-						npc.abortCast();
-					}
-					else
-					{
-						if (SkillCaster.checkUseConditions(npc, AQUA_RAGE_1.getSkill()))
-						{
-							npc.doCast(AQUA_RAGE_1.getSkill());
-						}
-					}
-				}
-				break;
-			}
-			case "check_status":
-			{
-				final Instance world = player.getInstanceWorld();
-				if (!isInInstance(world))
-				{
-					return null;
-				}
-				
-				switch (world.getStatus())
-				{
-					case 0:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(1);
-							world.despawnGroup("sealstone");
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 1:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(2);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_1, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 2:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(3);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_2, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_3, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 3:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(4);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_4, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_5, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 4:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(5);
-							player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(3), null));
-							addSpawn(KING_PROCELLA, 212862, 179828, -15489, 48103, false, 0, false, world.getId());
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 5: // Dummy stage pause, u need defeat boss to continue.
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 6:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(7);
-							world.spawnGroup("ruipwave_1");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_1, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 7:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(8);
-							world.spawnGroup("NormalMobs");
-							world.spawnGroup("ruipwave_1");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_2, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_3, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 8:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(9);
-							world.spawnGroup("NormalMobs");
-							world.spawnGroup("ruipwave_2");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_4, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_5, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 9:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(10);
-							player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(1), null));
-							addSpawn(KING_PETRAM, 222063, 191514, -15486, 50142, false, 0, false, world.getId());
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 10: // Dummy stage pause, u need defeat boss to continue.
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 11:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 1)
-						{
-							world.setStatus(12);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_1, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 12:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 1)
-						{
-							world.setStatus(13);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_2, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_3, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 13:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 1)
-						{
-							world.setStatus(14);
-							world.spawnGroup("ruipwave_2");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_4, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_5, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 14:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 1)
-						{
-							world.setStatus(15);
-							player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(4), null));
-							addSpawn(KING_IGNIS, 202350, 169121, -15484, 48103, false, 0, false, world.getId());
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 15: // Dummy stage pause, u need defeat boss for continue.
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 16:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(17);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_1, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 17:
-					{
-						if (world.getAliveNpcCount(RUIP) <= 3)
-						{
-							world.setStatus(18);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_2, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_3, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 18:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.setStatus(19);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_4, true));
-							player.broadcastPacket(new OnEventTrigger(KILL_INDICATOR_TRIGGER_5, true));
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 19: // need defeat boss for finish.
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						
-						{
-							world.setStatus(20);
-							world.spawnGroup("ruipwave_1");
-							world.spawnGroup("NormalMobs");
-							player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(2), null));
-							addSpawn(KING_NEBULA, 222127, 169057, -15486, 48730, false, 0, false, world.getId());
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-					case 20:
-					{
-						if (world.getAliveNpcCount(RUIP) == 0)
-						{
-							world.getParameters().set("DwellingOfSpiritsFinished", true);
-							world.setStatus(21);
-						}
-						startQuestTimer("check_status", 1000, null, player);
-						break;
-					}
-				}
-				
-				return null;
 			}
 		}
 		
 		return super.onAdvEvent(event, npc, player);
-		
-	}
-	
-	@Override
-	public String onSpawn(Npc npc)
-	{
-		startQuestTimer("SPAWN_WATER_SLIME", 40000, npc, null);
-		return super.onSpawn(npc);
-	}
-	
-	@Override
-	public String onAttack(Npc npc, Player player, int damage, boolean isSummon, Skill skill)
-	{
-		final Instance world = npc.getInstanceWorld();
-		if (world == null)
-		{
-			return null;
-		}
-		
-		switch (npc.getId())
-		{
-			case KING_PROCELLA:
-			{
-				if (npc.getCurrentHp() < (npc.getMaxHp() * 0.90))
-				{
-					startQuestTimer("SPAWN_MINION_PROCELLA", 80000 + getRandom(-15000, 15000), npc, player);
-					startQuestTimer("SPAWN_STORM_PROCELLA", 4000, npc, player);
-					world.setParameter("stormCount", 0);
-				}
-				break;
-			}
-			case KING_PETRAM:
-			{
-				if (npc.getCurrentHp() < (npc.getMaxHp() * 0.80))
-				{
-					startQuestTimer("EARTH_FURY", 1000, npc, player);
-					if ((world.getParameters().getInt("stage", 0) == 0) || (npc.getCurrentHp() < (npc.getMaxHp() * 0.50)))
-					{
-						startQuestTimer("SPAWN_MINION", 1000, npc, player);
-					}
-				}
-				break;
-			}
-			case KING_IGNIS:
-			{
-				if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.90)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.70)))
-				{
-					startQuestTimer("CAST_FIRE_RAGE_1", 1000, npc, null);
-				}
-				else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.70)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.50)))
-				{
-					startQuestTimer("CAST_FIRE_RAGE_2", 1000, npc, null);
-				}
-				else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.50)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.40)))
-				{
-					startQuestTimer("CAST_FIRE_RAGE_3", 1000, npc, null);
-				}
-				else if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.40)) && (npc.getCurrentHp() > (npc.getMaxHp() * 0.25)))
-				{
-					startQuestTimer("CAST_FIRE_RAGE_4", 1000, npc, null);
-				}
-				break;
-			}
-		}
-		
-		return null;
-	}
-	
-	@Override
-	public String onCreatureSee(Npc npc, Creature creature)
-	{
-		if (creature.isPlayer())
-		{
-			final Instance world = creature.getInstanceWorld();
-			if (world.getStatus() >= 5)
-			{
-				enableZoneWind();
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(WIND_FIRST_TRIGGER_1, true));
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(WIND_FIRST_TRIGGER_2, true));
-			}
-			else if (world.getStatus() >= 10)
-			{
-				enableZoneEarth();
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(EARTH_FIRST_TRIGGER_1, true));
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(EARTH_FIRST_TRIGGER_2, true));
-			}
-			else if (world.getStatus() >= 15)
-			{
-				enableZoneFire();
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(FIRE_FIRST_TRIGGER_1, true));
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(FIRE_FIRST_TRIGGER_2, true));
-			}
-			else if (world.getStatus() >= 20)
-			{
-				enableZoneWater();
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(WATER_FIRST_TRIGGER_1, true));
-				creature.getActingPlayer().sendPacket(new OnEventTrigger(WATER_FIRST_TRIGGER_2, true));
-			}
-			else if (world.getStatus() >= 21)
-			{
-				world.despawnGroup("ruipwave_1");
-				world.despawnGroup("ruipwave_2");
-				world.despawnGroup("NormalMobs");
-				world.finishInstance();
-			}
-		}
-		
-		return super.onCreatureSee(npc, creature);
 	}
 	
 	@Override
 	public String onKill(Npc npc, Player player, boolean isSummon)
 	{
 		final Instance instance = npc.getInstanceWorld();
+		final StatSet worldParameters = instance.getParameters();
+		
+		int totalBossDefeatCount = worldParameters.getInt("totalBossDefeatCount", 0);
 		
 		switch (npc.getId())
 		{
-			case KING_PETRAM:
+			case RUIP:
+			case FAIRY_C1:
+			case FAIRY_C2:
 			{
-				final Npc portal = addSpawn(PORTAL_EVENT_EARTH, 222065, 192767, -15488, 16384, false, 0, false, instance.getId());
-				portal.setDisplayEffect(1); // set the portal visible
-				player.getVariables().set("DSIGNIS", 1);
-				setActive(true);
-				enableZoneEarthExit();
-				cancelQuestTimer("SPAWN_MINION", npc, player);
-				instance.setStatus(12);
-				final Instance world = npc.getInstanceWorld();
-				for (Npc spawn : world.getNpcs(PETRAM_FRAGMENT))
+				if (Rnd.get(100) <= PORTAL_OPEN_CHANCE)
 				{
-					spawn.deleteMe();
-				}
-				break;
-			}
-			case KING_NEBULA:
-			{
-				final Npc portal = addSpawn(PORTAL_EVENT_WATER, 222127, 170488, -15488, 16384, false, 0, false, instance.getId());
-				portal.setDisplayEffect(1);
-				player.getVariables().set("DSIGNIS", 1);
-				player.sendPacket(new ExSendUIEvent(player, false, false, 0, 0, NpcStringId.TIME_LEFT));
-				setActive(true);
-				enableZoneWindExit();
-				instance.setStatus(21);
-				instance.spawnGroup("animael");
-				break;
-			}
-			case KING_IGNIS:
-			{
-				final Npc portal = addSpawn(PORTAL_EVENT_FIRE, 202349, 170533, -15488, 16384, false, 0, false, instance.getId());
-				portal.setDisplayEffect(1);
-				player.getVariables().set("DSIGNIS", 1);
-				setActive(true);
-				enableZoneFireExit();
-				instance.setStatus(17);
-				break;
-			}
-			case KING_PROCELLA:
-			{
-				final Npc portal = addSpawn(PORTAL_EVENT_WIND, 212863, 181090, -15487, 16384, false, 0, false, instance.getId());
-				portal.setDisplayEffect(1);
-				player.getVariables().set("DSIGNIS", 1);
-				setActive(true);
-				enableZoneWaterExit();
-				instance.setStatus(7);
-				final Instance world = npc.getInstanceWorld();
-				for (Npc spawn : world.getNpcs(PROCELLA_GUARDIAN_1))
-				{
-					spawn.deleteMe();
-				}
-				break;
-			}
-			case PETRAM_FRAGMENT:
-			{
-				startQuestTimer("UNSPAWN_MINION", 1000, instance.getNpc(KING_PETRAM), player);
-				break;
-			}
-			case PROCELLA_GUARDIAN_1:
-			{
-				
-				startQuestTimer("HIDE_PROCELLA", 1000, instance.getNpc(KING_PROCELLA), player);
-				break;
-			}
-			case WATER_SLIME:
-			{
-				if (getRandomBoolean())
-				{
-					switch (player.getAffectedSkillLevel(AQUA_RAGE))
+					int portalId = Rnd.get(4);
+					boolean isPortalOpened = worldParameters.getBoolean("portal" + portalId + "Opened", false);
+					
+					if (!isPortalOpened)
 					{
-						case 1:
+						if (instance.getStatus() > totalBossDefeatCount)
 						{
-							player.stopSkillEffects(AQUA_RAGE_1.getSkill());
-							break;
-						}
-						case 2:
-						{
-							player.stopSkillEffects(AQUA_RAGE_2.getSkill());
-							final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 1);
-							skill.applyEffects(player, player);
-							break;
-						}
-						case 3:
-						{
-							player.stopSkillEffects(AQUA_RAGE_3.getSkill());
-							final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 2);
-							skill.applyEffects(player, player);
-							break;
-						}
-						case 4:
-						{
-							player.stopSkillEffects(AQUA_RAGE_4.getSkill());
-							final Skill skill = SkillData.getInstance().getSkill(AQUA_RAGE, 3);
-							skill.applyEffects(player, player);
-							break;
+							return super.onKill(npc, player, isSummon);
 						}
+						instance.setStatus(instance.getStatus() + 1);
+						openPortal(player, portalId, instance);
+						worldParameters.set("portal" + portalId + "Opened", true);
 					}
 				}
 				break;
 			}
+			
+			case KING_PETRAM:
+			case KING_PROCELLA:
+			case KING_IGNIS:
+			case KING_NEBULA:
+			{
+				spawnExitPortal(instance, player, npc.getId());
+				CheckGeneralResidenceStages(npc, instance);
+				
+				break;
+			}
 		}
 		
 		return super.onKill(npc, player, isSummon);
 	}
 	
+	@Override
+	public String onEnterZone(Creature creature, ZoneType zone)
+	{
+		Instance instance = creature.getInstanceWorld();
+		if ((instance != null) && creature.isPlayer())
+		{
+			
+			final StatSet worldParameters = instance.getParameters();
+			
+			if (zone.getId() == DWELLING_CENTRAL)
+			{
+				worldParameters.set("InsideResidence", true);
+				handleCentralZone(instance, worldParameters);
+			}
+			
+			int portalId = getPortalIdByZone(zone.getId());
+			Location[] locations = getLocationsForPortal(portalId);
+			
+			if ((portalId >= 0) && (locations[0] != null))
+			{
+				boolean isPortalOpened = worldParameters.getBoolean("portal" + portalId + "Opened", false);
+				boolean isPortalExitOpened = worldParameters.getBoolean("portalExit" + portalId, false);
+				boolean InsideResidence = worldParameters.getBoolean("InsideResidence", false);
+				
+				if (isPortalOpened && (InsideResidence))
+				{
+					creature.teleToLocation(locations[0], instance);
+					worldParameters.set("InsideResidence", false);
+				}
+				
+				if (isPortalExitOpened && (!InsideResidence))
+				{
+					creature.teleToLocation(locations[1], instance);
+				}
+			}
+			
+		}
+		return null;
+	}
+	
 	@Override
 	public String onFirstTalk(Npc npc, Player player)
 	{
@@ -970,87 +308,251 @@ public class DwellingOfSpirits extends AbstractInstance
 		return super.onFirstTalk(npc, player);
 	}
 	
-	// PORTALS
-	private void enableZoneWind()
+	private void openPortal(Player player, int id, Instance instance)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("dwelling_portal_wind");
-		if (zone != null)
+		
+		if ((id >= 0) && (id < portalSpawnCoordinates.length))
 		{
-			zone.setEnabled(true);
+			int[] coordinates = portalSpawnCoordinates[id];
+			int trigger1 = portalConfigs[id][0][0];
+			int trigger2 = portalConfigs[id][0][1];
+			int kingId = portalConfigs[id][0][2];
+			
+			if ((id >= 0) && (id < PORTAL_MSG.size()))
+			{
+				NpcStringId portalMessage = PORTAL_MSG.get(id);
+				player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, portalMessage, null));
+			}
+			addSpawn(kingId, coordinates[0], coordinates[1], coordinates[2], coordinates[3], false, 0, false, instance.getId());
+			
+			instance.setParameter("TRIGGER_1_" + id, trigger1);
+			instance.setParameter("TRIGGER_2_" + id, trigger2);
+			
+			instance.broadcastPacket(new OnEventTrigger(trigger1, true));
+			instance.broadcastPacket(new OnEventTrigger(trigger2, true));
+			
 		}
 	}
 	
-	private void enableZoneEarth()
+	private void spawnExitPortal(Instance instance, Player player, int bossId)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("dwelling_portal_earth");
-		if (zone != null)
+		Npc portal;
+		int portalId;
+		Location portalLocation;
+		
+		final StatSet worldParameters = instance.getParameters();
+		worldParameters.set("portalExit" + getPortalByBossId(bossId), true);
+		
+		switch (bossId)
 		{
-			zone.setEnabled(true);
+			case KING_PROCELLA:
+			{
+				portalId = PORTAL_EVENT_WIND;
+				portalLocation = new Location(212863, 181090, -15487);
+				break;
+			}
+			case KING_PETRAM:
+			{
+				portalId = PORTAL_EVENT_EARTH;
+				portalLocation = new Location(222065, 192767, -15488);
+				break;
+			}
+			case KING_IGNIS:
+			{
+				portalId = PORTAL_EVENT_FIRE;
+				portalLocation = new Location(202349, 170533, -15488);
+				break;
+			}
+			case KING_NEBULA:
+			{
+				portalId = PORTAL_EVENT_WATER;
+				portalLocation = new Location(222127, 170488, -15488);
+				break;
+			}
+			default:
+			{
+				return;
+			}
+		}
+		portal = addSpawn(portalId, portalLocation, false, 0, false, instance.getId());
+		
+		if (portal != null)
+		{
+			portal.setDisplayEffect(1);
+		}
+		
+	}
+	
+	private int getPortalByBossId(int bossId)
+	{
+		switch (bossId)
+		{
+			case KING_PETRAM:
+			{
+				return 0;
+			}
+			case KING_IGNIS:
+			{
+				return 1;
+			}
+			case KING_NEBULA:
+			{
+				return 2;
+			}
+			case KING_PROCELLA:
+			{
+				return 3;
+			}
+			default:
+				return -1;
 		}
 	}
 	
-	private void enableZoneFire()
+	private int getPortalIdByZone(int zoneId)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("dwelling_portal_fire");
-		if (zone != null)
+		switch (zoneId)
 		{
-			zone.setEnabled(true);
+			case PETRAM_PORTAL_ENTER_ID:
+			case PETRAM_PORTAL_RETURN_ID:
+			{
+				return 0;
+			}
+			case IGNIS_PORTAL_ENTER_ID:
+			case IGNIS_PORTAL_RETURN_ID:
+			{
+				return 1;
+			}
+			case NEBULA_PORTAL_ENTER_ID:
+			case NEBULA_PORTAL_RETURN_ID:
+			{
+				return 2;
+			}
+			case PROCELLA_PORTAL_ENTER_ID:
+			case PROCELLA_PORTAL_RETURN_ID:
+			{
+				return 3;
+			}
+			default:
+			{
+				return -1;
+			}
 		}
 	}
 	
-	private void enableZoneWater()
+	private Location[] getLocationsForPortal(int portalId)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("dwelling_portal_water");
-		if (zone != null)
+		Location[] locations = new Location[2];
+		
+		switch (portalId)
 		{
-			zone.setEnabled(true);
+			case 0:
+			{
+				locations[0] = PETRAM_EARTH_L;
+				locations[1] = PETRAM_EARTH_RETURN_L;
+				break;
+			}
+			case 1:
+			{
+				locations[0] = IGNIS_FIRE_L;
+				locations[1] = IGNIS_FIRE_RETURN_L;
+				break;
+			}
+			case 2:
+			{
+				locations[0] = NEBULA_WATER_L;
+				locations[1] = NEBULA_WATER_RETURN_L;
+				break;
+			}
+			case 3:
+			{
+				locations[0] = PROCELLA_WIN_L;
+				locations[1] = PROCELLA_WIN_RETURN_L;
+				break;
+			}
+		}
+		
+		return locations;
+	}
+	
+	private void CheckGeneralResidenceStages(Npc npc, Instance instance)
+	{
+		final StatSet worldParameters = instance.getParameters();
+		
+		int portalId = getPortalByBossId(npc.getId());
+		
+		if ((portalId >= 0) && (portalId < portalConfigs.length))
+		{
+			String bossDefeatCountKey = "bossOfPortal_" + portalId + "_defeat_count";
+			int currentDefeatCount = worldParameters.getInt(bossDefeatCountKey, 0);
+			int newDefeatCount = currentDefeatCount + 1;
+			
+			worldParameters.set(bossDefeatCountKey, newDefeatCount);
+		}
+		
+		int totalBossDefeatCount = 0;
+		
+		for (int i = 0; i < portalConfigs.length; i++)
+		{
+			String bossDefeatCountKey = "bossOfPortal_" + i + "_defeat_count";
+			totalBossDefeatCount += worldParameters.getInt(bossDefeatCountKey, 0);
+		}
+		
+		worldParameters.set("totalBossDefeatCount", totalBossDefeatCount);
+		
+		if (totalBossDefeatCount >= 4)
+		{
+			instance.spawnGroup("animael");
+			instance.despawnGroup("ruipwave_1");
+			instance.despawnGroup("NormalMobs");
 		}
 	}
 	
-	private void enableZoneWindExit()
+	private void handleCentralZone(Instance instance, StatSet worldParameters)
 	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("return_portal_procella");
-		if (zone != null)
+		for (int id = 0; id < PORTAL_TRIGGER_IDS.length; id++)
 		{
-			zone.setEnabled(true);
-		}
-	}
-	
-	private void enableZoneEarthExit()
-	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("return_portal_petram");
-		if (zone != null)
-		{
-			zone.setEnabled(true);
-		}
-	}
-	
-	private void enableZoneFireExit()
-	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("return_portal_ignis");
-		if (zone != null)
-		{
-			zone.setEnabled(true);
-		}
-	}
-	
-	private void enableZoneWaterExit()
-	{
-		final ZoneType zone = ZoneManager.getInstance().getZoneByName("return_portal_nebula");
-		if (zone != null)
-		{
-			zone.setEnabled(true);
+			int trigger1 = worldParameters.getInt("TRIGGER_1_" + id, -1);
+			int trigger2 = worldParameters.getInt("TRIGGER_2_" + id, -1);
+			
+			if ((trigger1 != -1) && (trigger2 != -1))
+			{
+				instance.broadcastPacket(new OnEventTrigger(trigger1, true));
+				instance.broadcastPacket(new OnEventTrigger(trigger2, true));
+			}
 		}
 	}
 	
 	private void startEvent(Npc npc, Player player)
 	{
-		if (!player.getInstanceWorld().getParameters().getBoolean("DwellingOfSpiritsFinished", false))
+		final Instance instance = player.getInstanceWorld();
+		instance.setParameter("Running", true);
+		player.getInstanceWorld().broadcastPacket(new ExSendUIEvent(player, false, false, (int) (instance.getRemainingTime() / 1000), 0, NpcStringId.TIME_LEFT));
+		player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(4), null));
+		instance.spawnGroup("ruipwave_1");
+		instance.spawnGroup("NormalMobs");
+		
+		if (npc.getId() == SEALSTONE)
 		{
-			player.sendPacket(new ExSendUIEvent(player, false, false, 1800, 2, NpcStringId.TIME_LEFT));
-			player.sendPacket(new ExShowScreenMessage(2, -1, 2, 0, 0, 0, 0, true, 8000, false, null, PORTAL_MSG.get(5), null));
-			startQuestTimer("check_status", 1000, null, player);
+			instance.despawnGroup("sealstone");
 		}
+		
+	}
+	
+	@Override
+	public void onInstanceEnter(Player player, Instance instance)
+	{
+		boolean Running = instance.getParameters().getBoolean("Running", false);
+		if ((instance.getRemainingTime() > 0) && Running)
+		{
+			player.sendPacket(new ExSendUIEvent(player, false, false, (int) (instance.getRemainingTime() / 1000), 0, NpcStringId.TIME_LEFT));
+		}
+	}
+	
+	@Override
+	public void onInstanceLeave(Player player, Instance instance)
+	{
+		
+		player.sendPacket(new ExSendUIEvent(player, false, false, 0, 0, NpcStringId.TIME_LEFT));
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
index 912a293160..2414f8fcfe 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/instances/TimedHunting/TimedHunting.java
@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.ai.AttackableAI;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData;
+import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.enums.SkillFinishType;
 import org.l2jmobius.gameserver.instancemanager.InstanceManager;
@@ -60,6 +61,8 @@ public class TimedHunting extends AbstractInstance
 	private static final int DEBBIE = 34126; // War-Torn Plains 70-79
 	// Skill
 	private static final int BUFF = 45197;
+	private static final int BUFF_FOR_KAMAEL = 45198;
+	
 	// Misc
 	private static final int[] TEMPLATES =
 	{
@@ -201,7 +204,14 @@ public class TimedHunting extends AbstractInstance
 		}
 		
 		npc.setTarget(player);
-		if (!player.getEffectList().isAffectedBySkill(BUFF))
+		if (player.getRace() == Race.KAMAEL)
+		{
+			if (!player.getEffectList().isAffectedBySkill(BUFF_FOR_KAMAEL))
+			{
+				npc.doCast(new SkillHolder(BUFF_FOR_KAMAEL, 1).getSkill());
+			}
+		}
+		else if (!player.getEffectList().isAffectedBySkill(BUFF))
 		{
 			npc.doCast(new SkillHolder(BUFF, 1).getSkill());
 		}
@@ -276,6 +286,7 @@ public class TimedHunting extends AbstractInstance
 		player.sendPacket(new TimedHuntingZoneExit(108)); // Training Zone id.
 		
 		player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, BUFF);
+		player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, BUFF_FOR_KAMAEL);
 		instance.setParameter("PlayerIsOut", true);
 		
 		// Restore normal skills.
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10061_NewLifesLessons/Q10061_NewLifesLessons.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10061_NewLifesLessons/Q10061_NewLifesLessons.java
index 631e19a098..ce6f3104e0 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10061_NewLifesLessons/Q10061_NewLifesLessons.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10061_NewLifesLessons/Q10061_NewLifesLessons.java
@@ -28,6 +28,8 @@ import org.l2jmobius.gameserver.model.quest.newquestdata.QuestCondType;
 import org.l2jmobius.gameserver.network.serverpackets.quest.ExQuestDialog;
 import org.l2jmobius.gameserver.network.serverpackets.quest.ExQuestNotification;
 
+import quests.Q10062_StrengthOfSpirit.Q10062_StrengthOfSpirit;
+
 /**
  * @author Magik
  */
@@ -104,10 +106,10 @@ public class Q10061_NewLifesLessons extends Quest
 					questState.exitQuest(false, true);
 					rewardPlayer(player);
 					
-					final QuestState nextQuestState = player.getQuestState(Q10061_NewLifesLessons.class.getSimpleName());
+					final QuestState nextQuestState = player.getQuestState(Q10062_StrengthOfSpirit.class.getSimpleName());
 					if (nextQuestState == null)
 					{
-						player.sendPacket(new ExQuestDialog(10061, QuestDialogType.ACCEPT));
+						player.sendPacket(new ExQuestDialog(10062, QuestDialogType.ACCEPT));
 					}
 				}
 				break;
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10062_StrengthOfSpirit/Q10062_StrengthOfSpirit.java b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10062_StrengthOfSpirit/Q10062_StrengthOfSpirit.java
index 31705d73a6..2e0facd0a0 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10062_StrengthOfSpirit/Q10062_StrengthOfSpirit.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/scripts/quests/Q10062_StrengthOfSpirit/Q10062_StrengthOfSpirit.java
@@ -28,6 +28,8 @@ import org.l2jmobius.gameserver.model.quest.newquestdata.QuestCondType;
 import org.l2jmobius.gameserver.network.serverpackets.quest.ExQuestDialog;
 import org.l2jmobius.gameserver.network.serverpackets.quest.ExQuestNotification;
 
+import quests.Q10063_LearningAutoHunt.Q10063_LearningAutoHunt;
+
 /**
  * @author Magik
  */
@@ -36,7 +38,7 @@ public class Q10062_StrengthOfSpirit extends Quest
 	private static final int QUEST_ID = 10062;
 	private static final int[] MONSTERS =
 	{
-		22324 // Training dummy
+		22183 // Training dummy
 	};
 	
 	public Q10062_StrengthOfSpirit()
@@ -104,10 +106,10 @@ public class Q10062_StrengthOfSpirit extends Quest
 					questState.exitQuest(false, true);
 					rewardPlayer(player);
 					
-					final QuestState nextQuestState = player.getQuestState(Q10062_StrengthOfSpirit.class.getSimpleName());
+					final QuestState nextQuestState = player.getQuestState(Q10063_LearningAutoHunt.class.getSimpleName());
 					if (nextQuestState == null)
 					{
-						player.sendPacket(new ExQuestDialog(10062, QuestDialogType.ACCEPT));
+						player.sendPacket(new ExQuestDialog(10063, QuestDialogType.ACCEPT));
 					}
 				}
 				break;
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/skillTrees/2ndClass/Overlord.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/skillTrees/2ndClass/Overlord.xml
index 544886ba90..5c3fcf1fb0 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/skillTrees/2ndClass/Overlord.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/skillTrees/2ndClass/Overlord.xml
@@ -6,6 +6,7 @@
 			<removeSkill id="1003" onlyReplaceByLearn="true" /> <!-- Eagle Spirit -->
 			<removeSkill id="100" onlyReplaceByLearn="true" /> <!-- Shock Mastery -->
 			<removeSkill id="164" onlyReplaceByLearn="true" /> <!-- Quick Recovery -->
+			<removeSkill id="250" onlyReplaceByLearn="true" /> <!-- Weapon Mastery -->
 		</skill>
 		<skill skillName="Shaman's Attack Mastery" skillId="45056" skillLevel="2" getLevel="55" levelUpSp="31000" />
 		<skill skillName="Shaman's Attack Mastery" skillId="45056" skillLevel="3" getLevel="65" levelUpSp="73000" />
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/skillTrees/2ndClass/Warcryer.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/skillTrees/2ndClass/Warcryer.xml
index 7ee482f6a3..2ca595b04e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/skillTrees/2ndClass/Warcryer.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/skillTrees/2ndClass/Warcryer.xml
@@ -6,6 +6,7 @@
 			<removeSkill id="1003" onlyReplaceByLearn="true" /> <!-- Eagle Spirit -->
 			<removeSkill id="100" onlyReplaceByLearn="true" /> <!-- Shock Mastery -->
 			<removeSkill id="164" onlyReplaceByLearn="true" /> <!-- Quick Recovery -->
+			<removeSkill id="250" onlyReplaceByLearn="true" /> <!-- Weapon Mastery -->
 		</skill>
 		<skill skillName="Shaman's Attack Mastery" skillId="45056" skillLevel="2" getLevel="55" levelUpSp="47000" />
 		<skill skillName="Shaman's Attack Mastery" skillId="45056" skillLevel="3" getLevel="65" levelUpSp="110000" />
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/augmentation/options/50100-50199.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/augmentation/options/50100-50199.xml
index f8b80d4fb4..da45ee54ec 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/augmentation/options/50100-50199.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/augmentation/options/50100-50199.xml
@@ -677,38 +677,38 @@
 	</option>
 	<option id="50188" name="o_s_cl_deliverance">
 		<!-- <Arcane Deliverance>\nWhen triggered: Recovers 6000 HP, 1000 MP and 3000 CP when HP is lower than 20%. -->
-		<passive_skill id="39325" level="2" /> <!-- unknown skill -->
+		<passive_skill id="39325" level="1" /> <!-- Arcane Deliverance -->
 	</option>
 	<option id="50189" name="o_s_cl_speed">
 		<!-- <Arcane Speed>\nWhen triggered: Atk. Spd. +100, Casting Spd. +150, Speed +10. -->
-		<passive_skill id="39326" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39326" level="1" /> <!-- Arcane Speed -->
 	</option>
 	<option id="50190" name="o_s_cl_barrier">
 		<!-- <Arcane Barrier>\nWhen triggered: Absorbs 4000 damage. -->
-		<passive_skill id="39327" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39327" level="1" /> <!-- Arcane Barrier -->
 	</option>
 	<option id="50191" name="o_s_cl_immunity">
 		<!-- <Arcane Immunity>\nWhen triggered: Grants immunity to debuffs. -->
-		<passive_skill id="39328" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39328" level="1" /> <!-- Arcane Immunity -->
 	</option>
 	<option id="50192" name="o_s_cl_protection">
 		<!-- <Arcane Protection>\nWhen triggered: P. Def. +3000, M. Def. +2100. -->
-		<passive_skill id="39329" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39329" level="1" /> <!-- Arcane Protection -->
 	</option>
 	<option id="50193" name="o_s_cl_paralysis">
 		<!-- <Arcane Paralysis>\nWhen triggered: Paralyzes the target. -->
-		<passive_skill id="39330" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39330" level="1" /> <!-- Arcane Paralysis -->
 	</option>
 	<option id="50194" name="o_s_cl_silence">
 		<!-- <Arcane Silence>\nWhen triggered: Inflicts Silence on the target. -->
-		<passive_skill id="39331" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39331" level="1" /> <!-- Arcane Silence -->
 	</option>
 	<option id="50195" name="o_s_cl_sense">
 		<!-- <Arcane Critical Sense>\nAll Critical Rate +3%, All Critical Damage +150 -->
-		<passive_skill id="39332" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39332" level="1" /> <!-- Arcane Critical Sense -->
 	</option>
 	<option id="50196" name="o_s_cl_power">
 		<!-- <Arcane Power>\nP. Atk. +350, M. Atk. +500 -->
-		<passive_skill id="39333" level="3" /> <!-- unknown skill -->
+		<passive_skill id="39333" level="1" /> <!-- Arcane Power -->
 	</option>
 </list>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/49400-49499.xml
index 051690bf97..b00af4fb34 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/49400-49499.xml
@@ -1430,13 +1430,23 @@
 	<item id="49489" name="Chest of Enchant Scroll's Parts" additionalName="Not Available" type="EtcItem">
 		<!-- Double-click to obtain various items. -->
 		<set name="icon" val="icon.etc_ertheia2" />
-		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="default_action" val="PEEL" />
 		<set name="material" val="FISH" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="49474" min="1" max="1" chance="20" /> <!-- Scroll Part: Enchant Weapon -->
+			<item id="49475" min="1" max="1" chance="50" /> <!-- Scroll Part: Enchant Armor -->
+			<item id="49476" min="1" max="1" chance="2" /> <!-- Refined Scroll Part: Enchant Weapon -->
+			<item id="49478" min="1" max="1" chance="13" /> <!-- Refined Scroll Part: Enchant Armor -->
+			<item id="49479" min="1" max="1" chance="2" /> <!-- Solid Scroll Part: Enchant Weapon -->
+			<item id="49480" min="1" max="1" chance="13" /> <!-- Solid Scroll Part: Enchant Armor -->
+		</capsuled_items>
 	</item>
 	<item id="49490" name="Fishing Kit" additionalName="Sealed" type="EtcItem">
 		<!-- Double-click to obtain various items. -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/49500-49599.xml
index e36b4c92ba..c5729cce86 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/49500-49599.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/49500-49599.xml
@@ -386,6 +386,8 @@
 		<!-- Momentarily recovers 600 HP. If HP is full, CP is recovered. -->
 		<set name="icon" val="icon.etc_potion_red_i00" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="LIQUID" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
@@ -441,6 +443,12 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="is_event_restricted" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<skills>
+			<skill id="39103" level="1" /> <!-- Quick Hero Healing Potion -->
+		</skills>
 	</item>
 	<item id="49534" name="Hero's Cube" additionalName="7-day" type="EtcItem">
 		<!-- Available for 7 days. Required level: 20. Double-click to obtain Soulshot Ticket, Buff Scroll Chest, Hero's Top-grade HP Replenishing Potion, Hero's HP Recovery Potion, Angel Cat's Blessing, Improved Scroll of Resurrection, Chest of Enchant Scroll's Parts, Fishing Kit, Box of Scroll of Escape to Base, Blade Spirit, Spellbook Chest. Can be used only once a day. -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/49800-49899.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/49800-49899.xml
index 6e8d5c51c6..e949f27fe5 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/49800-49899.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/49800-49899.xml
@@ -789,6 +789,10 @@
 		<set name="is_destroyable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="time" val="10080" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39199" level="1" /> <!-- Hero's Wondrous Cubic -->
+		</skills>
 	</item>
 	<item id="49861" name="Life Stone - Tester" additionalName="Not Available" type="EtcItem">
 		<!-- The item is not available. Test. -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/91400-91499.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/91400-91499.xml
index dccb0a67c3..745be5016d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/91400-91499.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/91400-91499.xml
@@ -977,57 +977,129 @@
 		<!-- <font color=bbaa88><When enchanted from +1 to +3></font>. One-handed sword/ blunt weapon, dagger, rapier, spear: P. Atk. +4, M. Atk. +3. Two-handed sword/ blunt weapon, dual swords, fist weapon, ancient sword: P. Atk. +5, M. Atk. +3. Bow, firearms: P. Atk. +8, M. Atk. +3. <font color=bbaa88><When enchanted to +4 or higher></font>. One-handed sword/ blunt weapon, dagger, rapier, spear: P. Atk. +8, M. Atk. +6. Two-handed sword/ blunt weapon, dual swords, fist weapon, ancient sword: P. Atk. +10, M. Atk. +6. Bow, firearms: P. Atk. +16, M. Atk. +6. <font color=eeaa22>Safe enchanting to +4. In case of failure the enchant value remains the same. For items enchanted from +7 to +15.</font>. <font color=ff6666>Cannot be used for mass enchanting.</font> -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_d" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="51263" level="1" />
+		</skills>
 	</item>
 	<item id="91465" name="High-grade Stable Scroll: Enchant D-grade Armor" type="EtcItem">
 		<!-- <font color=bbaa88><When enchanted from +1 to +3></font>. Armor: P. Def. +1. Accessories: M. Def. +1. <font color=bbaa88><When enchanted to +4 or higher></font>. Armor: P. Def. +3. Accessories: M. Def. +3. <font color=eeaa22>Safe enchanting to +4. In case of failure the enchant value remains the same. For armor and accessories enchanted from +6 to +9</font>. <font color=ff6666>Cannot be used for mass enchanting.</font> -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_d" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="51264" level="1" />
+		</skills>
 	</item>
 	<item id="91466" name="High-grade Stable Scroll: Enchant C-grade Weapon" type="EtcItem">
 		<!-- <font color=bbaa88><When enchanted from +1 to +3></font>. One-handed sword/ blunt weapon, dagger, rapier, spear: P. Atk. +4, M. Atk. +3. Two-handed sword/ blunt weapon, dual swords, fist weapon, ancient sword: P. Atk. +5, M. Atk. +3. Bow, firearms: P. Atk. +8, M. Atk. +3. <font color=bbaa88><When enchanted to +4 or higher></font>. One-handed sword/ blunt weapon, dagger, rapier, spear: P. Atk. +8, M. Atk. +6. Two-handed sword/ blunt weapon, dual swords, fist weapon, ancient sword: P. Atk. +10, M. Atk. +6. Bow, firearms: P. Atk. +16, M. Atk. +6. <font color=eeaa22>Safe enchanting to +4. In case of failure the enchant value remains the same. For items enchanted from +7 to +15.</font>. <font color=ff6666>Cannot be used for mass enchanting.</font> -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_c" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="51265" level="1" />
+		</skills>
 	</item>
 	<item id="91467" name="High-grade Stable Scroll: Enchant C-grade Armor" type="EtcItem">
 		<!-- <font color=bbaa88><When enchanted from +1 to +3></font>. Armor: P. Def. +1. Accessories: M. Def. +1. <font color=bbaa88><When enchanted to +4 or higher></font>. Armor: P. Def. +3. Accessories: M. Def. +3. <font color=eeaa22>Safe enchanting to +4. In case of failure the enchant value remains the same. For armor and accessories enchanted from +6 to +9</font>. <font color=ff6666>Cannot be used for mass enchanting.</font> -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_c" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="51266" level="1" />
+		</skills>
 	</item>
 	<item id="91468" name="High-grade Stable Scroll: Enchant B-grade Weapon" type="EtcItem">
 		<!-- <font color=bbaa88><When enchanted from +1 to +3></font>. One-handed sword/ blunt weapon, dagger, rapier, spear: P. Atk. +4, M. Atk. +3. Two-handed sword/ blunt weapon, dual swords, fist weapon, ancient sword: P. Atk. +5, M. Atk. +3. Bow, firearms: P. Atk. +8, M. Atk. +3. <font color=bbaa88><When enchanted to +4 or higher></font>. One-handed sword/ blunt weapon, dagger, rapier, spear: P. Atk. +8, M. Atk. +6. Two-handed sword/ blunt weapon, dual swords, fist weapon, ancient sword: P. Atk. +10, M. Atk. +6. Bow, firearms: P. Atk. +16, M. Atk. +6. <font color=eeaa22>Safe enchanting to +4. In case of failure the enchant value remains the same. For items enchanted from +7 to +15.</font>. <font color=ff6666>Cannot be used for mass enchanting.</font> -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_b" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="51267" level="1" />
+		</skills>
 	</item>
 	<item id="91469" name="High-grade Stable Scroll: Enchant B-grade Armor" type="EtcItem">
 		<!-- <font color=bbaa88><When enchanted from +1 to +3></font>. Armor: P. Def. +1. Accessories: M. Def. +1. <font color=bbaa88><When enchanted to +4 or higher></font>. Armor: P. Def. +3. Accessories: M. Def. +3. <font color=eeaa22>Safe enchanting to +4. In case of failure the enchant value remains the same. For armor and accessories enchanted from +6 to +9</font>. <font color=ff6666>Cannot be used for mass enchanting.</font> -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_b" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="51268" level="1" />
+		</skills>
 	</item>
 	<item id="91470" name="High-grade Stable Scroll: Enchant A-grade Weapon" type="EtcItem">
 		<!-- <font color=bbaa88><When enchanted from +1 to +3></font>. One-handed sword/ blunt weapon, dagger, rapier, spear: P. Atk. +10, M. Atk. +6. Two-handed sword/ blunt weapon, dual swords, fist weapon, ancient sword: P. Atk. +12, M. Atk. +6. Bow, firearms: P. Atk. +16, M. Atk. +6. <font color=bbaa88><When enchanted to +4 or higher></font>. One-handed sword/ blunt weapon, dagger, rapier, spear: P. Atk. +30, M. Atk. +18. Two-handed sword/ blunt weapon, dual swords, fist weapon, ancient sword: P. Atk. +36, M. Atk. +18. Bow, firearms: P. Atk. +48, M. Atk. +18. <font color=eeaa22>Safe enchanting to +4. In case of failure the enchant value remains the same. For items enchanted from +7 to +15.</font>. <font color=ff6666>Cannot be used for mass enchanting.</font> -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_a" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="51269" level="1" />
+		</skills>
 	</item>
 	<item id="91471" name="High-grade Stable Scroll: Enchant A-grade Armor" type="EtcItem">
 		<!-- <font color=bbaa88><When enchanted from +1 to +3></font>. Armor: P. Def. +4. Accessories: M. Def. +3. <font color=bbaa88><When enchanted to +4 or higher></font>. Armor: P. Def. +9. Accessories: M. Def. +7. <font color=eeaa22>Safe enchanting to +4. In case of failure the enchant value remains the same. For armor and accessories enchanted from +6 to +9</font>. <font color=ff6666>Cannot be used for mass enchanting.</font> -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_a" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="51270" level="1" />
+		</skills>
 	</item>
 	<item id="91472" name="+5 Sealed Agathion Virgo" type="EtcItem">
 		<!-- Double-click to obtain various items. -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/94100-94199.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/94100-94199.xml
index 509c9469b3..e0a94a9f48 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/94100-94199.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/94100-94199.xml
@@ -292,6 +292,16 @@
 		<cond msgId="113" addName="1">
 			<player level="60" />
 		</cond>
+		<skills>
+			<skill id="35020" level="1" type="ON_EQUIP" /> <!-- Equip Talisman - Baium -->
+			<skill id="35021" level="1" type="ON_UNEQUIP" /> <!-- Unequip Talisman - Baium -->
+			<skill id="35017" level="7" /> <!-- Equip Talisman - Baium -->
+			<skill id="50191" level="1" type="ON_ENCHANT" type_value="1" /> <!-- Enchant Effect: +1 Talisman of Baium -->
+			<skill id="50191" level="2" type="ON_ENCHANT" type_value="2" /> <!-- Enchant Effect: +2 Talisman of Baium -->
+			<skill id="50191" level="3" type="ON_ENCHANT" type_value="3" /> <!-- Enchant Effect: +3 Talisman of Baium -->
+			<skill id="50191" level="4" type="ON_ENCHANT" type_value="4" /> <!-- Enchant Effect: +4 Talisman of Baium -->
+			<skill id="50191" level="5" type="ON_ENCHANT" type_value="5" /> <!-- Enchant Effect: +5 Talisman of Baium -->
+		</skills>
 	</item>
 	<item id="94120" name="Package: Talisman of Baium" additionalName="Sealed" type="EtcItem">
 		<!-- Double-click to obtain various items. -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/94400-94499.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/94400-94499.xml
index 64a7437fa3..9f6753352c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/94400-94499.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/94400-94499.xml
@@ -1232,7 +1232,10 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="40238" level="1" /> <!-- XP +100,000,000 -->
+		</skills>
 	</item>
 	<item id="94481" name="Clan XP" additionalName="Sealed" type="EtcItem">
 		<!-- Clan XP is granted as a reward. -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/94500-94599.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/94500-94599.xml
index 165afa230b..e612d5e17c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/94500-94599.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/94500-94599.xml
@@ -190,7 +190,10 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="40241" level="1" />
+		</skills>
 	</item>
 	<item id="94518" name="Amber Lv. 5" additionalName="Sealed" type="Armor">
 		<!-- <Active skill>. Interrupts the target's skill casting. <PvP effect>. Ignores CP and deals 2000 fixed damage. <font color=bbaa88><Compound></font>. Materials: identical Jewels and Jewelry Boxes. In case of failure, the current level remains the same, but materials disappear. Effects of two identical jewels do not stack, the higher-level jewel takes precedence. -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/94600-94699.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/94600-94699.xml
index 1460c4c82d..301569fd40 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/94600-94699.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/94600-94699.xml
@@ -604,7 +604,10 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="40250" level="1" /> <!-- XP +100,000,000 -->
+		</skills>
 	</item>
 	<item id="94636" name="Pet's XP Growth Scroll" additionalName="Sealed" type="EtcItem">
 		<!-- Applies a buff when used. <Buff effect>. Pet's acquired XP +30%. Duration: 20 min. Cooldown: 1 min. The effect disappears when a pet dies or is recalled. -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/96900-96999.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/96900-96999.xml
index fb24471653..2fc3953cb0 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/96900-96999.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/96900-96999.xml
@@ -339,23 +339,51 @@
 		<set name="icon" val="icon.immortal_weapon_bg0000" />
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="BLUNT" />
-		<set name="bodypart" val="lhand" />
+		<set name="bodypart" val="rhand" />
+		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="A" />
 		<set name="material" val="ORIHARUKON" />
 		<set name="weight" val="1550" />
 		<set name="soulshots" val="2" />
 		<set name="spiritshots" val="2" />
+		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
 		<set name="enchant_enabled" val="true" />
 		<set name="ensoulNormalSlots" val="2" />
 		<set name="ensoulSpecialSlots" val="1" />
+		<set name="commissionItemType" val="BLUNT_WEAPON" />
 		<stats>
 			<stat type="pAtk">543</stat>
 			<stat type="mAtk">304</stat>
 			<stat type="pAtkSpd">379</stat>
+			<stat type="accCombat">8</stat>
+			<stat type="rCrit">6</stat>
 			<stat type="randomDamage">19</stat>
 			<stat type="pAtkRange">40</stat>
 		</stats>
+		<skills>
+			<!-- Weapon Blessing Effect -->
+			<skill id="50397" level="1" type="ON_BLESSING" />
+			<skill id="50418" level="1" type="ON_BLESSING" />
+			<skill id="50419" level="1" type="ON_BLESSING" type_value="1" />
+			<skill id="50420" level="1" type="ON_BLESSING" type_value="2" />
+			<skill id="50421" level="1" type="ON_BLESSING" type_value="3" />
+			<skill id="50422" level="1" type="ON_BLESSING" type_value="4" />
+			<skill id="50423" level="1" type="ON_BLESSING" type_value="5" />
+			<!-- Weapon Enchant Effect -->
+			<skill id="50625" level="1" type="ON_ENCHANT" type_value="0" />
+			<skill id="50625" level="2" type="ON_ENCHANT" type_value="1" />
+			<skill id="50625" level="3" type="ON_ENCHANT" type_value="2" />
+			<skill id="50625" level="4" type="ON_ENCHANT" type_value="3" />
+			<skill id="50625" level="5" type="ON_ENCHANT" type_value="4" />
+			<skill id="50625" level="6" type="ON_ENCHANT" type_value="5" />
+			<skill id="50625" level="6" type="ON_ENCHANT" type_value="6" />
+			<skill id="50625" level="6" type="ON_ENCHANT" type_value="7" />
+			<skill id="50625" level="6" type="ON_ENCHANT" type_value="8" />
+			<skill id="50625" level="6" type="ON_ENCHANT" type_value="9" />
+			<skill id="50625" level="6" type="ON_ENCHANT" type_value="10" />
+		</skills>
 	</item>
 	<item id="96928" name="Demon King's Ancient Sword" additionalName="In development" type="Weapon">
 		<!-- <font color=ff6666><Unavailable to Humans/ Elves/ Dark Elves/ Sylphs/ Vanguard Riders/ Assassins.></font> -->
@@ -363,69 +391,153 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="ANCIENTSWORD" />
 		<set name="bodypart" val="lrhand" />
+		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="A" />
 		<set name="material" val="STEEL" />
 		<set name="weight" val="1530" />
 		<set name="soulshots" val="2" />
 		<set name="spiritshots" val="2" />
+		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
 		<set name="enchant_enabled" val="true" />
 		<set name="ensoulNormalSlots" val="2" />
 		<set name="ensoulSpecialSlots" val="1" />
+		<set name="commissionItemType" val="ANCIENT_SWORD" />
 		<stats>
 			<stat type="pAtk">597</stat>
 			<stat type="mAtk">304</stat>
 			<stat type="pAtkSpd">379</stat>
+			<stat type="accCombat">5</stat>
+			<stat type="rCrit">10</stat>
 			<stat type="randomDamage">15</stat>
 			<stat type="pAtkRange">40</stat>
 		</stats>
+		<skills>
+			<!-- Weapon Blessing Effect -->
+			<skill id="50392" level="1" type="ON_BLESSING" />
+			<skill id="50418" level="1" type="ON_BLESSING" />
+			<skill id="50419" level="1" type="ON_BLESSING" type_value="1" />
+			<skill id="50420" level="1" type="ON_BLESSING" type_value="2" />
+			<skill id="50421" level="1" type="ON_BLESSING" type_value="3" />
+			<skill id="50422" level="1" type="ON_BLESSING" type_value="4" />
+			<skill id="50423" level="1" type="ON_BLESSING" type_value="5" />
+			<!-- Weapon enchant Effect -->
+			<skill id="50628" level="1" type="ON_ENCHANT" type_value="0" />
+			<skill id="50628" level="2" type="ON_ENCHANT" type_value="1" />
+			<skill id="50628" level="3" type="ON_ENCHANT" type_value="2" />
+			<skill id="50628" level="4" type="ON_ENCHANT" type_value="3" />
+			<skill id="50628" level="5" type="ON_ENCHANT" type_value="4" />
+			<skill id="50628" level="6" type="ON_ENCHANT" type_value="5" />
+			<skill id="50628" level="6" type="ON_ENCHANT" type_value="6" />
+			<skill id="50628" level="6" type="ON_ENCHANT" type_value="7" />
+			<skill id="50628" level="6" type="ON_ENCHANT" type_value="8" />
+			<skill id="50628" level="6" type="ON_ENCHANT" type_value="9" />
+			<skill id="50628" level="6" type="ON_ENCHANT" type_value="10" />
+		</skills>
 	</item>
 	<item id="96929" name="Demon King's Magic Blunt Weapon" additionalName="In development" type="Weapon">
 		<!-- <font color=ff6666><Unavailable to Sylphs/ Vanguard Riders/ Assassins.></font> -->
 		<set name="icon" val="icon.immortal_weapon_bg0000" />
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="BLUNT" />
-		<set name="bodypart" val="lhand" />
+		<set name="bodypart" val="rhand" />
+		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="A" />
 		<set name="material" val="FINE_STEEL" />
 		<set name="weight" val="1510" />
 		<set name="soulshots" val="2" />
 		<set name="spiritshots" val="2" />
+		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
 		<set name="is_magic_weapon" val="true" />
 		<set name="ensoulNormalSlots" val="2" />
 		<set name="ensoulSpecialSlots" val="1" />
 		<set name="enchant_enabled" val="true" />
+		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
 		<stats>
 			<stat type="pAtk">462</stat>
 			<stat type="mAtk">357</stat>
 			<stat type="pAtkSpd">379</stat>
+			<stat type="accCombat">8</stat>
+			<stat type="rCrit">6</stat>
 			<stat type="randomDamage">19</stat>
 			<stat type="pAtkRange">40</stat>
 		</stats>
+		<skills>
+			<!-- Weapon Blessing Effect -->
+			<skill id="50397" level="1" type="ON_BLESSING" />
+			<skill id="50418" level="1" type="ON_BLESSING" />
+			<skill id="50419" level="1" type="ON_BLESSING" type_value="1" />
+			<skill id="50420" level="1" type="ON_BLESSING" type_value="2" />
+			<skill id="50421" level="1" type="ON_BLESSING" type_value="3" />
+			<skill id="50422" level="1" type="ON_BLESSING" type_value="4" />
+			<skill id="50423" level="1" type="ON_BLESSING" type_value="5" />
+			<!-- Weapon enchant Effect -->
+			<skill id="50634" level="1" type="ON_ENCHANT" type_value="0" />
+			<skill id="50634" level="2" type="ON_ENCHANT" type_value="1" />
+			<skill id="50634" level="3" type="ON_ENCHANT" type_value="2" />
+			<skill id="50634" level="4" type="ON_ENCHANT" type_value="3" />
+			<skill id="50634" level="5" type="ON_ENCHANT" type_value="4" />
+			<skill id="50634" level="6" type="ON_ENCHANT" type_value="5" />
+			<skill id="50634" level="6" type="ON_ENCHANT" type_value="6" />
+			<skill id="50634" level="6" type="ON_ENCHANT" type_value="7" />
+			<skill id="50634" level="6" type="ON_ENCHANT" type_value="8" />
+			<skill id="50634" level="6" type="ON_ENCHANT" type_value="9" />
+			<skill id="50634" level="6" type="ON_ENCHANT" type_value="10" />
+		</skills>
 	</item>
 	<item id="96930" name="Demon King's Fire Gloves" additionalName="In development" type="Weapon">
 		<!-- <font color=ff6666><Unavailable to Sylphs/ Vanguard Riders/ Assassins.></font> -->
 		<set name="icon" val="icon.immortal_weapon_bg0000" />
 		<set name="default_action" val="EQUIP" />
-		<set name="weapon_type" val="FIST" />
+		<set name="weapon_type" val="DUALFIST" />
 		<set name="bodypart" val="lrhand" />
+		<set name="damage_range" val="0;0;32;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="A" />
 		<set name="material" val="ADAMANTAITE" />
 		<set name="weight" val="1330" />
 		<set name="soulshots" val="2" />
 		<set name="spiritshots" val="2" />
+		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
 		<set name="enchant_enabled" val="true" />
 		<set name="ensoulNormalSlots" val="2" />
 		<set name="ensoulSpecialSlots" val="1" />
+		<set name="commissionItemType" val="FIST_WEAPON" />
 		<stats>
 			<stat type="pAtk">628</stat>
 			<stat type="mAtk">304</stat>
 			<stat type="pAtkSpd">325</stat>
+			<stat type="accCombat">8</stat>
+			<stat type="rCrit">6</stat>
 			<stat type="randomDamage">5</stat>
 			<stat type="pAtkRange">80</stat>
 		</stats>
+		<skills>
+			<!-- Weapon Blessing Effect -->
+			<skill id="50404" level="1" type="ON_BLESSING" />
+			<skill id="50418" level="1" type="ON_BLESSING" />
+			<skill id="50419" level="1" type="ON_BLESSING" type_value="1" />
+			<skill id="50420" level="1" type="ON_BLESSING" type_value="2" />
+			<skill id="50421" level="1" type="ON_BLESSING" type_value="3" />
+			<skill id="50422" level="1" type="ON_BLESSING" type_value="4" />
+			<skill id="50423" level="1" type="ON_BLESSING" type_value="5" />
+			<!-- Weapon enchant Effect -->
+			<skill id="50630" level="1" type="ON_ENCHANT" type_value="0" />
+			<skill id="50630" level="2" type="ON_ENCHANT" type_value="1" />
+			<skill id="50630" level="3" type="ON_ENCHANT" type_value="2" />
+			<skill id="50630" level="4" type="ON_ENCHANT" type_value="3" />
+			<skill id="50630" level="5" type="ON_ENCHANT" type_value="4" />
+			<skill id="50630" level="6" type="ON_ENCHANT" type_value="5" />
+			<skill id="50630" level="6" type="ON_ENCHANT" type_value="6" />
+			<skill id="50630" level="6" type="ON_ENCHANT" type_value="7" />
+			<skill id="50630" level="6" type="ON_ENCHANT" type_value="8" />
+			<skill id="50630" level="6" type="ON_ENCHANT" type_value="9" />
+			<skill id="50630" level="6" type="ON_ENCHANT" type_value="10" />
+		</skills>
 	</item>
 	<item id="96931" name="Demon King's Pistols" additionalName="In development" type="Weapon">
 		<!-- <font color=bbaa88><Sylph-exclusive Weapon.></font> -->
@@ -433,45 +545,101 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="PISTOLS" />
 		<set name="bodypart" val="lrhand" />
+		<set name="damage_range" val="0;0;10;0" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="A" />
 		<set name="material" val="ADAMANTAITE" />
 		<set name="weight" val="1640" />
 		<set name="soulshots" val="3" />
 		<set name="spiritshots" val="2" />
+		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
 		<set name="enchant_enabled" val="true" />
 		<set name="ensoulNormalSlots" val="2" />
 		<set name="ensoulSpecialSlots" val="1" />
+		<set name="commissionItemType" val="SPEAR" />
 		<stats>
 			<stat type="pAtk">1018</stat>
 			<stat type="mAtk">319</stat>
 			<stat type="pAtkSpd">293</stat>
+			<stat type="accCombat">-3.75</stat>
+			<stat type="rCrit">10</stat>
 			<stat type="randomDamage">5</stat>
-			<stat type="pAtkRange">80</stat>
+			<stat type="pAtkRange">400</stat>
 		</stats>
+		<skills>
+			<!-- Weapon Blessing Effect -->
+			<skill id="50403" level="1" type="ON_BLESSING" />
+			<skill id="50418" level="1" type="ON_BLESSING" />
+			<skill id="50419" level="1" type="ON_BLESSING" type_value="1" />
+			<skill id="50420" level="1" type="ON_BLESSING" type_value="2" />
+			<skill id="50421" level="1" type="ON_BLESSING" type_value="3" />
+			<skill id="50422" level="1" type="ON_BLESSING" type_value="4" />
+			<skill id="50423" level="1" type="ON_BLESSING" type_value="5" />
+			<!-- Weapon enchant Effect -->
+			<skill id="50637" level="1" type="ON_ENCHANT" type_value="0" />
+			<skill id="50637" level="2" type="ON_ENCHANT" type_value="1" />
+			<skill id="50637" level="3" type="ON_ENCHANT" type_value="2" />
+			<skill id="50637" level="4" type="ON_ENCHANT" type_value="3" />
+			<skill id="50637" level="5" type="ON_ENCHANT" type_value="4" />
+			<skill id="50637" level="6" type="ON_ENCHANT" type_value="5" />
+			<skill id="50637" level="6" type="ON_ENCHANT" type_value="6" />
+			<skill id="50637" level="6" type="ON_ENCHANT" type_value="7" />
+			<skill id="50637" level="6" type="ON_ENCHANT" type_value="8" />
+			<skill id="50637" level="6" type="ON_ENCHANT" type_value="9" />
+			<skill id="50637" level="6" type="ON_ENCHANT" type_value="10" />
+		</skills>
 	</item>
 	<item id="96932" name="Demon King's Rapier" additionalName="In development" type="Weapon">
 		<!-- <font color=ff6666><Unavailable to Orcs/ Sylphs/ Dwarves/ Assassins.></font> -->
 		<set name="icon" val="icon.immortal_weapon_bg0000" />
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="RAPIER" />
-		<set name="bodypart" val="lhand" />
+		<set name="bodypart" val="rhand" />
+		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="A" />
 		<set name="material" val="STEEL" />
 		<set name="weight" val="1300" />
 		<set name="soulshots" val="2" />
 		<set name="spiritshots" val="2" />
+		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
 		<set name="enchant_enabled" val="true" />
 		<set name="ensoulNormalSlots" val="2" />
 		<set name="ensoulSpecialSlots" val="1" />
+		<set name="commissionItemType" val="RAPIER" />
 		<stats>
 			<stat type="pAtk">506</stat>
 			<stat type="mAtk">337</stat>
 			<stat type="pAtkSpd">406</stat>
+			<stat type="accCombat">8</stat>
+			<stat type="rCrit">10</stat>
 			<stat type="randomDamage">19</stat>
 			<stat type="pAtkRange">40</stat>
 		</stats>
+		<skills>
+			<!-- Weapon Blessing Effect -->
+			<skill id="50395" level="1" type="ON_BLESSING" />
+			<skill id="50418" level="1" type="ON_BLESSING" />
+			<skill id="50419" level="1" type="ON_BLESSING" type_value="1" />
+			<skill id="50420" level="1" type="ON_BLESSING" type_value="2" />
+			<skill id="50421" level="1" type="ON_BLESSING" type_value="3" />
+			<skill id="50422" level="1" type="ON_BLESSING" type_value="4" />
+			<skill id="50423" level="1" type="ON_BLESSING" type_value="5" />
+			<!-- Weapon enchant Effect -->
+			<skill id="50633" level="1" type="ON_ENCHANT" type_value="0" />
+			<skill id="50633" level="2" type="ON_ENCHANT" type_value="1" />
+			<skill id="50633" level="3" type="ON_ENCHANT" type_value="2" />
+			<skill id="50633" level="4" type="ON_ENCHANT" type_value="3" />
+			<skill id="50633" level="5" type="ON_ENCHANT" type_value="4" />
+			<skill id="50633" level="6" type="ON_ENCHANT" type_value="5" />
+			<skill id="50633" level="6" type="ON_ENCHANT" type_value="6" />
+			<skill id="50633" level="6" type="ON_ENCHANT" type_value="7" />
+			<skill id="50633" level="6" type="ON_ENCHANT" type_value="8" />
+			<skill id="50633" level="6" type="ON_ENCHANT" type_value="9" />
+			<skill id="50633" level="6" type="ON_ENCHANT" type_value="10" />
+		</skills>
 	</item>
 	<item id="96933" name="Demon King's Staff" additionalName="In development" type="Weapon">
 		<!-- <font color=ff6666><Unavailable to Sylphs/ Vanguard Riders/ Assassins.></font> -->
@@ -479,23 +647,51 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="BLUNT" />
 		<set name="bodypart" val="lrhand" />
+		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="A" />
 		<set name="material" val="WOOD" />
 		<set name="weight" val="880" />
 		<set name="soulshots" val="2" />
 		<set name="spiritshots" val="2" />
+		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
 		<set name="is_magic_weapon" val="true" />
 		<set name="ensoulNormalSlots" val="2" />
 		<set name="ensoulSpecialSlots" val="1" />
 		<set name="enchant_enabled" val="true" />
+		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
 		<stats>
 			<stat type="pAtk">532</stat>
 			<stat type="mAtk">377</stat>
 			<stat type="pAtkSpd">325</stat>
+			<stat type="accCombat">8</stat>
+			<stat type="rCrit">6</stat>
 			<stat type="randomDamage">19</stat>
 			<stat type="pAtkRange">80</stat>
 		</stats>
+		<skills>
+			<!-- Weapon Blessing Effect -->
+			<skill id="50397" level="1" type="ON_BLESSING" />
+			<skill id="50418" level="1" type="ON_BLESSING" />
+			<skill id="50419" level="1" type="ON_BLESSING" type_value="1" />
+			<skill id="50420" level="1" type="ON_BLESSING" type_value="2" />
+			<skill id="50421" level="1" type="ON_BLESSING" type_value="3" />
+			<skill id="50422" level="1" type="ON_BLESSING" type_value="4" />
+			<skill id="50423" level="1" type="ON_BLESSING" type_value="5" />
+			<!-- Weapon enchant Effect -->
+			<skill id="50635" level="1" type="ON_ENCHANT" type_value="0" />
+			<skill id="50635" level="2" type="ON_ENCHANT" type_value="1" />
+			<skill id="50635" level="3" type="ON_ENCHANT" type_value="2" />
+			<skill id="50635" level="4" type="ON_ENCHANT" type_value="3" />
+			<skill id="50635" level="5" type="ON_ENCHANT" type_value="4" />
+			<skill id="50635" level="6" type="ON_ENCHANT" type_value="5" />
+			<skill id="50635" level="6" type="ON_ENCHANT" type_value="6" />
+			<skill id="50635" level="6" type="ON_ENCHANT" type_value="7" />
+			<skill id="50635" level="6" type="ON_ENCHANT" type_value="8" />
+			<skill id="50635" level="6" type="ON_ENCHANT" type_value="9" />
+			<skill id="50635" level="6" type="ON_ENCHANT" type_value="10" />
+		</skills>
 	</item>
 	<item id="96934" name="Demon King's Crossbow" additionalName="In development" type="Weapon">
 		<set name="icon" val="BranchSys3.Icon.g_beam_shield" />
@@ -519,23 +715,51 @@
 		<set name="icon" val="icon.immortal_weapon_bg0000" />
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="DAGGER" />
-		<set name="bodypart" val="lhand" />
+		<set name="bodypart" val="rhand" />
+		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="A" />
 		<set name="material" val="ORIHARUKON" />
 		<set name="weight" val="930" />
 		<set name="soulshots" val="2" />
 		<set name="spiritshots" val="2" />
+		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
 		<set name="enchant_enabled" val="true" />
 		<set name="ensoulNormalSlots" val="2" />
 		<set name="ensoulSpecialSlots" val="1" />
+		<set name="commissionItemType" val="DAGGER" />
 		<stats>
 			<stat type="pAtk">458</stat>
 			<stat type="mAtk">304</stat>
 			<stat type="pAtkSpd">433</stat>
+			<stat type="accCombat">-3.75</stat>
+			<stat type="rCrit">12</stat>
 			<stat type="randomDamage">5</stat>
 			<stat type="pAtkRange">40</stat>
 		</stats>
+		<skills>
+			<!-- Weapon Blessing Effect -->
+			<skill id="50402" level="1" type="ON_BLESSING" />
+			<skill id="50418" level="1" type="ON_BLESSING" />
+			<skill id="50419" level="1" type="ON_BLESSING" type_value="1" />
+			<skill id="50420" level="1" type="ON_BLESSING" type_value="2" />
+			<skill id="50421" level="1" type="ON_BLESSING" type_value="3" />
+			<skill id="50422" level="1" type="ON_BLESSING" type_value="4" />
+			<skill id="50423" level="1" type="ON_BLESSING" type_value="5" />
+			<!-- Weapon enchant Effect -->
+			<skill id="50632" level="1" type="ON_ENCHANT" type_value="0" />
+			<skill id="50632" level="2" type="ON_ENCHANT" type_value="1" />
+			<skill id="50632" level="3" type="ON_ENCHANT" type_value="2" />
+			<skill id="50632" level="4" type="ON_ENCHANT" type_value="3" />
+			<skill id="50632" level="5" type="ON_ENCHANT" type_value="4" />
+			<skill id="50632" level="6" type="ON_ENCHANT" type_value="5" />
+			<skill id="50632" level="6" type="ON_ENCHANT" type_value="6" />
+			<skill id="50632" level="6" type="ON_ENCHANT" type_value="7" />
+			<skill id="50632" level="6" type="ON_ENCHANT" type_value="8" />
+			<skill id="50632" level="6" type="ON_ENCHANT" type_value="9" />
+			<skill id="50632" level="6" type="ON_ENCHANT" type_value="10" />
+		</skills>
 	</item>
 	<item id="96936" name="Demon King's Shield" additionalName="In development" type="Armor">
 		<set name="icon" val="icon.shield_of_protection" />
@@ -574,22 +798,49 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="SWORD" />
 		<set name="bodypart" val="lrhand" />
+		<set name="damage_range" val="0;0;46;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="A" />
 		<set name="material" val="BONE" />
 		<set name="weight" val="1820" />
 		<set name="soulshots" val="2" />
 		<set name="spiritshots" val="2" />
+		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
 		<set name="enchant_enabled" val="true" />
 		<set name="ensoulNormalSlots" val="2" />
 		<set name="ensoulSpecialSlots" val="1" />
+		<set name="commissionItemType" val="TWO_HAND_SWORD" />
 		<stats>
 			<stat type="pAtk">628</stat>
 			<stat type="mAtk">304</stat>
 			<stat type="pAtkSpd">325</stat>
+			<stat type="rCrit">8</stat>
 			<stat type="randomDamage">10</stat>
 			<stat type="pAtkRange">40</stat>
 		</stats>
+		<skills>
+			<!-- Weapon Blessing Effect -->
+			<skill id="50392" level="1" type="ON_BLESSING" />
+			<skill id="50418" level="1" type="ON_BLESSING" />
+			<skill id="50419" level="1" type="ON_BLESSING" type_value="1" />
+			<skill id="50420" level="1" type="ON_BLESSING" type_value="2" />
+			<skill id="50421" level="1" type="ON_BLESSING" type_value="3" />
+			<skill id="50422" level="1" type="ON_BLESSING" type_value="4" />
+			<skill id="50423" level="1" type="ON_BLESSING" type_value="5" />
+			<!-- Weapon enchant Effect -->
+			<skill id="50626" level="1" type="ON_ENCHANT" type_value="0" />
+			<skill id="50626" level="2" type="ON_ENCHANT" type_value="1" />
+			<skill id="50626" level="3" type="ON_ENCHANT" type_value="2" />
+			<skill id="50626" level="4" type="ON_ENCHANT" type_value="3" />
+			<skill id="50626" level="5" type="ON_ENCHANT" type_value="4" />
+			<skill id="50626" level="6" type="ON_ENCHANT" type_value="5" />
+			<skill id="50626" level="6" type="ON_ENCHANT" type_value="6" />
+			<skill id="50626" level="6" type="ON_ENCHANT" type_value="7" />
+			<skill id="50626" level="6" type="ON_ENCHANT" type_value="8" />
+			<skill id="50626" level="6" type="ON_ENCHANT" type_value="9" />
+			<skill id="50626" level="6" type="ON_ENCHANT" type_value="10" />
+		</skills>
 	</item>
 	<item id="96939" name="Demon King's Spear" additionalName="In development" type="Weapon">
 		<!-- <font color=ff6666><Unavailable to Sylphs/ Assassins.></font> -->
@@ -597,25 +848,51 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="POLE" />
 		<set name="bodypart" val="lrhand" />
+		<set name="damage_range" val="0;0;66;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="A" />
 		<set name="material" val="CHRYSOLITE" />
 		<set name="weight" val="1820" />
 		<set name="soulshots" val="2" />
 		<set name="spiritshots" val="2" />
+		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
 		<set name="enchant_enabled" val="true" />
 		<set name="ensoulNormalSlots" val="2" />
 		<set name="ensoulSpecialSlots" val="1" />
-		<skills>
-			<skill id="3599" level="1" /> <!-- Polearm Multi-attack -->
-		</skills>
+		<set name="commissionItemType" val="SPEAR" />
 		<stats>
 			<stat type="pAtk">543</stat>
 			<stat type="mAtk">304</stat>
 			<stat type="pAtkSpd">325</stat>
+			<stat type="accCombat">-3.75</stat>
+			<stat type="rCrit">8</stat>
 			<stat type="randomDamage">10</stat>
 			<stat type="pAtkRange">80</stat>
 		</stats>
+		<skills>
+			<!-- Weapon Blessing Effect -->
+			<skill id="50405" level="1" type="ON_BLESSING" />
+			<skill id="50418" level="1" type="ON_BLESSING" />
+			<skill id="50419" level="1" type="ON_BLESSING" type_value="1" />
+			<skill id="50420" level="1" type="ON_BLESSING" type_value="2" />
+			<skill id="50421" level="1" type="ON_BLESSING" type_value="3" />
+			<skill id="50422" level="1" type="ON_BLESSING" type_value="4" />
+			<skill id="50423" level="1" type="ON_BLESSING" type_value="5" />
+			<!-- Weapon enchant Effect -->
+			<skill id="3599" level="1" /> <!-- Polearm Multi-attack -->
+			<skill id="50631" level="1" type="ON_ENCHANT" type_value="0" />
+			<skill id="50631" level="2" type="ON_ENCHANT" type_value="1" />
+			<skill id="50631" level="3" type="ON_ENCHANT" type_value="2" />
+			<skill id="50631" level="4" type="ON_ENCHANT" type_value="3" />
+			<skill id="50631" level="5" type="ON_ENCHANT" type_value="4" />
+			<skill id="50631" level="6" type="ON_ENCHANT" type_value="5" />
+			<skill id="50631" level="6" type="ON_ENCHANT" type_value="6" />
+			<skill id="50631" level="6" type="ON_ENCHANT" type_value="7" />
+			<skill id="50631" level="6" type="ON_ENCHANT" type_value="8" />
+			<skill id="50631" level="6" type="ON_ENCHANT" type_value="9" />
+			<skill id="50631" level="6" type="ON_ENCHANT" type_value="10" />
+		</skills>
 	</item>
 	<item id="96940" name="Demon King's Bow" additionalName="In development" type="Weapon">
 		<!-- <font color=ff6666><Unavailable to Sylphs/ Vanguard Riders/ Assassins.></font> -->
@@ -623,23 +900,51 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="BOW" />
 		<set name="bodypart" val="lrhand" />
+		<set name="damage_range" val="0;0;10;0" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="A" />
 		<set name="material" val="ORIHARUKON" />
 		<set name="weight" val="1640" />
+		<set name="mp_consume" val="5" />
 		<set name="soulshots" val="3" />
 		<set name="spiritshots" val="2" />
-		<set name="mp_consume" val="5" />
+		<set name="is_sellable" val="false" />
+		<set name="is_freightable" val="true" />
 		<set name="enchant_enabled" val="true" />
 		<set name="ensoulNormalSlots" val="2" />
 		<set name="ensoulSpecialSlots" val="1" />
+		<set name="commissionItemType" val="BOW" />
 		<stats>
 			<stat type="pAtk">1018</stat>
 			<stat type="mAtk">319</stat>
 			<stat type="pAtkSpd">293</stat>
+			<stat type="accCombat">-3.75</stat>
+			<stat type="rCrit">12</stat>
 			<stat type="randomDamage">5</stat>
 			<stat type="pAtkRange">500</stat>
 		</stats>
+		<skills>
+			<!-- Weapon Blessing Effect -->
+			<skill id="50401" level="1" type="ON_BLESSING" />
+			<skill id="50418" level="1" type="ON_BLESSING" />
+			<skill id="50419" level="1" type="ON_BLESSING" type_value="1" />
+			<skill id="50420" level="1" type="ON_BLESSING" type_value="2" />
+			<skill id="50421" level="1" type="ON_BLESSING" type_value="3" />
+			<skill id="50422" level="1" type="ON_BLESSING" type_value="4" />
+			<skill id="50423" level="1" type="ON_BLESSING" type_value="5" />
+			<!-- Weapon enchant Effect -->
+			<skill id="50636" level="1" type="ON_ENCHANT" type_value="0" />
+			<skill id="50636" level="2" type="ON_ENCHANT" type_value="1" />
+			<skill id="50636" level="3" type="ON_ENCHANT" type_value="2" />
+			<skill id="50636" level="4" type="ON_ENCHANT" type_value="3" />
+			<skill id="50636" level="5" type="ON_ENCHANT" type_value="4" />
+			<skill id="50636" level="6" type="ON_ENCHANT" type_value="5" />
+			<skill id="50636" level="6" type="ON_ENCHANT" type_value="6" />
+			<skill id="50636" level="6" type="ON_ENCHANT" type_value="7" />
+			<skill id="50636" level="6" type="ON_ENCHANT" type_value="8" />
+			<skill id="50636" level="6" type="ON_ENCHANT" type_value="9" />
+			<skill id="50636" level="6" type="ON_ENCHANT" type_value="10" />
+		</skills>
 	</item>
 	<item id="96941" name="Extra Pass: Training Zone" additionalName="Sealed" type="EtcItem">
 		<!-- Double-click to get an extra pass to the Training Zone. Note!. Can be used once a day outside of instance zones. Can only be used when the Training Zone is on cooldown. -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/97000-97099.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/97000-97099.xml
index 479be17e43..a633e4167b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/97000-97099.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/items/97000-97099.xml
@@ -1737,24 +1737,50 @@
 		<set name="icon" val="icon.immortal_weapon_bg0000" />
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="SWORD" />
-		<set name="bodypart" val="lhand" />
+		<set name="bodypart" val="rhand" />
+		<set name="damage_range" val="0;0;40;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="A" />
 		<set name="material" val="FINE_STEEL" />
 		<set name="weight" val="1300" />
 		<set name="soulshots" val="2" />
 		<set name="spiritshots" val="2" />
-		<set name="enchant_enabled" val="true" />
+		<set name="is_sellable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="enchant_enabled" val="true" />
 		<set name="ensoulNormalSlots" val="2" />
 		<set name="ensoulSpecialSlots" val="1" />
+		<set name="commissionItemType" val="ONE_HAND_SWORD" />
 		<stats>
 			<stat type="pAtk">543</stat>
 			<stat type="mAtk">304</stat>
 			<stat type="pAtkSpd">379</stat>
+			<stat type="rCrit">8</stat>
 			<stat type="randomDamage">10</stat>
 			<stat type="pAtkRange">40</stat>
 		</stats>
+		<skills>
+			<!-- Weapon Blessing Effect -->
+			<skill id="50392" level="1" type="ON_BLESSING" />
+			<skill id="50418" level="1" type="ON_BLESSING" type_value="0" />
+			<skill id="50419" level="1" type="ON_BLESSING" type_value="1" />
+			<skill id="50420" level="1" type="ON_BLESSING" type_value="2" />
+			<skill id="50421" level="1" type="ON_BLESSING" type_value="3" />
+			<skill id="50422" level="1" type="ON_BLESSING" type_value="4" />
+			<skill id="50423" level="1" type="ON_BLESSING" type_value="5" />
+			<!-- Weapon Enchant Effect -->
+			<skill id="50624" level="1" type="ON_ENCHANT" type_value="0" />
+			<skill id="50624" level="2" type="ON_ENCHANT" type_value="1" />
+			<skill id="50624" level="3" type="ON_ENCHANT" type_value="2" />
+			<skill id="50624" level="4" type="ON_ENCHANT" type_value="3" />
+			<skill id="50624" level="5" type="ON_ENCHANT" type_value="4" />
+			<skill id="50624" level="6" type="ON_ENCHANT" type_value="5" />
+			<skill id="50624" level="6" type="ON_ENCHANT" type_value="6" />
+			<skill id="50624" level="6" type="ON_ENCHANT" type_value="7" />
+			<skill id="50624" level="6" type="ON_ENCHANT" type_value="8" />
+			<skill id="50624" level="6" type="ON_ENCHANT" type_value="9" />
+			<skill id="50624" level="6" type="ON_ENCHANT" type_value="10" />
+		</skills>
 	</item>
 	<item id="97089" name="Demon King's Dual Swords" additionalName="In development" type="Weapon">
 		<!-- When enchanting dual swords, two-handed swords/ blunts and fists, the P. Atk. bonus is higher than that of one-handed weapons. <font color=ff6666><Unavailable to Sylphs/ Vanguard Riders/ Assassins.></font> -->
@@ -1762,23 +1788,48 @@
 		<set name="default_action" val="EQUIP" />
 		<set name="weapon_type" val="DUAL" />
 		<set name="bodypart" val="lrhand" />
+		<set name="damage_range" val="0;0;44;120" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="A" />
 		<set name="material" val="FINE_STEEL" />
 		<set name="weight" val="1890" />
 		<set name="soulshots" val="2" />
 		<set name="spiritshots" val="2" />
-		<set name="enchant_enabled" val="true" />
+		<set name="is_sellable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="enchant_enabled" val="true" />
 		<set name="ensoulNormalSlots" val="2" />
 		<set name="ensoulSpecialSlots" val="1" />
+		<set name="commissionItemType" val="DUALSWORD" />
 		<stats>
 			<stat type="pAtk">628</stat>
 			<stat type="mAtk">304</stat>
 			<stat type="pAtkSpd">325</stat>
+			<stat type="rCrit">8</stat>
 			<stat type="randomDamage">10</stat>
 			<stat type="pAtkRange">40</stat>
 		</stats>
+		<skills>
+			<!-- Weapon Blessing Effect -->
+			<skill id="50418" level="1" type="ON_BLESSING" />
+			<skill id="50419" level="1" type="ON_BLESSING" type_value="1" />
+			<skill id="50420" level="1" type="ON_BLESSING" type_value="2" />
+			<skill id="50421" level="1" type="ON_BLESSING" type_value="3" />
+			<skill id="50422" level="1" type="ON_BLESSING" type_value="4" />
+			<skill id="50423" level="1" type="ON_BLESSING" type_value="5" />
+			<!-- Weapon Enchant Effect -->
+			<skill id="50629" level="1" type="ON_ENCHANT" type_value="0" />
+			<skill id="50629" level="2" type="ON_ENCHANT" type_value="1" />
+			<skill id="50629" level="3" type="ON_ENCHANT" type_value="2" />
+			<skill id="50629" level="4" type="ON_ENCHANT" type_value="3" />
+			<skill id="50629" level="5" type="ON_ENCHANT" type_value="4" />
+			<skill id="50629" level="6" type="ON_ENCHANT" type_value="5" />
+			<skill id="50629" level="6" type="ON_ENCHANT" type_value="6" />
+			<skill id="50629" level="6" type="ON_ENCHANT" type_value="7" />
+			<skill id="50629" level="6" type="ON_ENCHANT" type_value="8" />
+			<skill id="50629" level="6" type="ON_ENCHANT" type_value="9" />
+			<skill id="50629" level="6" type="ON_ENCHANT" type_value="10" />
+		</skills>
 	</item>
 	<item id="97090" name="Wolf Master's Common Armor" additionalName="In development" type="Armor">
 		<set name="icon" val="icon.armor_t2000_ul_i00" />
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/npcs/29100-29199.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/npcs/29100-29199.xml
index 21cbdbee28..48917e71c4 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/npcs/29100-29199.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/npcs/29100-29199.xml
@@ -3327,7 +3327,7 @@
 				<walk ground="40" />
 				<run ground="180" />
 			</speed>
-			<attack physical="3611" magical="2465" critical="4" attackSpeed="250" range="40" />
+			<attack physical="3611" magical="2465" critical="4" attackSpeed="253" range="40" />
 			<defence physical="2383" magical="1045" />
 		</stats>
 		<status attackable="false" />
@@ -3652,7 +3652,7 @@
 				<walk ground="40" />
 				<run ground="180" />
 			</speed>
-			<attack physical="3611" magical="2465" critical="4" attackSpeed="250" range="40" />
+			<attack physical="3611" magical="2465" critical="4" attackSpeed="253" range="40" />
 			<defence physical="2383" magical="1045" />
 		</stats>
 		<status attackable="false" />
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/pets/16079_BuffaloCalt.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/pets/16079_BuffaloCalf.xml
similarity index 97%
rename from L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/pets/16079_BuffaloCalt.xml
rename to L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/pets/16079_BuffaloCalf.xml
index 55e3ace585..661b584e16 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/pets/16079_BuffaloCalt.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/pets/16079_BuffaloCalf.xml
@@ -1,1721 +1,1721 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/PetData.xsd">
-	<pet id="16079" itemId="93961" index="10" evolveLevel="None" type="13">
-		<set name="food" val="93966" />
-		<set name="hungry_limit" val="50" />
-		<set name="load" val="45540" />
-		<skills>
-			<skill minLevel="1" skillId="6618" skillLevel="1" />
-			<skill minLevel="60" skillId="6618" skillLevel="2" />
-			<skill minLevel="65" skillId="6618" skillLevel="3" />
-			<skill minLevel="70" skillId="6618" skillLevel="4" />
-			<skill minLevel="75" skillId="6618" skillLevel="5" />
-			<skill minLevel="80" skillId="6618" skillLevel="6" />
-			<skill minLevel="85" skillId="6618" skillLevel="7" />
-			<skill minLevel="60" skillId="6681" skillLevel="1" />
-			<skill minLevel="60" skillId="6683" skillLevel="1" />
-		</skills>
-		<stats>
-			<stat level="1">
-				<set name="max_meal" val="3000" />
-				<set name="exp" val="0" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="12" />
-				<set name="consume_meal_in_normal" val="2" />
-				<set name="org_pattack" val="167.83" />
-				<set name="org_pdefend" val="81" />
-				<set name="org_mattack" val="109.93" />
-				<set name="org_mdefend" val="36" />
-				<set name="org_hp" val="94" />
-				<set name="org_mp" val="30" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="2">
-				<set name="max_meal" val="3090" />
-				<set name="exp" val="68" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="12" />
-				<set name="consume_meal_in_normal" val="2" />
-				<set name="org_pattack" val="169.7" />
-				<set name="org_pdefend" val="81.9" />
-				<set name="org_mattack" val="111.15" />
-				<set name="org_mdefend" val="36.4" />
-				<set name="org_hp" val="107.65" />
-				<set name="org_mp" val="35.46" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="3">
-				<set name="max_meal" val="3183" />
-				<set name="exp" val="364" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="13" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="171.56" />
-				<set name="org_pdefend" val="82.8" />
-				<set name="org_mattack" val="112.37" />
-				<set name="org_mdefend" val="36.8" />
-				<set name="org_hp" val="121.45" />
-				<set name="org_mp" val="40.98" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="4">
-				<set name="max_meal" val="3278" />
-				<set name="exp" val="1169" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="13" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="173.43" />
-				<set name="org_pdefend" val="83.7" />
-				<set name="org_mattack" val="113.59" />
-				<set name="org_mdefend" val="37.2" />
-				<set name="org_hp" val="135.4" />
-				<set name="org_mp" val="46.56" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="5">
-				<set name="max_meal" val="3376" />
-				<set name="exp" val="2885" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="14" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="175.29" />
-				<set name="org_pdefend" val="84.6" />
-				<set name="org_mattack" val="114.82" />
-				<set name="org_mdefend" val="37.6" />
-				<set name="org_hp" val="149.5" />
-				<set name="org_mp" val="52.2" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="6">
-				<set name="max_meal" val="3477" />
-				<set name="exp" val="6039" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="15" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="177.16" />
-				<set name="org_pdefend" val="85.5" />
-				<set name="org_mattack" val="116.04" />
-				<set name="org_mdefend" val="38" />
-				<set name="org_hp" val="163.75" />
-				<set name="org_mp" val="57.9" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="7">
-				<set name="max_meal" val="3581" />
-				<set name="exp" val="11288" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="15" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="179.02" />
-				<set name="org_pdefend" val="86.4" />
-				<set name="org_mattack" val="117.26" />
-				<set name="org_mdefend" val="38.4" />
-				<set name="org_hp" val="178.15" />
-				<set name="org_mp" val="63.66" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="8">
-				<set name="max_meal" val="3688" />
-				<set name="exp" val="19424" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="16" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="180.89" />
-				<set name="org_pdefend" val="87.3" />
-				<set name="org_mattack" val="118.48" />
-				<set name="org_mdefend" val="38.8" />
-				<set name="org_hp" val="192.7" />
-				<set name="org_mp" val="69.48" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="9">
-				<set name="max_meal" val="3799" />
-				<set name="exp" val="31379" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="16" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="182.75" />
-				<set name="org_pdefend" val="88.2" />
-				<set name="org_mattack" val="119.7" />
-				<set name="org_mdefend" val="39.2" />
-				<set name="org_hp" val="207.4" />
-				<set name="org_mp" val="75.36" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="10">
-				<set name="max_meal" val="3913" />
-				<set name="exp" val="48230" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="17" />
-				<set name="consume_meal_in_normal" val="3" />
-				<set name="org_pattack" val="184.62" />
-				<set name="org_pdefend" val="89.1" />
-				<set name="org_mattack" val="120.92" />
-				<set name="org_mdefend" val="39.6" />
-				<set name="org_hp" val="222.25" />
-				<set name="org_mp" val="81.3" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="0.9" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="11">
-				<set name="max_meal" val="4030" />
-				<set name="exp" val="71203" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="18" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="186.48" />
-				<set name="org_pdefend" val="90" />
-				<set name="org_mattack" val="122.14" />
-				<set name="org_mdefend" val="40" />
-				<set name="org_hp" val="237.25" />
-				<set name="org_mp" val="87.3" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="12">
-				<set name="max_meal" val="4151" />
-				<set name="exp" val="101678" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="18" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="188.34" />
-				<set name="org_pdefend" val="90.9" />
-				<set name="org_mattack" val="123.37" />
-				<set name="org_mdefend" val="40.4" />
-				<set name="org_hp" val="252.4" />
-				<set name="org_mp" val="93.36" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="13">
-				<set name="max_meal" val="4276" />
-				<set name="exp" val="141194" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="19" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="190.21" />
-				<set name="org_pdefend" val="91.8" />
-				<set name="org_mattack" val="124.59" />
-				<set name="org_mdefend" val="40.8" />
-				<set name="org_hp" val="267.7" />
-				<set name="org_mp" val="99.48" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="14">
-				<set name="max_meal" val="4404" />
-				<set name="exp" val="191455" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="20" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="192.07" />
-				<set name="org_pdefend" val="92.7" />
-				<set name="org_mattack" val="125.81" />
-				<set name="org_mdefend" val="41.2" />
-				<set name="org_hp" val="283.15" />
-				<set name="org_mp" val="105.66" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="15">
-				<set name="max_meal" val="4536" />
-				<set name="exp" val="254331" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="21" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="193.94" />
-				<set name="org_pdefend" val="93.6" />
-				<set name="org_mattack" val="127.03" />
-				<set name="org_mdefend" val="41.6" />
-				<set name="org_hp" val="298.75" />
-				<set name="org_mp" val="111.9" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="16">
-				<set name="max_meal" val="4672" />
-				<set name="exp" val="331868" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="22" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="195.8" />
-				<set name="org_pdefend" val="94.5" />
-				<set name="org_mattack" val="128.25" />
-				<set name="org_mdefend" val="42" />
-				<set name="org_hp" val="314.5" />
-				<set name="org_mp" val="118.2" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="17">
-				<set name="max_meal" val="4812" />
-				<set name="exp" val="426289" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="22" />
-				<set name="consume_meal_in_normal" val="4" />
-				<set name="org_pattack" val="197.67" />
-				<set name="org_pdefend" val="95.4" />
-				<set name="org_mattack" val="129.47" />
-				<set name="org_mdefend" val="42.4" />
-				<set name="org_hp" val="330.4" />
-				<set name="org_mp" val="124.56" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="18">
-				<set name="max_meal" val="4956" />
-				<set name="exp" val="540001" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="23" />
-				<set name="consume_meal_in_normal" val="5" />
-				<set name="org_pattack" val="199.53" />
-				<set name="org_pdefend" val="96.3" />
-				<set name="org_mattack" val="130.69" />
-				<set name="org_mdefend" val="42.8" />
-				<set name="org_hp" val="346.45" />
-				<set name="org_mp" val="130.98" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="19">
-				<set name="max_meal" val="5105" />
-				<set name="exp" val="675597" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="24" />
-				<set name="consume_meal_in_normal" val="5" />
-				<set name="org_pattack" val="201.4" />
-				<set name="org_pdefend" val="97.2" />
-				<set name="org_mattack" val="131.92" />
-				<set name="org_mdefend" val="43.2" />
-				<set name="org_hp" val="362.65" />
-				<set name="org_mp" val="137.46" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="20">
-				<set name="max_meal" val="5258" />
-				<set name="exp" val="835864" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="25" />
-				<set name="consume_meal_in_normal" val="5" />
-				<set name="org_pattack" val="203.26" />
-				<set name="org_pdefend" val="98.1" />
-				<set name="org_mattack" val="133.14" />
-				<set name="org_mdefend" val="43.6" />
-				<set name="org_hp" val="379" />
-				<set name="org_mp" val="144" />
-				<set name="org_hp_regen" val="2" />
-				<set name="org_mp_regen" val="1.2" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="21">
-				<set name="max_meal" val="5416" />
-				<set name="exp" val="1020171" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="26" />
-				<set name="consume_meal_in_normal" val="5" />
-				<set name="org_pattack" val="205.13" />
-				<set name="org_pdefend" val="99" />
-				<set name="org_mattack" val="134.36" />
-				<set name="org_mdefend" val="44" />
-				<set name="org_hp" val="414.2" />
-				<set name="org_mp" val="153.9" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="22">
-				<set name="max_meal" val="5578" />
-				<set name="exp" val="1232124" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="27" />
-				<set name="consume_meal_in_normal" val="5" />
-				<set name="org_pattack" val="206.99" />
-				<set name="org_pdefend" val="99.9" />
-				<set name="org_mattack" val="135.58" />
-				<set name="org_mdefend" val="44.4" />
-				<set name="org_hp" val="449.72" />
-				<set name="org_mp" val="163.89" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="23">
-				<set name="max_meal" val="5745" />
-				<set name="exp" val="1475870" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="28" />
-				<set name="consume_meal_in_normal" val="6" />
-				<set name="org_pattack" val="208.86" />
-				<set name="org_pdefend" val="100.8" />
-				<set name="org_mattack" val="136.8" />
-				<set name="org_mdefend" val="44.8" />
-				<set name="org_hp" val="485.56" />
-				<set name="org_mp" val="173.97" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="24">
-				<set name="max_meal" val="5917" />
-				<set name="exp" val="1756178" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="30" />
-				<set name="consume_meal_in_normal" val="6" />
-				<set name="org_pattack" val="210.72" />
-				<set name="org_pdefend" val="101.7" />
-				<set name="org_mattack" val="138.02" />
-				<set name="org_mdefend" val="45.2" />
-				<set name="org_hp" val="521.72" />
-				<set name="org_mp" val="184.14" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="25">
-				<set name="max_meal" val="6095" />
-				<set name="exp" val="2078532" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="31" />
-				<set name="consume_meal_in_normal" val="6" />
-				<set name="org_pattack" val="212.59" />
-				<set name="org_pdefend" val="102.6" />
-				<set name="org_mattack" val="139.24" />
-				<set name="org_mdefend" val="45.6" />
-				<set name="org_hp" val="558.2" />
-				<set name="org_mp" val="194.4" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="26">
-				<set name="max_meal" val="6278" />
-				<set name="exp" val="2452463" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="32" />
-				<set name="consume_meal_in_normal" val="6" />
-				<set name="org_pattack" val="214.45" />
-				<set name="org_pdefend" val="103.5" />
-				<set name="org_mattack" val="140.47" />
-				<set name="org_mdefend" val="46" />
-				<set name="org_hp" val="595" />
-				<set name="org_mp" val="204.75" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="27">
-				<set name="max_meal" val="6466" />
-				<set name="exp" val="2886223" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="33" />
-				<set name="consume_meal_in_normal" val="7" />
-				<set name="org_pattack" val="216.32" />
-				<set name="org_pdefend" val="104.4" />
-				<set name="org_mattack" val="141.69" />
-				<set name="org_mdefend" val="46.4" />
-				<set name="org_hp" val="632.12" />
-				<set name="org_mp" val="215.19" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="28">
-				<set name="max_meal" val="6660" />
-				<set name="exp" val="3389384" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="35" />
-				<set name="consume_meal_in_normal" val="7" />
-				<set name="org_pattack" val="218.18" />
-				<set name="org_pdefend" val="105.3" />
-				<set name="org_mattack" val="142.91" />
-				<set name="org_mdefend" val="46.8" />
-				<set name="org_hp" val="669.56" />
-				<set name="org_mp" val="225.72" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="29">
-				<set name="max_meal" val="6860" />
-				<set name="exp" val="3973052" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="36" />
-				<set name="consume_meal_in_normal" val="7" />
-				<set name="org_pattack" val="220.05" />
-				<set name="org_pdefend" val="106.2" />
-				<set name="org_mattack" val="144.13" />
-				<set name="org_mdefend" val="47.2" />
-				<set name="org_hp" val="707.32" />
-				<set name="org_mp" val="236.34" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="30">
-				<set name="max_meal" val="7066" />
-				<set name="exp" val="4650105" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="37" />
-				<set name="consume_meal_in_normal" val="7" />
-				<set name="org_pattack" val="221.91" />
-				<set name="org_pdefend" val="107.1" />
-				<set name="org_mattack" val="145.35" />
-				<set name="org_mdefend" val="47.6" />
-				<set name="org_hp" val="745.4" />
-				<set name="org_mp" val="247.05" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.5" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="31">
-				<set name="max_meal" val="7278" />
-				<set name="exp" val="5442259" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="39" />
-				<set name="consume_meal_in_normal" val="8" />
-				<set name="org_pattack" val="223.78" />
-				<set name="org_pdefend" val="108" />
-				<set name="org_mattack" val="146.57" />
-				<set name="org_mdefend" val="48" />
-				<set name="org_hp" val="783.8" />
-				<set name="org_mp" val="257.85" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="32">
-				<set name="max_meal" val="7496" />
-				<set name="exp" val="6369078" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="40" />
-				<set name="consume_meal_in_normal" val="8" />
-				<set name="org_pattack" val="225.64" />
-				<set name="org_pdefend" val="108.9" />
-				<set name="org_mattack" val="147.79" />
-				<set name="org_mdefend" val="48.4" />
-				<set name="org_hp" val="822.52" />
-				<set name="org_mp" val="268.74" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="33">
-				<set name="max_meal" val="7721" />
-				<set name="exp" val="7453456" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="42" />
-				<set name="consume_meal_in_normal" val="8" />
-				<set name="org_pattack" val="227.51" />
-				<set name="org_pdefend" val="109.8" />
-				<set name="org_mattack" val="149.02" />
-				<set name="org_mdefend" val="48.8" />
-				<set name="org_hp" val="861.56" />
-				<set name="org_mp" val="279.72" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="34">
-				<set name="max_meal" val="7953" />
-				<set name="exp" val="8722179" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="44" />
-				<set name="consume_meal_in_normal" val="9" />
-				<set name="org_pattack" val="229.37" />
-				<set name="org_pdefend" val="110.7" />
-				<set name="org_mattack" val="150.24" />
-				<set name="org_mdefend" val="49.2" />
-				<set name="org_hp" val="900.92" />
-				<set name="org_mp" val="290.79" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="35">
-				<set name="max_meal" val="8192" />
-				<set name="exp" val="10206584" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="46" />
-				<set name="consume_meal_in_normal" val="9" />
-				<set name="org_pattack" val="231.24" />
-				<set name="org_pdefend" val="111.6" />
-				<set name="org_mattack" val="151.46" />
-				<set name="org_mdefend" val="49.6" />
-				<set name="org_hp" val="940.6" />
-				<set name="org_mp" val="301.95" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="36">
-				<set name="max_meal" val="8438" />
-				<set name="exp" val="11958183" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="47" />
-				<set name="consume_meal_in_normal" val="9" />
-				<set name="org_pattack" val="233.1" />
-				<set name="org_pdefend" val="112.5" />
-				<set name="org_mattack" val="152.68" />
-				<set name="org_mdefend" val="50" />
-				<set name="org_hp" val="980.6" />
-				<set name="org_mp" val="313.2" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="37">
-				<set name="max_meal" val="8691" />
-				<set name="exp" val="14025069" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="49" />
-				<set name="consume_meal_in_normal" val="10" />
-				<set name="org_pattack" val="234.96" />
-				<set name="org_pdefend" val="113.4" />
-				<set name="org_mattack" val="153.9" />
-				<set name="org_mdefend" val="50.4" />
-				<set name="org_hp" val="1020.92" />
-				<set name="org_mp" val="324.54" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="38">
-				<set name="max_meal" val="8952" />
-				<set name="exp" val="16463995" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="51" />
-				<set name="consume_meal_in_normal" val="10" />
-				<set name="org_pattack" val="236.83" />
-				<set name="org_pdefend" val="114.3" />
-				<set name="org_mattack" val="155.12" />
-				<set name="org_mdefend" val="50.8" />
-				<set name="org_hp" val="1061.56" />
-				<set name="org_mp" val="335.97" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="39">
-				<set name="max_meal" val="9221" />
-				<set name="exp" val="19341927" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="53" />
-				<set name="consume_meal_in_normal" val="11" />
-				<set name="org_pattack" val="238.69" />
-				<set name="org_pdefend" val="115.2" />
-				<set name="org_mattack" val="156.34" />
-				<set name="org_mdefend" val="51.2" />
-				<set name="org_hp" val="1102.52" />
-				<set name="org_mp" val="347.49" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="40">
-				<set name="max_meal" val="9498" />
-				<set name="exp" val="22737888" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="55" />
-				<set name="consume_meal_in_normal" val="11" />
-				<set name="org_pattack" val="240.56" />
-				<set name="org_pdefend" val="116.1" />
-				<set name="org_mattack" val="157.57" />
-				<set name="org_mdefend" val="51.6" />
-				<set name="org_hp" val="1143.8" />
-				<set name="org_mp" val="359.1" />
-				<set name="org_hp_regen" val="3" />
-				<set name="org_mp_regen" val="1.8" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="41">
-				<set name="max_meal" val="9783" />
-				<set name="exp" val="26779080" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="58" />
-				<set name="consume_meal_in_normal" val="12" />
-				<set name="org_pattack" val="242.42" />
-				<set name="org_pdefend" val="117" />
-				<set name="org_mattack" val="158.79" />
-				<set name="org_mdefend" val="52" />
-				<set name="org_hp" val="1198.4" />
-				<set name="org_mp" val="378.6" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="42">
-				<set name="max_meal" val="10076" />
-				<set name="exp" val="31588100" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="60" />
-				<set name="consume_meal_in_normal" val="12" />
-				<set name="org_pattack" val="244.29" />
-				<set name="org_pdefend" val="117.9" />
-				<set name="org_mattack" val="160.01" />
-				<set name="org_mdefend" val="52.4" />
-				<set name="org_hp" val="1253.42" />
-				<set name="org_mp" val="398.25" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="43">
-				<set name="max_meal" val="10378" />
-				<set name="exp" val="37310833" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="62" />
-				<set name="consume_meal_in_normal" val="12" />
-				<set name="org_pattack" val="246.15" />
-				<set name="org_pdefend" val="118.8" />
-				<set name="org_mattack" val="161.23" />
-				<set name="org_mdefend" val="52.8" />
-				<set name="org_hp" val="1308.86" />
-				<set name="org_mp" val="418.05" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="44">
-				<set name="max_meal" val="10689" />
-				<set name="exp" val="44120885" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="65" />
-				<set name="consume_meal_in_normal" val="13" />
-				<set name="org_pattack" val="248.02" />
-				<set name="org_pdefend" val="119.7" />
-				<set name="org_mattack" val="162.45" />
-				<set name="org_mdefend" val="53.2" />
-				<set name="org_hp" val="1364.72" />
-				<set name="org_mp" val="438" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="45">
-				<set name="max_meal" val="11010" />
-				<set name="exp" val="52224847" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="67" />
-				<set name="consume_meal_in_normal" val="13" />
-				<set name="org_pattack" val="249.88" />
-				<set name="org_pdefend" val="120.6" />
-				<set name="org_mattack" val="163.67" />
-				<set name="org_mdefend" val="53.6" />
-				<set name="org_hp" val="1421" />
-				<set name="org_mp" val="458.1" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="46">
-				<set name="max_meal" val="11340" />
-				<set name="exp" val="61949602" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="70" />
-				<set name="consume_meal_in_normal" val="14" />
-				<set name="org_pattack" val="251.75" />
-				<set name="org_pdefend" val="121.5" />
-				<set name="org_mattack" val="164.89" />
-				<set name="org_mdefend" val="54" />
-				<set name="org_hp" val="1477.7" />
-				<set name="org_mp" val="478.35" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="47">
-				<set name="max_meal" val="11680" />
-				<set name="exp" val="73619307" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="73" />
-				<set name="consume_meal_in_normal" val="15" />
-				<set name="org_pattack" val="253.61" />
-				<set name="org_pdefend" val="122.4" />
-				<set name="org_mattack" val="166.12" />
-				<set name="org_mdefend" val="54.4" />
-				<set name="org_hp" val="1534.82" />
-				<set name="org_mp" val="498.75" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="48">
-				<set name="max_meal" val="12030" />
-				<set name="exp" val="87622954" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="76" />
-				<set name="consume_meal_in_normal" val="15" />
-				<set name="org_pattack" val="255.48" />
-				<set name="org_pdefend" val="123.3" />
-				<set name="org_mattack" val="167.34" />
-				<set name="org_mdefend" val="54.8" />
-				<set name="org_hp" val="1592.36" />
-				<set name="org_mp" val="519.3" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="49">
-				<set name="max_meal" val="12391" />
-				<set name="exp" val="104427330" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="79" />
-				<set name="consume_meal_in_normal" val="16" />
-				<set name="org_pattack" val="257.34" />
-				<set name="org_pdefend" val="124.2" />
-				<set name="org_mattack" val="168.56" />
-				<set name="org_mdefend" val="55.2" />
-				<set name="org_hp" val="1650.32" />
-				<set name="org_mp" val="540" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="50">
-				<set name="max_meal" val="12763" />
-				<set name="exp" val="124592581" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="82" />
-				<set name="consume_meal_in_normal" val="16" />
-				<set name="org_pattack" val="259.21" />
-				<set name="org_pdefend" val="125.1" />
-				<set name="org_mattack" val="169.78" />
-				<set name="org_mdefend" val="55.6" />
-				<set name="org_hp" val="1708.7" />
-				<set name="org_mp" val="560.85" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.1" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="51">
-				<set name="max_meal" val="13146" />
-				<set name="exp" val="148790883" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="85" />
-				<set name="consume_meal_in_normal" val="17" />
-				<set name="org_pattack" val="261.07" />
-				<set name="org_pdefend" val="126" />
-				<set name="org_mattack" val="171" />
-				<set name="org_mdefend" val="56" />
-				<set name="org_hp" val="1767.5" />
-				<set name="org_mp" val="581.85" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="52">
-				<set name="max_meal" val="13540" />
-				<set name="exp" val="177828845" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="89" />
-				<set name="consume_meal_in_normal" val="18" />
-				<set name="org_pattack" val="262.94" />
-				<set name="org_pdefend" val="126.9" />
-				<set name="org_mattack" val="172.22" />
-				<set name="org_mdefend" val="56.4" />
-				<set name="org_hp" val="1826.72" />
-				<set name="org_mp" val="603" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="53">
-				<set name="max_meal" val="13946" />
-				<set name="exp" val="212674399" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="92" />
-				<set name="consume_meal_in_normal" val="18" />
-				<set name="org_pattack" val="264.8" />
-				<set name="org_pdefend" val="127.8" />
-				<set name="org_mattack" val="173.44" />
-				<set name="org_mdefend" val="56.8" />
-				<set name="org_hp" val="1886.36" />
-				<set name="org_mp" val="624.3" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="54">
-				<set name="max_meal" val="14364" />
-				<set name="exp" val="254489064" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="96" />
-				<set name="consume_meal_in_normal" val="19" />
-				<set name="org_pattack" val="266.67" />
-				<set name="org_pdefend" val="128.7" />
-				<set name="org_mattack" val="174.67" />
-				<set name="org_mdefend" val="57.2" />
-				<set name="org_hp" val="1946.42" />
-				<set name="org_mp" val="645.75" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="55">
-				<set name="max_meal" val="14795" />
-				<set name="exp" val="304666662" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="100" />
-				<set name="consume_meal_in_normal" val="20" />
-				<set name="org_pattack" val="268.53" />
-				<set name="org_pdefend" val="129.6" />
-				<set name="org_mattack" val="175.89" />
-				<set name="org_mdefend" val="57.6" />
-				<set name="org_hp" val="2006.9" />
-				<set name="org_mp" val="667.35" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="56">
-				<set name="max_meal" val="15239" />
-				<set name="exp" val="364879780" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="104" />
-				<set name="consume_meal_in_normal" val="21" />
-				<set name="org_pattack" val="270.4" />
-				<set name="org_pdefend" val="130.5" />
-				<set name="org_mattack" val="177.11" />
-				<set name="org_mdefend" val="58" />
-				<set name="org_hp" val="2067.8" />
-				<set name="org_mp" val="689.1" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="57">
-				<set name="max_meal" val="15696" />
-				<set name="exp" val="437135521" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="108" />
-				<set name="consume_meal_in_normal" val="22" />
-				<set name="org_pattack" val="272.26" />
-				<set name="org_pdefend" val="131.4" />
-				<set name="org_mattack" val="178.33" />
-				<set name="org_mdefend" val="58.4" />
-				<set name="org_hp" val="2129.12" />
-				<set name="org_mp" val="711" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="58">
-				<set name="max_meal" val="16167" />
-				<set name="exp" val="523842410" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="112" />
-				<set name="consume_meal_in_normal" val="22" />
-				<set name="org_pattack" val="274.13" />
-				<set name="org_pdefend" val="132.3" />
-				<set name="org_mattack" val="179.55" />
-				<set name="org_mdefend" val="58.8" />
-				<set name="org_hp" val="2190.86" />
-				<set name="org_mp" val="733.05" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="59">
-				<set name="max_meal" val="16652" />
-				<set name="exp" val="627890678" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="117" />
-				<set name="consume_meal_in_normal" val="23" />
-				<set name="org_pattack" val="275.99" />
-				<set name="org_pdefend" val="133.2" />
-				<set name="org_mattack" val="180.77" />
-				<set name="org_mdefend" val="59.2" />
-				<set name="org_hp" val="2253.02" />
-				<set name="org_mp" val="755.25" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="60">
-				<set name="max_meal" val="17152" />
-				<set name="exp" val="752748598" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="121" />
-				<set name="consume_meal_in_normal" val="24" />
-				<set name="org_pattack" val="277.86" />
-				<set name="org_pdefend" val="134.1" />
-				<set name="org_mattack" val="182" />
-				<set name="org_mdefend" val="59.6" />
-				<set name="org_hp" val="2315.6" />
-				<set name="org_mp" val="777.6" />
-				<set name="org_hp_regen" val="4" />
-				<set name="org_mp_regen" val="2.4" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="61">
-				<set name="max_meal" val="17667" />
-				<set name="exp" val="902578103" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="126" />
-				<set name="consume_meal_in_normal" val="25" />
-				<set name="org_pattack" val="279.72" />
-				<set name="org_pdefend" val="135" />
-				<set name="org_mattack" val="183.22" />
-				<set name="org_mdefend" val="60" />
-				<set name="org_hp" val="2378.6" />
-				<set name="org_mp" val="800.1" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="62">
-				<set name="max_meal" val="18197" />
-				<set name="exp" val="1082373509" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="131" />
-				<set name="consume_meal_in_normal" val="26" />
-				<set name="org_pattack" val="281.58" />
-				<set name="org_pdefend" val="135.9" />
-				<set name="org_mattack" val="184.44" />
-				<set name="org_mdefend" val="60.4" />
-				<set name="org_hp" val="2442.02" />
-				<set name="org_mp" val="822.75" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="63">
-				<set name="max_meal" val="18743" />
-				<set name="exp" val="1298127996" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="137" />
-				<set name="consume_meal_in_normal" val="27" />
-				<set name="org_pattack" val="283.45" />
-				<set name="org_pdefend" val="136.8" />
-				<set name="org_mattack" val="185.66" />
-				<set name="org_mdefend" val="60.8" />
-				<set name="org_hp" val="2505.86" />
-				<set name="org_mp" val="845.55" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="64">
-				<set name="max_meal" val="19305" />
-				<set name="exp" val="1557033381" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="142" />
-				<set name="consume_meal_in_normal" val="28" />
-				<set name="org_pattack" val="285.31" />
-				<set name="org_pdefend" val="137.7" />
-				<set name="org_mattack" val="186.88" />
-				<set name="org_mdefend" val="61.2" />
-				<set name="org_hp" val="2570.12" />
-				<set name="org_mp" val="868.5" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="65">
-				<set name="max_meal" val="19884" />
-				<set name="exp" val="1867719842" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="148" />
-				<set name="consume_meal_in_normal" val="30" />
-				<set name="org_pattack" val="287.18" />
-				<set name="org_pdefend" val="138.6" />
-				<set name="org_mattack" val="188.1" />
-				<set name="org_mdefend" val="61.6" />
-				<set name="org_hp" val="2634.8" />
-				<set name="org_mp" val="891.6" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="66">
-				<set name="max_meal" val="20481" />
-				<set name="exp" val="2240543596" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="154" />
-				<set name="consume_meal_in_normal" val="31" />
-				<set name="org_pattack" val="289.04" />
-				<set name="org_pdefend" val="139.5" />
-				<set name="org_mattack" val="189.32" />
-				<set name="org_mdefend" val="62" />
-				<set name="org_hp" val="2699.9" />
-				<set name="org_mp" val="914.85" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="67">
-				<set name="max_meal" val="21095" />
-				<set name="exp" val="2687932100" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="160" />
-				<set name="consume_meal_in_normal" val="32" />
-				<set name="org_pattack" val="290.91" />
-				<set name="org_pdefend" val="140.4" />
-				<set name="org_mattack" val="190.55" />
-				<set name="org_mdefend" val="62.4" />
-				<set name="org_hp" val="2765.42" />
-				<set name="org_mp" val="938.25" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="68">
-				<set name="max_meal" val="21728" />
-				<set name="exp" val="3229272190" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="166" />
-				<set name="consume_meal_in_normal" val="33" />
-				<set name="org_pattack" val="292.77" />
-				<set name="org_pdefend" val="141.3" />
-				<set name="org_mattack" val="191.77" />
-				<set name="org_mdefend" val="62.8" />
-				<set name="org_hp" val="2831.36" />
-				<set name="org_mp" val="961.8" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="69">
-				<set name="max_meal" val="22380" />
-				<set name="exp" val="3884293700" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="173" />
-				<set name="consume_meal_in_normal" val="35" />
-				<set name="org_pattack" val="294.64" />
-				<set name="org_pdefend" val="142.2" />
-				<set name="org_mattack" val="192.99" />
-				<set name="org_mdefend" val="63.2" />
-				<set name="org_hp" val="2897.72" />
-				<set name="org_mp" val="985.5" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="70">
-				<set name="max_meal" val="23051" />
-				<set name="exp" val="4683419941" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="180" />
-				<set name="consume_meal_in_normal" val="36" />
-				<set name="org_pattack" val="296.5" />
-				<set name="org_pdefend" val="143.1" />
-				<set name="org_mattack" val="194.21" />
-				<set name="org_mdefend" val="63.6" />
-				<set name="org_hp" val="2964.5" />
-				<set name="org_mp" val="1009.35" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="2.7" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="71">
-				<set name="max_meal" val="23743" />
-				<set name="exp" val="5666345218" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="187" />
-				<set name="consume_meal_in_normal" val="37" />
-				<set name="org_pattack" val="298.37" />
-				<set name="org_pdefend" val="144" />
-				<set name="org_mattack" val="195.43" />
-				<set name="org_mdefend" val="64" />
-				<set name="org_hp" val="3031.7" />
-				<set name="org_mp" val="1033.35" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="72">
-				<set name="max_meal" val="24455" />
-				<set name="exp" val="6885172561" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="194" />
-				<set name="consume_meal_in_normal" val="39" />
-				<set name="org_pattack" val="300.23" />
-				<set name="org_pdefend" val="144.9" />
-				<set name="org_mattack" val="196.65" />
-				<set name="org_mdefend" val="64.4" />
-				<set name="org_hp" val="3099.32" />
-				<set name="org_mp" val="1057.5" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="73">
-				<set name="max_meal" val="25189" />
-				<set name="exp" val="8408706740" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="202" />
-				<set name="consume_meal_in_normal" val="40" />
-				<set name="org_pattack" val="302.1" />
-				<set name="org_pdefend" val="145.8" />
-				<set name="org_mattack" val="197.87" />
-				<set name="org_mdefend" val="64.8" />
-				<set name="org_hp" val="3167.36" />
-				<set name="org_mp" val="1081.8" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="74">
-				<set name="max_meal" val="25945" />
-				<set name="exp" val="10328359805" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="210" />
-				<set name="consume_meal_in_normal" val="42" />
-				<set name="org_pattack" val="303.96" />
-				<set name="org_pdefend" val="146.7" />
-				<set name="org_mattack" val="199.1" />
-				<set name="org_mdefend" val="65.2" />
-				<set name="org_hp" val="3235.82" />
-				<set name="org_mp" val="1106.25" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="75">
-				<set name="max_meal" val="26723" />
-				<set name="exp" val="12766319199" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="219" />
-				<set name="consume_meal_in_normal" val="44" />
-				<set name="org_pattack" val="305.83" />
-				<set name="org_pdefend" val="147.6" />
-				<set name="org_mattack" val="200.32" />
-				<set name="org_mdefend" val="65.6" />
-				<set name="org_hp" val="3304.7" />
-				<set name="org_mp" val="1130.85" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="1" />
-				<set name="spiritshot_count" val="1" />
-			</stat>
-			<stat level="76">
-				<set name="max_meal" val="27257" />
-				<set name="exp" val="15886907222" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="227" />
-				<set name="consume_meal_in_normal" val="45" />
-				<set name="org_pattack" val="307.69" />
-				<set name="org_pdefend" val="148.5" />
-				<set name="org_mattack" val="201.54" />
-				<set name="org_mdefend" val="66" />
-				<set name="org_hp" val="3387.31" />
-				<set name="org_mp" val="1159.12" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="77">
-				<set name="max_meal" val="27802" />
-				<set name="exp" val="19943671652" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="232" />
-				<set name="consume_meal_in_normal" val="46" />
-				<set name="org_pattack" val="309.56" />
-				<set name="org_pdefend" val="149.4" />
-				<set name="org_mattack" val="202.76" />
-				<set name="org_mdefend" val="66.4" />
-				<set name="org_hp" val="3471.99" />
-				<set name="org_mp" val="1188.09" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="78">
-				<set name="max_meal" val="28358" />
-				<set name="exp" val="25420303633" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="237" />
-				<set name="consume_meal_in_normal" val="47" />
-				<set name="org_pattack" val="311.42" />
-				<set name="org_pdefend" val="150.3" />
-				<set name="org_mattack" val="203.98" />
-				<set name="org_mdefend" val="66.8" />
-				<set name="org_hp" val="3558.78" />
-				<set name="org_mp" val="1217.79" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="79">
-				<set name="max_meal" val="28925" />
-				<set name="exp" val="33087588407" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="241" />
-				<set name="consume_meal_in_normal" val="48" />
-				<set name="org_pattack" val="313.29" />
-				<set name="org_pdefend" val="151.2" />
-				<set name="org_mattack" val="205.2" />
-				<set name="org_mdefend" val="67.2" />
-				<set name="org_hp" val="3647.74" />
-				<set name="org_mp" val="1248.23" />
-				<set name="org_hp_regen" val="5" />
-				<set name="org_mp_regen" val="3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="80">
-				<set name="max_meal" val="29504" />
-				<set name="exp" val="44588515567" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="246" />
-				<set name="consume_meal_in_normal" val="49" />
-				<set name="org_pattack" val="315.15" />
-				<set name="org_pdefend" val="152.1" />
-				<set name="org_mattack" val="206.42" />
-				<set name="org_mdefend" val="67.6" />
-				<set name="org_hp" val="3738.93" />
-				<set name="org_mp" val="1279.43" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="81">
-				<set name="max_meal" val="30094" />
-				<set name="exp" val="61839906307" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="251" />
-				<set name="consume_meal_in_normal" val="50" />
-				<set name="org_pattack" val="317.02" />
-				<set name="org_pdefend" val="153" />
-				<set name="org_mattack" val="207.65" />
-				<set name="org_mdefend" val="68" />
-				<set name="org_hp" val="3851.09" />
-				<set name="org_mp" val="1317.81" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="82">
-				<set name="max_meal" val="30696" />
-				<set name="exp" val="87716992417" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="256" />
-				<set name="consume_meal_in_normal" val="51" />
-				<set name="org_pattack" val="318.88" />
-				<set name="org_pdefend" val="153.9" />
-				<set name="org_mattack" val="208.87" />
-				<set name="org_mdefend" val="68.4" />
-				<set name="org_hp" val="3966.62" />
-				<set name="org_mp" val="1357.34" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="83">
-				<set name="max_meal" val="31310" />
-				<set name="exp" val="126532621582" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="261" />
-				<set name="consume_meal_in_normal" val="52" />
-				<set name="org_pattack" val="320.75" />
-				<set name="org_pdefend" val="154.8" />
-				<set name="org_mattack" val="210.09" />
-				<set name="org_mdefend" val="68.8" />
-				<set name="org_hp" val="4085.61" />
-				<set name="org_mp" val="1398.06" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="84">
-				<set name="max_meal" val="31936" />
-				<set name="exp" val="184756065330" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="266" />
-				<set name="consume_meal_in_normal" val="53" />
-				<set name="org_pattack" val="322.61" />
-				<set name="org_pdefend" val="155.7" />
-				<set name="org_mattack" val="211.31" />
-				<set name="org_mdefend" val="69.2" />
-				<set name="org_hp" val="4208.17" />
-				<set name="org_mp" val="1440" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="85">
-				<set name="max_meal" val="32575" />
-				<set name="exp" val="272091230951" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="272" />
-				<set name="consume_meal_in_normal" val="54" />
-				<set name="org_pattack" val="324.48" />
-				<set name="org_pdefend" val="156.6" />
-				<set name="org_mattack" val="212.53" />
-				<set name="org_mdefend" val="69.6" />
-				<set name="org_hp" val="4334.41" />
-				<set name="org_mp" val="1483.2" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="86">
-				<set name="max_meal" val="33227" />
-				<set name="exp" val="403093979383" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="277" />
-				<set name="consume_meal_in_normal" val="55" />
-				<set name="org_pattack" val="326.34" />
-				<set name="org_pdefend" val="157.5" />
-				<set name="org_mattack" val="213.75" />
-				<set name="org_mdefend" val="70" />
-				<set name="org_hp" val="4464.44" />
-				<set name="org_mp" val="1527.69" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="87">
-				<set name="max_meal" val="33892" />
-				<set name="exp" val="599598102032" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="283" />
-				<set name="consume_meal_in_normal" val="57" />
-				<set name="org_pattack" val="328.2" />
-				<set name="org_pdefend" val="158.4" />
-				<set name="org_mattack" val="214.97" />
-				<set name="org_mdefend" val="70.4" />
-				<set name="org_hp" val="4598.37" />
-				<set name="org_mp" val="1573.52" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="88">
-				<set name="max_meal" val="34570" />
-				<set name="exp" val="953305522799" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="288" />
-				<set name="consume_meal_in_normal" val="58" />
-				<set name="org_pattack" val="330.07" />
-				<set name="org_pdefend" val="159.3" />
-				<set name="org_mattack" val="216.2" />
-				<set name="org_mdefend" val="70.8" />
-				<set name="org_hp" val="4736.32" />
-				<set name="org_mp" val="1620.72" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="89">
-				<set name="max_meal" val="35261" />
-				<set name="exp" val="1660720364334" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="294" />
-				<set name="consume_meal_in_normal" val="59" />
-				<set name="org_pattack" val="331.93" />
-				<set name="org_pdefend" val="160.2" />
-				<set name="org_mattack" val="217.42" />
-				<set name="org_mdefend" val="71.2" />
-				<set name="org_hp" val="4878.4" />
-				<set name="org_mp" val="1669.34" />
-				<set name="org_hp_regen" val="6" />
-				<set name="org_mp_regen" val="3.3" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="90">
-				<set name="max_meal" val="35966" />
-				<set name="exp" val="3775890740522" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="300" />
-				<set name="consume_meal_in_normal" val="60" />
-				<set name="org_pattack" val="333.8" />
-				<set name="org_pdefend" val="161.1" />
-				<set name="org_mattack" val="218.64" />
-				<set name="org_mdefend" val="71.6" />
-				<set name="org_hp" val="5024.75" />
-				<set name="org_mp" val="1719.42" />
-				<set name="org_hp_regen" val="7" />
-				<set name="org_mp_regen" val="3.6" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="91">
-				<set name="max_meal" val="36685" />
-				<set name="exp" val="14351742621463" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="306" />
-				<set name="consume_meal_in_normal" val="61" />
-				<set name="org_pattack" val="335.66" />
-				<set name="org_pdefend" val="162" />
-				<set name="org_mattack" val="219.86" />
-				<set name="org_mdefend" val="72" />
-				<set name="org_hp" val="5175.49" />
-				<set name="org_mp" val="1771" />
-				<set name="org_hp_regen" val="7.1" />
-				<set name="org_mp_regen" val="3.63" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="92">
-				<set name="max_meal" val="37419" />
-				<set name="exp" val="60885490897603" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="312" />
-				<set name="consume_meal_in_normal" val="62" />
-				<set name="org_pattack" val="337.53" />
-				<set name="org_pdefend" val="162.9" />
-				<set name="org_mattack" val="221.08" />
-				<set name="org_mdefend" val="72.4" />
-				<set name="org_hp" val="5330.75" />
-				<set name="org_mp" val="1824.13" />
-				<set name="org_hp_regen" val="7.2" />
-				<set name="org_mp_regen" val="3.66" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="93">
-				<set name="max_meal" val="38167" />
-				<set name="exp" val="265633983312619" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="318" />
-				<set name="consume_meal_in_normal" val="64" />
-				<set name="org_pattack" val="339.39" />
-				<set name="org_pdefend" val="163.8" />
-				<set name="org_mattack" val="222.3" />
-				<set name="org_mdefend" val="72.8" />
-				<set name="org_hp" val="5490.67" />
-				<set name="org_mp" val="1878.85" />
-				<set name="org_hp_regen" val="7.3" />
-				<set name="org_mp_regen" val="3.69" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="94">
-				<set name="max_meal" val="38930" />
-				<set name="exp" val="1166527349938690" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="325" />
-				<set name="consume_meal_in_normal" val="65" />
-				<set name="org_pattack" val="341.26" />
-				<set name="org_pdefend" val="164.7" />
-				<set name="org_mattack" val="223.52" />
-				<set name="org_mdefend" val="73.2" />
-				<set name="org_hp" val="5655.39" />
-				<set name="org_mp" val="1935.21" />
-				<set name="org_hp_regen" val="7.4" />
-				<set name="org_mp_regen" val="3.72" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="95">
-				<set name="max_meal" val="39709" />
-				<set name="exp" val="5130458163093410" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="331" />
-				<set name="consume_meal_in_normal" val="66" />
-				<set name="org_pattack" val="343.12" />
-				<set name="org_pdefend" val="165.6" />
-				<set name="org_mattack" val="224.75" />
-				<set name="org_mdefend" val="73.6" />
-				<set name="org_hp" val="5825.05" />
-				<set name="org_mp" val="1993.26" />
-				<set name="org_hp_regen" val="7.5" />
-				<set name="org_mp_regen" val="3.75" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="96">
-				<set name="max_meal" val="40503" />
-				<set name="exp" val="28914043042021700" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="338" />
-				<set name="consume_meal_in_normal" val="68" />
-				<set name="org_pattack" val="344.99" />
-				<set name="org_pdefend" val="166.5" />
-				<set name="org_mattack" val="225.97" />
-				<set name="org_mdefend" val="74" />
-				<set name="org_hp" val="5999.8" />
-				<set name="org_mp" val="2053.05" />
-				<set name="org_hp_regen" val="7.6" />
-				<set name="org_mp_regen" val="3.78" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="97">
-				<set name="max_meal" val="41313" />
-				<set name="exp" val="143075250460878000" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="345" />
-				<set name="consume_meal_in_normal" val="69" />
-				<set name="org_pattack" val="346.85" />
-				<set name="org_pdefend" val="167.4" />
-				<set name="org_mattack" val="227.19" />
-				<set name="org_mdefend" val="74.4" />
-				<set name="org_hp" val="6179.79" />
-				<set name="org_mp" val="2114.64" />
-				<set name="org_hp_regen" val="7.7" />
-				<set name="org_mp_regen" val="3.81" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="98">
-				<set name="max_meal" val="42139" />
-				<set name="exp" val="691049046071386000" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="351" />
-				<set name="consume_meal_in_normal" val="70" />
-				<set name="org_pattack" val="348.72" />
-				<set name="org_pdefend" val="168.3" />
-				<set name="org_mattack" val="228.41" />
-				<set name="org_mdefend" val="74.8" />
-				<set name="org_hp" val="6365.18" />
-				<set name="org_mp" val="2178.07" />
-				<set name="org_hp_regen" val="7.8" />
-				<set name="org_mp_regen" val="3.84" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="99">
-				<set name="max_meal" val="42982" />
-				<set name="exp" val="3321323265001830000" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="358" />
-				<set name="consume_meal_in_normal" val="72" />
-				<set name="org_pattack" val="350.58" />
-				<set name="org_pdefend" val="169.2" />
-				<set name="org_mattack" val="229.63" />
-				<set name="org_mdefend" val="75.2" />
-				<set name="org_hp" val="6556.13" />
-				<set name="org_mp" val="2243.41" />
-				<set name="org_hp_regen" val="7.9" />
-				<set name="org_mp_regen" val="3.87" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-			<stat level="100">
-				<set name="max_meal" val="43842" />
-				<set name="exp" val="3321323265001870000" />
-				<set name="get_exp_type" val="65" />
-				<set name="consume_meal_in_battle" val="366" />
-				<set name="consume_meal_in_normal" val="73" />
-				<set name="org_pattack" val="500" />
-				<set name="org_pdefend" val="500" />
-				<set name="org_mattack" val="500" />
-				<set name="org_mdefend" val="500" />
-				<set name="org_hp" val="6752.81" />
-				<set name="org_mp" val="2310.71" />
-				<set name="org_hp_regen" val="8.5" />
-				<set name="org_mp_regen" val="4" />
-				<set name="soulshot_count" val="2" />
-				<set name="spiritshot_count" val="2" />
-			</stat>
-		</stats>
-	</pet>
-</pets>
+<?xml version="1.0" encoding="UTF-8"?>
+<pets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/PetData.xsd">
+	<pet id="16079" itemId="93961" index="10" evolveLevel="None" type="13">
+		<set name="food" val="93966" />
+		<set name="hungry_limit" val="50" />
+		<set name="load" val="45540" />
+		<skills>
+			<skill minLevel="1" skillId="6618" skillLevel="1" />
+			<skill minLevel="60" skillId="6618" skillLevel="2" />
+			<skill minLevel="65" skillId="6618" skillLevel="3" />
+			<skill minLevel="70" skillId="6618" skillLevel="4" />
+			<skill minLevel="75" skillId="6618" skillLevel="5" />
+			<skill minLevel="80" skillId="6618" skillLevel="6" />
+			<skill minLevel="85" skillId="6618" skillLevel="7" />
+			<skill minLevel="60" skillId="6681" skillLevel="1" />
+			<skill minLevel="60" skillId="6683" skillLevel="1" />
+		</skills>
+		<stats>
+			<stat level="1">
+				<set name="max_meal" val="3000" />
+				<set name="exp" val="0" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="12" />
+				<set name="consume_meal_in_normal" val="2" />
+				<set name="org_pattack" val="167.83" />
+				<set name="org_pdefend" val="81" />
+				<set name="org_mattack" val="109.93" />
+				<set name="org_mdefend" val="36" />
+				<set name="org_hp" val="94" />
+				<set name="org_mp" val="30" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="2">
+				<set name="max_meal" val="3090" />
+				<set name="exp" val="68" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="12" />
+				<set name="consume_meal_in_normal" val="2" />
+				<set name="org_pattack" val="169.7" />
+				<set name="org_pdefend" val="81.9" />
+				<set name="org_mattack" val="111.15" />
+				<set name="org_mdefend" val="36.4" />
+				<set name="org_hp" val="107.65" />
+				<set name="org_mp" val="35.46" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="3">
+				<set name="max_meal" val="3183" />
+				<set name="exp" val="364" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="13" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="171.56" />
+				<set name="org_pdefend" val="82.8" />
+				<set name="org_mattack" val="112.37" />
+				<set name="org_mdefend" val="36.8" />
+				<set name="org_hp" val="121.45" />
+				<set name="org_mp" val="40.98" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="4">
+				<set name="max_meal" val="3278" />
+				<set name="exp" val="1169" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="13" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="173.43" />
+				<set name="org_pdefend" val="83.7" />
+				<set name="org_mattack" val="113.59" />
+				<set name="org_mdefend" val="37.2" />
+				<set name="org_hp" val="135.4" />
+				<set name="org_mp" val="46.56" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="5">
+				<set name="max_meal" val="3376" />
+				<set name="exp" val="2885" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="14" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="175.29" />
+				<set name="org_pdefend" val="84.6" />
+				<set name="org_mattack" val="114.82" />
+				<set name="org_mdefend" val="37.6" />
+				<set name="org_hp" val="149.5" />
+				<set name="org_mp" val="52.2" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="6">
+				<set name="max_meal" val="3477" />
+				<set name="exp" val="6039" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="15" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="177.16" />
+				<set name="org_pdefend" val="85.5" />
+				<set name="org_mattack" val="116.04" />
+				<set name="org_mdefend" val="38" />
+				<set name="org_hp" val="163.75" />
+				<set name="org_mp" val="57.9" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="7">
+				<set name="max_meal" val="3581" />
+				<set name="exp" val="11288" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="15" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="179.02" />
+				<set name="org_pdefend" val="86.4" />
+				<set name="org_mattack" val="117.26" />
+				<set name="org_mdefend" val="38.4" />
+				<set name="org_hp" val="178.15" />
+				<set name="org_mp" val="63.66" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="8">
+				<set name="max_meal" val="3688" />
+				<set name="exp" val="19424" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="16" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="180.89" />
+				<set name="org_pdefend" val="87.3" />
+				<set name="org_mattack" val="118.48" />
+				<set name="org_mdefend" val="38.8" />
+				<set name="org_hp" val="192.7" />
+				<set name="org_mp" val="69.48" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="9">
+				<set name="max_meal" val="3799" />
+				<set name="exp" val="31379" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="16" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="182.75" />
+				<set name="org_pdefend" val="88.2" />
+				<set name="org_mattack" val="119.7" />
+				<set name="org_mdefend" val="39.2" />
+				<set name="org_hp" val="207.4" />
+				<set name="org_mp" val="75.36" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="10">
+				<set name="max_meal" val="3913" />
+				<set name="exp" val="48230" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="17" />
+				<set name="consume_meal_in_normal" val="3" />
+				<set name="org_pattack" val="184.62" />
+				<set name="org_pdefend" val="89.1" />
+				<set name="org_mattack" val="120.92" />
+				<set name="org_mdefend" val="39.6" />
+				<set name="org_hp" val="222.25" />
+				<set name="org_mp" val="81.3" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="0.9" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="11">
+				<set name="max_meal" val="4030" />
+				<set name="exp" val="71203" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="18" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="186.48" />
+				<set name="org_pdefend" val="90" />
+				<set name="org_mattack" val="122.14" />
+				<set name="org_mdefend" val="40" />
+				<set name="org_hp" val="237.25" />
+				<set name="org_mp" val="87.3" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="12">
+				<set name="max_meal" val="4151" />
+				<set name="exp" val="101678" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="18" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="188.34" />
+				<set name="org_pdefend" val="90.9" />
+				<set name="org_mattack" val="123.37" />
+				<set name="org_mdefend" val="40.4" />
+				<set name="org_hp" val="252.4" />
+				<set name="org_mp" val="93.36" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="13">
+				<set name="max_meal" val="4276" />
+				<set name="exp" val="141194" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="19" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="190.21" />
+				<set name="org_pdefend" val="91.8" />
+				<set name="org_mattack" val="124.59" />
+				<set name="org_mdefend" val="40.8" />
+				<set name="org_hp" val="267.7" />
+				<set name="org_mp" val="99.48" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="14">
+				<set name="max_meal" val="4404" />
+				<set name="exp" val="191455" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="20" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="192.07" />
+				<set name="org_pdefend" val="92.7" />
+				<set name="org_mattack" val="125.81" />
+				<set name="org_mdefend" val="41.2" />
+				<set name="org_hp" val="283.15" />
+				<set name="org_mp" val="105.66" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="15">
+				<set name="max_meal" val="4536" />
+				<set name="exp" val="254331" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="21" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="193.94" />
+				<set name="org_pdefend" val="93.6" />
+				<set name="org_mattack" val="127.03" />
+				<set name="org_mdefend" val="41.6" />
+				<set name="org_hp" val="298.75" />
+				<set name="org_mp" val="111.9" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="16">
+				<set name="max_meal" val="4672" />
+				<set name="exp" val="331868" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="22" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="195.8" />
+				<set name="org_pdefend" val="94.5" />
+				<set name="org_mattack" val="128.25" />
+				<set name="org_mdefend" val="42" />
+				<set name="org_hp" val="314.5" />
+				<set name="org_mp" val="118.2" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="17">
+				<set name="max_meal" val="4812" />
+				<set name="exp" val="426289" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="22" />
+				<set name="consume_meal_in_normal" val="4" />
+				<set name="org_pattack" val="197.67" />
+				<set name="org_pdefend" val="95.4" />
+				<set name="org_mattack" val="129.47" />
+				<set name="org_mdefend" val="42.4" />
+				<set name="org_hp" val="330.4" />
+				<set name="org_mp" val="124.56" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="18">
+				<set name="max_meal" val="4956" />
+				<set name="exp" val="540001" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="23" />
+				<set name="consume_meal_in_normal" val="5" />
+				<set name="org_pattack" val="199.53" />
+				<set name="org_pdefend" val="96.3" />
+				<set name="org_mattack" val="130.69" />
+				<set name="org_mdefend" val="42.8" />
+				<set name="org_hp" val="346.45" />
+				<set name="org_mp" val="130.98" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="19">
+				<set name="max_meal" val="5105" />
+				<set name="exp" val="675597" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="24" />
+				<set name="consume_meal_in_normal" val="5" />
+				<set name="org_pattack" val="201.4" />
+				<set name="org_pdefend" val="97.2" />
+				<set name="org_mattack" val="131.92" />
+				<set name="org_mdefend" val="43.2" />
+				<set name="org_hp" val="362.65" />
+				<set name="org_mp" val="137.46" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="20">
+				<set name="max_meal" val="5258" />
+				<set name="exp" val="835864" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="25" />
+				<set name="consume_meal_in_normal" val="5" />
+				<set name="org_pattack" val="203.26" />
+				<set name="org_pdefend" val="98.1" />
+				<set name="org_mattack" val="133.14" />
+				<set name="org_mdefend" val="43.6" />
+				<set name="org_hp" val="379" />
+				<set name="org_mp" val="144" />
+				<set name="org_hp_regen" val="2" />
+				<set name="org_mp_regen" val="1.2" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="21">
+				<set name="max_meal" val="5416" />
+				<set name="exp" val="1020171" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="26" />
+				<set name="consume_meal_in_normal" val="5" />
+				<set name="org_pattack" val="205.13" />
+				<set name="org_pdefend" val="99" />
+				<set name="org_mattack" val="134.36" />
+				<set name="org_mdefend" val="44" />
+				<set name="org_hp" val="414.2" />
+				<set name="org_mp" val="153.9" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="22">
+				<set name="max_meal" val="5578" />
+				<set name="exp" val="1232124" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="27" />
+				<set name="consume_meal_in_normal" val="5" />
+				<set name="org_pattack" val="206.99" />
+				<set name="org_pdefend" val="99.9" />
+				<set name="org_mattack" val="135.58" />
+				<set name="org_mdefend" val="44.4" />
+				<set name="org_hp" val="449.72" />
+				<set name="org_mp" val="163.89" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="23">
+				<set name="max_meal" val="5745" />
+				<set name="exp" val="1475870" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="28" />
+				<set name="consume_meal_in_normal" val="6" />
+				<set name="org_pattack" val="208.86" />
+				<set name="org_pdefend" val="100.8" />
+				<set name="org_mattack" val="136.8" />
+				<set name="org_mdefend" val="44.8" />
+				<set name="org_hp" val="485.56" />
+				<set name="org_mp" val="173.97" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="24">
+				<set name="max_meal" val="5917" />
+				<set name="exp" val="1756178" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="30" />
+				<set name="consume_meal_in_normal" val="6" />
+				<set name="org_pattack" val="210.72" />
+				<set name="org_pdefend" val="101.7" />
+				<set name="org_mattack" val="138.02" />
+				<set name="org_mdefend" val="45.2" />
+				<set name="org_hp" val="521.72" />
+				<set name="org_mp" val="184.14" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="25">
+				<set name="max_meal" val="6095" />
+				<set name="exp" val="2078532" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="31" />
+				<set name="consume_meal_in_normal" val="6" />
+				<set name="org_pattack" val="212.59" />
+				<set name="org_pdefend" val="102.6" />
+				<set name="org_mattack" val="139.24" />
+				<set name="org_mdefend" val="45.6" />
+				<set name="org_hp" val="558.2" />
+				<set name="org_mp" val="194.4" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="26">
+				<set name="max_meal" val="6278" />
+				<set name="exp" val="2452463" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="32" />
+				<set name="consume_meal_in_normal" val="6" />
+				<set name="org_pattack" val="214.45" />
+				<set name="org_pdefend" val="103.5" />
+				<set name="org_mattack" val="140.47" />
+				<set name="org_mdefend" val="46" />
+				<set name="org_hp" val="595" />
+				<set name="org_mp" val="204.75" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="27">
+				<set name="max_meal" val="6466" />
+				<set name="exp" val="2886223" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="33" />
+				<set name="consume_meal_in_normal" val="7" />
+				<set name="org_pattack" val="216.32" />
+				<set name="org_pdefend" val="104.4" />
+				<set name="org_mattack" val="141.69" />
+				<set name="org_mdefend" val="46.4" />
+				<set name="org_hp" val="632.12" />
+				<set name="org_mp" val="215.19" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="28">
+				<set name="max_meal" val="6660" />
+				<set name="exp" val="3389384" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="35" />
+				<set name="consume_meal_in_normal" val="7" />
+				<set name="org_pattack" val="218.18" />
+				<set name="org_pdefend" val="105.3" />
+				<set name="org_mattack" val="142.91" />
+				<set name="org_mdefend" val="46.8" />
+				<set name="org_hp" val="669.56" />
+				<set name="org_mp" val="225.72" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="29">
+				<set name="max_meal" val="6860" />
+				<set name="exp" val="3973052" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="36" />
+				<set name="consume_meal_in_normal" val="7" />
+				<set name="org_pattack" val="220.05" />
+				<set name="org_pdefend" val="106.2" />
+				<set name="org_mattack" val="144.13" />
+				<set name="org_mdefend" val="47.2" />
+				<set name="org_hp" val="707.32" />
+				<set name="org_mp" val="236.34" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="30">
+				<set name="max_meal" val="7066" />
+				<set name="exp" val="4650105" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="37" />
+				<set name="consume_meal_in_normal" val="7" />
+				<set name="org_pattack" val="221.91" />
+				<set name="org_pdefend" val="107.1" />
+				<set name="org_mattack" val="145.35" />
+				<set name="org_mdefend" val="47.6" />
+				<set name="org_hp" val="745.4" />
+				<set name="org_mp" val="247.05" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.5" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="31">
+				<set name="max_meal" val="7278" />
+				<set name="exp" val="5442259" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="39" />
+				<set name="consume_meal_in_normal" val="8" />
+				<set name="org_pattack" val="223.78" />
+				<set name="org_pdefend" val="108" />
+				<set name="org_mattack" val="146.57" />
+				<set name="org_mdefend" val="48" />
+				<set name="org_hp" val="783.8" />
+				<set name="org_mp" val="257.85" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="32">
+				<set name="max_meal" val="7496" />
+				<set name="exp" val="6369078" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="40" />
+				<set name="consume_meal_in_normal" val="8" />
+				<set name="org_pattack" val="225.64" />
+				<set name="org_pdefend" val="108.9" />
+				<set name="org_mattack" val="147.79" />
+				<set name="org_mdefend" val="48.4" />
+				<set name="org_hp" val="822.52" />
+				<set name="org_mp" val="268.74" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="33">
+				<set name="max_meal" val="7721" />
+				<set name="exp" val="7453456" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="42" />
+				<set name="consume_meal_in_normal" val="8" />
+				<set name="org_pattack" val="227.51" />
+				<set name="org_pdefend" val="109.8" />
+				<set name="org_mattack" val="149.02" />
+				<set name="org_mdefend" val="48.8" />
+				<set name="org_hp" val="861.56" />
+				<set name="org_mp" val="279.72" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="34">
+				<set name="max_meal" val="7953" />
+				<set name="exp" val="8722179" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="44" />
+				<set name="consume_meal_in_normal" val="9" />
+				<set name="org_pattack" val="229.37" />
+				<set name="org_pdefend" val="110.7" />
+				<set name="org_mattack" val="150.24" />
+				<set name="org_mdefend" val="49.2" />
+				<set name="org_hp" val="900.92" />
+				<set name="org_mp" val="290.79" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="35">
+				<set name="max_meal" val="8192" />
+				<set name="exp" val="10206584" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="46" />
+				<set name="consume_meal_in_normal" val="9" />
+				<set name="org_pattack" val="231.24" />
+				<set name="org_pdefend" val="111.6" />
+				<set name="org_mattack" val="151.46" />
+				<set name="org_mdefend" val="49.6" />
+				<set name="org_hp" val="940.6" />
+				<set name="org_mp" val="301.95" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="36">
+				<set name="max_meal" val="8438" />
+				<set name="exp" val="11958183" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="47" />
+				<set name="consume_meal_in_normal" val="9" />
+				<set name="org_pattack" val="233.1" />
+				<set name="org_pdefend" val="112.5" />
+				<set name="org_mattack" val="152.68" />
+				<set name="org_mdefend" val="50" />
+				<set name="org_hp" val="980.6" />
+				<set name="org_mp" val="313.2" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="37">
+				<set name="max_meal" val="8691" />
+				<set name="exp" val="14025069" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="49" />
+				<set name="consume_meal_in_normal" val="10" />
+				<set name="org_pattack" val="234.96" />
+				<set name="org_pdefend" val="113.4" />
+				<set name="org_mattack" val="153.9" />
+				<set name="org_mdefend" val="50.4" />
+				<set name="org_hp" val="1020.92" />
+				<set name="org_mp" val="324.54" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="38">
+				<set name="max_meal" val="8952" />
+				<set name="exp" val="16463995" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="51" />
+				<set name="consume_meal_in_normal" val="10" />
+				<set name="org_pattack" val="236.83" />
+				<set name="org_pdefend" val="114.3" />
+				<set name="org_mattack" val="155.12" />
+				<set name="org_mdefend" val="50.8" />
+				<set name="org_hp" val="1061.56" />
+				<set name="org_mp" val="335.97" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="39">
+				<set name="max_meal" val="9221" />
+				<set name="exp" val="19341927" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="53" />
+				<set name="consume_meal_in_normal" val="11" />
+				<set name="org_pattack" val="238.69" />
+				<set name="org_pdefend" val="115.2" />
+				<set name="org_mattack" val="156.34" />
+				<set name="org_mdefend" val="51.2" />
+				<set name="org_hp" val="1102.52" />
+				<set name="org_mp" val="347.49" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="40">
+				<set name="max_meal" val="9498" />
+				<set name="exp" val="22737888" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="55" />
+				<set name="consume_meal_in_normal" val="11" />
+				<set name="org_pattack" val="240.56" />
+				<set name="org_pdefend" val="116.1" />
+				<set name="org_mattack" val="157.57" />
+				<set name="org_mdefend" val="51.6" />
+				<set name="org_hp" val="1143.8" />
+				<set name="org_mp" val="359.1" />
+				<set name="org_hp_regen" val="3" />
+				<set name="org_mp_regen" val="1.8" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="41">
+				<set name="max_meal" val="9783" />
+				<set name="exp" val="26779080" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="58" />
+				<set name="consume_meal_in_normal" val="12" />
+				<set name="org_pattack" val="242.42" />
+				<set name="org_pdefend" val="117" />
+				<set name="org_mattack" val="158.79" />
+				<set name="org_mdefend" val="52" />
+				<set name="org_hp" val="1198.4" />
+				<set name="org_mp" val="378.6" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="42">
+				<set name="max_meal" val="10076" />
+				<set name="exp" val="31588100" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="60" />
+				<set name="consume_meal_in_normal" val="12" />
+				<set name="org_pattack" val="244.29" />
+				<set name="org_pdefend" val="117.9" />
+				<set name="org_mattack" val="160.01" />
+				<set name="org_mdefend" val="52.4" />
+				<set name="org_hp" val="1253.42" />
+				<set name="org_mp" val="398.25" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="43">
+				<set name="max_meal" val="10378" />
+				<set name="exp" val="37310833" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="62" />
+				<set name="consume_meal_in_normal" val="12" />
+				<set name="org_pattack" val="246.15" />
+				<set name="org_pdefend" val="118.8" />
+				<set name="org_mattack" val="161.23" />
+				<set name="org_mdefend" val="52.8" />
+				<set name="org_hp" val="1308.86" />
+				<set name="org_mp" val="418.05" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="44">
+				<set name="max_meal" val="10689" />
+				<set name="exp" val="44120885" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="65" />
+				<set name="consume_meal_in_normal" val="13" />
+				<set name="org_pattack" val="248.02" />
+				<set name="org_pdefend" val="119.7" />
+				<set name="org_mattack" val="162.45" />
+				<set name="org_mdefend" val="53.2" />
+				<set name="org_hp" val="1364.72" />
+				<set name="org_mp" val="438" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="45">
+				<set name="max_meal" val="11010" />
+				<set name="exp" val="52224847" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="67" />
+				<set name="consume_meal_in_normal" val="13" />
+				<set name="org_pattack" val="249.88" />
+				<set name="org_pdefend" val="120.6" />
+				<set name="org_mattack" val="163.67" />
+				<set name="org_mdefend" val="53.6" />
+				<set name="org_hp" val="1421" />
+				<set name="org_mp" val="458.1" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="46">
+				<set name="max_meal" val="11340" />
+				<set name="exp" val="61949602" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="70" />
+				<set name="consume_meal_in_normal" val="14" />
+				<set name="org_pattack" val="251.75" />
+				<set name="org_pdefend" val="121.5" />
+				<set name="org_mattack" val="164.89" />
+				<set name="org_mdefend" val="54" />
+				<set name="org_hp" val="1477.7" />
+				<set name="org_mp" val="478.35" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="47">
+				<set name="max_meal" val="11680" />
+				<set name="exp" val="73619307" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="73" />
+				<set name="consume_meal_in_normal" val="15" />
+				<set name="org_pattack" val="253.61" />
+				<set name="org_pdefend" val="122.4" />
+				<set name="org_mattack" val="166.12" />
+				<set name="org_mdefend" val="54.4" />
+				<set name="org_hp" val="1534.82" />
+				<set name="org_mp" val="498.75" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="48">
+				<set name="max_meal" val="12030" />
+				<set name="exp" val="87622954" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="76" />
+				<set name="consume_meal_in_normal" val="15" />
+				<set name="org_pattack" val="255.48" />
+				<set name="org_pdefend" val="123.3" />
+				<set name="org_mattack" val="167.34" />
+				<set name="org_mdefend" val="54.8" />
+				<set name="org_hp" val="1592.36" />
+				<set name="org_mp" val="519.3" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="49">
+				<set name="max_meal" val="12391" />
+				<set name="exp" val="104427330" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="79" />
+				<set name="consume_meal_in_normal" val="16" />
+				<set name="org_pattack" val="257.34" />
+				<set name="org_pdefend" val="124.2" />
+				<set name="org_mattack" val="168.56" />
+				<set name="org_mdefend" val="55.2" />
+				<set name="org_hp" val="1650.32" />
+				<set name="org_mp" val="540" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="50">
+				<set name="max_meal" val="12763" />
+				<set name="exp" val="124592581" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="82" />
+				<set name="consume_meal_in_normal" val="16" />
+				<set name="org_pattack" val="259.21" />
+				<set name="org_pdefend" val="125.1" />
+				<set name="org_mattack" val="169.78" />
+				<set name="org_mdefend" val="55.6" />
+				<set name="org_hp" val="1708.7" />
+				<set name="org_mp" val="560.85" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.1" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="51">
+				<set name="max_meal" val="13146" />
+				<set name="exp" val="148790883" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="85" />
+				<set name="consume_meal_in_normal" val="17" />
+				<set name="org_pattack" val="261.07" />
+				<set name="org_pdefend" val="126" />
+				<set name="org_mattack" val="171" />
+				<set name="org_mdefend" val="56" />
+				<set name="org_hp" val="1767.5" />
+				<set name="org_mp" val="581.85" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="52">
+				<set name="max_meal" val="13540" />
+				<set name="exp" val="177828845" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="89" />
+				<set name="consume_meal_in_normal" val="18" />
+				<set name="org_pattack" val="262.94" />
+				<set name="org_pdefend" val="126.9" />
+				<set name="org_mattack" val="172.22" />
+				<set name="org_mdefend" val="56.4" />
+				<set name="org_hp" val="1826.72" />
+				<set name="org_mp" val="603" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="53">
+				<set name="max_meal" val="13946" />
+				<set name="exp" val="212674399" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="92" />
+				<set name="consume_meal_in_normal" val="18" />
+				<set name="org_pattack" val="264.8" />
+				<set name="org_pdefend" val="127.8" />
+				<set name="org_mattack" val="173.44" />
+				<set name="org_mdefend" val="56.8" />
+				<set name="org_hp" val="1886.36" />
+				<set name="org_mp" val="624.3" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="54">
+				<set name="max_meal" val="14364" />
+				<set name="exp" val="254489064" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="96" />
+				<set name="consume_meal_in_normal" val="19" />
+				<set name="org_pattack" val="266.67" />
+				<set name="org_pdefend" val="128.7" />
+				<set name="org_mattack" val="174.67" />
+				<set name="org_mdefend" val="57.2" />
+				<set name="org_hp" val="1946.42" />
+				<set name="org_mp" val="645.75" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="55">
+				<set name="max_meal" val="14795" />
+				<set name="exp" val="304666662" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="100" />
+				<set name="consume_meal_in_normal" val="20" />
+				<set name="org_pattack" val="268.53" />
+				<set name="org_pdefend" val="129.6" />
+				<set name="org_mattack" val="175.89" />
+				<set name="org_mdefend" val="57.6" />
+				<set name="org_hp" val="2006.9" />
+				<set name="org_mp" val="667.35" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="56">
+				<set name="max_meal" val="15239" />
+				<set name="exp" val="364879780" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="104" />
+				<set name="consume_meal_in_normal" val="21" />
+				<set name="org_pattack" val="270.4" />
+				<set name="org_pdefend" val="130.5" />
+				<set name="org_mattack" val="177.11" />
+				<set name="org_mdefend" val="58" />
+				<set name="org_hp" val="2067.8" />
+				<set name="org_mp" val="689.1" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="57">
+				<set name="max_meal" val="15696" />
+				<set name="exp" val="437135521" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="108" />
+				<set name="consume_meal_in_normal" val="22" />
+				<set name="org_pattack" val="272.26" />
+				<set name="org_pdefend" val="131.4" />
+				<set name="org_mattack" val="178.33" />
+				<set name="org_mdefend" val="58.4" />
+				<set name="org_hp" val="2129.12" />
+				<set name="org_mp" val="711" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="58">
+				<set name="max_meal" val="16167" />
+				<set name="exp" val="523842410" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="112" />
+				<set name="consume_meal_in_normal" val="22" />
+				<set name="org_pattack" val="274.13" />
+				<set name="org_pdefend" val="132.3" />
+				<set name="org_mattack" val="179.55" />
+				<set name="org_mdefend" val="58.8" />
+				<set name="org_hp" val="2190.86" />
+				<set name="org_mp" val="733.05" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="59">
+				<set name="max_meal" val="16652" />
+				<set name="exp" val="627890678" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="117" />
+				<set name="consume_meal_in_normal" val="23" />
+				<set name="org_pattack" val="275.99" />
+				<set name="org_pdefend" val="133.2" />
+				<set name="org_mattack" val="180.77" />
+				<set name="org_mdefend" val="59.2" />
+				<set name="org_hp" val="2253.02" />
+				<set name="org_mp" val="755.25" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="60">
+				<set name="max_meal" val="17152" />
+				<set name="exp" val="752748598" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="121" />
+				<set name="consume_meal_in_normal" val="24" />
+				<set name="org_pattack" val="277.86" />
+				<set name="org_pdefend" val="134.1" />
+				<set name="org_mattack" val="182" />
+				<set name="org_mdefend" val="59.6" />
+				<set name="org_hp" val="2315.6" />
+				<set name="org_mp" val="777.6" />
+				<set name="org_hp_regen" val="4" />
+				<set name="org_mp_regen" val="2.4" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="61">
+				<set name="max_meal" val="17667" />
+				<set name="exp" val="902578103" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="126" />
+				<set name="consume_meal_in_normal" val="25" />
+				<set name="org_pattack" val="279.72" />
+				<set name="org_pdefend" val="135" />
+				<set name="org_mattack" val="183.22" />
+				<set name="org_mdefend" val="60" />
+				<set name="org_hp" val="2378.6" />
+				<set name="org_mp" val="800.1" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="62">
+				<set name="max_meal" val="18197" />
+				<set name="exp" val="1082373509" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="131" />
+				<set name="consume_meal_in_normal" val="26" />
+				<set name="org_pattack" val="281.58" />
+				<set name="org_pdefend" val="135.9" />
+				<set name="org_mattack" val="184.44" />
+				<set name="org_mdefend" val="60.4" />
+				<set name="org_hp" val="2442.02" />
+				<set name="org_mp" val="822.75" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="63">
+				<set name="max_meal" val="18743" />
+				<set name="exp" val="1298127996" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="137" />
+				<set name="consume_meal_in_normal" val="27" />
+				<set name="org_pattack" val="283.45" />
+				<set name="org_pdefend" val="136.8" />
+				<set name="org_mattack" val="185.66" />
+				<set name="org_mdefend" val="60.8" />
+				<set name="org_hp" val="2505.86" />
+				<set name="org_mp" val="845.55" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="64">
+				<set name="max_meal" val="19305" />
+				<set name="exp" val="1557033381" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="142" />
+				<set name="consume_meal_in_normal" val="28" />
+				<set name="org_pattack" val="285.31" />
+				<set name="org_pdefend" val="137.7" />
+				<set name="org_mattack" val="186.88" />
+				<set name="org_mdefend" val="61.2" />
+				<set name="org_hp" val="2570.12" />
+				<set name="org_mp" val="868.5" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="65">
+				<set name="max_meal" val="19884" />
+				<set name="exp" val="1867719842" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="148" />
+				<set name="consume_meal_in_normal" val="30" />
+				<set name="org_pattack" val="287.18" />
+				<set name="org_pdefend" val="138.6" />
+				<set name="org_mattack" val="188.1" />
+				<set name="org_mdefend" val="61.6" />
+				<set name="org_hp" val="2634.8" />
+				<set name="org_mp" val="891.6" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="66">
+				<set name="max_meal" val="20481" />
+				<set name="exp" val="2240543596" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="154" />
+				<set name="consume_meal_in_normal" val="31" />
+				<set name="org_pattack" val="289.04" />
+				<set name="org_pdefend" val="139.5" />
+				<set name="org_mattack" val="189.32" />
+				<set name="org_mdefend" val="62" />
+				<set name="org_hp" val="2699.9" />
+				<set name="org_mp" val="914.85" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="67">
+				<set name="max_meal" val="21095" />
+				<set name="exp" val="2687932100" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="160" />
+				<set name="consume_meal_in_normal" val="32" />
+				<set name="org_pattack" val="290.91" />
+				<set name="org_pdefend" val="140.4" />
+				<set name="org_mattack" val="190.55" />
+				<set name="org_mdefend" val="62.4" />
+				<set name="org_hp" val="2765.42" />
+				<set name="org_mp" val="938.25" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="68">
+				<set name="max_meal" val="21728" />
+				<set name="exp" val="3229272190" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="166" />
+				<set name="consume_meal_in_normal" val="33" />
+				<set name="org_pattack" val="292.77" />
+				<set name="org_pdefend" val="141.3" />
+				<set name="org_mattack" val="191.77" />
+				<set name="org_mdefend" val="62.8" />
+				<set name="org_hp" val="2831.36" />
+				<set name="org_mp" val="961.8" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="69">
+				<set name="max_meal" val="22380" />
+				<set name="exp" val="3884293700" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="173" />
+				<set name="consume_meal_in_normal" val="35" />
+				<set name="org_pattack" val="294.64" />
+				<set name="org_pdefend" val="142.2" />
+				<set name="org_mattack" val="192.99" />
+				<set name="org_mdefend" val="63.2" />
+				<set name="org_hp" val="2897.72" />
+				<set name="org_mp" val="985.5" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="70">
+				<set name="max_meal" val="23051" />
+				<set name="exp" val="4683419941" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="180" />
+				<set name="consume_meal_in_normal" val="36" />
+				<set name="org_pattack" val="296.5" />
+				<set name="org_pdefend" val="143.1" />
+				<set name="org_mattack" val="194.21" />
+				<set name="org_mdefend" val="63.6" />
+				<set name="org_hp" val="2964.5" />
+				<set name="org_mp" val="1009.35" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="2.7" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="71">
+				<set name="max_meal" val="23743" />
+				<set name="exp" val="5666345218" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="187" />
+				<set name="consume_meal_in_normal" val="37" />
+				<set name="org_pattack" val="298.37" />
+				<set name="org_pdefend" val="144" />
+				<set name="org_mattack" val="195.43" />
+				<set name="org_mdefend" val="64" />
+				<set name="org_hp" val="3031.7" />
+				<set name="org_mp" val="1033.35" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="72">
+				<set name="max_meal" val="24455" />
+				<set name="exp" val="6885172561" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="194" />
+				<set name="consume_meal_in_normal" val="39" />
+				<set name="org_pattack" val="300.23" />
+				<set name="org_pdefend" val="144.9" />
+				<set name="org_mattack" val="196.65" />
+				<set name="org_mdefend" val="64.4" />
+				<set name="org_hp" val="3099.32" />
+				<set name="org_mp" val="1057.5" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="73">
+				<set name="max_meal" val="25189" />
+				<set name="exp" val="8408706740" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="202" />
+				<set name="consume_meal_in_normal" val="40" />
+				<set name="org_pattack" val="302.1" />
+				<set name="org_pdefend" val="145.8" />
+				<set name="org_mattack" val="197.87" />
+				<set name="org_mdefend" val="64.8" />
+				<set name="org_hp" val="3167.36" />
+				<set name="org_mp" val="1081.8" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="74">
+				<set name="max_meal" val="25945" />
+				<set name="exp" val="10328359805" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="210" />
+				<set name="consume_meal_in_normal" val="42" />
+				<set name="org_pattack" val="303.96" />
+				<set name="org_pdefend" val="146.7" />
+				<set name="org_mattack" val="199.1" />
+				<set name="org_mdefend" val="65.2" />
+				<set name="org_hp" val="3235.82" />
+				<set name="org_mp" val="1106.25" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="75">
+				<set name="max_meal" val="26723" />
+				<set name="exp" val="12766319199" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="219" />
+				<set name="consume_meal_in_normal" val="44" />
+				<set name="org_pattack" val="305.83" />
+				<set name="org_pdefend" val="147.6" />
+				<set name="org_mattack" val="200.32" />
+				<set name="org_mdefend" val="65.6" />
+				<set name="org_hp" val="3304.7" />
+				<set name="org_mp" val="1130.85" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="1" />
+				<set name="spiritshot_count" val="1" />
+			</stat>
+			<stat level="76">
+				<set name="max_meal" val="27257" />
+				<set name="exp" val="15886907222" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="227" />
+				<set name="consume_meal_in_normal" val="45" />
+				<set name="org_pattack" val="307.69" />
+				<set name="org_pdefend" val="148.5" />
+				<set name="org_mattack" val="201.54" />
+				<set name="org_mdefend" val="66" />
+				<set name="org_hp" val="3387.31" />
+				<set name="org_mp" val="1159.12" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="77">
+				<set name="max_meal" val="27802" />
+				<set name="exp" val="19943671652" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="232" />
+				<set name="consume_meal_in_normal" val="46" />
+				<set name="org_pattack" val="309.56" />
+				<set name="org_pdefend" val="149.4" />
+				<set name="org_mattack" val="202.76" />
+				<set name="org_mdefend" val="66.4" />
+				<set name="org_hp" val="3471.99" />
+				<set name="org_mp" val="1188.09" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="78">
+				<set name="max_meal" val="28358" />
+				<set name="exp" val="25420303633" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="237" />
+				<set name="consume_meal_in_normal" val="47" />
+				<set name="org_pattack" val="311.42" />
+				<set name="org_pdefend" val="150.3" />
+				<set name="org_mattack" val="203.98" />
+				<set name="org_mdefend" val="66.8" />
+				<set name="org_hp" val="3558.78" />
+				<set name="org_mp" val="1217.79" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="79">
+				<set name="max_meal" val="28925" />
+				<set name="exp" val="33087588407" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="241" />
+				<set name="consume_meal_in_normal" val="48" />
+				<set name="org_pattack" val="313.29" />
+				<set name="org_pdefend" val="151.2" />
+				<set name="org_mattack" val="205.2" />
+				<set name="org_mdefend" val="67.2" />
+				<set name="org_hp" val="3647.74" />
+				<set name="org_mp" val="1248.23" />
+				<set name="org_hp_regen" val="5" />
+				<set name="org_mp_regen" val="3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="80">
+				<set name="max_meal" val="29504" />
+				<set name="exp" val="44588515567" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="246" />
+				<set name="consume_meal_in_normal" val="49" />
+				<set name="org_pattack" val="315.15" />
+				<set name="org_pdefend" val="152.1" />
+				<set name="org_mattack" val="206.42" />
+				<set name="org_mdefend" val="67.6" />
+				<set name="org_hp" val="3738.93" />
+				<set name="org_mp" val="1279.43" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="81">
+				<set name="max_meal" val="30094" />
+				<set name="exp" val="61839906307" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="251" />
+				<set name="consume_meal_in_normal" val="50" />
+				<set name="org_pattack" val="317.02" />
+				<set name="org_pdefend" val="153" />
+				<set name="org_mattack" val="207.65" />
+				<set name="org_mdefend" val="68" />
+				<set name="org_hp" val="3851.09" />
+				<set name="org_mp" val="1317.81" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="82">
+				<set name="max_meal" val="30696" />
+				<set name="exp" val="87716992417" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="256" />
+				<set name="consume_meal_in_normal" val="51" />
+				<set name="org_pattack" val="318.88" />
+				<set name="org_pdefend" val="153.9" />
+				<set name="org_mattack" val="208.87" />
+				<set name="org_mdefend" val="68.4" />
+				<set name="org_hp" val="3966.62" />
+				<set name="org_mp" val="1357.34" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="83">
+				<set name="max_meal" val="31310" />
+				<set name="exp" val="126532621582" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="261" />
+				<set name="consume_meal_in_normal" val="52" />
+				<set name="org_pattack" val="320.75" />
+				<set name="org_pdefend" val="154.8" />
+				<set name="org_mattack" val="210.09" />
+				<set name="org_mdefend" val="68.8" />
+				<set name="org_hp" val="4085.61" />
+				<set name="org_mp" val="1398.06" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="84">
+				<set name="max_meal" val="31936" />
+				<set name="exp" val="184756065330" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="266" />
+				<set name="consume_meal_in_normal" val="53" />
+				<set name="org_pattack" val="322.61" />
+				<set name="org_pdefend" val="155.7" />
+				<set name="org_mattack" val="211.31" />
+				<set name="org_mdefend" val="69.2" />
+				<set name="org_hp" val="4208.17" />
+				<set name="org_mp" val="1440" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="85">
+				<set name="max_meal" val="32575" />
+				<set name="exp" val="272091230951" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="272" />
+				<set name="consume_meal_in_normal" val="54" />
+				<set name="org_pattack" val="324.48" />
+				<set name="org_pdefend" val="156.6" />
+				<set name="org_mattack" val="212.53" />
+				<set name="org_mdefend" val="69.6" />
+				<set name="org_hp" val="4334.41" />
+				<set name="org_mp" val="1483.2" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="86">
+				<set name="max_meal" val="33227" />
+				<set name="exp" val="403093979383" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="277" />
+				<set name="consume_meal_in_normal" val="55" />
+				<set name="org_pattack" val="326.34" />
+				<set name="org_pdefend" val="157.5" />
+				<set name="org_mattack" val="213.75" />
+				<set name="org_mdefend" val="70" />
+				<set name="org_hp" val="4464.44" />
+				<set name="org_mp" val="1527.69" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="87">
+				<set name="max_meal" val="33892" />
+				<set name="exp" val="599598102032" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="283" />
+				<set name="consume_meal_in_normal" val="57" />
+				<set name="org_pattack" val="328.2" />
+				<set name="org_pdefend" val="158.4" />
+				<set name="org_mattack" val="214.97" />
+				<set name="org_mdefend" val="70.4" />
+				<set name="org_hp" val="4598.37" />
+				<set name="org_mp" val="1573.52" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="88">
+				<set name="max_meal" val="34570" />
+				<set name="exp" val="953305522799" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="288" />
+				<set name="consume_meal_in_normal" val="58" />
+				<set name="org_pattack" val="330.07" />
+				<set name="org_pdefend" val="159.3" />
+				<set name="org_mattack" val="216.2" />
+				<set name="org_mdefend" val="70.8" />
+				<set name="org_hp" val="4736.32" />
+				<set name="org_mp" val="1620.72" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="89">
+				<set name="max_meal" val="35261" />
+				<set name="exp" val="1660720364334" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="294" />
+				<set name="consume_meal_in_normal" val="59" />
+				<set name="org_pattack" val="331.93" />
+				<set name="org_pdefend" val="160.2" />
+				<set name="org_mattack" val="217.42" />
+				<set name="org_mdefend" val="71.2" />
+				<set name="org_hp" val="4878.4" />
+				<set name="org_mp" val="1669.34" />
+				<set name="org_hp_regen" val="6" />
+				<set name="org_mp_regen" val="3.3" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="90">
+				<set name="max_meal" val="35966" />
+				<set name="exp" val="3775890740522" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="300" />
+				<set name="consume_meal_in_normal" val="60" />
+				<set name="org_pattack" val="333.8" />
+				<set name="org_pdefend" val="161.1" />
+				<set name="org_mattack" val="218.64" />
+				<set name="org_mdefend" val="71.6" />
+				<set name="org_hp" val="5024.75" />
+				<set name="org_mp" val="1719.42" />
+				<set name="org_hp_regen" val="7" />
+				<set name="org_mp_regen" val="3.6" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="91">
+				<set name="max_meal" val="36685" />
+				<set name="exp" val="14351742621463" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="306" />
+				<set name="consume_meal_in_normal" val="61" />
+				<set name="org_pattack" val="335.66" />
+				<set name="org_pdefend" val="162" />
+				<set name="org_mattack" val="219.86" />
+				<set name="org_mdefend" val="72" />
+				<set name="org_hp" val="5175.49" />
+				<set name="org_mp" val="1771" />
+				<set name="org_hp_regen" val="7.1" />
+				<set name="org_mp_regen" val="3.63" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="92">
+				<set name="max_meal" val="37419" />
+				<set name="exp" val="60885490897603" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="312" />
+				<set name="consume_meal_in_normal" val="62" />
+				<set name="org_pattack" val="337.53" />
+				<set name="org_pdefend" val="162.9" />
+				<set name="org_mattack" val="221.08" />
+				<set name="org_mdefend" val="72.4" />
+				<set name="org_hp" val="5330.75" />
+				<set name="org_mp" val="1824.13" />
+				<set name="org_hp_regen" val="7.2" />
+				<set name="org_mp_regen" val="3.66" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="93">
+				<set name="max_meal" val="38167" />
+				<set name="exp" val="265633983312619" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="318" />
+				<set name="consume_meal_in_normal" val="64" />
+				<set name="org_pattack" val="339.39" />
+				<set name="org_pdefend" val="163.8" />
+				<set name="org_mattack" val="222.3" />
+				<set name="org_mdefend" val="72.8" />
+				<set name="org_hp" val="5490.67" />
+				<set name="org_mp" val="1878.85" />
+				<set name="org_hp_regen" val="7.3" />
+				<set name="org_mp_regen" val="3.69" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="94">
+				<set name="max_meal" val="38930" />
+				<set name="exp" val="1166527349938690" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="325" />
+				<set name="consume_meal_in_normal" val="65" />
+				<set name="org_pattack" val="341.26" />
+				<set name="org_pdefend" val="164.7" />
+				<set name="org_mattack" val="223.52" />
+				<set name="org_mdefend" val="73.2" />
+				<set name="org_hp" val="5655.39" />
+				<set name="org_mp" val="1935.21" />
+				<set name="org_hp_regen" val="7.4" />
+				<set name="org_mp_regen" val="3.72" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="95">
+				<set name="max_meal" val="39709" />
+				<set name="exp" val="5130458163093410" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="331" />
+				<set name="consume_meal_in_normal" val="66" />
+				<set name="org_pattack" val="343.12" />
+				<set name="org_pdefend" val="165.6" />
+				<set name="org_mattack" val="224.75" />
+				<set name="org_mdefend" val="73.6" />
+				<set name="org_hp" val="5825.05" />
+				<set name="org_mp" val="1993.26" />
+				<set name="org_hp_regen" val="7.5" />
+				<set name="org_mp_regen" val="3.75" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="96">
+				<set name="max_meal" val="40503" />
+				<set name="exp" val="28914043042021700" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="338" />
+				<set name="consume_meal_in_normal" val="68" />
+				<set name="org_pattack" val="344.99" />
+				<set name="org_pdefend" val="166.5" />
+				<set name="org_mattack" val="225.97" />
+				<set name="org_mdefend" val="74" />
+				<set name="org_hp" val="5999.8" />
+				<set name="org_mp" val="2053.05" />
+				<set name="org_hp_regen" val="7.6" />
+				<set name="org_mp_regen" val="3.78" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="97">
+				<set name="max_meal" val="41313" />
+				<set name="exp" val="143075250460878000" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="345" />
+				<set name="consume_meal_in_normal" val="69" />
+				<set name="org_pattack" val="346.85" />
+				<set name="org_pdefend" val="167.4" />
+				<set name="org_mattack" val="227.19" />
+				<set name="org_mdefend" val="74.4" />
+				<set name="org_hp" val="6179.79" />
+				<set name="org_mp" val="2114.64" />
+				<set name="org_hp_regen" val="7.7" />
+				<set name="org_mp_regen" val="3.81" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="98">
+				<set name="max_meal" val="42139" />
+				<set name="exp" val="691049046071386000" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="351" />
+				<set name="consume_meal_in_normal" val="70" />
+				<set name="org_pattack" val="348.72" />
+				<set name="org_pdefend" val="168.3" />
+				<set name="org_mattack" val="228.41" />
+				<set name="org_mdefend" val="74.8" />
+				<set name="org_hp" val="6365.18" />
+				<set name="org_mp" val="2178.07" />
+				<set name="org_hp_regen" val="7.8" />
+				<set name="org_mp_regen" val="3.84" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="99">
+				<set name="max_meal" val="42982" />
+				<set name="exp" val="3321323265001830000" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="358" />
+				<set name="consume_meal_in_normal" val="72" />
+				<set name="org_pattack" val="350.58" />
+				<set name="org_pdefend" val="169.2" />
+				<set name="org_mattack" val="229.63" />
+				<set name="org_mdefend" val="75.2" />
+				<set name="org_hp" val="6556.13" />
+				<set name="org_mp" val="2243.41" />
+				<set name="org_hp_regen" val="7.9" />
+				<set name="org_mp_regen" val="3.87" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+			<stat level="100">
+				<set name="max_meal" val="43842" />
+				<set name="exp" val="3321323265001870000" />
+				<set name="get_exp_type" val="65" />
+				<set name="consume_meal_in_battle" val="366" />
+				<set name="consume_meal_in_normal" val="73" />
+				<set name="org_pattack" val="500" />
+				<set name="org_pdefend" val="500" />
+				<set name="org_mattack" val="500" />
+				<set name="org_mdefend" val="500" />
+				<set name="org_hp" val="6752.81" />
+				<set name="org_mp" val="2310.71" />
+				<set name="org_hp_regen" val="8.5" />
+				<set name="org_mp_regen" val="4" />
+				<set name="soulshot_count" val="2" />
+				<set name="spiritshot_count" val="2" />
+			</stat>
+		</stats>
+	</pet>
+</pets>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/01800-01899.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/01800-01899.xml
index f89271b95e..02ac7645f0 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/01800-01899.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/01800-01899.xml
@@ -1318,6 +1318,7 @@
 			<value level="1">1</value>
 			<value level="2">2</value>
 			<value level="3">3</value>
+			<value level="4">4</value>
 		</abnormalLevel>
 		<abnormalTime>3</abnormalTime>
 		<abnormalType>KNOCKDOWN</abnormalType>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/39100-39199.xml
index 6edd99a281..f24e72a5f4 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/39100-39199.xml
@@ -57,7 +57,19 @@
 	</skill>
 	<skill id="39103" toLevel="1" name="Hero's HP Recovery Potion">
 		<icon>icon.etc_reagent_white_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<amount>500</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39104" toLevel="1" name="Hero's Cube - 7 d.">
 		<icon>icon.sa_cube</icon>
@@ -2493,6 +2505,59 @@
 	</skill>
 	<skill id="39199" toLevel="1" name="Hero's Wondrous Cube - 7 d.">
 		<icon>icon.sa_cube</icon>
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<reuseDelay>-1</reuseDelay>
+		<hitTime>500</hitTime>
+		<coolTime>500</coolTime>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpEncumbered">
+				<weightPercent>20</weightPercent>
+				<slotsPercent>10</slotsPercent>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="RestorationRandom">
+				<items>
+					<item chance="16">
+						<item id="49487" count="2"/> <!-- Soulshot Ticket -->
+					</item>
+					<item chance="4">
+						<item id="49772" count="1"/> <!-- Scroll of Mood Melody -->
+					</item>
+					<item chance="16.49">
+						<item id="49488" count="5"/> <!-- Major Healing Potion -->
+					</item>
+					<item chance="20">
+						<item id="35669" count="1"/> <!-- Angel Cat's Blessing -->
+					</item>
+					<item chance="5">
+						<item id="49533" count="1"/> <!-- Quick Hero Healing Potion -->
+					</item>
+					<item chance="10">
+						<item id="49542" count="1"/> <!-- Improved Scroll of Resurrection -->
+					</item>
+					<item chance="14.5">
+						<item id="49536" count="1"/> <!-- Box of Scroll of Escape to the Base -->
+					</item>
+					<item chance="2">
+						<item id="49489" count="3"/> <!-- Parts of Enchantment Scrolls Chest -->
+					</item>
+					<item chance="10">
+						<item id="49416" count="1"/> <!-- Blade Spirit -->
+					</item>
+					<item chance="0.01">
+						<item id="49859" count="1"/> <!-- Weapon Exchange Coupon -->
+					</item>
+					<item chance="2">
+						<item id="49490" count="1"/> <!-- Fishing Kit -->
+					</item>
+				</items>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/39200-39299.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/39200-39299.xml
index 18443f9ebc..bd7bd85859 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/39200-39299.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/39200-39299.xml
@@ -2064,7 +2064,7 @@
 		<abnormalTime>1200</abnormalTime>
 		<abnormalLevel>
 			<value level="1">1</value>
-			<value level="1">2</value>
+			<value level="2">2</value>
 		</abnormalLevel>
 		<isMagic>4</isMagic>
 		<reuseDelay>60000</reuseDelay>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/39300-39399.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/39300-39399.xml
index 87c7313e0c..4a0928359b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/39300-39399.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/39300-39399.xml
@@ -532,14 +532,14 @@
 			</effect>
 		</effects>
 	</skill>
-	<skill id="39325" toLevel="3" name="Arcane Deliverance">
+	<skill id="39325" toLevel="1" name="Arcane Deliverance">
 		<!-- Recovers HP/ MP/ CP after an attack. (Triggers when Max HP is at 20% or lower.). (Cooldown: 300 sec.) -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
 		<hitTime>500</hitTime>
 		<reuseDelay>900000</reuseDelay>
 	</skill>
-	<skill id="39326" toLevel="3" name="Arcane Speed">
+	<skill id="39326" toLevel="1" name="Arcane Speed">
 		<!-- Temporarily increases Speed, Atk. Spd. and Casting Spd. after an attack. (Cooldown: 300 sec.) -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -547,7 +547,7 @@
 		<reuseDelay>900000</reuseDelay>
 		<effectPoint>100</effectPoint>
 	</skill>
-	<skill id="39327" toLevel="3" name="Arcane Barrier">
+	<skill id="39327" toLevel="1" name="Arcane Barrier">
 		<!-- Creates a time-limited barrier when hit. (Cooldown: 300 sec.) -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -555,7 +555,7 @@
 		<reuseDelay>900000</reuseDelay>
 		<effectPoint>100</effectPoint>
 	</skill>
-	<skill id="39328" toLevel="3" name="Arcane Immunity">
+	<skill id="39328" toLevel="1" name="Arcane Immunity">
 		<!-- Temporarily grants immunity to debuffs and anomalies when hit. (Cooldown: 300 sec.) -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -563,7 +563,7 @@
 		<reuseDelay>600000</reuseDelay>
 		<effectPoint>100</effectPoint>
 	</skill>
-	<skill id="39329" toLevel="3" name="Arcane Protection">
+	<skill id="39329" toLevel="1" name="Arcane Protection">
 		<!-- Temporarily increases P./ M. Def. when hit. (Cooldown: 300 sec.) -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -571,7 +571,7 @@
 		<reuseDelay>600000</reuseDelay>
 		<effectPoint>100</effectPoint>
 	</skill>
-	<skill id="39330" toLevel="3" name="Arcane Paralysis">
+	<skill id="39330" toLevel="1" name="Arcane Paralysis">
 		<!-- Temporarily paralyzes the enemy after an attack. (Cooldown: 300 sec.) -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -582,7 +582,7 @@
 		<reuseDelay>300000</reuseDelay>
 		<effectPoint>-100</effectPoint>
 	</skill>
-	<skill id="39331" toLevel="3" name="Arcane Silence">
+	<skill id="39331" toLevel="1" name="Arcane Silence">
 		<!-- Temporarily inflicts Silence on the enemy after an attack. (Cooldown: 300 sec.) -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -593,7 +593,7 @@
 		<reuseDelay>300000</reuseDelay>
 		<effectPoint>-100</effectPoint>
 	</skill>
-	<skill id="39332" toLevel="3" name="Arcane Critical Sense">
+	<skill id="39332" toLevel="1" name="Arcane Critical Sense">
 		<!-- All Critical Rate +3%. All Critical Damage +150 -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
@@ -604,7 +604,7 @@
 		<effectPoint>-671</effectPoint>
 		<mpConsume>43</mpConsume>
 	</skill>
-	<skill id="39333" toLevel="3" name="Arcane Power">
+	<skill id="39333" toLevel="1" name="Arcane Power">
 		<!-- P. Atk. +350. M. Atk. +500 -->
 		<icon>icon.etc_wit_symbol_i01</icon>
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/40200-40299.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/40200-40299.xml
index d0528393dc..ac9352c483 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/40200-40299.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/40200-40299.xml
@@ -620,11 +620,14 @@
 		<itemConsumeCount>1</itemConsumeCount>
 		<itemConsumeId>94480</itemConsumeId>
 		<magicCriticalRate>5</magicCriticalRate>
-		<hitCancelTime>0</hitCancelTime>
-		<magicLevel>1</magicLevel>
 		<reuseDelay>5</reuseDelay>
 		<targetType>PET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="GivePetXp">
+				<xp>100000000</xp>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="40239" toLevel="1" name="Pet Buff Scroll">
 		<!-- Max HP +1000. P. Def. +300. M. Def. +300. HP Recovery Rate +10 -->
@@ -642,12 +645,14 @@
 		<operateType>A1</operateType>
 		<itemConsumeCount>1</itemConsumeCount>
 		<itemConsumeId>94517</itemConsumeId>
-		<magicCriticalRate>5</magicCriticalRate>
-		<hitCancelTime>0</hitCancelTime>
-		<magicLevel>1</magicLevel>
 		<reuseDelay>5</reuseDelay>
 		<targetType>PET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="GivePetXp">
+				<xp>2000000000</xp>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="40242" toLevel="1" name="Sayha's Blessing Scroll">
 		<icon>icon.skill0000</icon>
@@ -836,6 +841,16 @@
 		<!-- Pet XP +1,000,000. -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>94635</itemConsumeId>
+		<reuseDelay>5</reuseDelay>
+		<targetType>PET</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="GivePetXp">
+				<xp>1000000</xp>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="40251" toLevel="1" name="Pet's XP Growth Scroll">
 		<!-- Pet's XP +30%. Removed when your pet dies or is unsummoned. -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/45100-45199.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/45100-45199.xml
index 677f06a52d..2f71ecc947 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/45100-45199.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/45100-45199.xml
@@ -4805,10 +4805,11 @@
 	<skill id="45198" toLevel="2" name="Grand Master's Transcendent Blessing">
 		<!-- Grand Master's power has pushed you beyond the limits of your class. HP Recovery Potions' Effect +50. With a certain chance, absorbs 3% of the inflicted damage as MP. Note!. You can't consume Light Souls and Shadow Souls. -->
 		<icon>icon.skill_kamael_shadowside</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
 		<abnormalLevel>1</abnormalLevel>
 		<abnormalTime>600</abnormalTime>
-		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<abnormalType>KAMAEL_TRANSFORM</abnormalType>
+		<abnormalVisualEffect>KAMAEL_BLACK_TRANSFORM;LONG_RAPIER_BLACK_AVE;BLACK_STANCE_AVE</abnormalVisualEffect>
 		<isMagic>4</isMagic>
 		<magicLevel>
 			<value level="1">20</value>
@@ -4816,9 +4817,21 @@
 		</magicLevel>
 		<operateType>A2</operateType>
 		<effectPoint>1</effectPoint>
-		<abnormalVisualEffect>U_ER_WI_WINDHIDE_AVE</abnormalVisualEffect>
 		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="BlockAbnormalSlot">
+				<slot>TRANSFORM</slot>
+			</effect>
+			<effect name="AdditionalPotionHp">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MpVampiricAttack">
+				<amount>3</amount>
+				<chance>50</chance>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="45199" toLevel="24" name="Transcendent Power Strike">
 		<!-- The character prepares for making a destructive blow. Attacks the enemy with 45 power. The skill can be used only in the transcendent instance zones. -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/47000-47099.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/47000-47099.xml
index 96e334db6e..6b128de90d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/47000-47099.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/47000-47099.xml
@@ -2142,6 +2142,7 @@
 			<value level="1">1</value>
 			<value level="2">2</value>
 			<value level="3">3</value>
+			<value level="4">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalLevel>
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>CHEAP_MAGIC</abnormalType>
@@ -2153,6 +2154,7 @@
 			<value level="1">20</value>
 			<value level="2">30</value>
 			<value level="3">40</value>
+			<value level="4">40</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</magicLevel>
 		<itemConsumeCount>3</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
@@ -2168,6 +2170,7 @@
 					<value level="1">-10</value>
 					<value level="2">-15</value>
 					<value level="3">-20</value>
+					<value level="4">-20</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 				</amount>
 				<mode>PER</mode>
 				<magicType>0</magicType>
@@ -2177,6 +2180,7 @@
 					<value level="1">-4</value>
 					<value level="2">-7</value>
 					<value level="3">-10</value>
+					<value level="4">-10</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 				</amount>
 				<mode>PER</mode>
 				<magicType>1</magicType>
@@ -2186,6 +2190,7 @@
 					<value level="1">-10</value>
 					<value level="2">-15</value>
 					<value level="3">-20</value>
+					<value level="4">-20</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 				</amount>
 				<mode>PER</mode>
 				<magicType>3</magicType>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/47200-47299.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/47200-47299.xml
index d5fc60c64c..0abc834edc 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/47200-47299.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/47200-47299.xml
@@ -1957,38 +1957,7 @@
 	</skill>
 	<skill id="47260" toLevel="3" name="Divine Recovery">
 		<icon>icon.s_saint_recovery</icon>
-		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
-		<magicLevel>76</magicLevel>
-		<effects>
-			<effect name="TriggerSkillByKill">
-				<!-- HP Drain -->
-				<chance>100</chance>
-				<skillId>47261</skillId> <!-- Divine Recovery -->
-				<skillLevel>
-					<value level="1">1</value>
-					<value level="2">2</value>
-					<value level="3">3</value>
-				</skillLevel>
-			</effect>
-			<effect name="TriggerSkillByKill">
-				<!-- HP Drain -->
-				<chance>100</chance>
-				<skillId>47262</skillId> <!-- Divine Recovery -->
-				<skillLevel>
-					<value level="1">1</value>
-					<value level="2">2</value>
-					<value level="3">3</value>
-				</skillLevel>
-			</effect>
-		</effects>
-	</skill>
-	<skill id="47261" toLevel="3" name="Divine Recovery">
-		<!-- Consumes the target's soul and recovers MP. (Trigger cooldown: 10 sec.). Recovers 96 MP after killing monsters. Recovers 768 MP after killing characters. -->
-		<icon>icon.s_saint_recovery</icon>
-		<castRange>600</castRange>
-		<effectRange>1100</effectRange>
-		<isMagic>1</isMagic> <!-- Magic Skill -->
+		<isTriggeredSkill>true</isTriggeredSkill>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
@@ -2003,10 +1972,35 @@
 			</effect>
 		</effects>
 	</skill>
+	<skill id="47261" toLevel="3" name="Divine Recovery">
+		<!-- Consumes the target's soul and recovers MP. (Trigger cooldown: 10 sec.) Recovers $s1 MP after killing monsters. Recovers $s2 MP after killing characters. -->
+		<icon>icon.s_saint_recovery</icon>
+		<operateType>P</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>76</magicLevel>
+		<effects>
+			<effect name="TriggerSkillByKill">
+				<chance>100</chance>
+				<skillId>47260</skillId> <!-- Divine Recovery -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+				</skillLevel>
+			</effect>
+			<effect name="TriggerSkillByKill">
+				<chance>100</chance>
+				<skillId>47262</skillId> <!-- Divine Recovery -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+				</skillLevel>
+			</effect>
+		</effects>
+	</skill>
 	<skill id="47262" toLevel="3" name="Divine Recovery">
 		<icon>icon.s_saint_recovery</icon>
-		<castRange>600</castRange>
-		<effectRange>1100</effectRange>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<operateType>A1</operateType>
 		<reuseDelay>60000</reuseDelay>
@@ -4140,7 +4134,7 @@
 				<attackerType>Creature</attackerType>
 				<minDamage>1</minDamage>
 				<chance>20</chance>
-				<targetType>TARGET</targetType>
+				<targetType>SELF</targetType>
 				<isCritical>false</isCritical>
 				<allowWeapons>ALL</allowWeapons>
 				<skillId>53007</skillId> <!-- Power Stance -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/47400-47499.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/47400-47499.xml
index 452aeefdbc..0856f096bd 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/47400-47499.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/47400-47499.xml
@@ -1084,6 +1084,11 @@
 					<value toLevel="1" fromLevel="1" toSubLevel="1003" fromSubLevel="1003">3047418</value>
 				</skillId>
 				<skillLevel>1</skillLevel>
+				<skillSubLevel>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">1001</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1002" toSubLevel="1002">1002</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">1003</value>
+				</skillSubLevel>
 				<min>0</min>
 				<max>64</max>
 			</effect>
@@ -1096,6 +1101,11 @@
 					<value toLevel="1" fromLevel="1" toSubLevel="1003" fromSubLevel="1003">3047419</value>
 				</skillId>
 				<skillLevel>1</skillLevel>
+				<skillSubLevel>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">1001</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1002" toSubLevel="1002">1002</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">1003</value>
+				</skillSubLevel>
 				<min>65</min>
 				<max>74</max>
 			</effect>
@@ -1108,6 +1118,11 @@
 					<value toLevel="1" fromLevel="1" toSubLevel="1003" fromSubLevel="1003">3047420</value>
 				</skillId>
 				<skillLevel>1</skillLevel>
+				<skillSubLevel>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">1001</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1002" toSubLevel="1002">1002</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">1003</value>
+				</skillSubLevel>
 				<min>75</min>
 				<max>84</max>
 			</effect>
@@ -1120,6 +1135,11 @@
 					<value toLevel="1" fromLevel="1" toSubLevel="1003" fromSubLevel="1003">3047421</value>
 				</skillId>
 				<skillLevel>1</skillLevel>
+				<skillSubLevel>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">1001</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1002" toSubLevel="1002">1002</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">1003</value>
+				</skillSubLevel>
 				<min>85</min>
 				<max>999</max>
 			</effect>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/50400-50499.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/50400-50499.xml
index f9046d7b98..85734214c3 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/50400-50499.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/50400-50499.xml
@@ -165,8 +165,12 @@
 				<amount>80</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxPhysicalCriticalRate">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>50</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
@@ -266,8 +270,12 @@
 				<amount>150</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxPhysicalCriticalRate">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>50</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
@@ -306,8 +314,6 @@
 		<!-- All Critical Damage +200. Increases Max Critical Rate. -->
 		<icon>icon.bless_effect_enchant</icon>
 		<operateType>P</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
-		<magicLevel>1</magicLevel>
 		<effects>
 			<effect name="CriticalDamage">
 				<amount>200</amount>
@@ -321,8 +327,12 @@
 				<amount>200</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="MaxMagicCriticalRate">
-				<amount>550</amount>
+			<effect name="AddMaxPhysicalCriticalRate">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>50</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/50500-50599.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/50500-50599.xml
index be1d04901b..a1355e326c 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/50500-50599.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/50500-50599.xml
@@ -4333,6 +4333,7 @@
 					<value level="9">28</value>
 					<value level="10">30</value>
 					<value level="10">32</value>
+					<value level="11">32</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -4639,7 +4640,7 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="AbsorbDamage">
+			<effect name="IgnoreReduceDamage">
 				<amount>
 					<value fromLevel="1" toLevel="2">0</value>
 					<value level="3">50</value>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/50600-50699.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/50600-50699.xml
index fc48ae87db..a40c7d1780 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/50600-50699.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/50600-50699.xml
@@ -1578,943 +1578,1914 @@
 	<skill id="50624" toLevel="6" name="Sword of Immortality">
 		<!-- A sword imbued with the power of immortality. <<font color="00FF00">Base effect</font>>. STR <font color="FFBB00">+5</font>. CON <font color="FFBB00">+5</font>. Soulshot damage <font color="FFBB00">+20%</font>. Spiritshot damage <font color="FFBB00">+20%</font>. <<font color="00FF00">Special effect</font>>. <font color="FF8000">Slash of Immortality</font>. Target: <font color="FF8000">area</font>. With a certain chance, attacks nearby targets. Trigger rate after a basic attack: <font color="FFBB00">2%</font>. Trigger rate after using skills: <font color="FFBB00">5%</font>. Fixed Damage Resistance: <font color="FFBB00">5000</font>. <font color="FF8000">Critical Rate Limit</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Max Critical Rate limit: <font color="FFBB00">50%</font>. All Critical Damage <font color="FFBB00">-1000</font>. <font color="FF8000">Critical Vulnerability Increase</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Skill Power when hit <font color="FFBB00">+5%</font> -->
 		<icon>icon.immortal_weapon_sword</icon>
-		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>0</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
-		<!--<effects>-->
-		<!--	<effect name="STR <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{5%}</font>">5%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{50%}</font>">50%</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{4%}</font>">4%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{12%}</font>">12%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{10000}</font>">10000</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-5000}</font>">-5000</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+10%}</font>">+10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{35%}</font>">35%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{30000}</font>">30000</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{45%}</font>">45%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{22000}</font>">22000</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{9%}</font>">9%</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+15%}</font>">+15%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{30%}</font>">30%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{2%}</font>">2%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{5000}</font>">5000</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+30%}</font>">+30%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-2000}</font>">-2000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1500}</font>">-1500</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{10%}</font>">10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{40%}</font>">40%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{15000}</font>">15000</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{16%}</font>">16%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+5%}</font>">+5%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-3000}</font>">-3000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1000}</font>">-1000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{8%}</font>">8%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{7%}</font>">7%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{3%}</font>">3%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+20%}</font>">+20%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{25%}</font>">25%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-4000}</font>">-4000</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{7000}</font>">7000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{6%}</font>">6%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+25%}</font>">+25%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{20%}</font>">20%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--</effects>-->
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>CON</stat>
+			</effect>
+			<effect name="ShotsBonus">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50643</skillId> <!-- Slash of Immortality -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50643</skillId> <!-- Slash of Immortality -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50643</skillId> <!-- Slash of Immortality -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50643</skillId> <!-- Slash of Immortality -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50625" toLevel="6" name="Axe of Immortality">
 		<!-- An axe imbued with the power of immortality. <<font color="00FF00">Base effect</font>>. STR <font color="FFBB00">+5</font>. CON <font color="FFBB00">+5</font>. Soulshot damage <font color="FFBB00">+20%</font>. Spiritshot damage <font color="FFBB00">+20%</font>. <<font color="00FF00">Special effect</font>>. <font color="FF8000">Slash of Immortality</font>. Target: <font color="FF8000">area</font>. With a certain chance, attacks nearby targets. Trigger rate after a basic attack: <font color="FFBB00">2%</font>. Trigger rate after using skills: <font color="FFBB00">5%</font>. Fixed Damage Resistance: <font color="FFBB00">5000</font>. <font color="FF8000">Critical Rate Limit</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Max Critical Rate limit: <font color="FFBB00">50%</font>. All Critical Damage <font color="FFBB00">-1000</font>. <font color="FF8000">Critical Vulnerability Increase</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Skill Power when hit <font color="FFBB00">+5%</font> -->
 		<icon>icon.immortal_weapon_blunt</icon>
-		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>0</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
-		<!--<effects>-->
-		<!--	<effect name="STR <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{5%}</font>">5%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{50%}</font>">50%</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{4%}</font>">4%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{12%}</font>">12%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{10000}</font>">10000</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-5000}</font>">-5000</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+10%}</font>">+10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{35%}</font>">35%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{30000}</font>">30000</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{45%}</font>">45%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{22000}</font>">22000</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{9%}</font>">9%</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+15%}</font>">+15%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{30%}</font>">30%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{2%}</font>">2%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{5000}</font>">5000</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+30%}</font>">+30%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-2000}</font>">-2000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1500}</font>">-1500</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{10%}</font>">10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{40%}</font>">40%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{15000}</font>">15000</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{16%}</font>">16%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+5%}</font>">+5%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-3000}</font>">-3000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1000}</font>">-1000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{8%}</font>">8%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{7%}</font>">7%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{3%}</font>">3%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+20%}</font>">+20%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{25%}</font>">25%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-4000}</font>">-4000</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{7000}</font>">7000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{6%}</font>">6%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+25%}</font>">+25%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{20%}</font>">20%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--</effects>-->
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>CON</stat>
+			</effect>
+			<effect name="ShotsBonus">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50643</skillId> <!-- Slash of Immortality -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50643</skillId> <!-- Slash of Immortality -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50643</skillId> <!-- Slash of Immortality -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50643</skillId> <!-- Slash of Immortality -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50626" toLevel="6" name="Two-handed Sword of Immortality">
 		<!-- A two-handed sword imbued with the power of immortality. <<font color="00FF00">Base effect</font>>. STR <font color="FFBB00">+5</font>. DEX <font color="FFBB00">+5</font>. Soulshot damage <font color="FFBB00">+20%</font>. Spiritshot damage <font color="FFBB00">+20%</font>. <<font color="00FF00">Special effect</font>>. <font color="FF8000">Hurricane Smash</font>. Target: <font color="FF8000">area</font>. With a certain chance, attacks nearby targets. Trigger rate after a basic attack: <font color="FFBB00">2%</font>. Trigger rate after using skills: <font color="FFBB00">5%</font>. Fixed Damage Resistance: <font color="FFBB00">5000</font>. <font color="FF8000">Critical Rate Limit</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Max Critical Rate limit: <font color="FFBB00">50%</font>. All Critical Damage <font color="FFBB00">-1000</font>. <font color="FF8000">Critical Vulnerability Increase</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Skill Power when hit <font color="FFBB00">+5%</font> -->
 		<icon>icon.immortal_weapon_two_hand_sword</icon>
-		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>0</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
-		<!--<effects>-->
-		<!--	<effect name="STR <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{5%}</font>">5%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{50%}</font>">50%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{4%}</font>">4%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{12%}</font>">12%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{10000}</font>">10000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-5000}</font>">-5000</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+10%}</font>">+10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{35%}</font>">35%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{30000}</font>">30000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{45%}</font>">45%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{22000}</font>">22000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{9%}</font>">9%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+15%}</font>">+15%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{30%}</font>">30%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{2%}</font>">2%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{5000}</font>">5000</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+30%}</font>">+30%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-2000}</font>">-2000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1500}</font>">-1500</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{10%}</font>">10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{40%}</font>">40%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{15000}</font>">15000</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{16%}</font>">16%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+5%}</font>">+5%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-3000}</font>">-3000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1000}</font>">-1000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{8%}</font>">8%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{7%}</font>">7%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{3%}</font>">3%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+20%}</font>">+20%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{25%}</font>">25%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-4000}</font>">-4000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{7000}</font>">7000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{6%}</font>">6%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+25%}</font>">+25%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{20%}</font>">20%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--</effects>-->
-	</skill><skill id="50628" toLevel="6" name="Ancient Sword of Immortality">
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="ShotsBonus">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50645</skillId> <!-- Hurricane Smash -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50645</skillId> <!-- Hurricane Smash -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50645</skillId> <!-- Hurricane Smash -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50645</skillId> <!-- Hurricane Smash -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+		</effects>
+	</skill>
+	<skill id="50628" toLevel="6" name="Ancient Sword of Immortality">
 		<!-- An ancient sword imbued with the power of immortality. <<font color="00FF00">Base effect</font>>. STR <font color="FFBB00">+5</font>. DEX <font color="FFBB00">+5</font>. Soulshot damage <font color="FFBB00">+20%</font>. Spiritshot damage <font color="FFBB00">+20%</font>. <<font color="00FF00">Special effect</font>>. <font color="FF8000">Hurricane Smash</font>. Target: <font color="FF8000">area</font>. With a certain chance, attacks nearby targets. Trigger rate after a basic attack: <font color="FFBB00">2%</font>. Trigger rate after using skills: <font color="FFBB00">5%</font>. Fixed Damage Resistance: <font color="FFBB00">5000</font>. <font color="FF8000">Critical Rate Limit</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Max Critical Rate limit: <font color="FFBB00">50%</font>. All Critical Damage <font color="FFBB00">-1000</font>. <font color="FF8000">Critical Vulnerability Increase</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Skill Power when hit <font color="FFBB00">+5%</font> -->
 		<icon>icon.immortal_weapon_ancientsword</icon>
-		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>0</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
-		<!--<effects>-->
-		<!--	<effect name="STR <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{5%}</font>">5%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{50%}</font>">50%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{4%}</font>">4%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{12%}</font>">12%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{10000}</font>">10000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-5000}</font>">-5000</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+10%}</font>">+10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{35%}</font>">35%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{30000}</font>">30000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{45%}</font>">45%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{22000}</font>">22000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{9%}</font>">9%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+15%}</font>">+15%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{30%}</font>">30%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{2%}</font>">2%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{5000}</font>">5000</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+30%}</font>">+30%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-2000}</font>">-2000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1500}</font>">-1500</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{10%}</font>">10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{40%}</font>">40%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{15000}</font>">15000</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{16%}</font>">16%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+5%}</font>">+5%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-3000}</font>">-3000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1000}</font>">-1000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{8%}</font>">8%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{7%}</font>">7%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{3%}</font>">3%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+20%}</font>">+20%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{25%}</font>">25%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-4000}</font>">-4000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{7000}</font>">7000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{6%}</font>">6%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+25%}</font>">+25%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{20%}</font>">20%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--</effects>-->
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="ShotsBonus">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50645</skillId> <!-- Hurricane Smash -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50645</skillId> <!-- Hurricane Smash -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50645</skillId> <!-- Hurricane Smash -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50645</skillId> <!-- Hurricane Smash -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50629" toLevel="6" name="Dual Swords of Immortality">
 		<!-- Dual swords imbued with the power of immortality. <<font color="00FF00">Base effect</font>>. STR <font color="FFBB00">+5</font>. DEX <font color="FFBB00">+5</font>. Soulshot damage <font color="FFBB00">+20%</font>. Spiritshot damage <font color="FFBB00">+20%</font>. <<font color="00FF00">Special effect</font>>. <font color="FF8000">Dual Execution</font>. Target: <font color="FF8000">area</font>. With a certain chance, attacks nearby targets. Trigger rate after a basic attack: <font color="FFBB00">2%</font>. Trigger rate after using skills: <font color="FFBB00">5%</font>. Fixed Damage Resistance: <font color="FFBB00">5000</font>. <font color="FF8000">Critical Rate Limit</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Max Critical Rate limit: <font color="FFBB00">50%</font>. All Critical Damage <font color="FFBB00">-1000</font>. <font color="FF8000">Critical Vulnerability Increase</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Skill Power when hit <font color="FFBB00">+5%</font> -->
 		<icon>icon.immortal_weapon_dual_sword</icon>
-		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>0</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
-		<!--<effects>-->
-		<!--	<effect name="STR <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{5%}</font>">5%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{50%}</font>">50%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{4%}</font>">4%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{12%}</font>">12%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{10000}</font>">10000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-5000}</font>">-5000</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+10%}</font>">+10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{35%}</font>">35%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{30000}</font>">30000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{45%}</font>">45%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{22000}</font>">22000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{9%}</font>">9%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+15%}</font>">+15%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{30%}</font>">30%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{2%}</font>">2%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{5000}</font>">5000</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+30%}</font>">+30%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-2000}</font>">-2000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1500}</font>">-1500</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{10%}</font>">10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{40%}</font>">40%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{15000}</font>">15000</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{16%}</font>">16%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+5%}</font>">+5%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-3000}</font>">-3000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1000}</font>">-1000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{8%}</font>">8%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{7%}</font>">7%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{3%}</font>">3%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+20%}</font>">+20%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{25%}</font>">25%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-4000}</font>">-4000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{7000}</font>">7000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{6%}</font>">6%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+25%}</font>">+25%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{20%}</font>">20%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--</effects>-->
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="ShotsBonus">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50647</skillId> <!-- Dual Execution -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50647</skillId> <!-- Dual Execution -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50647</skillId> <!-- Dual Execution -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50647</skillId> <!-- Dual Execution -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50630" toLevel="6" name="Flame Fists of Immortality">
 		<!-- Fists imbued with the power of immortality. <<font color="00FF00">Base effect</font>>. STR <font color="FFBB00">+5</font>. DEX <font color="FFBB00">+5</font>. Soulshot damage <font color="FFBB00">+20%</font>. Spiritshot damage <font color="FFBB00">+20%</font>. <<font color="00FF00">Special effect</font>>. <font color="FF8000">Dual Execution</font>. Target: <font color="FF8000">area</font>. With a certain chance, attacks nearby targets. Trigger rate after a basic attack: <font color="FFBB00">2%</font>. Trigger rate after using skills: <font color="FFBB00">5%</font>. Fixed Damage Resistance: <font color="FFBB00">5000</font>. <font color="FF8000">Critical Rate Limit</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Max Critical Rate limit: <font color="FFBB00">50%</font>. All Critical Damage <font color="FFBB00">-1000</font>. <font color="FF8000">Critical Vulnerability Increase</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Skill Power when hit <font color="FFBB00">+5%</font> -->
 		<icon>icon.immortal_weapon_dualfist</icon>
-		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>0</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
-		<!--<effects>-->
-		<!--	<effect name="STR <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{5%}</font>">5%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{50%}</font>">50%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{4%}</font>">4%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{12%}</font>">12%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{10000}</font>">10000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-5000}</font>">-5000</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+10%}</font>">+10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{35%}</font>">35%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{30000}</font>">30000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{45%}</font>">45%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{22000}</font>">22000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{9%}</font>">9%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+15%}</font>">+15%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{30%}</font>">30%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{2%}</font>">2%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{5000}</font>">5000</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+30%}</font>">+30%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-2000}</font>">-2000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1500}</font>">-1500</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{10%}</font>">10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{40%}</font>">40%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{15000}</font>">15000</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{16%}</font>">16%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+5%}</font>">+5%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-3000}</font>">-3000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1000}</font>">-1000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{8%}</font>">8%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{7%}</font>">7%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{3%}</font>">3%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+20%}</font>">+20%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{25%}</font>">25%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-4000}</font>">-4000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{7000}</font>">7000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{6%}</font>">6%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+25%}</font>">+25%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{20%}</font>">20%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--</effects>-->
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="ShotsBonus">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50647</skillId> <!-- Dual Execution -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50647</skillId> <!-- Dual Execution -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50647</skillId> <!-- Dual Execution -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50647</skillId> <!-- Dual Execution -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50631" toLevel="6" name="Spear of Immortality">
 		<!-- A spear imbued with the power of immortality. <<font color="00FF00">Base effect</font>>. STR <font color="FFBB00">+5</font>. CON <font color="FFBB00">+5</font>. Soulshot damage <font color="FFBB00">+20%</font>. Spiritshot damage <font color="FFBB00">+20%</font>. <<font color="00FF00">Special effect</font>>. <font color="FF8000">Hurricane Smash</font>. Target: <font color="FF8000">area</font>. With a certain chance, attacks nearby targets. Trigger rate after a basic attack: <font color="FFBB00">2%</font>. Trigger rate after using skills: <font color="FFBB00">5%</font>. Fixed Damage Resistance: <font color="FFBB00">5000</font>. <font color="FF8000">Critical Rate Limit</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Max Critical Rate limit: <font color="FFBB00">50%</font>. All Critical Damage <font color="FFBB00">-1000</font>. <font color="FF8000">Critical Vulnerability Increase</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Skill Power when hit <font color="FFBB00">+5%</font> -->
 		<icon>icon.immortal_weapon_pole</icon>
-		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>0</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
-		<!--<effects>-->
-		<!--	<effect name="STR <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{5%}</font>">5%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{50%}</font>">50%</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{4%}</font>">4%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{12%}</font>">12%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{10000}</font>">10000</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-5000}</font>">-5000</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+10%}</font>">+10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{35%}</font>">35%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{30000}</font>">30000</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{45%}</font>">45%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{22000}</font>">22000</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{9%}</font>">9%</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+15%}</font>">+15%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{30%}</font>">30%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{2%}</font>">2%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{5000}</font>">5000</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+30%}</font>">+30%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-2000}</font>">-2000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1500}</font>">-1500</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{10%}</font>">10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{40%}</font>">40%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{15000}</font>">15000</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{16%}</font>">16%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+5%}</font>">+5%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-3000}</font>">-3000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1000}</font>">-1000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{8%}</font>">8%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{7%}</font>">7%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{3%}</font>">3%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+20%}</font>">+20%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{25%}</font>">25%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-4000}</font>">-4000</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{7000}</font>">7000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{6%}</font>">6%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+25%}</font>">+25%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{20%}</font>">20%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--</effects>-->
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>CON</stat>
+			</effect>
+			<effect name="ShotsBonus">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50645</skillId> <!-- Hurricane Smash -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50645</skillId> <!-- Hurricane Smash -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50645</skillId> <!-- Hurricane Smash -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50645</skillId> <!-- Hurricane Smash -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50632" toLevel="6" name="Dagger of Immortality">
 		<!-- A dagger imbued with the power of immortality. <<font color="00FF00">Base effect</font>>. STR <font color="FFBB00">+5</font>. DEX <font color="FFBB00">+5</font>. Soulshot damage <font color="FFBB00">+20%</font>. Spiritshot damage <font color="FFBB00">+20%</font>. <<font color="00FF00">Special effect</font>>. <font color="FF8000">Slash of Immortality</font>. Target: <font color="FF8000">area</font>. With a certain chance, attacks nearby targets. Trigger rate after a basic attack: <font color="FFBB00">2%</font>. Trigger rate after using skills: <font color="FFBB00">5%</font>. Fixed Damage Resistance: <font color="FFBB00">5000</font>. <font color="FF8000">Critical Rate Limit</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Max Critical Rate limit: <font color="FFBB00">50%</font>. All Critical Damage <font color="FFBB00">-1000</font>. <font color="FF8000">Critical Vulnerability Increase</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Skill Power when hit <font color="FFBB00">+5%</font> -->
 		<icon>icon.immortal_weapon_dagger</icon>
-		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>0</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
-		<!--<effects>-->
-		<!--	<effect name="STR <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{5%}</font>">5%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{50%}</font>">50%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{4%}</font>">4%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{12%}</font>">12%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{10000}</font>">10000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-5000}</font>">-5000</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+10%}</font>">+10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{35%}</font>">35%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{30000}</font>">30000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{45%}</font>">45%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{22000}</font>">22000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{9%}</font>">9%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+15%}</font>">+15%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{30%}</font>">30%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{2%}</font>">2%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{5000}</font>">5000</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+30%}</font>">+30%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-2000}</font>">-2000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1500}</font>">-1500</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{10%}</font>">10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{40%}</font>">40%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{15000}</font>">15000</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{16%}</font>">16%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+5%}</font>">+5%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-3000}</font>">-3000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1000}</font>">-1000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{8%}</font>">8%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{7%}</font>">7%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{3%}</font>">3%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+20%}</font>">+20%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{25%}</font>">25%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-4000}</font>">-4000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{7000}</font>">7000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{6%}</font>">6%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+25%}</font>">+25%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{20%}</font>">20%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--</effects>-->
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="ShotsBonus">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50643</skillId> <!-- Slash of Immortality -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50643</skillId> <!-- Slash of Immortality -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50643</skillId> <!-- Slash of Immortality -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50643</skillId> <!-- Slash of Immortality -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50633" toLevel="6" name="Rapier of Immortality">
 		<!-- A rapier imbued with the power of immortality. <<font color="00FF00">Base effect</font>>. STR <font color="FFBB00">+5</font>. MEN <font color="FFBB00">+5</font>. Soulshot damage <font color="FFBB00">+20%</font>. Spiritshot damage <font color="FFBB00">+20%</font>. <<font color="00FF00">Special effect</font>>. <font color="FF8000">Slash of Immortality</font>. Target: <font color="FF8000">area</font>. With a certain chance, attacks nearby targets. Trigger rate after a basic attack: <font color="FFBB00">2%</font>. Trigger rate after using skills: <font color="FFBB00">5%</font>. Fixed Damage Resistance: <font color="FFBB00">5000</font>. <font color="FF8000">Critical Rate Limit</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Max Critical Rate limit: <font color="FFBB00">50%</font>. All Critical Damage <font color="FFBB00">-1000</font>. <font color="FF8000">Critical Vulnerability Increase</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Skill Power when hit <font color="FFBB00">+5%</font> -->
 		<icon>icon.immortal_weapon_rapier</icon>
-		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>0</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
-		<!--<effects>-->
-		<!--	<effect name="STR <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{5%}</font>">5%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{50%}</font>">50%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{4%}</font>">4%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{12%}</font>">12%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{10000}</font>">10000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-5000}</font>">-5000</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+10%}</font>">+10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{35%}</font>">35%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{30000}</font>">30000</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{45%}</font>">45%</effect>-->
-		<!--	<effect name="MEN <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{22000}</font>">22000</effect>-->
-		<!--	<effect name="MEN <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{9%}</font>">9%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+15%}</font>">+15%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{30%}</font>">30%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{2%}</font>">2%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{5000}</font>">5000</effect>-->
-		<!--	<effect name="MEN <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="MEN <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+30%}</font>">+30%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-2000}</font>">-2000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1500}</font>">-1500</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{10%}</font>">10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{40%}</font>">40%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{15000}</font>">15000</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{16%}</font>">16%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+5%}</font>">+5%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-3000}</font>">-3000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1000}</font>">-1000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{8%}</font>">8%</effect>-->
-		<!--	<effect name="MEN <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{7%}</font>">7%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{3%}</font>">3%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+20%}</font>">+20%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{25%}</font>">25%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-4000}</font>">-4000</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{7000}</font>">7000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{6%}</font>">6%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+25%}</font>">+25%</effect>-->
-		<!--	<effect name="MEN <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{20%}</font>">20%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--</effects>-->
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>MEN</stat>
+			</effect>
+			<effect name="ShotsBonus">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50643</skillId> <!-- Slash of Immortality -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50643</skillId> <!-- Slash of Immortality -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50643</skillId> <!-- Slash of Immortality -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50643</skillId> <!-- Slash of Immortality -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50634" toLevel="6" name="Magic Blunt Weapon of Immortality">
 		<!-- A magic blunt weapon imbued with the power of immortality. <<font color="00FF00">Base effect</font>>. INT <font color="FFBB00">+5</font>. WIT <font color="FFBB00">+5</font>. Soulshot damage <font color="FFBB00">+20%</font>. Spiritshot damage <font color="FFBB00">+20%</font>. <<font color="00FF00">Special effect</font>>. <font color="FF8000">Doom Lightning</font>. Target: <font color="FF8000">area</font>. With a certain chance, attacks nearby targets. Trigger rate after a basic attack: <font color="FFBB00">2%</font>. Trigger rate after using skills: <font color="FFBB00">5%</font>. Fixed Damage Resistance: <font color="FFBB00">5000</font>. <font color="FF8000">Critical Rate Limit</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Max Critical Rate limit: <font color="FFBB00">50%</font>. All Critical Damage <font color="FFBB00">-1000</font>. <font color="FF8000">Critical Vulnerability Increase</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Skill Power when hit <font color="FFBB00">+5%</font> -->
 		<icon>icon.immortal_weapon_staff</icon>
-		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>0</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
-		<!--<effects>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{5%}</font>">5%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{50%}</font>">50%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{4%}</font>">4%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{12%}</font>">12%</effect>-->
-		<!--	<effect name="WIT <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{10000}</font>">10000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-5000}</font>">-5000</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+10%}</font>">+10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{35%}</font>">35%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{30000}</font>">30000</effect>-->
-		<!--	<effect name="WIT <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{45%}</font>">45%</effect>-->
-		<!--	<effect name="WIT <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{22000}</font>">22000</effect>-->
-		<!--	<effect name="WIT <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{9%}</font>">9%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+15%}</font>">+15%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{30%}</font>">30%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{2%}</font>">2%</effect>-->
-		<!--	<effect name="WIT <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{5000}</font>">5000</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+30%}</font>">+30%</effect>-->
-		<!--	<effect name="WIT <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-2000}</font>">-2000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1500}</font>">-1500</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{10%}</font>">10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{40%}</font>">40%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{15000}</font>">15000</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{16%}</font>">16%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+5%}</font>">+5%</effect>-->
-		<!--	<effect name="INT <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-3000}</font>">-3000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1000}</font>">-1000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{8%}</font>">8%</effect>-->
-		<!--	<effect name="INT <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="INT <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{7%}</font>">7%</effect>-->
-		<!--	<effect name="INT <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{3%}</font>">3%</effect>-->
-		<!--	<effect name="INT <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+20%}</font>">+20%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{25%}</font>">25%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-4000}</font>">-4000</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{7000}</font>">7000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{6%}</font>">6%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+25%}</font>">+25%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{20%}</font>">20%</effect>-->
-		<!--	<effect name="INT <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--</effects>-->
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>INT</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>WIT</stat>
+			</effect>
+			<effect name="ShotsBonus">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50651</skillId> <!-- Doom Lightning -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50651</skillId> <!-- Doom Lightning -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50651</skillId> <!-- Doom Lightning -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50651</skillId> <!-- Doom Lightning -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50635" toLevel="6" name="Staff of Immortality">
 		<!-- A two-handed magic blunt weapon imbued with the power of immortality. <<font color="00FF00">Base effect</font>>. INT <font color="FFBB00">+5</font>. MEN <font color="FFBB00">+5</font>. Soulshot damage <font color="FFBB00">+20%</font>. Spiritshot damage <font color="FFBB00">+20%</font>. <<font color="00FF00">Special effect</font>>. <font color="FF8000">Doom Lightning</font>. Target: <font color="FF8000">area</font>. With a certain chance, attacks nearby targets. Trigger rate after a basic attack: <font color="FFBB00">2%</font>. Trigger rate after using skills: <font color="FFBB00">5%</font>. Fixed Damage Resistance: <font color="FFBB00">5000</font>. <font color="FF8000">Critical Rate Limit</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Max Critical Rate limit: <font color="FFBB00">50%</font>. All Critical Damage <font color="FFBB00">-1000</font>. <font color="FF8000">Critical Vulnerability Increase</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Skill Power when hit <font color="FFBB00">+5%</font> -->
 		<icon>icon.immortal_weapon_two_hand_staff</icon>
-		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>0</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
-		<!--<effects>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{5%}</font>">5%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{50%}</font>">50%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{4%}</font>">4%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{12%}</font>">12%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{10000}</font>">10000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-5000}</font>">-5000</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+10%}</font>">+10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{35%}</font>">35%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{30000}</font>">30000</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{45%}</font>">45%</effect>-->
-		<!--	<effect name="MEN <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{22000}</font>">22000</effect>-->
-		<!--	<effect name="MEN <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{9%}</font>">9%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+15%}</font>">+15%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{30%}</font>">30%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{2%}</font>">2%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{5000}</font>">5000</effect>-->
-		<!--	<effect name="MEN <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="MEN <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+30%}</font>">+30%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-2000}</font>">-2000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1500}</font>">-1500</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{10%}</font>">10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{40%}</font>">40%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{15000}</font>">15000</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{16%}</font>">16%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+5%}</font>">+5%</effect>-->
-		<!--	<effect name="INT <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-3000}</font>">-3000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1000}</font>">-1000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{8%}</font>">8%</effect>-->
-		<!--	<effect name="INT <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="MEN <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="INT <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{7%}</font>">7%</effect>-->
-		<!--	<effect name="INT <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{3%}</font>">3%</effect>-->
-		<!--	<effect name="INT <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+20%}</font>">+20%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{25%}</font>">25%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-4000}</font>">-4000</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{7000}</font>">7000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{6%}</font>">6%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+25%}</font>">+25%</effect>-->
-		<!--	<effect name="MEN <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{20%}</font>">20%</effect>-->
-		<!--	<effect name="INT <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--</effects>-->
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>INT</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>MEN</stat>
+			</effect>
+			<effect name="ShotsBonus">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50651</skillId> <!-- Doom Lightning -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50651</skillId> <!-- Doom Lightning -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50651</skillId> <!-- Doom Lightning -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50651</skillId> <!-- Doom Lightning -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50636" toLevel="6" name="Bow of Immortality">
 		<!-- A bow imbued with the power of immortality. <<font color="00FF00">Base effect</font>>. STR <font color="FFBB00">+5</font>. DEX <font color="FFBB00">+5</font>. Soulshot damage <font color="FFBB00">+20%</font>. Spiritshot damage <font color="FFBB00">+20%</font>. <<font color="00FF00">Special effect</font>>. <font color="FF8000">Wrecking Arrow</font>. Target: <font color="FF8000">area</font>. With a certain chance, attacks nearby targets. Trigger rate after a basic attack: <font color="FFBB00">2%</font>. Trigger rate after using skills: <font color="FFBB00">5%</font>. Fixed Damage Resistance: <font color="FFBB00">5000</font>. <font color="FF8000">Critical Rate Limit</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Max Critical Rate limit: <font color="FFBB00">50%</font>. All Critical Damage <font color="FFBB00">-1000</font>. <font color="FF8000">Critical Vulnerability Increase</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Skill Power when hit <font color="FFBB00">+5%</font> -->
 		<icon>icon.immortal_weapon_bow</icon>
-		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>0</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
-		<!--<effects>-->
-		<!--	<effect name="STR <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{5%}</font>">5%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{50%}</font>">50%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{4%}</font>">4%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{12%}</font>">12%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{10000}</font>">10000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-5000}</font>">-5000</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+10%}</font>">+10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{35%}</font>">35%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{30000}</font>">30000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{45%}</font>">45%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{22000}</font>">22000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{9%}</font>">9%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+15%}</font>">+15%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{30%}</font>">30%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{2%}</font>">2%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{5000}</font>">5000</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+30%}</font>">+30%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-2000}</font>">-2000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1500}</font>">-1500</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{10%}</font>">10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{40%}</font>">40%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{15000}</font>">15000</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{16%}</font>">16%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+5%}</font>">+5%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-3000}</font>">-3000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1000}</font>">-1000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{8%}</font>">8%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{7%}</font>">7%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{3%}</font>">3%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+20%}</font>">+20%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{25%}</font>">25%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-4000}</font>">-4000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{7000}</font>">7000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{6%}</font>">6%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+25%}</font>">+25%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{20%}</font>">20%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--</effects>-->
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="ShotsBonus">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50649</skillId> <!-- Wrecking Arrow -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50649</skillId> <!-- Wrecking Arrow -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50649</skillId> <!-- Wrecking Arrow -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50649</skillId> <!-- Wrecking Arrow -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50637" toLevel="6" name="Pistols of Immortality">
 		<!-- Firearms imbued with the power of immortality. <<font color="00FF00">Base effect</font>>. STR <font color="FFBB00">+5</font>. DEX <font color="FFBB00">+5</font>. Soulshot damage <font color="FFBB00">+20%</font>. Spiritshot damage <font color="FFBB00">+20%</font>. <<font color="00FF00">Special effect</font>>. <font color="FF8000">Wrecking Arrow</font>. Target: <font color="FF8000">area</font>. With a certain chance, attacks nearby targets. Trigger rate after a basic attack: <font color="FFBB00">2%</font>. Trigger rate after using skills: <font color="FFBB00">5%</font>. Fixed Damage Resistance: <font color="FFBB00">5000</font>. <font color="FF8000">Critical Rate Limit</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Max Critical Rate limit: <font color="FFBB00">50%</font>. All Critical Damage <font color="FFBB00">-1000</font>. <font color="FF8000">Critical Vulnerability Increase</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Skill Power when hit <font color="FFBB00">+5%</font> -->
 		<icon>icon.Immortal_weapon_shooter</icon>
-		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>0</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
-		<!--<effects>-->
-		<!--	<effect name="STR <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{5%}</font>">5%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{50%}</font>">50%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{4%}</font>">4%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{12%}</font>">12%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{10000}</font>">10000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-5000}</font>">-5000</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+10%}</font>">+10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{35%}</font>">35%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{30000}</font>">30000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{45%}</font>">45%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{22000}</font>">22000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{9%}</font>">9%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+15%}</font>">+15%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{30%}</font>">30%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{2%}</font>">2%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{5000}</font>">5000</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+30%}</font>">+30%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-2000}</font>">-2000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1500}</font>">-1500</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{10%}</font>">10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{40%}</font>">40%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{15000}</font>">15000</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{16%}</font>">16%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+5%}</font>">+5%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-3000}</font>">-3000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1000}</font>">-1000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{8%}</font>">8%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{7%}</font>">7%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{3%}</font>">3%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+20%}</font>">+20%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{25%}</font>">25%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-4000}</font>">-4000</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{7000}</font>">7000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{6%}</font>">6%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+25%}</font>">+25%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{20%}</font>">20%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="DEX <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--</effects>-->
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="ShotsBonus">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50649</skillId> <!-- Wrecking Arrow -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50649</skillId> <!-- Wrecking Arrow -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50649</skillId> <!-- Wrecking Arrow -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50649</skillId> <!-- Wrecking Arrow -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50638" toLevel="6" name="Death Knight's Flame Sword">
 		<!-- Death Knight's Flame Sword imbued with the power of Valakas. <<font color="00FF00">Base effect</font>>. STR <font color="FFBB00">+5</font>. CON <font color="FFBB00">+5</font>. Soulshot damage <font color="FFBB00">+20%</font>. Spiritshot damage <font color="FFBB00">+20%</font>. <<font color="00FF00">Special effect</font>>. <font color="FF8000">Hellish Slash</font>. Target: <font color="FF8000">area</font>. With a certain chance, attacks nearby targets. Trigger rate after a basic attack: <font color="FFBB00">2%</font>. Trigger rate after using skills: <font color="FFBB00">5%</font>. Fixed Damage Resistance: <font color="FFBB00">5000</font>. <font color="FF8000">Critical Rate Limit</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Max Critical Rate limit: <font color="FFBB00">50%</font>. All Critical Damage <font color="FFBB00">-1000</font>. <font color="FF8000">Critical Vulnerability Increase</font>. Target: <font color="FFBB00">single</font>. Duration: <font color="FFBB00">5 sec.</font>. Skill Power when hit <font color="FFBB00">+5%</font>. <font color="FF8000">Dark Form</font>. <font color="FFBB00">Flaming Body</font><Skill upgrade>. Speed Boost. <font color="FF8000">Flame Whip</font>. <font color="FFBB00">Deadly Pull</font> Skill upgrade. Pull Atk. Rate increased. DP not consumed -->
 		<icon>icon.fire_sword_aden</icon>
-		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>0</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
-		<!--<effects>-->
-		<!--	<effect name="STR <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{5%}</font>">5%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{50%}</font>">50%</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{4%}</font>">4%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{12%}</font>">12%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+7}</font>">+7</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{10000}</font>">10000</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+9}</font>">+9</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-5000}</font>">-5000</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+10%}</font>">+10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{35%}</font>">35%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{30000}</font>">30000</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+8}</font>">+8</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{45%}</font>">45%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{22000}</font>">22000</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{9%}</font>">9%</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+15%}</font>">+15%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{30%}</font>">30%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{2%}</font>">2%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{5000}</font>">5000</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+30%}</font>">+30%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-2000}</font>">-2000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1500}</font>">-1500</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{10%}</font>">10%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{40%}</font>">40%</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{15000}</font>">15000</effect>-->
-		<!--	<effect name="CON <font color="FFBB00">{+10}</font>">+10</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{16%}</font>">16%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+5%}</font>">+5%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-3000}</font>">-3000</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-1000}</font>">-1000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{8%}</font>">8%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{7%}</font>">7%</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{3%}</font>">3%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+20%}</font>">+20%</effect>-->
-		<!--	<effect name="Max Critical Rate limit: <font color="FFBB00">{25%}</font>">25%</effect>-->
-		<!--	<effect name="All Critical Damage <font color="FFBB00">{-4000}</font>">-4000</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+6}</font>">+6</effect>-->
-		<!--	<effect name="Fixed Damage Resistance: <font color="FFBB00">{7000}</font>">7000</effect>-->
-		<!--	<effect name="Trigger rate after a basic attack: <font color="FFBB00">{6%}</font>">6%</effect>-->
-		<!--	<effect name="Skill Power when hit <font color="FFBB00">{+25%}</font>">+25%</effect>-->
-		<!--	<effect name="Trigger rate after using skills: <font color="FFBB00">{20%}</font>">20%</effect>-->
-		<!--	<effect name="STR <font color="FFBB00">{+5}</font>">+5</effect>-->
-		<!--</effects>-->
+		<operateType>P</operateType>
+		<effects>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">6</value>
+					<value level="3">7</value>
+					<value level="4">8</value>
+					<value level="5">9</value>
+					<value level="6">10</value>
+				</amount>
+				<stat>CON</stat>
+			</effect>
+			<effect name="ShotsBonus">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50653</skillId> <!-- Hellish Slash -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50653</skillId> <!-- Hellish Slash -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">2</value>
+					<value level="2">3</value>
+					<value level="3">4</value>
+					<value level="4">6</value>
+					<value level="5">8</value>
+					<value level="6">10</value>
+				</chance>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>false</isCritical>
+				<skillId>50653</skillId> <!-- Hellish Slash -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+			<effect name="TriggerSkillByAttack">
+				<attackerType>Creature</attackerType>
+				<minDamage>1</minDamage>
+				<targetType>SELF</targetType>
+				<isCritical>true</isCritical>
+				<skillId>50653</skillId> <!-- Hellish Slash -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+				<chance>
+					<value level="1">5</value>
+					<value level="2">7</value>
+					<value level="3">9</value>
+					<value level="4">12</value>
+					<value level="5">16</value>
+					<value level="6">20</value>
+				</chance>
+				<allowSkillAttack>true</allowSkillAttack>
+				<allowNormalAttack>false</allowNormalAttack>
+			</effect>
+			<effect name="ReplaceSkillBySkill">
+				<existingSkillId>45332</existingSkillId> <!-- Flaming Body -->
+				<replacementSkillId>87201</replacementSkillId> <!-- Dark Form -->
+			</effect>
+			<effect name="ReplaceSkillBySkill">
+				<existingSkillId>45333</existingSkillId> <!-- Flaming Body -->
+				<replacementSkillId>87202</replacementSkillId> <!-- Dark Form -->
+			</effect>
+			<effect name="ReplaceSkillBySkill">
+				<existingSkillId>45334</existingSkillId> <!-- Flaming Body -->
+				<replacementSkillId>87203</replacementSkillId> <!-- Dark Form -->
+			</effect>
+			<effect name="AttackTrait">
+				<PULL>10</PULL>
+			</effect>
+			<effect name="ReplaceSkillBySkill">
+				<existingSkillId>45311</existingSkillId> <!-- Deadly Pull -->
+				<replacementSkillId>87204</replacementSkillId> <!-- Flame Whip -->
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50639" toLevel="6" name="Critical Rate Limit">
 		<!-- Max Critical Rate 50%. All Critical Damage -1000 -->
 		<icon>icon.skill30858</icon>
-		<operateType>A1</operateType>
-		<isMagic>1</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>-9999</effectPoint>
-		<hpConsume>0</hpConsume>
+		<isTriggeredSkill>true</isTriggeredSkill>
+		<operateType>A2</operateType>
 		<abnormalTime>5</abnormalTime>
-		<!--<effects>-->
-		<!--	<effect name="Max Critical Rate">-->
-		<!--		<value level="1">50%</value>-->
-		<!--		<value level="2">45%</value>-->
-		<!--		<value level="3">40%</value>-->
-		<!--		<value level="4">35%</value>-->
-		<!--		<value level="5">30%</value>-->
-		<!--		<value level="6">25%</value>-->
-		<!--	</effect>-->
-		<!--	<effect name="All Critical Damage">-->
-		<!--		<value level="1">-1000</value>-->
-		<!--		<value level="2">-1500</value>-->
-		<!--		<value level="3">-2000</value>-->
-		<!--		<value level="4">-3000</value>-->
-		<!--		<value level="5">-4000</value>-->
-		<!--		<value level="6">-5000</value>-->
-		<!--	</effect>-->
-		<!--</effects>-->
+		<isDebuff>true</isDebuff>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="AddMaxPhysicalCriticalRate">
+				<amount>
+					<value level="1">-250</value>
+					<value level="2">-275</value>
+					<value level="3">-300</value>
+					<value level="4">-325</value>
+					<value level="5">-350</value>
+					<value level="6">-375</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="AddMaxMagicCriticalRate">
+				<amount>
+					<value level="1">-100</value>
+					<value level="2">-110</value>
+					<value level="3">-120</value>
+					<value level="4">-130</value>
+					<value level="5">-140</value>
+					<value level="6">-150</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="CriticalDamage">
+				<amount>
+					<value level="1">-1000</value>
+					<value level="2">-1500</value>
+					<value level="3">-2000</value>
+					<value level="4">-3000</value>
+					<value level="5">-4000</value>
+					<value level="6">-5000</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="PhysicalSkillCriticalDamage">
+				<amount>
+					<value level="1">-1000</value>
+					<value level="2">-1500</value>
+					<value level="3">-2000</value>
+					<value level="4">-3000</value>
+					<value level="5">-4000</value>
+					<value level="6">-5000</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicCriticalDamage">
+				<amount>
+					<value level="1">-1000</value>
+					<value level="2">-1500</value>
+					<value level="3">-2000</value>
+					<value level="4">-3000</value>
+					<value level="5">-4000</value>
+					<value level="6">-5000</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>50640</skillId> <!-- Critical Vulnerability Increase -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50640" toLevel="6" name="Critical Vulnerability Increase">
 		<!-- The target's Skill Power when hit +5% -->
 		<icon>icon.skill10512</icon>
-		<operateType>A1</operateType>
-		<isMagic>1</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>-9999</effectPoint>
-		<hpConsume>0</hpConsume>
+		<isTriggeredSkill>true</isTriggeredSkill>
+		<operateType>A2</operateType>
 		<abnormalTime>5</abnormalTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 		<!--<effects>-->
 		<!--	<effect name="The target's Skill Power when hit">-->
 		<!--		<value level="1">+5%</value>-->
@@ -2546,15 +3517,40 @@
 	<skill id="50643" toLevel="6" name="Slash of Immortality">
 		<icon>icon.s_immortal_slash</icon>
 		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>1200</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
+		<affectRange>200</affectRange>
+		<affectLimit>1-5</affectLimit>
 		<effectPoint>-9999</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<effects>
+			<effect name="RealDamage">
+				<power>
+					<value level="1">5000</value>
+					<value level="2">7000</value>
+					<value level="3">10000</value>
+					<value level="4">15000</value>
+					<value level="5">22000</value>
+					<value level="6">30000</value>
+				</power>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>50657</skillId> <!-- One-handed of Immortality - Display on Hit -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>50639</skillId> <!-- Critical Rate Limit -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50644" toLevel="6" name="Immortal Zone Scheme - Two-handed">
 		<icon>icon.skill0000</icon>
@@ -2572,15 +3568,40 @@
 	<skill id="50645" toLevel="6" name="Hurricane Smash">
 		<icon>icon.s_hurricane_crush</icon>
 		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>1200</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
+		<affectRange>200</affectRange>
+		<affectLimit>1-5</affectLimit>
 		<effectPoint>-9999</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<effects>
+			<effect name="RealDamage">
+				<power>
+					<value level="1">5000</value>
+					<value level="2">7000</value>
+					<value level="3">10000</value>
+					<value level="4">15000</value>
+					<value level="5">22000</value>
+					<value level="6">30000</value>
+				</power>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>50658</skillId> <!-- Two-handed of Immortality - Display on Hit -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>50639</skillId> <!-- Critical Rate Limit -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50646" toLevel="6" name="Immortal Zone Scheme - Dual">
 		<icon>icon.skill0000</icon>
@@ -2598,15 +3619,40 @@
 	<skill id="50647" toLevel="6" name="Dual Execution">
 		<icon>icon.s_dual_execution</icon>
 		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>1200</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
+		<affectRange>200</affectRange>
+		<affectLimit>1-5</affectLimit>
 		<effectPoint>-9999</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<effects>
+			<effect name="RealDamage">
+				<power>
+					<value level="1">5000</value>
+					<value level="2">7000</value>
+					<value level="3">10000</value>
+					<value level="4">15000</value>
+					<value level="5">22000</value>
+					<value level="6">30000</value>
+				</power>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>50659</skillId> <!-- Dual of Immortality - Display on Hit -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>50639</skillId> <!-- Critical Rate Limit -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50648" toLevel="6" name="Immortal Zone Scheme - Range">
 		<icon>icon.skill0000</icon>
@@ -2624,15 +3670,40 @@
 	<skill id="50649" toLevel="6" name="Wrecking Arrow">
 		<icon>icon.s_ruin_arrow</icon>
 		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>1200</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
+		<affectRange>200</affectRange>
+		<affectLimit>1-5</affectLimit>
 		<effectPoint>-9999</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<effects>
+			<effect name="RealDamage">
+				<power>
+					<value level="1">5000</value>
+					<value level="2">7000</value>
+					<value level="3">10000</value>
+					<value level="4">15000</value>
+					<value level="5">22000</value>
+					<value level="6">30000</value>
+				</power>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>50660</skillId> <!-- Range of Immortality - Display on Hit -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>50639</skillId> <!-- Critical Rate Limit -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50650" toLevel="6" name="Immortal Zone Scheme - Magic">
 		<icon>icon.skill0000</icon>
@@ -2650,15 +3721,40 @@
 	<skill id="50651" toLevel="6" name="Doom Lightning">
 		<icon>icon.s_dual_execution</icon>
 		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>1200</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
+		<affectRange>200</affectRange>
+		<affectLimit>1-5</affectLimit>
 		<effectPoint>-9999</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<effects>
+			<effect name="RealDamage">
+				<power>
+					<value level="1">5000</value>
+					<value level="2">7000</value>
+					<value level="3">10000</value>
+					<value level="4">15000</value>
+					<value level="5">22000</value>
+					<value level="6">30000</value>
+				</power>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>50661</skillId> <!-- Magic of Immortality - Display on Hit -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>50639</skillId> <!-- Critical Rate Limit -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50652" toLevel="6" name="Immortal Zone Scheme - Flame Sword">
 		<icon>icon.skill0000</icon>
@@ -2676,15 +3772,40 @@
 	<skill id="50653" toLevel="6" name="Hellish Slash">
 		<icon>icon.skill30974</icon>
 		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>1200</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
+		<affectRange>200</affectRange>
+		<affectLimit>1-5</affectLimit>
 		<effectPoint>-9999</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<effects>
+			<effect name="RealDamage">
+				<power>
+					<value level="1">5000</value>
+					<value level="2">7000</value>
+					<value level="3">10000</value>
+					<value level="4">15000</value>
+					<value level="5">22000</value>
+					<value level="6">30000</value>
+				</power>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>50662</skillId> <!-- Flame Sword - Display on Hit -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>50639</skillId> <!-- Critical Rate Limit -->
+				<skillLevel>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+				</skillLevel>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50654" toLevel="1" name="Power of Immortality">
 		<icon>icon.skill0000</icon>
@@ -2728,80 +3849,26 @@
 	<skill id="50657" toLevel="1" name="One-handed of Immortality - Display on Hit">
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>-1000</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
 	</skill>
 	<skill id="50658" toLevel="1" name="Two-handed of Immortality - Display on Hit">
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>-1000</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
 	</skill>
 	<skill id="50659" toLevel="1" name="Dual of Immortality - Display on Hit">
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>-1000</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
 	</skill>
 	<skill id="50660" toLevel="1" name="Range of Immortality - Display on Hit">
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>-1000</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
 	</skill>
 	<skill id="50661" toLevel="1" name="Magic of Immortality - Display on Hit">
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>-1000</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
 	</skill>
 	<skill id="50662" toLevel="1" name="Flame Sword - Display on Hit">
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
-		<isMagic>0</isMagic>
-		<mpConsume>0</mpConsume>
-		<castRange>-1</castRange>
-		<hitTime>0</hitTime>
-		<coolTime>0</coolTime>
-		<reuseDelay>0</reuseDelay>
-		<effectPoint>-1000</effectPoint>
-		<hpConsume>0</hpConsume>
-		<abnormalTime>0</abnormalTime>
 	</skill>
 	<skill id="50663" toLevel="17" name="Agathion Dragon Egg">
 		<!-- An agathion that has the power of unborn dragon. <Base effect>. Atk. Spd. +2. Casting Spd. +2. P. Atk. +20. M. Atk. +20 -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/51200-51299.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/51200-51299.xml
index 5f92cd7d0f..e612214213 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/51200-51299.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/51200-51299.xml
@@ -1569,35 +1569,83 @@
 	</skill>
 	<skill id="51263" toLevel="1" name="High-grade Stable Scroll: Enchant D-grade Weapon">
 		<icon>icon.giant_scrl_of_ench_wp_d</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51264" toLevel="1" name="High-grade Stable Scroll: Enchant D-grade Armor">
 		<icon>icon.giant_scrl_of_ench_am_d</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51265" toLevel="1" name="High-grade Stable Scroll: Enchant C-grade Weapon">
 		<icon>icon.giant_scrl_of_ench_wp_c</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51266" toLevel="1" name="High-grade Stable Scroll: Enchant C-grade Armor">
 		<icon>icon.giant_scrl_of_ench_am_c</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51267" toLevel="1" name="High-grade Stable Scroll: Enchant B-grade Weapon">
 		<icon>icon.giant_scrl_of_ench_wp_b</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51268" toLevel="1" name="High-grade Stable Scroll: Enchant B-grade Armor">
 		<icon>icon.giant_scrl_of_ench_am_b</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51269" toLevel="1" name="High-grade Stable Scroll: Enchant A-grade Weapon">
 		<icon>icon.skill0000</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51270" toLevel="1" name="High-grade Stable Scroll: Enchant A-grade Armor">
 		<icon>icon.skill0000</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51271" toLevel="5" name="War Paint">
 		<!-- PvP Damage +$s1. -->
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/55200-55299.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/55200-55299.xml
index c9cc7ad214..4d0f44f532 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/55200-55299.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/55200-55299.xml
@@ -500,7 +500,7 @@
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>ATTACK_TIME_DOWN</abnormalType>
 		<itemConsumeCount>1</itemConsumeCount>
-		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer’s Potion -->
+		<itemConsumeId>70102</itemConsumeId> <!-- Adventurer's Potion -->
 		<mpConsume>75</mpConsume>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/87300-87399.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/87300-87399.xml
index 2a4c07b05c..e3ce735cad 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/87300-87399.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/87300-87399.xml
@@ -2359,6 +2359,11 @@
 				<amount>3</amount>
 			</effect>
 		</effects>
+		<endEffects>
+			<effect name="ModifyAssassinationPoints">
+				<amount>-10</amount>
+			</effect>
+		</endEffects>
 	</skill>
 	<skill id="87367" toLevel="3" name="Sharp Blade">
 		<!-- Sharpens the dagger. P. Atk. +5% -->
@@ -2953,6 +2958,10 @@
 				<amount>50</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="ReplaceSkillBySkill">
+				<existingSkillId>87301</existingSkillId>
+				<replacementSkillId>87310</replacementSkillId>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="87396" toLevel="1" name="Shadow Boost">
@@ -2967,6 +2976,10 @@
 				<amount>15</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="ReplaceSkillBySkill">
+				<existingSkillId>87304</existingSkillId>
+				<replacementSkillId>87313</replacementSkillId>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="87397" toLevel="3" name="Maximum Critical">
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/87400-87499.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/87400-87499.xml
index b34b48ece5..aa7d475a4e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/87400-87499.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/87400-87499.xml
@@ -14,6 +14,11 @@
 					<value fromLevel="1" toLevel="1" fromSubLevel="1002" toSubLevel="1002">2087431</value>
 					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">3087431</value>
 				</skillId>
+				<skillSubLevel>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">1001</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1002" toSubLevel="1002">1002</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">1003</value>
+				</skillSubLevel>
 				<skillLevel>1</skillLevel>
 				<min>0</min>
 				<max>19</max>
@@ -27,6 +32,11 @@
 					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">3087432</value>
 				</skillId>
 				<skillLevel>1</skillLevel>
+				<skillSubLevel>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">1001</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1002" toSubLevel="1002">1002</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">1003</value>
+				</skillSubLevel>
 				<min>20</min>
 				<max>
 					<value fromLevel="1" toLevel="1">39</value>
@@ -44,6 +54,11 @@
 					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">3087433</value>
 				</skillId>
 				<skillLevel>1</skillLevel>
+				<skillSubLevel>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">1001</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1002" toSubLevel="1002">1002</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">1003</value>
+				</skillSubLevel>
 				<min>
 					<value fromLevel="1" toLevel="1">40</value>
 					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">35</value>
@@ -66,6 +81,11 @@
 					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">3087434</value>
 				</skillId>
 				<skillLevel>1</skillLevel>
+				<skillSubLevel>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">1001</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1002" toSubLevel="1002">1002</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">1003</value>
+				</skillSubLevel>
 				<min>
 					<value fromLevel="1" toLevel="1">60</value>
 					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">55</value>
@@ -83,6 +103,11 @@
 					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">3087435</value>
 				</skillId>
 				<skillLevel>1</skillLevel>
+				<skillSubLevel>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">1001</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1002" toSubLevel="1002">1002</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">1003</value>
+				</skillSubLevel>
 				<min>0</min>
 				<max>14</max>
 			</effect>
@@ -95,6 +120,11 @@
 					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">3087436</value>
 				</skillId>
 				<skillLevel>1</skillLevel>
+				<skillSubLevel>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">1001</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1002" toSubLevel="1002">1002</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">1003</value>
+				</skillSubLevel>
 				<min>15</min>
 				<max>
 					<value fromLevel="1" toLevel="1">34</value>
@@ -112,6 +142,11 @@
 					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">3087437</value>
 				</skillId>
 				<skillLevel>1</skillLevel>
+				<skillSubLevel>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">1001</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1002" toSubLevel="1002">1002</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">1003</value>
+				</skillSubLevel>
 				<min>
 					<value fromLevel="1" toLevel="1">35</value>
 					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">30</value>
@@ -134,6 +169,11 @@
 					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">3087438</value>
 				</skillId>
 				<skillLevel>1</skillLevel>
+				<skillSubLevel>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">1001</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1002" toSubLevel="1002">1002</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">1003</value>
+				</skillSubLevel>
 				<min>
 					<value fromLevel="1" toLevel="1">50</value>
 					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">45</value>
@@ -151,6 +191,11 @@
 					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">3087439</value>
 				</skillId>
 				<skillLevel>1</skillLevel>
+				<skillSubLevel>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">1001</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1002" toSubLevel="1002">1002</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">1003</value>
+				</skillSubLevel>
 				<min>0</min>
 				<max>39</max>
 			</effect>
@@ -163,6 +208,11 @@
 					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">3087440</value>
 				</skillId>
 				<skillLevel>1</skillLevel>
+				<skillSubLevel>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">1001</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1002" toSubLevel="1002">1002</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">1003</value>
+				</skillSubLevel>
 				<min>40</min>
 				<max>
 					<value fromLevel="1" toLevel="1">59</value>
@@ -180,6 +230,11 @@
 					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">3087441</value>
 				</skillId>
 				<skillLevel>1</skillLevel>
+				<skillSubLevel>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">1001</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1002" toSubLevel="1002">1002</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">1003</value>
+				</skillSubLevel>
 				<min>
 					<value fromLevel="1" toLevel="1">60</value>
 					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">55</value>
@@ -202,6 +257,11 @@
 					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">3087442</value>
 				</skillId>
 				<skillLevel>1</skillLevel>
+				<skillSubLevel>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">1001</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1002" toSubLevel="1002">1002</value>
+					<value fromLevel="1" toLevel="1" fromSubLevel="1003" toSubLevel="1003">1003</value>
+				</skillSubLevel>
 				<min>
 					<value fromLevel="1" toLevel="1">80</value>
 					<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1001">75</value>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/documentation.txt
index 9307ae0d3f..32e93953ca 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/stats/skills/documentation.txt
@@ -13,6 +13,8 @@ AdditionalPhysicalAttack: Additional PhysicalAttack effect handler. (l2jmobius)
 AdditionalPotionCp: Increases the amount of CP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionHp: Increases the amount of HP heal gained from potions or elixirs. (l2jmobius)
 AdditionalPotionMp: Increases the amount of MP heal gained from potions or elixirs. (l2jmobius)
+AddMaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
+AddMaxPhysicalCriticalRate: Stat that overrides the default config MAX_PCRIT_RATE. (l2jmobius)
 AddPcCafePoints: Increase PcCafe points permanently. (l2jmobius)
 AddSkillBySkill: Add skill when other skill already exists. (l2jmobius)
 AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots.
@@ -149,6 +151,7 @@ GiveExpAndSp: Gives a given amount of XP and SP. (l2jmobius)
 GiveFame: Gives a given amount of Fame. (l2jmobius)
 GiveHonorCoins: Gives a given amount of Honor Coins. (l2jmobius)
 GiveItemByExp: Gives an item when a certain amount of EXP is gathered. (l2jmobius)
+GivePetXp: Gives a given amount of XP to a pet. (l2jmobius)
 GiveRecommendation: Gives recommendations to a player. Blue name.
 GiveSp: Gives a given amount of SP.
 GiveXp: Gives a given amount of XP. (l2jmobius)
@@ -168,10 +171,11 @@ HpCpHealCritical: HpCp heal effects always trigger Magic Critical Hit.
 HpCpHeal: Increases current HP by a given amount. If the given amount exceeds maximum HP, it increases current CP with the rest value as well.
 HpDrain: Magical attack that absorbs given percentage of the damage inflicted as HP.
 Hp: Increases current HP by a static value.
-HpLimit: Increase a character's max hp limit (l2jmobius)
+HpLimit: Increase a character's max hp limit. (l2jmobius)
 HpRegen: HP Regeneration stat.
 HpToOwner: DOT effect that absorbs HP over time.
 IgnoreDeath: Become undying. Hp cannot decrease below 1.
+IgnoreReduceDamage: Ignore ReduceDamage effect implementation. (l2jmobius)
 ImmobileDamageBonus: Bonus damage to immobile targets. (l2jmobius)
 ImmobileDamageResist: Resist damage while immobile. (l2jmobius)
 ImmobilePetBuff: Causes your pet to become immobilized.
@@ -212,7 +216,6 @@ MAtk: M. Atk. stat.
 MAtkByPAtk: M. Atk. bonus from P. Atk stat. (l2jmobius)
 MaxCp: Max. CP stat.
 MaxHp: Max. HP stat.
-MaxMagicCriticalRate: Stat that overrides the default config MAX_MCRIT_RATE. (l2jmobius)
 MaxMp: Max. MP stat.
 ModifyAssassinationPoints: Modifies player Assassination Point count. (l2jmobius)
 ModifyBeastPoints: Modifies player Beast Point count. (l2jmobius)
@@ -282,6 +285,7 @@ RearDamage: Multiplier for damage done from behind the target. (l2jmobius)
 RebalanceHP: Balances targets' current HP.
 RebalanceHPSummon: Balances targets' current HP for summons.
 RecoverVitalityInPeaceZone: Recover periodically vitality when player is in a peace zone. (l2jmobius)
+ReduceDamage: Reduce damage effect implementation.
 ReduceCancel: Magic skill casting interruption stat.
 ReduceDropPenalty: Reduces EXP lost and death penalty chance.
 ReflectMagic: Deflects magical damage back to the attacker.
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/xsd/DailyMission.xsd b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/xsd/DailyMission.xsd
index 35f2f6dc35..28d8ddeac4 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/xsd/DailyMission.xsd
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/xsd/DailyMission.xsd
@@ -33,8 +33,8 @@
 			<xs:element type="handlerType" name="handler" minOccurs="0" maxOccurs="unbounded" />
 			<xs:element type="itemsType" name="items" />
 		</xs:sequence>
-		<xs:attribute type="xs:short" name="id" />
-		<xs:attribute type="xs:short" name="reward_id" />
+		<xs:attribute type="xs:int" name="id" />
+		<xs:attribute type="xs:int" name="reward_id" />
 		<xs:attribute type="xs:string" name="name" />
 		<xs:attribute type="xs:int" name="requiredCompletion" />
 		<xs:attribute type="xs:boolean" name="dailyReset" />
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/xsd/LimitShop.xsd b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/xsd/LimitShop.xsd
index 2ef0e76e84..77f1bb3a5d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/xsd/LimitShop.xsd
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/xsd/LimitShop.xsd
@@ -24,6 +24,7 @@
 											<xs:attribute type="xs:long" name="count" use="optional"/>
 											<xs:attribute type="xs:float" name="chance" use="optional"/>
 											<xs:attribute type="xs:boolean" name="announce" use="optional"/>
+											<xs:attribute type="xs:int" name="enchant" use="optional"/>
 											<xs:attribute type="xs:int" name="id2" use="optional"/>
 											<xs:attribute type="xs:long" name="count2" use="optional"/>
 											<xs:attribute type="xs:float" name="chance2" use="optional"/>
@@ -40,6 +41,7 @@
 											<xs:attribute type="xs:long" name="count5" use="optional"/>
 											<xs:attribute type="xs:boolean" name="announce5" use="optional"/>
 											<xs:attribute type="xs:int" name="accountDailyLimit" use="optional"/>
+											<xs:attribute type="xs:int" name="accountMontlyLimit" use="optional"/>
 											<xs:attribute type="xs:int" name="accountBuyLimit" use="optional"/>
 										</xs:extension>
 									</xs:simpleContent>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/xsd/PetExtractData.xsd b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/xsd/PetExtractData.xsd
new file mode 100644
index 0000000000..e9115b614a
--- /dev/null
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/xsd/PetExtractData.xsd
@@ -0,0 +1,24 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+	<xs:element name="list">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="extraction" maxOccurs="unbounded" minOccurs="0">
+					<xs:complexType>
+						<xs:simpleContent>
+							<xs:extension base="xs:string">
+								<xs:attribute type="xs:short" name="petId" />
+								<xs:attribute type="xs:int" name="petLevel" />
+								<xs:attribute type="xs:long" name="extractExp" />
+								<xs:attribute type="xs:int" name="extractItem"/>
+								<xs:attribute type="xs:int" name="defaultCostId" />
+								<xs:attribute type="xs:long" name="defaultCostCount" />
+								<xs:attribute type="xs:int" name="extractCostId" />
+								<xs:attribute type="xs:long" name="extractCostCount" />
+							</xs:extension>
+						</xs:simpleContent>
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/xsd/skills.xsd
index f8333709ee..c8bb7df24d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/xsd/skills.xsd
@@ -1023,25 +1023,6 @@
 																	</xs:sequence>
 																</xs:complexType>
 															</xs:element>
-															<xs:element name="min">
-																<xs:complexType mixed="true">
-																	<xs:sequence minOccurs="0">
-																		<xs:element maxOccurs="unbounded" name="value">
-																			<xs:complexType>
-																				<xs:simpleContent>
-																					<xs:extension base="xs:unsignedInt">
-																						<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
-																						<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
-																						<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
-																						<xs:attribute name="fromSubLevel" type="xs:unsignedShort" use="optional" />
-																						<xs:attribute name="toSubLevel" type="xs:unsignedShort" use="optional" />
-																					</xs:extension>
-																				</xs:simpleContent>
-																			</xs:complexType>
-																		</xs:element>
-																	</xs:sequence>
-																</xs:complexType>
-															</xs:element>
 															<xs:element name="max">
 																<xs:complexType mixed="true">
 																	<xs:sequence minOccurs="0">
@@ -1767,7 +1748,8 @@
 																</xs:complexType>
 															</xs:element>
 															<xs:element name="blockedActions" type="xs:byte" />
-															<xs:element name="delay">
+															<xs:element name="delay" type="xs:unsignedShort" />
+															<xs:element name="min">
 																<xs:complexType mixed="true">
 																	<xs:sequence minOccurs="0">
 																		<xs:element maxOccurs="unbounded" name="value">
@@ -1787,6 +1769,8 @@
 																</xs:complexType>
 															</xs:element>
 															<xs:element name="addStat" type="xs:string" />
+															<xs:element name="baseStat" type="xs:string" />
+															<xs:element name="mulStat" type="xs:string" />
 															<xs:element name="hp" type="xs:unsignedByte" />
 															<xs:element name="cp" type="xs:unsignedByte" />
 															<xs:element name="xp">
@@ -1857,75 +1841,20 @@
 																	</xs:sequence>
 																</xs:complexType>
 															</xs:element>
-															<xs:element name="baseStatConditionMin">
-																<xs:complexType mixed="true">
-																	<xs:sequence minOccurs="0">
-																		<xs:element maxOccurs="unbounded" name="value">
-																			<xs:complexType>
-																				<xs:simpleContent>
-																					<xs:extension base="xs:unsignedShort">
-																						<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
-																						<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
-																						<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
-																						<xs:attribute name="fromSubLevel" type="xs:unsignedShort" use="optional" />
-																						<xs:attribute name="toSubLevel" type="xs:unsignedShort" use="optional" />
-																					</xs:extension>
-																				</xs:simpleContent>
-																			</xs:complexType>
-																		</xs:element>
-																	</xs:sequence>
-																</xs:complexType>
-															</xs:element>
-															<xs:element name="baseStatConditionMax">
-																<xs:complexType mixed="true">
-																	<xs:sequence minOccurs="0">
-																		<xs:element maxOccurs="unbounded" name="value">
-																			<xs:complexType>
-																				<xs:simpleContent>
-																					<xs:extension base="xs:unsignedInt">
-																						<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
-																						<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
-																						<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
-																						<xs:attribute name="fromSubLevel" type="xs:unsignedShort" use="optional" />
-																						<xs:attribute name="toSubLevel" type="xs:unsignedShort" use="optional" />
-																					</xs:extension>
-																				</xs:simpleContent>
-																			</xs:complexType>
-																		</xs:element>
-																	</xs:sequence>
-																</xs:complexType>
-															</xs:element>
 															<xs:element name="skillIds" type="xs:string" />
 															<xs:element name="staticChance" type="xs:boolean" />
-															<xs:element name="baseStat" type="xs:string" />
-															<xs:element name="mulStat" type="xs:string" />
 															<xs:element name="disable" type="xs:string" />
-															<xs:element name="skillSubLevel" type="xs:unsignedShort" />
-															<xs:element name="allowBadSkills" type="xs:boolean" />
-															<xs:element name="allowGoodSkills" type="xs:boolean" />
-															<xs:element name="chargesSkill">
-																<xs:complexType>
-																	<xs:sequence>
-																		<xs:element maxOccurs="unbounded" name="value">
-																			<xs:complexType>
-																				<xs:simpleContent>
-																					<xs:extension base="xs:string">
-																						<xs:attribute name="level" type="xs:unsignedByte" use="required" />
-																					</xs:extension>
-																				</xs:simpleContent>
-																			</xs:complexType>
-																		</xs:element>
-																	</xs:sequence>
-																</xs:complexType>
-															</xs:element>
-															<xs:element name="skillAttack">
-																<xs:complexType>
-																	<xs:sequence>
+															<xs:element name="skillSubLevel">
+																<xs:complexType mixed="true">
+																	<xs:sequence minOccurs="0">
 																		<xs:element maxOccurs="unbounded" name="value">
 																			<xs:complexType>
 																				<xs:simpleContent>
 																					<xs:extension base="xs:unsignedShort">
-																						<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+																						<xs:attribute name="fromLevel" type="xs:unsignedByte" use="required" />
+																						<xs:attribute name="toLevel" type="xs:unsignedByte" use="required" />
+																						<xs:attribute name="fromSubLevel" type="xs:unsignedShort" use="required" />
+																						<xs:attribute name="toSubLevel" type="xs:unsignedShort" use="required" />
 																					</xs:extension>
 																				</xs:simpleContent>
 																			</xs:complexType>
@@ -1933,6 +1862,8 @@
 																	</xs:sequence>
 																</xs:complexType>
 															</xs:element>
+															<xs:element name="allowBadSkills" type="xs:boolean" />
+															<xs:element name="allowGoodSkills" type="xs:boolean" />
 															<xs:element name="damage">
 																<xs:complexType>
 																	<xs:sequence>
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/zones/no_landing.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/zones/no_landing.xml
index 4b280f64a8..88b454d0db 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/zones/no_landing.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/zones/no_landing.xml
@@ -58,4 +58,41 @@
 		<node X="-98296" Y="-262136" />
 		<node X="-65544" Y="-229384" />
 	</zone>
+	
+	<!-- Dwelling of Spirits zones -->
+	<zone id="202201" name="dwelling_portal_enter_fire" type="NoLandingZone" shape="Cuboid" minZ="-12209" maxZ="-10700">
+		<node X="-115236" Y="-77408" />
+		<node X="-115617" Y="-77631" />
+	</zone>
+	<zone id="202202" name="dwelling_portal_enter_earth" type="NoLandingZone" shape="Cuboid" minZ="-12209" maxZ="-10700">
+		<node X="-113417" Y="-77633" />
+		<node X="-113032" Y="-77411" />
+	</zone>
+	<zone id="202203" name="dwelling_portal_enter_water" type="NoLandingZone" shape="NPoly" minZ="-12209" maxZ="-10700">
+		<node X="-115160" Y="-79013" />
+		<node X="-115333" Y="-79182" />
+		<node X="-115216" Y="-79282" />
+		<node X="-115053" Y="-79121" />
+	</zone>
+	<zone id="202204" name="dwelling_portal_enter_wind" type="NoLandingZone" shape="NPoly" minZ="-12209" maxZ="-10700">
+		<node X="-113596" Y="-79120" />
+		<node X="-113436" Y="-79275" />
+		<node X="-113325" Y="-79176" />
+		<node X="-113490" Y="-79012" />
+	</zone>
+	<zone id="202205" name="dwelling_portal_return_fire" type="NoLandingZone" shape="Cylinder" minZ="-15515" maxZ="-15400" rad="230">
+		<node X="202349" Y="170533" />
+	</zone>
+	<zone id="202206" name="dwelling_portal_return_earth" type="NoLandingZone" shape="Cylinder" minZ="-15515" maxZ="-15400" rad="230">
+		<node X="222065" Y="192767" />
+	</zone>
+	<zone id="202207" name="dwelling_portal_return_water" type="NoLandingZone" shape="Cylinder" minZ="-15515" maxZ="-15400" rad="230">
+		<node X="222127" Y="170488" />
+	</zone>
+	<zone id="202208" name="dwelling_portal_return_wind" type="NoLandingZone" shape="Cylinder" minZ="-15515" maxZ="-15400" rad="230">
+		<node X="212855" Y="181242" />
+	</zone>
+	<zone id="21400000" name="dwelling_central" type="NoLandingZone" shape="Cylinder" minZ="-12209" maxZ="-10700" rad="1000">
+		<node X="-114339" Y="-78005" />
+	</zone>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/zones/teleportzones.xml b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/zones/teleportzones.xml
index 6eb199dfcd..417000681d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/zones/teleportzones.xml
+++ b/L2J_Mobius_Essence_7.1_Assassin/dist/game/data/zones/teleportzones.xml
@@ -1,81 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/zones.xsd">
-	<zone name="dwelling_portal_earth" type="TeleportZone" shape="Cylinder" minZ="-11518" maxZ="-11218" rad="100">
-		<stat name="oustX" val="222086" />
-		<stat name="oustY" val="190539" />
-		<stat name="oustZ" val="-15488" />
-		<stat name="default_enabled" val="false" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="-113465" Y="-77520" />
-	</zone>
-	<zone name="dwelling_portal_wind" type="TeleportZone" shape="Cylinder" minZ="-11518" maxZ="-11218" rad="100">
-		<stat name="oustX" val="222151" />
-		<stat name="oustY" val="168077" />
-		<stat name="oustZ" val="-15488" />
-		<stat name="default_enabled" val="false" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="-115115" Y="-79080" />
-	</zone>
-	<zone name="dwelling_portal_water" type="TeleportZone" shape="Cylinder" minZ="-11518" maxZ="-11218" rad="100">
-		<stat name="oustX" val="212886" />
-		<stat name="oustY" val="178829" />
-		<stat name="oustZ" val="-15488" />
-		<stat name="instanceId" val="214" />
-		<stat name="default_enabled" val="true" /> <!-- Fixes a problem with the other portals. -->
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="-113529" Y="-79077" />
-	</zone>
-	<zone name="dwelling_portal_fire" type="TeleportZone" shape="Cylinder" minZ="-11518" maxZ="-11218" rad="100">
-		<stat name="oustX" val="202376" />
-		<stat name="oustY" val="168141" />
-		<stat name="oustZ" val="-15488" />
-		<stat name="default_enabled" val="false" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="-115202" Y="-77519" />
-	</zone>
-	<zone name="return_portal_petram" type="TeleportZone" shape="Cylinder" minZ="-15688" maxZ="-15218" rad="100">
-		<stat name="oustX" val="-114323" />
-		<stat name="oustY" val="-78292" />
-		<stat name="oustZ" val="-11433" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="222061" Y="192921" />
-	</zone>
-	<zone name="return_portal_nebula" type="TeleportZone" shape="Cylinder" minZ="-15688" maxZ="-15218" rad="100">
-		<stat name="oustX" val="-114323" />
-		<stat name="oustY" val="-78292" />
-		<stat name="oustZ" val="-11433" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="222127" Y="170488" />
-	</zone>
-	<zone name="return_portal_procella" type="TeleportZone" shape="Cylinder" minZ="-15688" maxZ="-15218" rad="100">
-		<stat name="oustX" val="-114323" />
-		<stat name="oustY" val="-78292" />
-		<stat name="oustZ" val="-11433" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="212855" Y="181242" />
-	</zone>
-	<zone name="return_portal_ignis" type="TeleportZone" shape="Cylinder" minZ="-15688" maxZ="-15218" rad="100">
-		<stat name="oustX" val="-114323" />
-		<stat name="oustY" val="-78292" />
-		<stat name="oustZ" val="-11433" />
-		<stat name="instanceId" val="214" />
-		<stat name="targetClass" val="Player" />
-		<stat name="affectedLvlMin" val="75" />
-		<node X="202349" Y="170533" />
-	</zone>
 	<zone name="hellbound_tp_1" type="TeleportZone" shape="Cylinder" minZ="-3600" maxZ="-3300" rad="200">
 		<stat name="oustX" val="6736" />
 		<stat name="oustY" val="251024" />
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/Config.java
index b513ffb4f9..c6dc6459d4 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/Config.java
@@ -646,6 +646,7 @@ public class Config
 	public static boolean ENABLE_AUTO_ITEM;
 	public static boolean AUTO_PLAY_ATTACK_ACTION;
 	public static boolean RESUME_AUTO_PLAY;
+	public static boolean ENABLE_AUTO_ASSIST;
 	public static AbnormalVisualEffect BLUE_TEAM_ABNORMAL_EFFECT;
 	public static AbnormalVisualEffect RED_TEAM_ABNORMAL_EFFECT;
 	public static int SHARING_LOCATION_COST;
@@ -1356,6 +1357,7 @@ public class Config
 	public static boolean FAKE_PLAYER_USE_SHOTS;
 	public static boolean FAKE_PLAYER_KILL_PVP;
 	public static boolean FAKE_PLAYER_KILL_KARMA;
+	public static boolean FAKE_PLAYER_AUTO_ATTACKABLE;
 	public static boolean FAKE_PLAYER_AGGRO_MONSTERS;
 	public static boolean FAKE_PLAYER_AGGRO_PLAYERS;
 	public static boolean FAKE_PLAYER_AGGRO_FPC;
@@ -2340,6 +2342,7 @@ public class Config
 			ENABLE_AUTO_ITEM = generalConfig.getBoolean("EnableAutoItem", true);
 			AUTO_PLAY_ATTACK_ACTION = generalConfig.getBoolean("AutoPlayAttackAction", true);
 			RESUME_AUTO_PLAY = generalConfig.getBoolean("ResumeAutoPlay", false);
+			ENABLE_AUTO_ASSIST = generalConfig.getBoolean("AssistLeader", false);
 			BLUE_TEAM_ABNORMAL_EFFECT = null;
 			final String blueTeamAve = generalConfig.getString("BlueTeamAbnormalEffect", "").trim();
 			if (!blueTeamAve.isEmpty())
@@ -3514,6 +3517,7 @@ public class Config
 			FAKE_PLAYER_USE_SHOTS = fakePlayerConfig.getBoolean("FakePlayerUseShots", false);
 			FAKE_PLAYER_KILL_PVP = fakePlayerConfig.getBoolean("FakePlayerKillsRewardPvP", false);
 			FAKE_PLAYER_KILL_KARMA = fakePlayerConfig.getBoolean("FakePlayerUnflaggedKillsKarma", false);
+			FAKE_PLAYER_AUTO_ATTACKABLE = fakePlayerConfig.getBoolean("FakePlayerAutoAttackable", false);
 			FAKE_PLAYER_AGGRO_MONSTERS = fakePlayerConfig.getBoolean("FakePlayerAggroMonsters", false);
 			FAKE_PLAYER_AGGRO_PLAYERS = fakePlayerConfig.getBoolean("FakePlayerAggroPlayers", false);
 			FAKE_PLAYER_AGGRO_FPC = fakePlayerConfig.getBoolean("FakePlayerAggroFPC", false);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/GameServer.java
index 24847e0b76..e28eaead01 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/GameServer.java
@@ -98,6 +98,7 @@ import org.l2jmobius.gameserver.data.xml.NpcNameLocalisationData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
 import org.l2jmobius.gameserver.data.xml.PetAcquireList;
 import org.l2jmobius.gameserver.data.xml.PetDataTable;
+import org.l2jmobius.gameserver.data.xml.PetExtractData;
 import org.l2jmobius.gameserver.data.xml.PetSkillData;
 import org.l2jmobius.gameserver.data.xml.PetTypeData;
 import org.l2jmobius.gameserver.data.xml.PlayerTemplateData;
@@ -347,6 +348,8 @@ public class GameServer
 		CharInfoTable.getInstance();
 		AdminData.getInstance();
 		PetDataTable.getInstance();
+		PetTypeData.getInstance();
+		PetExtractData.getInstance();
 		CubicData.getInstance();
 		CharSummonTable.getInstance().init();
 		BeautyShopData.getInstance();
@@ -396,7 +399,6 @@ public class GameServer
 		CrestTable.getInstance();
 		TeleportListData.getInstance();
 		SharedTeleportManager.getInstance();
-		PetTypeData.getInstance();
 		TeleporterData.getInstance();
 		TimedHuntingZoneData.getInstance();
 		MatchingRoomManager.getInstance();
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/ai/SummonAI.java
index dc9c2e80f1..783e998673 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/ai/SummonAI.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/ai/SummonAI.java
@@ -27,6 +27,7 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -327,9 +328,17 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		final Summon summon = getActor();
-		if ((summon.getOwner() != null) && (summon.getOwner() != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+		final Player owner = summon.getOwner();
+		if (owner != null)
 		{
-			summon.doAttack(attacker);
+			if (summon.calculateDistance3D(owner) > 3000)
+			{
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, owner);
+			}
+			else if ((owner != attacker) && !summon.isMoving() && summon.canAttack(attacker, false))
+			{
+				summon.doAttack(attacker);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
index 1f09ab7191..b260653119 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
@@ -420,7 +420,6 @@ public class ClanTable
 	
 	private void restoreClanWars()
 	{
-		final long currentTime = System.currentTimeMillis();
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement statement = con.createStatement();
 			ResultSet rset = statement.executeQuery("SELECT clan1, clan2, clan1Kill, clan2Kill, winnerClan, startTime, endTime, state FROM clan_wars"))
@@ -431,14 +430,8 @@ public class ClanTable
 				final Clan attacked = getClan(rset.getInt("clan2"));
 				if ((attacker != null) && (attacked != null))
 				{
-					final long endTime = rset.getLong("endTime");
-					if (endTime < currentTime)
-					{
-						continue;
-					}
-					
 					final ClanWarState state = ClanWarState.values()[rset.getInt("state")];
-					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), endTime, state);
+					final ClanWar clanWar = new ClanWar(attacker, attacked, rset.getInt("clan1Kill"), rset.getInt("clan2Kill"), rset.getInt("winnerClan"), rset.getLong("startTime"), rset.getLong("endTime"), state);
 					attacker.addWar(attacked.getId(), clanWar);
 					attacked.addWar(attacker.getId(), clanWar);
 				}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/ActionData.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/ActionData.java
index ee8748fe16..1583360766 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/ActionData.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/ActionData.java
@@ -88,6 +88,11 @@ public class ActionData implements IXmlReader
 		return _actionSkillsData.getOrDefault(skillId, -1);
 	}
 	
+	public int[] getActionIdList()
+	{
+		return _actionData.keySet().stream().mapToInt(Number::intValue).toArray();
+	}
+	
 	/**
 	 * Gets the single instance of ActionData.
 	 * @return single instance of ActionData
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
index e33a1b0efa..337ac6dd99 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java
@@ -307,7 +307,7 @@ public class InitialShortcutData implements IXmlReader
 			
 			// Register shortcut
 			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.sendPacket(new ShortCutRegister(newShortcut, player));
 			player.registerShortCut(newShortcut);
 		}
 		
@@ -350,7 +350,7 @@ public class InitialShortcutData implements IXmlReader
 				}
 				// Register shortcut
 				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getSubLevel(), shortcut.getCharacterType());
-				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.sendPacket(new ShortCutRegister(newShortcut, player));
 				player.registerShortCut(newShortcut);
 			}
 		}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/LimitShopClanData.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/LimitShopClanData.java
index 81ad3f8ff8..fce691a15b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/LimitShopClanData.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/LimitShopClanData.java
@@ -107,6 +107,7 @@ public class LimitShopClanData implements IXmlReader
 							ingredientEnchants[4] = 0;
 							int productionId = 0;
 							int accountDailyLimit = 0;
+							int accountMontlyLimit = 0;
 							int accountBuyLimit = 0;
 							for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling())
 							{
@@ -185,11 +186,12 @@ public class LimitShopClanData implements IXmlReader
 								{
 									productionId = parseInteger(attrs, "id");
 									accountDailyLimit = parseInteger(attrs, "accountDailyLimit", 0);
+									accountMontlyLimit = parseInteger(attrs, "accountMontlyLimit", 0);
 									accountBuyLimit = parseInteger(attrs, "accountBuyLimit", 0);
 								}
 							}
 							
-							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, 1, 100, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, false, accountDailyLimit, accountBuyLimit));
+							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, 1, 100, false, 0, 0, 0, 0, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, false, accountDailyLimit, accountMontlyLimit, accountBuyLimit));
 						}
 					}
 				}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java
index 5bc59aa442..e6f94bf829 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java
@@ -126,7 +126,9 @@ public class LimitShopCraftData implements IXmlReader
 							boolean announce3 = false;
 							boolean announce4 = false;
 							boolean announce5 = false;
+							int enchant = 0;
 							int accountDailyLimit = 0;
+							int accountMontlyLimit = 0;
 							int accountBuyLimit = 0;
 							for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling())
 							{
@@ -217,6 +219,7 @@ public class LimitShopCraftData implements IXmlReader
 									count = parseLong(attrs, "count", 1L);
 									chance = parseFloat(attrs, "chance", 100f);
 									announce = parseBoolean(attrs, "announce", false);
+									enchant = parseInteger(attrs, "enchant", 0);
 									productionId2 = parseInteger(attrs, "id2", 0);
 									count2 = parseLong(attrs, "count2", 1L);
 									chance2 = parseFloat(attrs, "chance2", 100f);
@@ -233,6 +236,7 @@ public class LimitShopCraftData implements IXmlReader
 									count5 = parseLong(attrs, "count5", 1L);
 									announce5 = parseBoolean(attrs, "announce5", false);
 									accountDailyLimit = parseInteger(attrs, "accountDailyLimit", 0);
+									accountMontlyLimit = parseInteger(attrs, "accountMontlyLimit", 0);
 									accountBuyLimit = parseInteger(attrs, "accountBuyLimit", 0);
 									
 									final ItemTemplate item = ItemTable.getInstance().getTemplate(productionId);
@@ -244,7 +248,7 @@ public class LimitShopCraftData implements IXmlReader
 								}
 							}
 							
-							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, count, chance, announce, productionId2, count2, chance2, announce2, productionId3, count3, chance3, announce3, productionId4, count4, chance4, announce4, productionId5, count5, announce5, accountDailyLimit, accountBuyLimit));
+							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, count, chance, announce, enchant, productionId2, count2, chance2, announce2, productionId3, count3, chance3, announce3, productionId4, count4, chance4, announce4, productionId5, count5, announce5, accountDailyLimit, accountMontlyLimit, accountBuyLimit));
 						}
 					}
 				}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
index 19176d0ee5..7303b86055 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
@@ -109,6 +109,7 @@ public class LimitShopData implements IXmlReader
 							ingredientEnchants[4] = 0;
 							int productionId = 0;
 							int accountDailyLimit = 0;
+							int accountMontlyLimit = 0;
 							int accountBuyLimit = 0;
 							for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling())
 							{
@@ -197,6 +198,7 @@ public class LimitShopData implements IXmlReader
 								{
 									productionId = parseInteger(attrs, "id");
 									accountDailyLimit = parseInteger(attrs, "accountDailyLimit", 0);
+									accountMontlyLimit = parseInteger(attrs, "accountMontlyLimit", 0);
 									accountBuyLimit = parseInteger(attrs, "accountBuyLimit", 0);
 									
 									final ItemTemplate item = ItemTable.getInstance().getTemplate(productionId);
@@ -208,7 +210,7 @@ public class LimitShopData implements IXmlReader
 								}
 							}
 							
-							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, 1, 100, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, false, accountDailyLimit, accountBuyLimit));
+							_products.add(new LimitShopProductHolder(id, category, minLevel, maxLevel, ingredientIds, ingredientQuantities, ingredientEnchants, productionId, 1, 100, false, 0, 0, 0, 0, false, 0, 0, 0, false, 0, 0, 0, false, 0, 0, false, accountDailyLimit, accountMontlyLimit, accountBuyLimit));
 						}
 					}
 				}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/PetExtractData.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/PetExtractData.java
new file mode 100644
index 0000000000..e53f5ca3cd
--- /dev/null
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/PetExtractData.java
@@ -0,0 +1,107 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.data.xml;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.gameserver.model.holders.ItemHolder;
+import org.l2jmobius.gameserver.model.holders.PetExtractionHolder;
+
+/**
+ * @author Geremy
+ */
+public class PetExtractData implements IXmlReader
+{
+	private static final Logger LOGGER = Logger.getLogger(PetExtractData.class.getName());
+	// <Pet_Id, <Pet_Level, Cost>>
+	private final Map<Integer, Map<Integer, PetExtractionHolder>> _extractionData = new HashMap<>();
+	
+	protected PetExtractData()
+	{
+		load();
+	}
+	
+	@Override
+	public void load()
+	{
+		_extractionData.clear();
+		parseDatapackFile("data/PetExtractData.xml");
+		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _extractionData.size() + " pet extraction data.");
+	}
+	
+	@Override
+	public void parseDocument(Document doc, File f)
+	{
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling())
+		{
+			if ("list".equalsIgnoreCase(n.getNodeName()))
+			{
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
+				{
+					if ("extraction".equalsIgnoreCase(d.getNodeName()))
+					{
+						final NamedNodeMap attrs = d.getAttributes();
+						final int petId = parseInteger(attrs, "petId");
+						final int petLevel = parseInteger(attrs, "petLevel");
+						final long extractExp = parseLong(attrs, "extractExp");
+						final int extractItem = parseInteger(attrs, "extractItem");
+						final int defaultCostId = parseInteger(attrs, "defaultCostId");
+						final int defaultCostCount = parseInteger(attrs, "defaultCostCount");
+						final int extractCostId = parseInteger(attrs, "extractCostId");
+						final int extractCostCount = parseInteger(attrs, "extractCostCount");
+						Map<Integer, PetExtractionHolder> data = _extractionData.get(petId);
+						if (data == null)
+						{
+							data = new HashMap<>();
+							_extractionData.put(petId, data);
+						}
+						data.put(petLevel, new PetExtractionHolder(petId, petLevel, extractExp, extractItem, new ItemHolder(defaultCostId, defaultCostCount), new ItemHolder(extractCostId, extractCostCount)));
+					}
+				}
+			}
+		}
+	}
+	
+	public PetExtractionHolder getExtraction(int petId, int petLevel)
+	{
+		final Map<Integer, PetExtractionHolder> map = _extractionData.get(petId);
+		if (map == null)
+		{
+			LOGGER.warning(getClass().getSimpleName() + ": Missing pet extraction data: [PetId: " + petId + "] [PetLevel: " + petLevel + "]");
+			return null;
+		}
+		return map.get(petLevel);
+	}
+	
+	public static PetExtractData getInstance()
+	{
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final PetExtractData INSTANCE = new PetExtractData();
+	}
+}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/SkillData.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/SkillData.java
index 58ee961f76..d6559174bb 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/SkillData.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/SkillData.java
@@ -548,9 +548,10 @@ public class SkillData implements IXmlReader
 								variables.put("index", (i - fromLevel) + 1d);
 								variables.put("subIndex", (j - fromSubLevel) + 1d);
 								final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1);
-								if ((base != null) && !(base instanceof StatSet))
+								final String baseText = String.valueOf(base);
+								if ((base != null) && !(base instanceof StatSet) && (!baseText.equalsIgnoreCase("true") && !baseText.equalsIgnoreCase("false")))
 								{
-									variables.put("base", Double.parseDouble(String.valueOf(base)));
+									variables.put("base", Double.parseDouble(baseText));
 								}
 								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/TransformData.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/TransformData.java
index 290c9084cc..320e04a0a7 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/TransformData.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/data/xml/TransformData.java
@@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder;
 import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * Transformation data.
@@ -142,7 +141,7 @@ public class TransformData implements IXmlReader
 											}
 											set.set("actions", z.getTextContent());
 											final int[] actions = set.getIntArray("actions", " ");
-											templateData.setBasicActionList(new ExBasicActionList(actions));
+											templateData.setBasicActionList(actions);
 											break;
 										}
 										case "additionalSkills":
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/enums/CategoryType.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/enums/CategoryType.java
index 3ea4f4693b..93fb659432 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/enums/CategoryType.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/enums/CategoryType.java
@@ -36,6 +36,7 @@ public enum CategoryType
 	STRIDER,
 	WOLF_GROUP,
 	WYVERN_GROUP,
+	PET_GROUP,
 	SUBJOB_GROUP_KNIGHT,
 	HUMAN_FALL_CLASS,
 	HUMAN_MALL_CLASS,
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/enums/NpcInfoType.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
index a4a43ecd9f..3ed430b9eb 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/enums/NpcInfoType.java
@@ -30,14 +30,14 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	NAME(0x03, 2),
 	POSITION(0x04, (3 * 4)),
 	HEADING(0x05, 4),
-	UNKNOWN2(0x06, 4),
+	VEHICLE_ID(0x06, 4),
 	ATK_CAST_SPEED(0x07, (2 * 4)),
 	
 	// 1
 	SPEED_MULTIPLIER(0x08, (2 * 4)),
 	EQUIPPED(0x09, (3 * 4)),
-	ALIVE(0x0A, 1),
-	RUNNING(0x0B, 1),
+	STOP_MODE(0x0A, 1),
+	MOVE_MODE(0x0B, 1),
 	SWIM_OR_FLY(0x0E, 1),
 	TEAM(0x0F, 1),
 	
@@ -45,7 +45,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	ENCHANT(0x10, 4),
 	FLYING(0x11, 4),
 	CLONE(0x12, 4),
-	COLOR_EFFECT(0x13, 4),
+	PET_EVOLUTION_ID(0x13, 4),
 	DISPLAY_EFFECT(0x16, 4),
 	TRANSFORMATION(0x17, 4),
 	
@@ -55,7 +55,7 @@ public enum NpcInfoType implements IUpdateTypeComponent
 	MAX_HP(0x1A, 4),
 	MAX_MP(0x1B, 4),
 	SUMMONED(0x1C, 1),
-	UNKNOWN12(0x1D, (2 * 4)),
+	FOLLOW_INFO(0x1D, (2 * 4)),
 	TITLE(0x1E, 2),
 	NAME_NPCSTRINGID(0x1F, 4),
 	
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
index 46f12b32ae..34ca89e316 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/handler/IPlayerActionHandler.java
@@ -25,4 +25,9 @@ import org.l2jmobius.gameserver.model.actor.Player;
 public interface IPlayerActionHandler
 {
 	void useAction(Player player, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed);
+	
+	default boolean isPetAction()
+	{
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
index c2dc67819f..9dcec79490 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java
@@ -65,7 +65,7 @@ public class DailyTaskManager
 	private static final Set<Integer> RESET_SKILLS = new HashSet<>();
 	static
 	{
-		// No known skills.
+		RESET_SKILLS.add(39199); // Hero's Wondrous Cubic
 	}
 	public static final Set<Integer> RESET_ITEMS = new HashSet<>();
 	static
@@ -131,6 +131,11 @@ public class DailyTaskManager
 			resetHuntPass();
 		}
 		
+		if (calendar.get(Calendar.DAY_OF_MONTH) == 1)
+		{
+			resetMontlyLimitShopData();
+		}
+		
 		// Daily tasks.
 		resetClanBonus();
 		resetClanContributionList();
@@ -688,6 +693,31 @@ public class DailyTaskManager
 		LOGGER.info("LimitShopData has been resetted.");
 	}
 	
+	private void resetMontlyLimitShopData()
+	{
+		for (LimitShopProductHolder holder : LimitShopData.getInstance().getProducts())
+		{
+			// Update data for offline players.
+			try (Connection con = DatabaseFactory.getConnection();
+				PreparedStatement ps = con.prepareStatement("DELETE FROM account_gsdata WHERE var=?"))
+			{
+				ps.setString(1, AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + holder.getProductionId());
+				ps.executeUpdate();
+			}
+			catch (Exception e)
+			{
+				LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Could not reset LimitShopData: " + e);
+			}
+			// Update data for online players.
+			for (Player player : World.getInstance().getPlayers())
+			{
+				player.getAccountVariables().remove(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + holder.getProductionId());
+				player.getAccountVariables().storeMe();
+			}
+		}
+		LOGGER.info("LimitShopData has been resetted.");
+	}
+	
 	private void resetHuntPass()
 	{
 		// Update data for offline players.
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
index 579070ebda..b0fd030621 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
@@ -100,6 +100,7 @@ public class IdManager
 				cleanCount += statement.executeUpdate("DELETE FROM character_shortcuts WHERE character_shortcuts.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_skills WHERE character_skills.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_skills_save WHERE character_skills_save.charId NOT IN (SELECT charId FROM characters);");
+				cleanCount += statement.executeUpdate("DELETE FROM character_spirits WHERE character_spirits.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_subclasses WHERE character_subclasses.charId NOT IN (SELECT charId FROM characters);");
 				cleanCount += statement.executeUpdate("DELETE FROM character_instance_time WHERE character_instance_time.charId NOT IN (SELECT charId FROM characters);");
 				
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java
index 9801ec6f72..a517a43c6b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java
@@ -250,7 +250,7 @@ public class PurgeRankingManager
 			{
 			}
 		}
-		return top5.entrySet().stream().sorted(Map.Entry.<String, Integer> comparingByValue().reversed()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e2, LinkedHashMap::new));
+		return top5.entrySet().stream().sorted(Entry.<String, Integer> comparingByValue().reversed()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e2, LinkedHashMap::new));
 	}
 	
 	public SimpleEntry<Integer, Integer> getPlayerRating(int category, int charId)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
index ed13229014..272c1e6add 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -364,7 +364,11 @@ public class WalkingManager implements IXmlReader
 		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
 		if (walk != null)
 		{
-			walk.getWalkCheckTask().cancel(true);
+			final ScheduledFuture<?> task = walk.getWalkCheckTask();
+			if (task != null)
+			{
+				task.cancel(true);
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/ShortCuts.java
index b4cd9646dc..83fc87bdab 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -215,7 +215,7 @@ public class ShortCuts implements IRestorable
 			{
 				final Shortcut newsc = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, skillSubLevel, 1);
 				newsc.setAutoUse(sc.isAutoUse());
-				_owner.sendPacket(new ShortCutRegister(newsc));
+				_owner.sendPacket(new ShortCutRegister(newsc, _owner));
 				_owner.registerShortCut(newsc);
 			}
 		}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/Creature.java
index cd44570d49..5d3c375a01 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1320,7 +1320,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				player.updatePvPStatus(target);
 			}
 			
-			if (isFakePlayer() && (target.isPlayable() || target.isFakePlayer()))
+			if (isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (target.isPlayable() || target.isFakePlayer()))
 			{
 				final Npc npc = ((Npc) this);
 				if (!npc.isScriptValue(1))
@@ -1789,6 +1789,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			EventDispatcher.getInstance().notifyEvent(new OnCreatureKilled(killer, this), killer);
 		}
 		
+		if ((killer != null) && killer.isPlayer())
+		{
+			final Player player = killer.getActingPlayer();
+			if (player.isAssassin() && player.isAffectedBySkill(CommonSkill.BRUTALITY.getId()))
+			{
+				player.setAssassinationPoints(player.getAssassinationPoints() + 10000);
+			}
+		}
+		
 		abortAttack();
 		abortCast();
 		
@@ -2848,7 +2857,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 				
 				// If this creature was previously moving, but now due to stat change can no longer move, broadcast StopMove packet.
-				if (isMoving() && (_stat.getMoveSpeed() <= 0))
+				if (isMoving() && (getMoveSpeed() <= 0))
 				{
 					stopMove(null);
 				}
@@ -2861,189 +2870,151 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						summon.updateAndBroadcastStatus(1);
 					}
 				}
-				else
+				else if (isPlayer())
 				{
-					final boolean broadcastFull = true;
-					final StatusUpdate su = new StatusUpdate(this);
-					UserInfo info = null;
-					if (isPlayer())
+					final UserInfo info = new UserInfo(getActingPlayer(), false);
+					info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
+					
+					boolean updateWeight = false;
+					for (Stat stat : currentChanges)
 					{
-						info = new UserInfo(getActingPlayer(), false);
-						info.addComponentType(UserInfoType.SLOTS, UserInfoType.ENCHANTLEVEL);
-					}
-					if (info != null)
-					{
-						for (Stat stat : currentChanges)
+						switch (stat)
 						{
-							switch (stat)
+							case MOVE_SPEED:
+							case RUN_SPEED:
+							case WALK_SPEED:
+							case SWIM_RUN_SPEED:
+							case SWIM_WALK_SPEED:
+							case FLY_RUN_SPEED:
+							case FLY_WALK_SPEED:
 							{
-								case MOVE_SPEED:
-								case RUN_SPEED:
-								case WALK_SPEED:
-								case SWIM_RUN_SPEED:
-								case SWIM_WALK_SPEED:
-								case FLY_RUN_SPEED:
-								case FLY_WALK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER);
-									break;
-								}
-								case PHYSICAL_ATTACK_SPEED:
-								{
-									info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
-									break;
-								}
-								case PHYSICAL_ATTACK:
-								case PHYSICAL_DEFENCE:
-								case EVASION_RATE:
-								case ACCURACY_COMBAT:
-								case CRITICAL_RATE:
-								case MAGIC_CRITICAL_RATE:
-								case MAGIC_EVASION_RATE:
-								case ACCURACY_MAGIC:
-								case MAGIC_ATTACK:
-								case MAGIC_ATTACK_SPEED:
-								case MAGICAL_DEFENCE:
-								{
-									info.addComponentType(UserInfoType.STATS);
-									break;
-								}
-								case MAX_CP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxCp());
-									}
-									break;
-								}
-								case MAX_HP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_HP, _stat.getMaxHp());
-									}
-									break;
-								}
-								case MAX_MP:
-								{
-									if (isPlayer())
-									{
-										info.addComponentType(UserInfoType.MAX_HPCPMP);
-									}
-									else
-									{
-										su.addUpdate(StatusUpdateType.MAX_CP, _stat.getMaxMp());
-									}
-									break;
-								}
-								case STAT_STR:
-								case STAT_CON:
-								case STAT_DEX:
-								case STAT_INT:
-								case STAT_WIT:
-								case STAT_MEN:
-								{
-									info.addComponentType(UserInfoType.BASE_STATS);
-									break;
-								}
-								case FIRE_RES:
-								case WATER_RES:
-								case WIND_RES:
-								case EARTH_RES:
-								case HOLY_RES:
-								case DARK_RES:
-								{
-									info.addComponentType(UserInfoType.ELEMENTALS);
-									break;
-								}
-								case FIRE_POWER:
-								case WATER_POWER:
-								case WIND_POWER:
-								case EARTH_POWER:
-								case HOLY_POWER:
-								case DARK_POWER:
-								{
-									info.addComponentType(UserInfoType.ATK_ELEMENTAL);
-									break;
-								}
-								case ELEMENTAL_SPIRIT_EARTH_ATTACK:
-								case ELEMENTAL_SPIRIT_EARTH_DEFENSE:
-								case ELEMENTAL_SPIRIT_FIRE_ATTACK:
-								case ELEMENTAL_SPIRIT_FIRE_DEFENSE:
-								case ELEMENTAL_SPIRIT_WATER_ATTACK:
-								case ELEMENTAL_SPIRIT_WATER_DEFENSE:
-								case ELEMENTAL_SPIRIT_WIND_ATTACK:
-								case ELEMENTAL_SPIRIT_WIND_DEFENSE:
-								{
-									info.addComponentType(UserInfoType.ATT_SPIRITS);
-									break;
-								}
+								info.addComponentType(UserInfoType.MULTIPLIER);
+								break;
+							}
+							case PHYSICAL_ATTACK_SPEED:
+							{
+								info.addComponentType(UserInfoType.MULTIPLIER, UserInfoType.STATS);
+								break;
+							}
+							case PHYSICAL_ATTACK:
+							case PHYSICAL_DEFENCE:
+							case EVASION_RATE:
+							case ACCURACY_COMBAT:
+							case CRITICAL_RATE:
+							case MAGIC_CRITICAL_RATE:
+							case MAGIC_EVASION_RATE:
+							case ACCURACY_MAGIC:
+							case MAGIC_ATTACK:
+							case MAGIC_ATTACK_SPEED:
+							case MAGICAL_DEFENCE:
+							{
+								info.addComponentType(UserInfoType.STATS);
+								break;
+							}
+							case MAX_CP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_HP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case MAX_MP:
+							{
+								info.addComponentType(UserInfoType.MAX_HPCPMP);
+								break;
+							}
+							case STAT_STR:
+							case STAT_CON:
+							case STAT_DEX:
+							case STAT_INT:
+							case STAT_WIT:
+							case STAT_MEN:
+							{
+								info.addComponentType(UserInfoType.BASE_STATS);
+								updateWeight = true;
+								break;
+							}
+							case FIRE_RES:
+							case WATER_RES:
+							case WIND_RES:
+							case EARTH_RES:
+							case HOLY_RES:
+							case DARK_RES:
+							{
+								info.addComponentType(UserInfoType.ELEMENTALS);
+								break;
+							}
+							case FIRE_POWER:
+							case WATER_POWER:
+							case WIND_POWER:
+							case EARTH_POWER:
+							case HOLY_POWER:
+							case DARK_POWER:
+							{
+								info.addComponentType(UserInfoType.ATK_ELEMENTAL);
+								break;
+							}
+							case WEIGHT_LIMIT:
+							case WEIGHT_PENALTY:
+							{
+								updateWeight = true;
+								break;
+							}
+							case ELEMENTAL_SPIRIT_EARTH_ATTACK:
+							case ELEMENTAL_SPIRIT_EARTH_DEFENSE:
+							case ELEMENTAL_SPIRIT_FIRE_ATTACK:
+							case ELEMENTAL_SPIRIT_FIRE_DEFENSE:
+							case ELEMENTAL_SPIRIT_WATER_ATTACK:
+							case ELEMENTAL_SPIRIT_WATER_DEFENSE:
+							case ELEMENTAL_SPIRIT_WIND_ATTACK:
+							case ELEMENTAL_SPIRIT_WIND_DEFENSE:
+							{
+								info.addComponentType(UserInfoType.ATT_SPIRITS);
+								break;
 							}
 						}
-						// currentChanges.clear();
 					}
 					
-					if (isPlayer())
+					final Player player = getActingPlayer();
+					if (updateWeight)
 					{
-						final Player player = getActingPlayer();
 						player.refreshOverloaded(true);
-						sendPacket(info);
+					}
+					
+					sendPacket(info);
+					
+					player.broadcastCharInfo();
+					
+					if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+					{
+						getServitors().values().forEach(Summon::broadcastStatusUpdate);
+					}
+				}
+				else if (isNpc())
+				{
+					World.getInstance().forEachVisibleObject(this, Player.class, player ->
+					{
+						if (!isVisibleFor(player))
+						{
+							return;
+						}
 						
-						if (broadcastFull)
+						if (isFakePlayer())
 						{
-							player.broadcastCharInfo();
+							player.sendPacket(new FakePlayerInfo((Npc) this));
 						}
-						else if (su.hasUpdates())
+						else if (getRunSpeed() == 0)
 						{
-							broadcastPacket(su);
+							player.sendPacket(new ServerObjectInfo((Npc) this, player));
 						}
-						if (hasServitors() && hasAbnormalType(AbnormalType.ABILITY_CHANGE))
+						else
 						{
-							getServitors().values().forEach(Summon::broadcastStatusUpdate);
+							player.sendPacket(new NpcInfo((Npc) this));
 						}
-					}
-					else if (isNpc())
-					{
-						if (broadcastFull)
-						{
-							World.getInstance().forEachVisibleObject(this, Player.class, player ->
-							{
-								if (!isVisibleFor(player))
-								{
-									return;
-								}
-								
-								if (isFakePlayer())
-								{
-									player.sendPacket(new FakePlayerInfo((Npc) this));
-								}
-								else if (_stat.getRunSpeed() == 0)
-								{
-									player.sendPacket(new ServerObjectInfo((Npc) this, player));
-								}
-								else
-								{
-									player.sendPacket(new NpcInfo((Npc) this));
-								}
-							});
-						}
-						else if (su.hasUpdates())
-						{
-							broadcastPacket(su);
-						}
-					}
-					else if (su.hasUpdates())
-					{
-						broadcastPacket(su);
-					}
+					});
 				}
 				
 				_broadcastModifiedStatTask = null;
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/Player.java
index b01e8b7b5c..d48e00f06a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -395,7 +395,7 @@ import org.l2jmobius.gameserver.network.serverpackets.elementalspirits.ExElement
 import org.l2jmobius.gameserver.network.serverpackets.friend.FriendStatus;
 import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimeRestrictFieldDieLimitTime;
 import org.l2jmobius.gameserver.network.serverpackets.limitshop.ExBloodyCoinCount;
-import org.l2jmobius.gameserver.network.serverpackets.pet.PetInfo;
+import org.l2jmobius.gameserver.network.serverpackets.pet.PetSummonInfo;
 import org.l2jmobius.gameserver.network.serverpackets.surveillance.ExUserWatcherTargetStatus;
 import org.l2jmobius.gameserver.network.serverpackets.vip.ReceiveVipInfo;
 import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
@@ -4788,7 +4788,7 @@ public class Player extends Playable
 	{
 		super.doAutoAttack(target);
 		setRecentFakeDeath(false);
-		if (target.isFakePlayer())
+		if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 		{
 			updatePvPStatus();
 		}
@@ -7167,7 +7167,11 @@ public class Player extends Playable
 			player.setOnlineStatus(true, false);
 			
 			PlayerAutoSaveTaskManager.getInstance().add(player);
-			player.getAchievementBox().restore();
+			
+			if (Config.ENABLE_ACHIEVEMENT_BOX)
+			{
+				player.getAchievementBox().restore();
+			}
 		}
 		catch (Exception e)
 		{
@@ -8812,9 +8816,13 @@ public class Player extends Playable
 				if ((getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember())
 				{
 					final ClanWar war = attackerClan.getWarWith(getClanId());
-					if ((war != null) && ((war.getState() == ClanWarState.MUTUAL) || (((war.getState() == ClanWarState.BLOOD_DECLARATION) || (war.getState() == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == attackerClan.getId()))))
+					if (war != null)
 					{
-						return true;
+						final ClanWarState warState = war.getState();
+						if ((warState == ClanWarState.MUTUAL) || (((warState == ClanWarState.BLOOD_DECLARATION) || (warState == ClanWarState.DECLARATION)) && (war.getAttackerClanId() == clan.getId())))
+						{
+							return true;
+						}
 					}
 				}
 			}
@@ -11095,7 +11103,7 @@ public class Player extends Playable
 			_pet.setFollowStatus(true);
 			_pet.setInstance(getInstanceWorld());
 			_pet.updateAndBroadcastStatus(0);
-			sendPacket(new PetInfo(_pet, 0));
+			sendPacket(new PetSummonInfo(_pet, 0));
 		}
 		
 		getServitors().values().forEach(s ->
@@ -11106,7 +11114,7 @@ public class Player extends Playable
 			s.setFollowStatus(true);
 			s.setInstance(getInstanceWorld());
 			s.updateAndBroadcastStatus(0);
-			sendPacket(new PetInfo(s, 0));
+			sendPacket(new PetSummonInfo(s, 0));
 		});
 		
 		// Show movie if available.
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 918bcbfa08..abca499335 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -74,10 +74,10 @@ import org.l2jmobius.gameserver.network.serverpackets.TeleportToLocation;
 import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetSkillList;
 import org.l2jmobius.gameserver.network.serverpackets.pet.PetDelete;
-import org.l2jmobius.gameserver.network.serverpackets.pet.PetInfo;
 import org.l2jmobius.gameserver.network.serverpackets.pet.PetInventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList;
 import org.l2jmobius.gameserver.network.serverpackets.pet.PetStatusUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.pet.PetSummonInfo;
 import org.l2jmobius.gameserver.taskmanager.DecayTaskManager;
 
 public abstract class Summon extends Playable
@@ -134,7 +134,7 @@ public abstract class Summon extends Playable
 		{
 			if (isPet())
 			{
-				sendPacket(new PetInfo(this, 1));
+				sendPacket(new PetSummonInfo(this, 1));
 				sendPacket(new ExPetSkillList(true, (Pet) this));
 				if (getInventory() != null)
 				{
@@ -228,7 +228,7 @@ public abstract class Summon extends Playable
 					{
 						if (player == _owner)
 						{
-							player.sendPacket(new PetInfo(this, 1));
+							player.sendPacket(new PetSummonInfo(this, 1));
 							return;
 						}
 						
@@ -392,7 +392,7 @@ public abstract class Summon extends Playable
 	@Override
 	public void onDecay()
 	{
-		super.onDecay();
+		unSummon(_owner);
 		deleteMe(_owner);
 	}
 	
@@ -879,7 +879,7 @@ public abstract class Summon extends Playable
 		
 		if (isSpawned())
 		{
-			sendPacket(new PetInfo(this, value));
+			sendPacket(new PetSummonInfo(this, value));
 			sendPacket(new PetStatusUpdate(this));
 			broadcastNpcInfo(value);
 			
@@ -900,7 +900,14 @@ public abstract class Summon extends Playable
 				return;
 			}
 			
-			player.sendPacket(new ExPetInfo(this, player, value));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, value));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, value));
+			}
 		});
 	}
 	
@@ -925,7 +932,7 @@ public abstract class Summon extends Playable
 		// Check if the Player is the owner of the Pet
 		if (player == _owner)
 		{
-			player.sendPacket(new PetInfo(this, isDead() ? 0 : 1));
+			player.sendPacket(new PetSummonInfo(this, isDead() ? 0 : 1));
 			if (isPet())
 			{
 				player.sendPacket(new PetItemList(getInventory().getItems()));
@@ -933,7 +940,14 @@ public abstract class Summon extends Playable
 		}
 		else
 		{
-			player.sendPacket(new ExPetInfo(this, player, 0));
+			if (isPet())
+			{
+				player.sendPacket(new ExPetInfo(this, player, 0));
+			}
+			else
+			{
+				player.sendPacket(new SummonInfo(this, player, 0));
+			}
 		}
 	}
 	
@@ -979,7 +993,7 @@ public abstract class Summon extends Playable
 		{
 			setTarget(target);
 			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
-			if (target.isFakePlayer())
+			if (target.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE)
 			{
 				_owner.updatePvPStatus();
 			}
@@ -1166,7 +1180,7 @@ public abstract class Summon extends Playable
 			{
 				owner.sendPacket(new PetItemList(getInventory().getItems()));
 			}
-			owner.sendPacket(new PetInfo(this, 1));
+			owner.sendPacket(new PetSummonInfo(this, 1));
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
index 3e5ebd7c98..38b04a0109 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/instance/Door.java
@@ -596,6 +596,8 @@ public class Door extends Creature
 	{
 		if (isVisibleFor(player))
 		{
+			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
+			player.sendPacket(new DoorStatusUpdate(this));
 			if (getEmitter() > 0)
 			{
 				if (_isInverted)
@@ -607,7 +609,6 @@ public class Door extends Creature
 					player.sendPacket(new OnEventTrigger(getEmitter(), _open));
 				}
 			}
-			player.sendPacket(new StaticObjectInfo(this, player.isGM()));
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
index 647f398100..b5d228678e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java
@@ -67,7 +67,7 @@ public class Monster extends Attackable
 	{
 		if (isFakePlayer())
 		{
-			return isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
+			return Config.FAKE_PLAYER_AUTO_ATTACKABLE || isInCombat() || attacker.isMonster() || (getScriptValue() > 0);
 		}
 		
 		// Check if the Monster target is aggressive
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index 8d4678e0f9..63af530bc0 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.actor.stat;
 
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -61,8 +62,6 @@ public class CreatureStat
 	
 	private final Map<Stat, Double> _statsAdd = new EnumMap<>(Stat.class);
 	private final Map<Stat, Double> _statsMul = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _addValueCache = new EnumMap<>(Stat.class);
-	private final Map<Stat, Double> _mulValueCache = new EnumMap<>(Stat.class);
 	private final Map<Stat, Map<MoveType, Double>> _moveTypeStats = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _reuseStat = new ConcurrentHashMap<>();
 	private final Map<Integer, Double> _mpConsumeStat = new ConcurrentHashMap<>();
@@ -873,15 +872,13 @@ public class CreatureStat
 		// Initialize default values
 		for (Stat stat : Stat.values())
 		{
-			final Double resetAddValue = stat.getResetAddValue();
-			if (resetAddValue.doubleValue() != 0)
+			if (stat.getResetAddValue() != 0)
 			{
-				_statsAdd.put(stat, resetAddValue);
+				_statsAdd.put(stat, stat.getResetAddValue());
 			}
-			final Double resetMulValue = stat.getResetMulValue();
-			if (resetMulValue.doubleValue() != 0)
+			if (stat.getResetMulValue() != 0)
 			{
-				_statsMul.put(stat, resetMulValue);
+				_statsMul.put(stat, stat.getResetMulValue());
 			}
 		}
 	}
@@ -892,8 +889,12 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		// Copy old data before wiping it out.
+		final Map<Stat, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
+		final Map<Stat, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
+		
 		_lock.writeLock().lock();
+		
 		try
 		{
 			// Wipe all the data.
@@ -902,7 +903,7 @@ public class CreatureStat
 			// Call pump to each effect.
 			for (BuffInfo info : _creature.getEffectList().getPassives())
 			{
-				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature))
+				if (info.isInUse() && info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature.getTarget()))
 				{
 					for (AbstractEffect effect : info.getEffects())
 					{
@@ -975,33 +976,6 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
-			
-			if (broadcast)
-			{
-				// Calculate the difference between old and new stats.
-				changed = EnumSet.noneOf(Stat.class);
-				for (Stat stat : Stat.values())
-				{
-					// Check if add value changed for this stat.
-					final Double resetAddValue = stat.getResetAddValue();
-					final Double addValue = _statsAdd.getOrDefault(stat, resetAddValue);
-					if (addValue.doubleValue() != _addValueCache.getOrDefault(stat, resetAddValue).doubleValue())
-					{
-						_addValueCache.put(stat, addValue);
-						changed.add(stat);
-					}
-					else // Check if mul value changed for this stat.
-					{
-						final Double resetMulValue = stat.getResetMulValue();
-						final Double mulValue = _statsMul.getOrDefault(stat, resetMulValue);
-						if (mulValue.doubleValue() != _mulValueCache.getOrDefault(stat, resetMulValue).doubleValue())
-						{
-							_mulValueCache.put(stat, mulValue);
-							changed.add(stat);
-						}
-					}
-				}
-			}
 		}
 		finally
 		{
@@ -1011,9 +985,17 @@ public class CreatureStat
 		// Notify recalculation to child classes.
 		onRecalculateStats(broadcast);
 		
-		// Broadcast changes.
-		if ((changed != null) && !changed.isEmpty())
+		if (broadcast)
 		{
+			// Calculate the difference between old and new stats
+			final Set<Stat> changed = EnumSet.noneOf(Stat.class);
+			for (Stat stat : Stat.values())
+			{
+				if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()).equals(adds.getOrDefault(stat, stat.getResetAddValue())) || _statsMul.getOrDefault(stat, stat.getResetMulValue()).equals(muls.getOrDefault(stat, stat.getResetMulValue())))
+				{
+					changed.add(stat);
+				}
+			}
 			_creature.broadcastModifiedStats(changed);
 		}
 	}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
index 61623cf473..d53b9c3c09 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
@@ -122,7 +122,7 @@ public class Transform implements IIdentifiable
 		return _title;
 	}
 	
-	private TransformTemplate getTemplate(Creature creature)
+	public TransformTemplate getTemplate(Creature creature)
 	{
 		if (creature.isPlayer())
 		{
@@ -318,7 +318,7 @@ public class Transform implements IIdentifiable
 				// Send basic action list.
 				if (template.hasBasicActionList())
 				{
-					player.sendPacket(template.getBasicActionList());
+					player.sendPacket(new ExBasicActionList(template.getBasicActionList()));
 				}
 				
 				player.getEffectList().stopAllToggles();
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
index 1a95ccb397..8b59c5c95e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java
@@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.stats.Stat;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author UnAfraid
@@ -45,8 +44,7 @@ public class TransformTemplate
 	private List<AdditionalItemHolder> _additionalItems;
 	private Map<Integer, Integer> _baseDefense;
 	private Map<Integer, Double> _baseStats;
-	
-	private ExBasicActionList _list;
+	private int[] _actions;
 	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
 	
 	public TransformTemplate(StatSet set)
@@ -282,19 +280,19 @@ public class TransformTemplate
 		return _additionalItems != null ? _additionalItems : Collections.emptyList();
 	}
 	
-	public void setBasicActionList(ExBasicActionList list)
+	public void setBasicActionList(int[] actions)
 	{
-		_list = list;
+		_actions = actions;
 	}
 	
-	public ExBasicActionList getBasicActionList()
+	public int[] getBasicActionList()
 	{
-		return _list;
+		return _actions;
 	}
 	
 	public boolean hasBasicActionList()
 	{
-		return _list != null;
+		return _actions != null;
 	}
 	
 	public void addLevelData(TransformLevelData data)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
index 49bcba09e5..e5db83f103 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/clan/ClanWar.java
@@ -184,7 +184,7 @@ public class ClanWar
 		
 		_winnerClanId = winnerClan.getId();
 		_endTime = System.currentTimeMillis();
-		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis());
+		ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis() */);
 	}
 	
 	public void clanWarTimeout()
@@ -203,7 +203,7 @@ public class ClanWar
 			
 			_state = ClanWarState.TIE;
 			_endTime = System.currentTimeMillis();
-			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis());
+			ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), 5000 /* (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis() */);
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
index 49e27ac3e4..aea3f1b7b2 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/commission/CommissionItemType.java
@@ -57,7 +57,10 @@ public enum CommissionItemType
 	NECKLACE(31),
 	BELT(32),
 	BRACELET(33),
+	AGATHION(62),
 	HAIR_ACCESSORY(34),
+	BROOCH_JEWEL(63),
+	ARTIFACT(64),
 	// Supplies
 	POTION(35),
 	SCROLL_ENCHANT_WEAPON(36),
@@ -65,6 +68,7 @@ public enum CommissionItemType
 	SCROLL_OTHER(38),
 	SOULSHOT(39),
 	SPIRITSHOT(40),
+	OTHER_SUPPLIES(41),
 	// Pet Goods
 	PET_EQUIPMENT(42),
 	PET_SUPPLIES(43),
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
index afa13f0b6c..e3dd26b44a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/commission/CommissionTreeType.java
@@ -47,8 +47,8 @@ public enum CommissionTreeType
 		CommissionItemType.SPEAR,
 		CommissionItemType.OTHER_WEAPON),
 	ARMOR(1, CommissionItemType.HELMET, CommissionItemType.ARMOR_TOP, CommissionItemType.ARMOR_PANTS, CommissionItemType.FULL_BODY, CommissionItemType.GLOVES, CommissionItemType.FEET, CommissionItemType.SHIELD, CommissionItemType.SIGIL, CommissionItemType.UNDERWEAR, CommissionItemType.CLOAK),
-	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.HAIR_ACCESSORY),
-	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT),
+	ACCESSORY(2, CommissionItemType.RING, CommissionItemType.EARRING, CommissionItemType.NECKLACE, CommissionItemType.BELT, CommissionItemType.BRACELET, CommissionItemType.AGATHION, CommissionItemType.HAIR_ACCESSORY, CommissionItemType.BROOCH_JEWEL, CommissionItemType.ARTIFACT),
+	SUPPLIES(3, CommissionItemType.POTION, CommissionItemType.SCROLL_ENCHANT_WEAPON, CommissionItemType.SCROLL_ENCHANT_ARMOR, CommissionItemType.SCROLL_OTHER, CommissionItemType.SOULSHOT, CommissionItemType.SPIRITSHOT, CommissionItemType.OTHER_SUPPLIES),
 	PET_GOODS(4, CommissionItemType.PET_EQUIPMENT, CommissionItemType.PET_SUPPLIES),
 	MISC(
 		5,
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index a5ac2d9f22..317f22eb46 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2216,6 +2216,17 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 				summoner.addSummonedNpc(npc);
 			}
 			
+			// Retain monster original position if ENABLE_RANDOM_MONSTER_SPAWNS is enabled.
+			if (Config.ENABLE_RANDOM_MONSTER_SPAWNS && !randomOffset && npc.isMonster())
+			{
+				spawn.setXYZ(x, y, zValue);
+				npc.setXYZ(x, y, zValue);
+				if (heading > -1)
+				{
+					npc.setHeading(heading);
+				}
+			}
+			
 			// Fixes invisible NPCs spawned by script.
 			npc.broadcastInfo();
 			
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java
index 425bca897b..4e00472bdf 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/holders/LimitShopProductHolder.java
@@ -32,6 +32,7 @@ public class LimitShopProductHolder
 	private final long _count;
 	private final float _chance;
 	private final boolean _announce;
+	private final int _enchant;
 	private final int _productionId2;
 	private final long _count2;
 	private final float _chance2;
@@ -48,9 +49,10 @@ public class LimitShopProductHolder
 	private final long _count5;
 	private final boolean _announce5;
 	private final int _accountDailyLimit;
+	private final int _accountMontlyLimit;
 	private final int _accountBuyLimit;
 	
-	public LimitShopProductHolder(int id, int category, int minLevel, int maxLevel, int[] ingredientIds, long[] ingredientQuantities, int[] ingredientEnchants, int productionId, long count, float chance, boolean announce, int productionId2, long count2, float chance2, boolean announce2, int productionId3, long count3, float chance3, boolean announce3, int productionId4, long count4, float chance4, boolean announce4, int productionId5, long count5, boolean announce5, int accountDailyLimit, int accountBuyLimit)
+	public LimitShopProductHolder(int id, int category, int minLevel, int maxLevel, int[] ingredientIds, long[] ingredientQuantities, int[] ingredientEnchants, int productionId, long count, float chance, boolean announce, int enchant, int productionId2, long count2, float chance2, boolean announce2, int productionId3, long count3, float chance3, boolean announce3, int productionId4, long count4, float chance4, boolean announce4, int productionId5, long count5, boolean announce5, int accountDailyLimit, int accountMontlyLimit, int accountBuyLimit)
 	{
 		_id = id;
 		_category = category;
@@ -63,6 +65,7 @@ public class LimitShopProductHolder
 		_count = count;
 		_chance = chance;
 		_announce = announce;
+		_enchant = enchant;
 		_productionId2 = productionId2;
 		_count2 = count2;
 		_chance2 = chance2;
@@ -79,6 +82,7 @@ public class LimitShopProductHolder
 		_count5 = count5;
 		_announce5 = announce5;
 		_accountDailyLimit = accountDailyLimit;
+		_accountMontlyLimit = accountMontlyLimit;
 		_accountBuyLimit = accountBuyLimit;
 	}
 	
@@ -137,6 +141,11 @@ public class LimitShopProductHolder
 		return _announce;
 	}
 	
+	public int getEnchant()
+	{
+		return _enchant;
+	}
+	
 	public int getProductionId2()
 	{
 		return _productionId2;
@@ -217,6 +226,11 @@ public class LimitShopProductHolder
 		return _accountDailyLimit;
 	}
 	
+	public int getAccountMontlyLimit()
+	{
+		return _accountMontlyLimit;
+	}
+	
 	public int getAccountBuyLimit()
 	{
 		return _accountBuyLimit;
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/holders/PetExtractionHolder.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/holders/PetExtractionHolder.java
new file mode 100644
index 0000000000..bc54fd0c63
--- /dev/null
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/holders/PetExtractionHolder.java
@@ -0,0 +1,70 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.model.holders;
+
+/**
+ * @author Geremy
+ */
+public class PetExtractionHolder
+{
+	private final int _petId;
+	private final int _petLevel;
+	private final long _extractExp;
+	private final int _extractItem;
+	private final ItemHolder _defaultCost;
+	private final ItemHolder _extractCost;
+	
+	public PetExtractionHolder(int petId, int petLevel, long extractExp, int extractItem, ItemHolder defaultCost, ItemHolder extractCost)
+	{
+		_petId = petId;
+		_petLevel = petLevel;
+		_extractExp = extractExp;
+		_extractItem = extractItem;
+		_defaultCost = defaultCost;
+		_extractCost = extractCost;
+	}
+	
+	public int getPetId()
+	{
+		return _petId;
+	}
+	
+	public int getPetLevel()
+	{
+		return _petLevel;
+	}
+	
+	public long getExtractExp()
+	{
+		return _extractExp;
+	}
+	
+	public int getExtractItem()
+	{
+		return _extractItem;
+	}
+	
+	public ItemHolder getDefaultCost()
+	{
+		return _defaultCost;
+	}
+	
+	public ItemHolder getExtractCost()
+	{
+		return _extractCost;
+	}
+}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/item/instance/Item.java
index af5f4f14d9..d4efe730bb 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/item/instance/Item.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/item/instance/Item.java
@@ -39,6 +39,7 @@ import org.l2jmobius.commons.util.StringUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.xml.AgathionData;
 import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
+import org.l2jmobius.gameserver.data.xml.ArmorSetData;
 import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
 import org.l2jmobius.gameserver.data.xml.EnsoulData;
 import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -52,6 +53,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.IdManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager;
+import org.l2jmobius.gameserver.model.ArmorSet;
 import org.l2jmobius.gameserver.model.DropProtection;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.VariationInstance;
@@ -72,12 +74,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPi
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk;
 import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder;
+import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.Armor;
 import org.l2jmobius.gameserver.model.item.EtcItem;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone;
+import org.l2jmobius.gameserver.model.item.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder;
 import org.l2jmobius.gameserver.model.item.type.EtcItemType;
 import org.l2jmobius.gameserver.model.item.type.ItemType;
@@ -92,6 +96,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
 import org.l2jmobius.gameserver.network.serverpackets.GetItem;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
+import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import org.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.taskmanager.ItemAppearanceTaskManager;
@@ -1069,11 +1074,14 @@ public class Item extends WorldObject
 	 */
 	public boolean setAugmentation(VariationInstance augmentation, boolean updateDatabase)
 	{
-		// there shall be no previous augmentation..
+		// Remove previous augmentation.
 		if (_augmentation != null)
 		{
-			LOGGER.info("Warning: Augment set for (" + getObjectId() + ") " + getName() + " owner: " + _ownerId);
-			return false;
+			if (isEquipped())
+			{
+				_augmentation.removeBonus(getActingPlayer());
+			}
+			removeAugmentation();
 		}
 		
 		_augmentation = augmentation;
@@ -1641,7 +1649,9 @@ public class Item extends WorldObject
 		setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo
 		
 		// Add the Item dropped in the world as a visible object
-		World.getInstance().addVisibleObject(this, getWorldRegion());
+		final WorldRegion region = getWorldRegion();
+		region.addVisibleObject(this);
+		World.getInstance().addVisibleObject(this, region);
 		if (Config.SAVE_DROPPED_ITEM)
 		{
 			ItemsOnGroundManager.getInstance().save(this);
@@ -2575,6 +2585,11 @@ public class Item extends WorldObject
 		}
 	}
 	
+	public int getAppearanceStoneId()
+	{
+		return getVariables().getInt(ItemVariables.VISUAL_APPEARANCE_STONE_ID, 0);
+	}
+	
 	public long getVisualLifeTime()
 	{
 		return getVariables().getLong(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, 0);
@@ -2604,6 +2619,8 @@ public class Item extends WorldObject
 	
 	public void onVisualLifeTimeEnd(boolean announce)
 	{
+		removeVisualSetSkills();
+		
 		final ItemVariables vars = getVariables();
 		vars.remove(ItemVariables.VISUAL_ID);
 		vars.remove(ItemVariables.VISUAL_APPEARANCE_STONE_ID);
@@ -2653,6 +2670,124 @@ public class Item extends WorldObject
 		vars.storeMe();
 	}
 	
+	public void removeVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if ((armorSet.getPiecesCount(player, Item::getVisualId) - 1 /* not removed yet */) < armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								final Skill skill = holder.getSkill();
+								if (skill != null)
+								{
+									player.removeSkill(skill, false, skill.isPassive());
+									update = true;
+								}
+							}
+						}
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
+	public void applyVisualSetSkills()
+	{
+		if (!isEquipped())
+		{
+			return;
+		}
+		
+		final int appearanceStoneId = getAppearanceStoneId();
+		if (appearanceStoneId > 0)
+		{
+			final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId);
+			if ((stone != null) && (stone.getType() == AppearanceType.FIXED))
+			{
+				final Player player = getActingPlayer();
+				if (player != null)
+				{
+					boolean update = false;
+					boolean updateTimeStamp = false;
+					for (ArmorSet armorSet : ArmorSetData.getInstance().getSets(stone.getVisualId()))
+					{
+						if (armorSet.getPiecesCount(player, Item::getVisualId) >= armorSet.getMinimumPieces())
+						{
+							for (ArmorsetSkillHolder holder : armorSet.getSkills())
+							{
+								if (player.getSkillLevel(holder.getSkillId()) >= holder.getSkillLevel())
+								{
+									continue;
+								}
+								
+								final Skill skill = holder.getSkill();
+								if ((skill == null) || (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player)))
+								{
+									continue;
+								}
+								
+								player.addSkill(skill, false);
+								update = true;
+								
+								if (skill.isActive())
+								{
+									if (!player.hasSkillReuse(skill.getReuseHashCode()))
+									{
+										final int equipDelay = getEquipReuseDelay();
+										if (equipDelay > 0)
+										{
+											player.addTimeStamp(skill, equipDelay);
+											player.disableSkill(skill, equipDelay);
+										}
+									}
+									
+									// Active, non offensive, skills start with reuse on equip.
+									if (!skill.isBad() && !skill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
+									{
+										player.addTimeStamp(skill, skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
+									}
+									
+									updateTimeStamp = true;
+								}
+							}
+						}
+					}
+					
+					if (updateTimeStamp)
+					{
+						player.sendPacket(new SkillCoolTime(player));
+					}
+					
+					if (update)
+					{
+						player.sendSkillList();
+					}
+				}
+			}
+		}
+	}
+	
 	/**
 	 * Returns the item in String format
 	 * @return String
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 03f913690c..aa08958f9d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -900,7 +900,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndApply(playable, item, Item::getVisualId))
 				{
 					update = true;
@@ -1052,7 +1053,8 @@ public abstract class Inventory extends ItemContainer
 			final int itemVisualId = item.getVisualId();
 			if (itemVisualId > 0)
 			{
-				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				final int appearanceStoneId = item.getAppearanceStoneId();
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(appearanceStoneId > 0 ? appearanceStoneId : itemVisualId);
 				if ((stone != null) && (stone.getType() == AppearanceType.FIXED) && verifyAndRemove(playable, item, Item::getVisualId))
 				{
 					remove = true;
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/siege/FortSiege.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/siege/FortSiege.java
index 20cfe5d465..829b487252 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/siege/FortSiege.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/siege/FortSiege.java
@@ -268,7 +268,7 @@ public class FortSiege extends ListenersContainer implements Siegable
 					}
 					
 					ThreadPool.schedule(new ScheduleStartSiegeTask(nextTask), _initialDelayInMilliseconds - (nextTask * 1000)); // Prepare task for @nextTask minutes left.
-					LOGGER.info("scheduling " + nextTask + " in " + ((_initialDelayInMilliseconds / 1000) - nextTask) + " sec");
+					// LOGGER.info("scheduling " + nextTask + " in " + ((_initialDelayInMilliseconds / 1000) - nextTask) + " sec");
 				}
 				else if ((_time == 3600) && (_fortInst.getResidenceId() != FortManager.ORC_FORTRESS)) // 1hr remains
 				
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/skill/CommonSkill.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/skill/CommonSkill.java
index eb776c7c42..0d3b2f6ad0 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/skill/CommonSkill.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/skill/CommonSkill.java
@@ -95,7 +95,8 @@ public enum CommonSkill
 	FLAG_EQUIP(52013, 1),
 	REMOTE_FLAG_DISPLAY(52017, 1),
 	EINHASAD_OVERSEEING(60002, 1),
-	TELEPORT(60018, 1);
+	TELEPORT(60018, 1),
+	BRUTALITY(87366, 1);
 	
 	private final SkillHolder _holder;
 	
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
index 761d9b19c4..e256a08948 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java
@@ -691,7 +691,7 @@ public class SkillCaster implements Runnable
 							((Creature) obj).addAttackerToAttackByList(caster);
 							
 							// Summoning a servitor should not renew your own PvP flag time.
-							if (obj.isFakePlayer() && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
+							if (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!obj.isServitor() || (obj.getObjectId() != player.getFirstServitor().getObjectId())))
 							{
 								player.updatePvPStatus();
 							}
@@ -714,7 +714,7 @@ public class SkillCaster implements Runnable
 						{
 							// Consider fake player PvP status.
 							if (!obj.isFakePlayer() //
-								|| (obj.isFakePlayer() && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
+								|| (obj.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE && (!((Npc) obj).isScriptValue(0) || (((Npc) obj).getReputation() < 0))))
 							{
 								player.updatePvPStatus();
 							}
@@ -749,7 +749,7 @@ public class SkillCaster implements Runnable
 					}
 				});
 			}
-			else if (caster.isFakePlayer()) // fake player attacks player
+			else if (caster.isFakePlayer() && !Config.FAKE_PLAYER_AUTO_ATTACKABLE) // fake player attacks player
 			{
 				if (target.isPlayable() || target.isFakePlayer())
 				{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 7d380549a9..42deb6e249 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -97,6 +97,7 @@ public enum Stat
 	HATE_ATTACK("attackHate"),
 	REAR_DAMAGE_RATE("rearDamage"),
 	AUTO_ATTACK_DAMAGE_BONUS("autoAttackDamageBonus"),
+	IGNORE_REDUCE_DAMAGE("ignoreReduceDamage"),
 	
 	// ELEMENTAL SPIRITS
 	ELEMENTAL_SPIRIT_FIRE_ATTACK("elementalSpiritFireAttack"),
@@ -150,7 +151,8 @@ public enum Stat
 	SHIELD_DEFENCE_RATE("rShld", new ShieldDefenceRateFinalizer()),
 	CRITICAL_RATE("rCrit", new PCriticalRateFinalizer(), MathUtil::add, MathUtil::add, 0, 1),
 	CRITICAL_RATE_SKILL("physicalSkillCriticalRate"),
-	MAX_MAGIC_CRITICAL_RATE("maxMagicCritRate"),
+	ADD_MAX_MAGIC_CRITICAL_RATE("addMaxMagicCritRate"),
+	ADD_MAX_PHYSICAL_CRITICAL_RATE("addMaxPhysicalCritRate"),
 	MAGIC_CRITICAL_RATE("mCritRate", new MCritRateFinalizer()),
 	MAGIC_CRITICAL_RATE_BY_CRITICAL_RATE("mCritRateByRCrit", Stat::defaultValue, MathUtil::add, MathUtil::mul, 0, 0),
 	DEFENCE_CRITICAL_RATE("defCritRate"),
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
index 5ca3b81223..3ddbf6530e 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java
@@ -44,7 +44,18 @@ public class MCritRateFinalizer implements IStatFunction
 		
 		final double physicalBonus = (creature.getStat().getMul(Stat.MAGIC_CRITICAL_RATE_BY_CRITICAL_RATE, 1) - 1) * creature.getStat().getCriticalHit();
 		final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, (baseValue * witBonus * 10) + physicalBonus), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
+		
+		final double maxMagicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxMagicalCritRate = Config.MAX_MCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_MAGIC_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxMagicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, (baseValue * witBonus * 10) + physicalBonus), 0, maxMagicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
index ac0451e3e1..704975f84b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
@@ -93,6 +93,6 @@ public class MDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
index 33f96df6cd..a1ef8d0a85 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java
@@ -42,7 +42,18 @@ public class PCriticalRateFinalizer implements IStatFunction
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
 		}
 		final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
-		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
+		
+		final double maxPhysicalCritRate;
+		if (creature.isPlayable())
+		{
+			maxPhysicalCritRate = Config.MAX_PCRIT_RATE + creature.getStat().getValue(Stat.ADD_MAX_PHYSICAL_CRITICAL_RATE, 0);
+		}
+		else
+		{
+			maxPhysicalCritRate = Double.MAX_VALUE;
+		}
+		
+		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, maxPhysicalCritRate);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
index a45e8bb28a..f2c6378069 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
@@ -95,6 +95,6 @@ public class PDefenseFinalizer implements IStatFunction
 	{
 		final double mul = Math.max(creature.getStat().getMul(stat), 0.5);
 		final double add = creature.getStat().getAdd(stat);
-		return (baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType());
+		return Math.max((baseValue * mul) + add + creature.getStat().getMoveTypeValue(stat, creature.getMoveType()), creature.getTemplate().getBaseValue(stat, 0) * 0.2);
 	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java
index 06b7bc57a9..8fcb00e5bf 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/variables/AccountVariables.java
@@ -46,6 +46,7 @@ public class AccountVariables extends AbstractVariables
 	public static final String PRIME_SHOP_PRODUCT_DAILY_COUNT = "PSPDailyCount";
 	public static final String LCOIN_SHOP_PRODUCT_COUNT = "LCSCount";
 	public static final String LCOIN_SHOP_PRODUCT_DAILY_COUNT = "LCSDailyCount";
+	public static final String LCOIN_SHOP_PRODUCT_MONTLY_COUNT = "LCSMontlyCount";
 	public static final String VIP_POINTS = "VipPoints";
 	public static final String VIP_TIER = "VipTier";
 	public static final String VIP_EXPIRATION = "VipExpiration";
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/zone/ZoneType.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
index 69530d1955..6301c52fc8 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
@@ -36,6 +36,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureZoneEnter;
 import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureZoneExit;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.interfaces.ILocational;
+import org.l2jmobius.gameserver.network.SystemMessageId;
+import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 
 /**
@@ -215,6 +217,10 @@ public abstract class ZoneType extends ListenersContainer
 		// Check level
 		if ((creature.getLevel() < _minLevel) || (creature.getLevel() > _maxLevel))
 		{
+			if (creature.isPlayer())
+			{
+				creature.getActingPlayer().sendPacket(new ExShowScreenMessage(SystemMessageId.YOU_CANNOT_ENTER_AS_YOUR_LEVEL_DOES_NOT_MEET_THE_REQUIREMENTS, ExShowScreenMessage.TOP_CENTER, 10000));
+			}
 			return false;
 		}
 		
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index a6eaf014dc..df6cec9f99 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.zone.type;
 
+import org.l2jmobius.gameserver.enums.InstanceType;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.zone.ZoneType;
@@ -32,6 +33,7 @@ public class TeleportZone extends ZoneType
 	public TeleportZone(int id)
 	{
 		super(id);
+		setTargetType(InstanceType.Player); // Default only player.
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/ExClientPackets.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/ExClientPackets.java
index 540b4694bb..ad0a3f1c60 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/ExClientPackets.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/ExClientPackets.java
@@ -150,6 +150,7 @@ import org.l2jmobius.gameserver.network.clientpackets.newskillenchant.RequestExS
 import org.l2jmobius.gameserver.network.clientpackets.pet.ExEvolvePet;
 import org.l2jmobius.gameserver.network.clientpackets.pet.ExPetEquipItem;
 import org.l2jmobius.gameserver.network.clientpackets.pet.ExPetUnequipItem;
+import org.l2jmobius.gameserver.network.clientpackets.pet.ExTryPetExtractSystem;
 import org.l2jmobius.gameserver.network.clientpackets.pet.RequestExAcquirePetSkill;
 import org.l2jmobius.gameserver.network.clientpackets.pledgeV3.RequestExPledgeEnemyDelete;
 import org.l2jmobius.gameserver.network.clientpackets.pledgeV3.RequestExPledgeEnemyInfoList;
@@ -717,7 +718,7 @@ public enum ExClientPackets
 	EX_PLEDGE_ENEMY_INFO_LIST(0x1C8, RequestExPledgeEnemyInfoList::new, ConnectionState.IN_GAME),
 	EX_PLEDGE_ENEMY_REGISTER(0x1C9, RequestExPledgeEnemyRegister::new, ConnectionState.IN_GAME),
 	EX_PLEDGE_ENEMY_DELETE(0x1CA, RequestExPledgeEnemyDelete::new, ConnectionState.IN_GAME),
-	EX_TRY_PET_EXTRACT_SYSTEM(0x1CB, null, ConnectionState.IN_GAME),
+	EX_TRY_PET_EXTRACT_SYSTEM(0x1CB, ExTryPetExtractSystem::new, ConnectionState.IN_GAME),
 	EX_PLEDGE_V3_SET_ANNOUNCE(0x1CC, RequestExPledgeV3SetAnnounce::new, ConnectionState.IN_GAME),
 	// 306
 	EX_RANKING_FESTIVAL_OPEN(0x1CD, null, ConnectionState.IN_GAME),
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 5669a389ff..abfec000db 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -109,6 +109,11 @@ public class RequestAcquireSkill implements ClientPacket
 		
 		final int skillId = player.getReplacementSkill(_id);
 		final Skill existingSkill = player.getKnownSkill(skillId); // Mobius: Keep existing sublevel.
+		if ((_level > 65536000) && (existingSkill != null) && (existingSkill.getSubLevel() > 1000))
+		{
+			_level -= existingSkill.getSubLevel() * 65536;
+		}
+		
 		final Skill skill = SkillData.getInstance().getSkill(skillId, _level, existingSkill == null ? 0 : existingSkill.getSubLevel());
 		if (skill == null)
 		{
@@ -640,7 +645,7 @@ public class RequestAcquireSkill implements ClientPacket
 		player.sendItemList();
 		player.updateShortCuts(_id, skill.getLevel(), skill.getSubLevel());
 		player.sendPacket(new ShortCutInit(player));
-		player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
+		player.sendPacket(ExBasicActionList.STATIC_PACKET);
 		player.sendPacket(new ExAcquireSkillResult(skill.getId(), skill.getLevel(), true, SystemMessageId.YOU_HAVE_LEARNED_S1));
 		player.sendSkillList(skill.getId());
 		
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index f57765cd74..c58d605857 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.handler.PlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
@@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
 /**
@@ -86,8 +86,9 @@ public class RequestActionUse implements ClientPacket
 		// Don't allow to do some action if player is transformed
 		if (player.isTransformed())
 		{
-			final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-			if (Arrays.binarySearch(allowedActions, _actionId) < 0)
+			final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+			final int[] allowedActions = transformTemplate.getBasicActionList();
+			if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, _actionId) < 0))
 			{
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId());
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 05934422b3..a35d839832 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -87,7 +87,7 @@ public class RequestShortCutReg implements ClientPacket
 		else if (_page == 23)
 		{
 			final Item item = player.getInventory().getItemByObjectId(_id);
-			if ((item != null) && !item.isPotion())
+			if (((item != null) && !item.isPotion()) || (_type == ShortcutType.ACTION))
 			{
 				return;
 			}
@@ -148,7 +148,7 @@ public class RequestShortCutReg implements ClientPacket
 		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
 		sc.setAutoUse(_active);
 		player.registerShortCut(sc);
-		player.sendPacket(new ShortCutRegister(sc));
+		player.sendPacket(new ShortCutRegister(sc, player));
 		player.sendPacket(new ExActivateAutoShortcut(sc, _active));
 		
 		// When id is not auto used, deactivate auto shortcuts.
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 67ae4e4741..ddabd11d33 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -226,7 +226,7 @@ public class UseItem implements ClientPacket
 			}
 			
 			// Prevent Death Knight players to equip other weapons.
-			if (item.isWeapon() && (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, player.getClassId().getId())) && ((item.getWeaponItem().getItemType() != WeaponType.SWORD) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND)))
+			if (item.isWeapon() && CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, player.getClassId().getId()) && (item.getWeaponItem().getItemType() != WeaponType.FISHINGROD) && ((item.getWeaponItem().getItemType() != WeaponType.SWORD) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND)))
 			{
 				player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
 				return;
@@ -247,7 +247,7 @@ public class UseItem implements ClientPacket
 			}
 			
 			// Prevent Sylph players to equip other weapons.
-			if (item.isWeapon() && (player.getRace() == Race.SYLPH) && (item.getWeaponItem().getItemType() != WeaponType.PISTOLS))
+			if (item.isWeapon() && (player.getRace() == Race.SYLPH) && (item.getWeaponItem().getItemType() != WeaponType.FISHINGROD) && (item.getWeaponItem().getItemType() != WeaponType.PISTOLS))
 			{
 				player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
 				return;
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index a140c01f0e..c366a156ba 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -229,6 +229,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 			}
 			case FIXED:
 			{
+				targetItem.removeVisualSetSkills();
+				
 				if (appearanceStone.getVisualIds().isEmpty())
 				{
 					extracItemId = appearanceStone.getVisualId();
@@ -245,6 +247,8 @@ public class RequestShapeShiftingItem implements ClientPacket
 						targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_STONE_ID, appearanceStone.getId());
 					}
 				}
+				
+				targetItem.applyVisualSetSkills();
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
index 13c71e9403..61e0c0a0f1 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
@@ -103,10 +103,6 @@ public class RequestEnchantItem implements ClientPacket
 			player.removeRequest(request.getClass());
 			return;
 		}
-		if (item.getEnchantLevel() != request.getEnchantLevel())
-		{
-			item.setEnchantLevel(request.getEnchantLevel());
-		}
 		
 		// Template for scroll.
 		final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java
index ea83f702e2..73bdbcd0f3 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassReward.java
@@ -112,26 +112,9 @@ public class RequestHuntPassReward implements ClientPacket
 			return;
 		}
 		
-		// Normal reward.
-		if (!huntPass.isPremium() && (rewardIndex <= HuntPassData.getInstance().getRewardsCount()))
-		{
-			rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
-			huntPass.setRewardStep(rewardIndex + 1);
-		}
-		// Premium reward.
-		else if (huntPass.isPremium())
-		{
-			if ((rewardIndex < HuntPassData.getInstance().getRewardsCount()) && (rewardIndex <= premiumRewardIndex))
-			{
-				rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
-				huntPass.setRewardStep(rewardIndex + 1);
-			}
-			else if ((premiumRewardIndex < rewardIndex) && (premiumRewardIndex <= HuntPassData.getInstance().getPremiumRewardsCount()))
-			{
-				rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex));
-				huntPass.setPremiumRewardStep(premiumRewardIndex + 1);
-			}
-		}
+		normalReward(player);
+		premiumReward(player);
+		huntPass.setRewardStep(rewardIndex + 1);
 		huntPass.setRewardAlert(false);
 		
 		player.sendPacket(new HuntPassInfo(player, _huntPassType));
@@ -157,4 +140,39 @@ public class RequestHuntPassReward implements ClientPacket
 			player.addItem("HuntPassReward", reward, player, true);
 		}
 	}
+	
+	private void premiumReward(Player player)
+	{
+		final HuntPass huntPass = player.getHuntPass();
+		final int premiumRewardIndex = huntPass.getPremiumRewardStep();
+		if (premiumRewardIndex >= HuntPassData.getInstance().getPremiumRewardsCount())
+		{
+			return;
+		}
+		
+		if (!huntPass.isPremium())
+		{
+			return;
+		}
+		
+		rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex));
+		huntPass.setPremiumRewardStep(premiumRewardIndex + 1);
+	}
+	
+	private void normalReward(Player player)
+	{
+		final HuntPass huntPass = player.getHuntPass();
+		final int rewardIndex = huntPass.getRewardStep();
+		if (rewardIndex >= HuntPassData.getInstance().getRewardsCount())
+		{
+			return;
+		}
+		
+		if (huntPass.isPremium() && ((huntPass.getPremiumRewardStep() < rewardIndex) || (huntPass.getPremiumRewardStep() >= HuntPassData.getInstance().getPremiumRewardsCount())))
+		{
+			return;
+		}
+		
+		rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
+	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassRewardAll.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassRewardAll.java
index dc8277d5b6..032cf143c5 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassRewardAll.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/huntpass/RequestHuntPassRewardAll.java
@@ -115,26 +115,9 @@ public class RequestHuntPassRewardAll implements ClientPacket
 				break REWARD_LOOP;
 			}
 			
-			// Normal reward.
-			if (!huntPass.isPremium() && (rewardIndex <= HuntPassData.getInstance().getRewardsCount()))
-			{
-				rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
-				huntPass.setRewardStep(rewardIndex + 1);
-			}
-			// Premium reward.
-			else if (huntPass.isPremium())
-			{
-				if ((rewardIndex < HuntPassData.getInstance().getRewardsCount()) && (rewardIndex <= premiumRewardIndex))
-				{
-					rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
-					huntPass.setRewardStep(rewardIndex + 1);
-				}
-				else if ((premiumRewardIndex < rewardIndex) && (premiumRewardIndex <= HuntPassData.getInstance().getPremiumRewardsCount()))
-				{
-					rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex));
-					huntPass.setPremiumRewardStep(premiumRewardIndex + 1);
-				}
-			}
+			normalReward(player);
+			premiumReward(player);
+			huntPass.setRewardStep(rewardIndex + 1);
 		}
 		
 		if (!inventoryLimitReached)
@@ -165,4 +148,39 @@ public class RequestHuntPassRewardAll implements ClientPacket
 			player.addItem("HuntPassReward", reward, player, true);
 		}
 	}
+	
+	private void premiumReward(Player player)
+	{
+		final HuntPass huntPass = player.getHuntPass();
+		final int premiumRewardIndex = huntPass.getPremiumRewardStep();
+		if (premiumRewardIndex >= HuntPassData.getInstance().getPremiumRewardsCount())
+		{
+			return;
+		}
+		
+		if (!huntPass.isPremium())
+		{
+			return;
+		}
+		
+		rewardItem(player, HuntPassData.getInstance().getPremiumRewards().get(premiumRewardIndex));
+		huntPass.setPremiumRewardStep(premiumRewardIndex + 1);
+	}
+	
+	private void normalReward(Player player)
+	{
+		final HuntPass huntPass = player.getHuntPass();
+		final int rewardIndex = huntPass.getRewardStep();
+		if (rewardIndex >= HuntPassData.getInstance().getRewardsCount())
+		{
+			return;
+		}
+		
+		if (huntPass.isPremium() && ((huntPass.getPremiumRewardStep() < rewardIndex) || (huntPass.getPremiumRewardStep() >= HuntPassData.getInstance().getPremiumRewardsCount())))
+		{
+			return;
+		}
+		
+		rewardItem(player, HuntPassData.getInstance().getRewards().get(rewardIndex));
+	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
index 7b893addd1..3897c4a9d5 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java
@@ -154,6 +154,25 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 				return;
 			}
 		}
+		else if (_product.getAccountMontlyLimit() > 0)
+		{
+			final long amount = _product.getAccountMontlyLimit() * _amount;
+			if (amount < 1)
+			{
+				player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
+				player.removeRequest(PrimeShopRequest.class);
+				player.sendPacket(new ExPurchaseLimitShopItemResult(false, _shopIndex, _productId, 0, Collections.emptyList()));
+				return;
+			}
+			if (player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + _product.getProductionId(), 0) >= amount)
+			{
+				player.sendMessage("You have reached your montly limit.");
+				player.removeRequest(PrimeShopRequest.class);
+				player.sendPacket(new ExPurchaseLimitShopItemResult(false, _shopIndex, _productId, 0, Collections.emptyList()));
+				return;
+			}
+			
+		}
 		else if (_product.getAccountBuyLimit() > 0) // Count limit.
 		{
 			final long amount = _product.getAccountBuyLimit() * _amount;
@@ -175,7 +194,7 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 		}
 		
 		// Check existing items.
-		final int remainingInfo = Math.max(0, Math.max(_product.getAccountBuyLimit(), _product.getAccountDailyLimit()));
+		final int remainingInfo = Math.max(0, Math.max(_product.getAccountBuyLimit(), Math.max(_product.getAccountDailyLimit(), _product.getAccountMontlyLimit())));
 		for (int i = 0; i < _product.getIngredientIds().length; i++)
 		{
 			if (_product.getIngredientIds()[i] == 0)
@@ -326,7 +345,7 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 				if (Rnd.get(100) < _product.getChance())
 				{
 					rewards.computeIfAbsent(0, k -> new LimitShopRandomCraftReward(_product.getProductionId(), 0, 0)).getCount().addAndGet((int) _product.getCount());
-					final Item item = player.addItem("LCoinShop", _product.getProductionId(), _product.getCount(), player, true);
+					final Item item = player.addItem("LCoinShop", _product.getProductionId(), _product.getCount(), _product.getEnchant(), player, true);
 					if (_product.isAnnounce())
 					{
 						Broadcast.toAllOnlinePlayers(new ExItemAnnounce(player, item, ExItemAnnounce.SPECIAL_CREATION));
@@ -373,7 +392,7 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 		else if (Rnd.get(100) < _product.getChance())
 		{
 			rewards.put(0, new LimitShopRandomCraftReward(_product.getProductionId(), (int) (_product.getCount() * _amount), 0));
-			final Item item = player.addItem("LCoinShop", _product.getProductionId(), _product.getCount() * _amount, player, true);
+			final Item item = player.addItem("LCoinShop", _product.getProductionId(), _product.getCount() * _amount, _product.getEnchant(), player, true);
 			if (_product.isAnnounce())
 			{
 				Broadcast.toAllOnlinePlayers(new ExItemAnnounce(player, item, ExItemAnnounce.SPECIAL_CREATION));
@@ -385,6 +404,10 @@ public class RequestPurchaseLimitShopItemBuy implements ClientPacket
 		{
 			player.getAccountVariables().set(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + _product.getProductionId(), player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + _product.getProductionId(), 0) + _amount);
 		}
+		if (_product.getAccountMontlyLimit() > 0)
+		{
+			player.getAccountVariables().set(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + _product.getProductionId(), player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + _product.getProductionId(), 0) + _amount);
+		}
 		else if (_product.getAccountBuyLimit() > 0)
 		{
 			player.getAccountVariables().set(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + _product.getProductionId(), player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + _product.getProductionId(), 0) + _amount);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
index 36ff68c36c..e95b6ff799 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
@@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetSkillList;
-import org.l2jmobius.gameserver.network.serverpackets.pet.PetInfo;
+import org.l2jmobius.gameserver.network.serverpackets.pet.PetSummonInfo;
 
 /**
  * @author Berezkin Nikolay
@@ -230,7 +230,7 @@ public class ExPetEquipItem implements ClientPacket
 	private void sendInfos(Pet pet, Player player)
 	{
 		pet.getStat().recalculateStats(true);
-		player.sendPacket(new PetInfo(pet, 1));
+		player.sendPacket(new PetSummonInfo(pet, 1));
 		player.sendPacket(new ExPetSkillList(false, pet));
 	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
index f5e874bfce..47264a1436 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java
@@ -17,7 +17,7 @@ import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.pet.ExPetSkillList;
-import org.l2jmobius.gameserver.network.serverpackets.pet.PetInfo;
+import org.l2jmobius.gameserver.network.serverpackets.pet.PetSummonInfo;
 
 /**
  * @author Berezkin Nikolay
@@ -183,7 +183,7 @@ public class ExPetUnequipItem implements ClientPacket
 	private void sendInfos(Pet pet, Player player)
 	{
 		pet.getStat().recalculateStats(true);
-		player.sendPacket(new PetInfo(pet, 1));
+		player.sendPacket(new PetSummonInfo(pet, 1));
 		player.sendPacket(new ExPetSkillList(false, pet));
 	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExTryPetExtractSystem.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExTryPetExtractSystem.java
new file mode 100644
index 0000000000..6bb1753d14
--- /dev/null
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExTryPetExtractSystem.java
@@ -0,0 +1,115 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.clientpackets.pet;
+
+import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.gameserver.data.xml.NpcData;
+import org.l2jmobius.gameserver.data.xml.PetDataTable;
+import org.l2jmobius.gameserver.data.xml.PetExtractData;
+import org.l2jmobius.gameserver.model.PetData;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
+import org.l2jmobius.gameserver.model.holders.PetExtractionHolder;
+import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.itemcontainer.PetInventory;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
+import org.l2jmobius.gameserver.network.GameClient;
+import org.l2jmobius.gameserver.network.SystemMessageId;
+import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
+import org.l2jmobius.gameserver.network.serverpackets.pet.ResultPetExtractSystem;
+
+/**
+ * @author Geremy
+ */
+public class ExTryPetExtractSystem implements ClientPacket
+{
+	private int _itemObjId;
+	
+	@Override
+	public void read(ReadablePacket packet)
+	{
+		_itemObjId = packet.readInt();
+	}
+	
+	@Override
+	public void run(GameClient client)
+	{
+		final Player player = client.getPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		final Item petItem = player.getInventory().getItemByObjectId(_itemObjId);
+		if ((petItem == null) || ((player.getPet() != null) && (player.getPet().getControlItem() == petItem)))
+		{
+			player.sendPacket(new ResultPetExtractSystem(false));
+			return;
+		}
+		
+		final PetData petData = PetDataTable.getInstance().getPetDataByItemId(petItem.getId());
+		final NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(petData.getNpcId());
+		final Pet pet = new Pet(npcTemplate, player, petItem);
+		final PetInventory petInventory = pet.getInventory();
+		final PlayerInventory playerInventory = player.getInventory();
+		if ((petInventory == null) || (playerInventory == null))
+		{
+			player.sendPacket(new ResultPetExtractSystem(false));
+			return;
+		}
+		
+		if (!playerInventory.validateWeight(petInventory.getTotalWeight()) || !playerInventory.validateCapacity(petInventory.getSize()))
+		{
+			player.sendPacket(SystemMessageId.THERE_ARE_ITEMS_IN_THE_PET_S_INVENTORY_TAKE_THEM_OUT_FIRST);
+			player.sendPacket(new ResultPetExtractSystem(false));
+			return;
+		}
+		
+		petInventory.transferItemsToOwner();
+		
+		final Pet petInfo = Pet.restore(petItem, NpcData.getInstance().getTemplate(petData.getNpcId()), player);
+		final int petId = PetDataTable.getInstance().getPetDataByItemId(petItem.getId()).getType();
+		final int petLevel = petInfo.getLevel();
+		final PetExtractionHolder holder = PetExtractData.getInstance().getExtraction(petId, petLevel);
+		if (holder != null)
+		{
+			final int extractItemId = holder.getExtractItem();
+			final int extractItemCount = (int) (petInfo.getStat().getExp() / holder.getExtractExp());
+			final int extractCostId = holder.getExtractCost().getId();
+			final long extractCostCount = holder.getExtractCost().getCount() * extractItemCount;
+			final int defaultCostId = holder.getDefaultCost().getId();
+			final long defaultCostCount = holder.getDefaultCost().getCount();
+			if ((player.getInventory().getInventoryItemCount(extractCostId, -1) >= extractCostCount) && (player.getInventory().getInventoryItemCount(defaultCostId, -1) >= defaultCostCount))
+			{
+				if (player.destroyItemByItemId("Pet Extraction", extractCostId, extractCostCount, player, true) && player.destroyItemByItemId("Pet Extraction", defaultCostId, defaultCostCount, player, true) && player.destroyItem("Pet Extraction", petItem, player, true))
+				{
+					player.addItem("Pet Extraction", extractItemId, extractItemCount, player, true);
+					player.sendPacket(new ResultPetExtractSystem(true));
+				}
+			}
+			else
+			{
+				player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT);
+				player.sendPacket(new ResultPetExtractSystem(false));
+			}
+			return;
+		}
+		
+		player.sendPacket(new ResultPetExtractSystem(false));
+	}
+}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java
index 6d9cbca72a..16b9a09305 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java
@@ -46,7 +46,7 @@ public class ExRequestRandomCraftExtract implements ClientPacket
 		{
 			final int objId = packet.readInt();
 			final long count = packet.readLong();
-			if (count > 1)
+			if (count > 0)
 			{
 				_items.put(objId, count);
 			}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGacha.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGacha.java
index 2889ac5094..66eb16b811 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGacha.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/subjugation/RequestSubjugationGacha.java
@@ -48,6 +48,11 @@ public class RequestSubjugationGacha implements ClientPacket
 	@Override
 	public void run(GameClient client)
 	{
+		if ((_amount < 1) || ((_amount * 20000L) < 1))
+		{
+			return;
+		}
+		
 		final Player player = client.getPlayer();
 		if (player == null)
 		{
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/variation/ExApplyVariationOption.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/variation/ExApplyVariationOption.java
index 43532feacc..d19439926d 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/variation/ExApplyVariationOption.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/clientpackets/variation/ExApplyVariationOption.java
@@ -23,7 +23,6 @@ import org.l2jmobius.gameserver.model.actor.request.VariationRequest;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
-import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.variation.ApplyVariationOption;
 
 /**
@@ -58,34 +57,26 @@ public class ExApplyVariationOption implements ClientPacket
 		final int option1Id = augment.getOption1Id();
 		final int option2Id = augment.getOption2Id();
 		
-		// Unequip item.
-		final InventoryUpdate iu = new InventoryUpdate();
-		if (targetItem.isEquipped())
-		{
-			for (Item itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()))
-			{
-				iu.addModifiedItem(itm);
-			}
-			player.broadcastUserInfo();
-		}
-		
 		if ((targetItem.getObjectId() != _enchantedObjectId) || (_option1 != option1Id) || (_option2 != option2Id))
 		{
 			player.sendPacket(new ApplyVariationOption(0, 0, 0, 0));
 			return;
 		}
 		
-		// Remove the augmentation if any (286).
-		if (targetItem.isAugmented())
-		{
-			targetItem.removeAugmentation();
-		}
-		
 		targetItem.setAugmentation(augment, true);
 		
-		iu.addModifiedItem(targetItem);
-		player.sendInventoryUpdate(iu);
 		player.sendPacket(new ApplyVariationOption(1, _enchantedObjectId, _option1, _option2));
+		
+		// Apply new augment.
+		if (targetItem.isEquipped())
+		{
+			targetItem.getAugmentation().applyBonus(player);
+		}
+		
+		// Recalculate all stats.
+		player.getStat().recalculateStats(true);
+		
+		player.sendItemList();
 		player.removeRequest(VariationRequest.class);
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index 73459940e5..189fda4a5a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import org.l2jmobius.gameserver.data.xml.ActionData;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
@@ -23,132 +24,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  */
 public class ExBasicActionList extends ServerPacket
 {
-	//@formatter:off
-	public static final int[] ACTIONS_ON_TRANSFORM =
-	{
-		1, 3, 4, 5,
-		6, 7, 8, 9,
-		11, 15, 16, 17,
-		18, 19, 21, 22,
-		23, 32, 36, 39,
-		40, 41, 42, 43,
-		44, 45, 46, 47,
-		48, 50, 52, 53,
-		54, 55, 56, 57,
-		63, 64, 65, 70,
-		86, 1000, 1001, 1003,
-		1004, 1005, 1006, 1007,
-		1008, 1009, 1010, 1011,
-		1012, 1013, 1014, 1015,
-		1016, 1017, 1018, 1019,
-		1020, 1021, 1022, 1023,
-		1024, 1025, 1026, 1027,
-		1028, 1029, 1030, 1031,
-		1032, 1033, 1034, 1035,
-		1036, 1037, 1038, 1039,
-		1040, 1041, 1042, 1043,
-		1044, 1045, 1046, 1047,
-		1048, 1049, 1050, 1051,
-		1052, 1053, 1054, 1055,
-		1056, 1057, 1058, 1059,
-		1060, 1061, 1062, 1063,
-		1064, 1065, 1066, 1067,
-		1068, 1069, 1070, 1071,
-		1072, 1073, 1074, 1075,
-		1076, 1077, 1078, 1079,
-		1080, 1081, 1082, 1083,
-		1084, 1089, 1090, 1091,
-		1092, 1093, 1094, 1095,
-		1096, 1097, 1098, 1099,
-		1100, 1101, 1102, 1103,
-		1104, 1106, 1107, 1108,
-		1109, 1110, 1111, 1113,
-		1114, 1115, 1116, 1117,
-		1118, 1120, 1121, 1124,
-		1125, 1126, 1127, 1128,
-		1129, 1130, 1131, 1132,
-		1133, 1134, 1135, 1136,
-		1137, 1138, 1139, 1140,
-		1141, 1142, 1143, 1144,
-		1145, 1146, 1147, 1148,
-		1149, 1150, 1151, 1152,
-		1153, 1154, 1155
-	};
-	public static final int[] DEFAULT_ACTION_LIST = 
-	{ 
-		0, 1, 2, 3,
-		4, 5, 6, 7,
-		8, 9, 10, 11,
-		12, 13, 14, 15,
-		16, 17, 18, 19,
-		20, 21, 22, 23,
-		24, 25, 26, 27,
-		28, 29, 30, 31,
-		32, 33, 34, 35,
-		36, 37, 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, 76,
-		77, 78, 79, 80,
-		81, 82, 83, 84,
-		85, 86, 87, 88,
-		89, 90, 92, 93,
-		94, 96, 97, 98,
-		99, 100,
-		1000, 1001,
-		1002, 1003, 1004, 1005,
-		1006, 1007, 1008, 1009,
-		1010, 1011, 1012, 1013,
-		1014, 1015, 1016, 1017,
-		1018, 1019, 1020, 1021,
-		1022, 1023, 1024, 1025,
-		1026, 1027, 1028, 1029,
-		1030, 1031, 1032, 1033,
-		1034, 1035, 1036, 1037,
-		1038, 1039, 1040, 1041,
-		1042, 1043, 1044, 1045,
-		1046, 1047, 1048, 1049,
-		1050, 1051, 1052, 1053,
-		1054, 1055, 1056, 1057,
-		1058, 1059, 1060, 1061,
-		1062, 1063, 1064, 1065,
-		1066, 1067, 1068, 1069,
-		1070, 1071, 1072, 1073,
-		1074, 1075, 1076, 1077,
-		1078, 1079, 1080, 1081,
-		1082, 1083, 1084, 1086,
-		1087, 1088, 1089, 1090,
-		1091, 1092, 1093, 1094,
-		1095, 1096, 1097, 1098,
-		1099, 1100, 1101, 1102,
-		1103, 1104, 1106, 1107,
-		1108, 1109, 1110, 1111,
-		1112, 1113, 1114, 1115,
-		1116, 1117, 1118, 1119,
-		1120, 1121, 1122, 1123,
-		1124, 1125, 1126, 1127,
-		1128, 1129, 1130, 1131,
-		1132, 1133, 1134, 1135,
-		1136, 1137, 1138, 1139,
-		1140, 1141, 1142, 1143,
-		1144, 1145, 1146, 1147,
-		1148, 1149, 1150, 1151,
-		1152, 1153, 1154, 1155,
-		1168, 1169, 1170, 1171,
-		1172, 1173,
-		5000, 5001, 5002, 5003,
-		5004, 5005, 5006, 5007,
-		5008, 5009, 5010, 5011,
-		5012, 5013, 5014, 5015,
-	};
-	//@formatter:on
-	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(ActionData.getInstance().getActionIdList());
 	
 	private final int[] _actionIds;
 	
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
index 4dee5efb84..3c298a3a2a 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
@@ -167,7 +167,7 @@ public class FakePlayerInfo extends ServerPacket
 		writeByte(_npc.getTeam().getId());
 		writeInt(_clan != null ? _clan.getCrestLargeId() : 0);
 		writeByte(_fpcHolder.getNobleLevel());
-		writeByte(_fpcHolder.isHero());
+		writeByte(_fpcHolder.isHero() ? 2 : 0); // 152 - Value for enabled changed to 2
 		writeByte(_fpcHolder.isFishing());
 		writeInt(_fpcHolder.getBaitLocationX());
 		writeInt(_fpcHolder.getBaitLocationY());
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
index 1d4d2509c7..b78f4d0bb2 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
@@ -118,7 +118,7 @@ public class MultiSellList extends AbstractItemPacket
 				}
 				writeLong(_list.getProductCount(product));
 				writeShort(product.getEnchantmentLevel() > 0 ? product.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level
-				writeInt((int) product.getChance() * 1000000); // chance
+				writeInt((int) (product.getChance() * 1000000)); // chance
 				writeItemAugment(displayItemEnchantment);
 				writeItemElemental(displayItemEnchantment);
 				writeItemEnsoulOptions(displayItemEnchantment);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index 77da3642a8..1efc641196 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -61,7 +61,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 	{
 		_npc = npc;
 		_abnormalVisualEffects = npc.getEffectList().getCurrentAbnormalVisualEffects();
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE);
 		if (npc.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -170,7 +170,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 				addComponentType(NpcInfoType.CLAN);
 			}
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		if (npc.getPvpFlag() > 0)
 		{
 			addComponentType(NpcInfoType.PVP_FLAG);
@@ -330,9 +330,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -350,11 +350,11 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(0); // Armor id?
 			writeInt(_npc.getLeftHandItem());
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_npc.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_npc.isRunning());
 		}
@@ -378,9 +378,9 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_npc.getCloneObjId()); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			writeInt(_npc.getColorEffect()); // Color effect
+			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
 		{
@@ -410,7 +410,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index e88df6a6c3..142634a205 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,20 +19,21 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import java.util.Collection;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutInit extends ServerPacket
 {
-	private Collection<Shortcut> _shortCuts;
+	private final Player _player;
+	private final Collection<Shortcut> _shortCuts;
 	
 	public ShortCutInit(Player player)
 	{
-		if (player == null)
-		{
-			return;
-		}
+		_player = player;
 		_shortCuts = player.getAllShortCuts();
+		player.restoreAutoShortcutVisual();
 	}
 	
 	@Override
@@ -54,8 +55,21 @@ public class ShortCutInit extends ServerPacket
 					writeInt(sc.getSharedReuseGroup());
 					writeInt(0);
 					writeInt(0);
-					writeLong(0); // Augment id
-					writeInt(0); // Visual id
+					
+					final Item item = _player.getInventory().getItemByObjectId(sc.getId());
+					if (item != null)
+					{
+						final VariationInstance augment = item.getAugmentation();
+						writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+						writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+						writeInt(item.getVisualId()); // visual id
+					}
+					else
+					{
+						writeInt(0);
+						writeInt(0);
+						writeInt(0);
+					}
 					break;
 				}
 				case SKILL:
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 77c19e8bcb..d3dd7e1eb6 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -17,18 +17,24 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import org.l2jmobius.gameserver.model.Shortcut;
+import org.l2jmobius.gameserver.model.VariationInstance;
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 public class ShortCutRegister extends ServerPacket
 {
+	private final Player _player;
 	private final Shortcut _shortcut;
 	
 	/**
 	 * Register new skill shortcut
 	 * @param shortcut
+	 * @param player
 	 */
-	public ShortCutRegister(Shortcut shortcut)
+	public ShortCutRegister(Shortcut shortcut, Player player)
 	{
+		_player = player;
 		_shortcut = shortcut;
 	}
 	
@@ -43,14 +49,16 @@ public class ShortCutRegister extends ServerPacket
 		{
 			case ITEM:
 			{
+				final Item item = _player.getInventory().getItemByObjectId(_shortcut.getId());
+				final VariationInstance augment = item.getAugmentation();
 				writeInt(_shortcut.getId());
 				writeInt(_shortcut.getCharacterType());
 				writeInt(_shortcut.getSharedReuseGroup());
 				writeInt(0); // unknown
 				writeInt(0); // unknown
-				writeInt(0); // item augment id
-				writeInt(0); // item augment id
-				writeInt(0); // visual id
+				writeInt(augment != null ? augment.getOption1Id() : 0); // item augment id
+				writeInt(augment != null ? augment.getOption2Id() : 0); // item augment id
+				writeInt(item.getVisualId()); // visual id
 				break;
 			}
 			case SKILL:
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 209a163197..c2cf957f35 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.enums.SiegeClanType;
 import org.l2jmobius.gameserver.model.SiegeClan;
@@ -44,7 +47,7 @@ import org.l2jmobius.gameserver.network.ServerPackets;
  * S = AllyName<br>
  * S = AllyLeaderName<br>
  * d = AllyCrestID<br>
- * @author KenM
+ * @author Atronic
  */
 public class SiegeDefenderList extends ServerPacket
 {
@@ -60,64 +63,76 @@ public class SiegeDefenderList extends ServerPacket
 	{
 		ServerPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(this);
 		writeInt(_castle.getResidenceId());
-		writeInt(0); // Unknown
-		writeInt(1); // Unknown
-		writeInt(0); // Unknown
-		final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0);
-		writeInt(size);
-		writeInt(size);
-		// Add owners
-		final Clan ownerClan = _castle.getOwner();
-		if (ownerClan != null)
+		writeInt(0); // Unknown.
+		
+		final Clan owner = _castle.getOwner();
+		writeInt((owner != null) && _castle.isTimeRegistrationOver()); // Valid registration.
+		writeInt(0); // Unknown.
+		
+		// Add owners.
+		final List<Clan> defenders = new ArrayList<>();
+		if (owner != null)
 		{
-			writeInt(ownerClan.getId());
-			writeString(ownerClan.getName());
-			writeString(ownerClan.getLeaderName());
-			writeInt(ownerClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.OWNER.ordinal());
-			writeInt(ownerClan.getAllyId());
-			writeString(ownerClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(ownerClan.getAllyCrestId());
+			defenders.add(owner);
 		}
-		// List of confirmed defenders
+		
+		// List of confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if ((defendingClan == null) || (defendingClan == _castle.getOwner()))
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if ((clan != null) && (clan != owner))
 			{
-				continue;
+				defenders.add(clan);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
-		// List of not confirmed defenders
+		
+		// List of not confirmed defenders.
 		for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans())
 		{
-			final Clan defendingClan = ClanTable.getInstance().getClan(siegeClan.getClanId());
-			if (defendingClan == null)
+			final Clan clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+			if (clan != null)
 			{
-				continue;
+				defenders.add(clan);
+			}
+		}
+		
+		final int size = defenders.size();
+		writeInt(size);
+		writeInt(size);
+		
+		for (Clan clan : defenders)
+		{
+			writeInt(clan.getId());
+			writeString(clan.getName());
+			writeString(clan.getLeaderName());
+			writeInt(clan.getCrestId());
+			writeInt(0); // Signed time in seconds.
+			if (clan == owner)
+			{
+				writeInt(SiegeClanType.OWNER.ordinal() + 1);
+			}
+			else if (_castle.getSiege().getDefenderClans().stream().anyMatch(defender -> defender.getClanId() == clan.getId()))
+			{
+				writeInt(SiegeClanType.DEFENDER.ordinal() + 1);
+			}
+			else
+			{
+				writeInt(SiegeClanType.DEFENDER_PENDING.ordinal() + 1);
+			}
+			writeInt(clan.getAllyId());
+			if (clan.getAllyId() != 0)
+			{
+				final AllianceInfo info = new AllianceInfo(clan.getAllyId());
+				writeString(info.getName());
+				writeString(info.getLeaderP()); // Ally leader name.
+				writeInt(clan.getAllyCrestId());
+			}
+			else
+			{
+				writeString("");
+				writeString(""); // Ally leader name.
+				writeInt(0);
 			}
-			writeInt(defendingClan.getId());
-			writeString(defendingClan.getName());
-			writeString(defendingClan.getLeaderName());
-			writeInt(defendingClan.getCrestId());
-			writeInt(0); // signed time (seconds) (not storated by L2J)
-			writeInt(SiegeClanType.DEFENDER_PENDING.ordinal());
-			writeInt(defendingClan.getAllyId());
-			writeString(defendingClan.getAllyName());
-			writeString(""); // AllyLeaderName
-			writeInt(defendingClan.getAllyCrestId());
 		}
 	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index bdf3abdebe..edd30aaec3 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -68,7 +68,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -149,7 +149,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -249,9 +249,9 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -269,11 +269,11 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -297,9 +297,8 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -330,7 +329,7 @@ public class SummonInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
index 8e5c5f7765..22eb4ac7d4 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java
@@ -83,6 +83,17 @@ public class ExPurchaseLimitShopItemListNew extends ServerPacket
 					writeInt(product.getAccountDailyLimit() - _player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_DAILY_COUNT + product.getProductionId(), 0));
 				}
 			}
+			else if (product.getAccountMontlyLimit() > 0)
+			{
+				if (_player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + product.getProductionId(), 0) >= product.getAccountMontlyLimit())
+				{
+					writeInt(0);
+				}
+				else
+				{
+					writeInt(product.getAccountMontlyLimit() - _player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_MONTLY_COUNT + product.getProductionId(), 0));
+				}
+			}
 			else if (product.getAccountBuyLimit() > 0) // Count limit.
 			{
 				if (_player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + product.getProductionId(), 0) >= product.getAccountBuyLimit())
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java
index 88230d32a1..900d346e33 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java
@@ -68,7 +68,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_masks[2] |= 0x10;
 			addComponentType(NpcInfoType.NAME);
 		}
-		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG);
+		addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.STOP_MODE, NpcInfoType.MOVE_MODE, NpcInfoType.PVP_FLAG);
 		if (summon.getHeading() > 0)
 		{
 			addComponentType(NpcInfoType.HEADING);
@@ -142,7 +142,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			_allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId();
 			addComponentType(NpcInfoType.CLAN);
 		}
-		addComponentType(NpcInfoType.COLOR_EFFECT);
+		addComponentType(NpcInfoType.PET_EVOLUTION_ID);
 		// TODO: Confirm me
 		if (summon.isInCombat())
 		{
@@ -241,9 +241,9 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(_summon.getHeading());
 		}
-		if (containsMask(NpcInfoType.UNKNOWN2))
+		if (containsMask(NpcInfoType.VEHICLE_ID))
 		{
-			writeInt(0); // Unknown
+			writeInt(0); // Vehicle object id.
 		}
 		if (containsMask(NpcInfoType.ATK_CAST_SPEED))
 		{
@@ -261,11 +261,11 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 			writeInt(_summon.getArmor()); // Armor id?
 			writeInt(0);
 		}
-		if (containsMask(NpcInfoType.ALIVE))
+		if (containsMask(NpcInfoType.STOP_MODE))
 		{
 			writeByte(!_summon.isDead());
 		}
-		if (containsMask(NpcInfoType.RUNNING))
+		if (containsMask(NpcInfoType.MOVE_MODE))
 		{
 			writeByte(_summon.isRunning());
 		}
@@ -289,9 +289,8 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeInt(0); // Player ObjectId with Decoy
 		}
-		if (containsMask(NpcInfoType.COLOR_EFFECT))
+		if (containsMask(NpcInfoType.PET_EVOLUTION_ID))
 		{
-			// No visual effect
 			writeInt(0); // Unknown
 		}
 		if (containsMask(NpcInfoType.DISPLAY_EFFECT))
@@ -322,7 +321,7 @@ public class ExPetInfo extends AbstractMaskPacket<NpcInfoType>
 		{
 			writeByte(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn
 		}
-		if (containsMask(NpcInfoType.UNKNOWN12))
+		if (containsMask(NpcInfoType.FOLLOW_INFO))
 		{
 			writeInt(0);
 			writeInt(0);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetSummonInfo.java
similarity index 96%
rename from L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java
rename to L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetSummonInfo.java
index fed7aa46a8..56cbbf532b 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetSummonInfo.java
@@ -1,212 +1,212 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver.network.serverpackets.pet;
-
-import java.util.Set;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.enums.EvolveLevel;
-import org.l2jmobius.gameserver.enums.Team;
-import org.l2jmobius.gameserver.model.actor.Summon;
-import org.l2jmobius.gameserver.model.actor.instance.Pet;
-import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
-import org.l2jmobius.gameserver.network.ServerPackets;
-import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
-import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
-
-/**
- * 12 - wolf, 13 - buffalo, 14 - tiger, 15-kukkabara, 17 - hawk, 16 - dragon
- */
-public class PetInfo extends ServerPacket
-{
-	private final Summon _summon;
-	private final int _value;
-	private final int _runSpd;
-	private final int _walkSpd;
-	private final int _swimRunSpd;
-	private final int _swimWalkSpd;
-	private final int _flRunSpd = 0;
-	private final int _flWalkSpd = 0;
-	private final int _flyRunSpd;
-	private final int _flyWalkSpd;
-	private final double _moveMultiplier;
-	private int _maxFed;
-	private int _curFed;
-	private int _statusMask = 0;
-	
-	public PetInfo(Summon summon, int value)
-	{
-		_summon = summon;
-		_moveMultiplier = summon.getMovementSpeedMultiplier();
-		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
-		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
-		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
-		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
-		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
-		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
-		_value = value;
-		if (summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			_curFed = pet.getCurrentFed(); // how fed it is
-			_maxFed = pet.getMaxFed(); // max fed it can be
-		}
-		else if (summon.isServitor())
-		{
-			final Servitor sum = (Servitor) _summon;
-			_curFed = sum.getLifeTimeRemaining();
-			_maxFed = sum.getLifeTime();
-		}
-		if (summon.isBetrayed())
-		{
-			_statusMask |= 0x01; // Auto attackable status
-		}
-		_statusMask |= 0x02; // can be chatted with
-		if (summon.isRunning())
-		{
-			_statusMask |= 0x04;
-		}
-		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
-		{
-			_statusMask |= 0x08;
-		}
-		if (summon.isDead())
-		{
-			_statusMask |= 0x10;
-		}
-		if (summon.isMountable())
-		{
-			_statusMask |= 0x20;
-		}
-	}
-	
-	@Override
-	public void write()
-	{
-		ServerPackets.PET_INFO.writeId(this);
-		writeByte(_summon.getSummonType());
-		writeInt(_summon.getObjectId());
-		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
-		writeInt(_summon.getX());
-		writeInt(_summon.getY());
-		writeInt(_summon.getZ());
-		writeInt(_summon.getHeading());
-		writeInt(_summon.getStat().getMAtkSpd());
-		writeInt(_summon.getStat().getPAtkSpd());
-		writeShort(_runSpd);
-		writeShort(_walkSpd);
-		writeShort(_swimRunSpd);
-		writeShort(_swimWalkSpd);
-		writeShort(_flRunSpd);
-		writeShort(_flWalkSpd);
-		writeShort(_flyRunSpd);
-		writeShort(_flyWalkSpd);
-		writeDouble(_moveMultiplier);
-		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
-		writeDouble(_summon.getTemplate().getFCollisionRadius());
-		writeDouble(_summon.getTemplate().getFCollisionHeight());
-		writeInt(_summon.getWeapon()); // right hand weapon
-		writeInt(_summon.getArmor()); // body armor
-		writeInt(0); // left hand weapon
-		writeByte(_summon.isDead() ? 0 : _summon.isShowSummonAnimation() ? 2 : _value);
-		writeInt(-1); // High Five NPCString ID
-		if (_summon.isPet())
-		{
-			writeString(_summon.getName()); // Pet name.
-		}
-		else
-		{
-			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
-		}
-		writeInt(-1); // High Five NPCString ID
-		writeString(_summon.getTitle()); // owner name
-		writeByte(_summon.getPvpFlag()); // confirmed
-		writeInt(_summon.getReputation()); // confirmed
-		writeInt(_curFed); // how fed it is
-		writeInt(_maxFed); // max fed it can be
-		writeInt((int) _summon.getCurrentHp()); // current hp
-		writeInt(_summon.getMaxHp()); // max hp
-		writeInt((int) _summon.getCurrentMp()); // current mp
-		writeInt(_summon.getMaxMp()); // max mp
-		writeLong(_summon.getStat().getSp()); // sp
-		writeShort(_summon.getLevel()); // level
-		writeLong(_summon.getStat().getExp());
-		// 0% absolute value
-		writeLong(Math.min(_summon.getExpForThisLevel(), _summon.getStat().getExp())); // 0% absolute value
-		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
-		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
-		writeInt(_summon.getMaxLoad()); // max weight it can carry
-		writeInt(_summon.getPAtk()); // patk
-		writeInt(_summon.getPDef()); // pdef
-		writeInt(_summon.getAccuracy()); // accuracy
-		writeInt(_summon.getEvasionRate()); // evasion
-		writeInt(_summon.getCriticalHit()); // critical
-		writeInt(_summon.getMAtk()); // matk
-		writeInt(_summon.getMDef()); // mdef
-		writeInt(_summon.getMagicAccuracy()); // magic accuracy
-		writeInt(_summon.getMagicEvasionRate()); // magic evasion
-		writeInt(_summon.getMCriticalHit()); // mcritical
-		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
-		writeInt(_summon.getPAtkSpd()); // atkspeed
-		writeInt(_summon.getMAtkSpd()); // casting speed
-		writeByte(0); // TODO: Check me, might be ride status
-		writeByte(_summon.getTeam().getId()); // Confirmed
-		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
-		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
-		writeInt(-1);
-		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
-		writeByte(0); // Used Summon Points
-		writeByte(0); // Maximum Summon Points
-		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
-		final Team team = (Config.BLUE_TEAM_ABNORMAL_EFFECT != null) && (Config.RED_TEAM_ABNORMAL_EFFECT != null) ? _summon.getTeam() : Team.NONE;
-		writeShort(aves.size() + (_summon.isInvisible() ? 1 : 0) + (team != Team.NONE ? 1 : 0)); // Confirmed
-		for (AbnormalVisualEffect ave : aves)
-		{
-			writeShort(ave.getClientId()); // Confirmed
-		}
-		if (_summon.isInvisible())
-		{
-			writeShort(AbnormalVisualEffect.STEALTH.getClientId());
-		}
-		if (team == Team.BLUE)
-		{
-			if (Config.BLUE_TEAM_ABNORMAL_EFFECT != null)
-			{
-				writeShort(Config.BLUE_TEAM_ABNORMAL_EFFECT.getClientId());
-			}
-		}
-		else if ((team == Team.RED) && (Config.RED_TEAM_ABNORMAL_EFFECT != null))
-		{
-			writeShort(Config.RED_TEAM_ABNORMAL_EFFECT.getClientId());
-		}
-		writeByte(_statusMask);
-		if (_summon.isPet())
-		{
-			final Pet pet = (Pet) _summon;
-			writeInt(pet.getPetData().getType());
-			writeInt(pet.getEvolveLevel());
-			writeInt(pet.getEvolveLevel() == 0 ? -1 : pet.getId());
-		}
-		else
-		{
-			writeInt(0);
-			writeInt(EvolveLevel.None.ordinal());
-			writeInt(0);
-		}
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets.pet;
+
+import java.util.Set;
+
+import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.enums.EvolveLevel;
+import org.l2jmobius.gameserver.enums.Team;
+import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.instance.Servitor;
+import org.l2jmobius.gameserver.model.skill.AbnormalVisualEffect;
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
+import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
+
+/**
+ * 12 - wolf, 13 - buffalo, 14 - tiger, 15-kukkabara, 17 - hawk, 16 - dragon
+ */
+public class PetSummonInfo extends ServerPacket
+{
+	private final Summon _summon;
+	private final int _value;
+	private final int _runSpd;
+	private final int _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flRunSpd = 0;
+	private final int _flWalkSpd = 0;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private int _maxFed;
+	private int _curFed;
+	private int _statusMask = 0;
+	
+	public PetSummonInfo(Summon summon, int value)
+	{
+		_summon = summon;
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_value = value;
+		if (summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		}
+		else if (summon.isServitor())
+		{
+			final Servitor sum = (Servitor) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+		if (summon.isBetrayed())
+		{
+			_statusMask |= 0x01; // Auto attackable status
+		}
+		_statusMask |= 0x02; // can be chatted with
+		if (summon.isRunning())
+		{
+			_statusMask |= 0x04;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(summon))
+		{
+			_statusMask |= 0x08;
+		}
+		if (summon.isDead())
+		{
+			_statusMask |= 0x10;
+		}
+		if (summon.isMountable())
+		{
+			_statusMask |= 0x20;
+		}
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.PET_INFO.writeId(this);
+		writeByte(_summon.getSummonType());
+		writeInt(_summon.getObjectId());
+		writeInt(_summon.getTemplate().getDisplayId() + 1000000);
+		writeInt(_summon.getX());
+		writeInt(_summon.getY());
+		writeInt(_summon.getZ());
+		writeInt(_summon.getHeading());
+		writeInt(_summon.getStat().getMAtkSpd());
+		writeInt(_summon.getStat().getPAtkSpd());
+		writeShort(_runSpd);
+		writeShort(_walkSpd);
+		writeShort(_swimRunSpd);
+		writeShort(_swimWalkSpd);
+		writeShort(_flRunSpd);
+		writeShort(_flWalkSpd);
+		writeShort(_flyRunSpd);
+		writeShort(_flyWalkSpd);
+		writeDouble(_moveMultiplier);
+		writeDouble(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeDouble(_summon.getTemplate().getFCollisionRadius());
+		writeDouble(_summon.getTemplate().getFCollisionHeight());
+		writeInt(_summon.getWeapon()); // right hand weapon
+		writeInt(_summon.getArmor()); // body armor
+		writeInt(0); // left hand weapon
+		writeByte(_summon.isDead() ? 0 : _summon.isShowSummonAnimation() ? 2 : _value);
+		writeInt(-1); // High Five NPCString ID
+		if (_summon.isPet())
+		{
+			writeString(_summon.getName()); // Pet name.
+		}
+		else
+		{
+			writeString(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeInt(-1); // High Five NPCString ID
+		writeString(_summon.getTitle()); // owner name
+		writeByte(_summon.getPvpFlag()); // confirmed
+		writeInt(_summon.getReputation()); // confirmed
+		writeInt(_curFed); // how fed it is
+		writeInt(_maxFed); // max fed it can be
+		writeInt((int) _summon.getCurrentHp()); // current hp
+		writeInt(_summon.getMaxHp()); // max hp
+		writeInt((int) _summon.getCurrentMp()); // current mp
+		writeInt(_summon.getMaxMp()); // max mp
+		writeLong(_summon.getStat().getSp()); // sp
+		writeShort(_summon.getLevel()); // level
+		writeLong(_summon.getStat().getExp());
+		// 0% absolute value
+		writeLong(Math.min(_summon.getExpForThisLevel(), _summon.getStat().getExp())); // 0% absolute value
+		writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+		writeInt(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight
+		writeInt(_summon.getMaxLoad()); // max weight it can carry
+		writeInt(_summon.getPAtk()); // patk
+		writeInt(_summon.getPDef()); // pdef
+		writeInt(_summon.getAccuracy()); // accuracy
+		writeInt(_summon.getEvasionRate()); // evasion
+		writeInt(_summon.getCriticalHit()); // critical
+		writeInt(_summon.getMAtk()); // matk
+		writeInt(_summon.getMDef()); // mdef
+		writeInt(_summon.getMagicAccuracy()); // magic accuracy
+		writeInt(_summon.getMagicEvasionRate()); // magic evasion
+		writeInt(_summon.getMCriticalHit()); // mcritical
+		writeInt((int) _summon.getStat().getMoveSpeed()); // speed
+		writeInt(_summon.getPAtkSpd()); // atkspeed
+		writeInt(_summon.getMAtkSpd()); // casting speed
+		writeByte(0); // TODO: Check me, might be ride status
+		writeByte(_summon.getTeam().getId()); // Confirmed
+		writeByte(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed
+		writeByte(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed
+		writeInt(-1);
+		writeInt(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level.
+		writeByte(0); // Used Summon Points
+		writeByte(0); // Maximum Summon Points
+		final Set<AbnormalVisualEffect> aves = _summon.getEffectList().getCurrentAbnormalVisualEffects();
+		final Team team = (Config.BLUE_TEAM_ABNORMAL_EFFECT != null) && (Config.RED_TEAM_ABNORMAL_EFFECT != null) ? _summon.getTeam() : Team.NONE;
+		writeShort(aves.size() + (_summon.isInvisible() ? 1 : 0) + (team != Team.NONE ? 1 : 0)); // Confirmed
+		for (AbnormalVisualEffect ave : aves)
+		{
+			writeShort(ave.getClientId()); // Confirmed
+		}
+		if (_summon.isInvisible())
+		{
+			writeShort(AbnormalVisualEffect.STEALTH.getClientId());
+		}
+		if (team == Team.BLUE)
+		{
+			if (Config.BLUE_TEAM_ABNORMAL_EFFECT != null)
+			{
+				writeShort(Config.BLUE_TEAM_ABNORMAL_EFFECT.getClientId());
+			}
+		}
+		else if ((team == Team.RED) && (Config.RED_TEAM_ABNORMAL_EFFECT != null))
+		{
+			writeShort(Config.RED_TEAM_ABNORMAL_EFFECT.getClientId());
+		}
+		writeByte(_statusMask);
+		if (_summon.isPet())
+		{
+			final Pet pet = (Pet) _summon;
+			writeInt(pet.getPetData().getType());
+			writeInt(pet.getEvolveLevel());
+			writeInt(pet.getEvolveLevel() == 0 ? -1 : pet.getId());
+		}
+		else
+		{
+			writeInt(0);
+			writeInt(EvolveLevel.None.ordinal());
+			writeInt(0);
+		}
+	}
+}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/pet/ResultPetExtractSystem.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/pet/ResultPetExtractSystem.java
new file mode 100644
index 0000000000..0deca5b570
--- /dev/null
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/pet/ResultPetExtractSystem.java
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets.pet;
+
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
+
+/**
+ * @author Geremy
+ */
+public class ResultPetExtractSystem extends ServerPacket
+{
+	private final boolean _success;
+	
+	public ResultPetExtractSystem(boolean success)
+	{
+		_success = success;
+	}
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.EX_RESULT_PET_EXTRACT_SYSTEM.writeId(this);
+		writeInt(_success);
+	}
+}
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/not_done/Q10907_WhereFlowersBlossom.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/pet/ShowPetExtractSystem.java
similarity index 61%
rename from L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/not_done/Q10907_WhereFlowersBlossom.java
rename to L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/pet/ShowPetExtractSystem.java
index 5498674f66..29683dc5a5 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/quests/not_done/Q10907_WhereFlowersBlossom.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/network/serverpackets/pet/ShowPetExtractSystem.java
@@ -1,36 +1,35 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package quests.not_done;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.model.quest.Quest;
-
-/**
- * @author Mobius
- */
-public class Q10907_WhereFlowersBlossom extends Quest
-{
-	private static final int START_NPC = 34599;
-	
-	public Q10907_WhereFlowersBlossom()
-	{
-		super(10907);
-		addStartNpc(START_NPC);
-		addTalkId(START_NPC);
-		addCondMinLevel(Config.PLAYER_MAXIMUM_LEVEL, getNoQuestMsg(null));
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.l2jmobius.gameserver.network.serverpackets.pet;
+
+import org.l2jmobius.gameserver.network.ServerPackets;
+import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
+
+/**
+ * @author Geremy
+ */
+public class ShowPetExtractSystem extends ServerPacket
+{
+	public static final ShowPetExtractSystem STATIC_PACKET = new ShowPetExtractSystem();
+	
+	@Override
+	public void write()
+	{
+		ServerPackets.EX_SHOW_PET_EXTRACT_SYSTEM.writeId(this);
+		writeInt(0);
+	}
+}
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
index d9708e71db..25ce6b8dd7 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.taskmanager;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -25,11 +26,13 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.item.Weapon;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
@@ -42,9 +45,12 @@ import org.l2jmobius.gameserver.util.Util;
 public class AutoPlayTaskManager
 {
 	private static final Set<Set<Player>> POOLS = ConcurrentHashMap.newKeySet();
+	private static final Map<Player, Integer> IDLE_COUNT = new ConcurrentHashMap<>();
 	private static final int POOL_SIZE = 300;
 	private static final int TASK_DELAY = 300;
 	private static final Integer AUTO_ATTACK_ACTION = 2;
+	private static final Integer PET_ATTACK_ACTION = 16;
+	private static final Integer SUMMON_ATTACK_ACTION = 22;
 	
 	protected AutoPlayTaskManager()
 	{
@@ -94,6 +100,25 @@ public class AutoPlayTaskManager
 					}
 					else if ((creature.getTarget() == player) || (creature.getTarget() == null))
 					{
+						// Pet Attack.
+						final Pet pet = player.getPet();
+						if ((pet != null) && player.getAutoUseSettings().getAutoActions().contains(PET_ATTACK_ACTION) && pet.hasAI() && !pet.isMoving() && !pet.isDisabled() && (pet.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (pet.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+						{
+							pet.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+						}
+						
+						// Summon Attack.
+						if (player.hasSummon() && player.getAutoUseSettings().getAutoActions().contains(SUMMON_ATTACK_ACTION))
+						{
+							for (Summon summon : player.getServitors().values())
+							{
+								if (summon.hasAI() && !summon.isMoving() && !summon.isDisabled() && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (summon.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && creature.isAutoAttackable(player) && GeoEngine.getInstance().canSeeTarget(player, creature))
+								{
+									summon.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+								}
+							}
+						}
+						
 						// We take granted that mage classes do not auto hit.
 						if (isMageCaster(player))
 						{
@@ -122,23 +147,32 @@ public class AutoPlayTaskManager
 								final Weapon weapon = player.getActiveWeaponItem();
 								if (weapon != null)
 								{
-									final boolean ranged = weapon.getItemType().isRanged();
-									final double angle = Util.calculateHeadingFrom(player, creature);
-									final double radian = Math.toRadians(angle);
-									final double course = Math.toRadians(180);
-									final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
-									final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
-									final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
-									final Location location;
-									if (ranged)
+									final int idleCount = IDLE_COUNT.getOrDefault(player, 0);
+									if (idleCount > 10)
 									{
-										location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										final boolean ranged = weapon.getItemType().isRanged();
+										final double angle = Util.calculateHeadingFrom(player, creature);
+										final double radian = Math.toRadians(angle);
+										final double course = Math.toRadians(180);
+										final double distance = (ranged ? player.getCollisionRadius() : player.getCollisionRadius() + creature.getCollisionRadius()) * 2;
+										final int x1 = (int) (Math.cos(Math.PI + radian + course) * distance);
+										final int y1 = (int) (Math.sin(Math.PI + radian + course) * distance);
+										final Location location;
+										if (ranged)
+										{
+											location = new Location(player.getX() + x1, player.getY() + y1, player.getZ());
+										}
+										else
+										{
+											location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										}
+										player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
+										IDLE_COUNT.remove(player);
 									}
 									else
 									{
-										location = new Location(creature.getX() + x1, creature.getY() + y1, player.getZ());
+										IDLE_COUNT.put(player, idleCount + 1);
 									}
-									player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, location);
 								}
 							}
 						}
@@ -146,6 +180,9 @@ public class AutoPlayTaskManager
 					}
 				}
 				
+				// Reset idle count.
+				IDLE_COUNT.remove(player);
+				
 				// Pickup.
 				if (player.getAutoPlaySettings().doPickup())
 				{
@@ -180,32 +217,55 @@ public class AutoPlayTaskManager
 				
 				// Find target.
 				Creature creature = null;
-				double closestDistance = Double.MAX_VALUE;
-				TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) && (targetMode != 4 /* Counterattack */) ? 600 : 1400))
+				final Party party = player.getParty();
+				final Player leader = party == null ? null : party.getLeader();
+				if (Config.ENABLE_AUTO_ASSIST && (party != null) && (leader != null) && (leader != player) && !leader.isDead())
 				{
-					// Skip unavailable creatures.
-					if ((nearby == null) || nearby.isAlikeDead())
+					if (leader.calculateDistance3D(player) < (Config.ALT_PARTY_RANGE * 2 /* 2? */))
 					{
-						continue TARGET;
-					}
-					// Check creature target.
-					if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
-					{
-						continue TARGET;
-					}
-					// Check next target mode.
-					if (!isTargetModeValid(targetMode, player, nearby))
-					{
-						continue TARGET;
-					}
-					// Check if creature is reachable.
-					if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
-					{
-						final double creatureDistance = player.calculateDistance2D(nearby);
-						if (creatureDistance < closestDistance)
+						final WorldObject leaderTarget = leader.getTarget();
+						if ((leaderTarget != null) && (leaderTarget.isAttackable() || (leaderTarget.isPlayable() && !party.containsPlayer(leaderTarget.getActingPlayer()))))
 						{
-							creature = nearby;
-							closestDistance = creatureDistance;
+							creature = (Creature) leaderTarget;
+						}
+						else if ((player.getAI().getIntention() != CtrlIntention.AI_INTENTION_FOLLOW) && !player.isDisabled())
+						{
+							player.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, leader);
+						}
+					}
+				}
+				else
+				{
+					double closestDistance = Double.MAX_VALUE;
+					TARGET: for (Creature nearby : World.getInstance().getVisibleObjectsInRange(player, Creature.class, player.getAutoPlaySettings().isShortRange() && (targetMode != 2 /* Characters */) && (targetMode != 4 /* Counterattack */) ? 600 : 1400))
+					{
+						// Skip unavailable creatures.
+						if ((nearby == null) || nearby.isAlikeDead())
+						{
+							continue TARGET;
+						}
+						
+						// Check creature target.
+						if (player.getAutoPlaySettings().isRespectfulHunting() && !nearby.isPlayable() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
+						{
+							continue TARGET;
+						}
+						
+						// Check next target mode.
+						if (!isTargetModeValid(targetMode, player, nearby))
+						{
+							continue TARGET;
+						}
+						
+						// Check if creature is reachable.
+						if ((Math.abs(player.getZ() - nearby.getZ()) < 180) && GeoEngine.getInstance().canSeeTarget(player, nearby) && GeoEngine.getInstance().canMoveToTarget(player.getX(), player.getY(), player.getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), player.getInstanceWorld()))
+						{
+							final double creatureDistance = player.calculateDistance2D(nearby);
+							if (creatureDistance < closestDistance)
+							{
+								creature = nearby;
+								closestDistance = creatureDistance;
+							}
 						}
 					}
 				}
@@ -256,7 +316,7 @@ public class AutoPlayTaskManager
 				}
 				case 4: // Counterattack
 				{
-					return creature.isMonster() || (creature.isPlayable() && creature.isAutoAttackable(player));
+					return creature.isMonster() || (creature.isPlayer() && ((creature.getTarget() == player) && (creature.getActingPlayer().getEinhasadOverseeingLevel() >= 1)));
 				}
 				default: // Any Target
 				{
@@ -315,6 +375,7 @@ public class AutoPlayTaskManager
 				{
 					player.getPet().followOwner();
 				}
+				IDLE_COUNT.remove(player);
 				return;
 			}
 		}
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 0b448194b6..a5dda1d99b 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -36,7 +36,9 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Guard;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
+import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
+import org.l2jmobius.gameserver.model.effects.EffectType;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.EventType;
 import org.l2jmobius.gameserver.model.events.impl.item.OnItemUse;
@@ -47,12 +49,12 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.EffectScope;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
-import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 
 /**
  * @author Mobius
@@ -429,8 +431,9 @@ public class AutoUseTaskManager
 						// Do not allow to do some action if player is transformed.
 						if (player.isTransformed())
 						{
-							final int[] allowedActions = player.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
-							if (Arrays.binarySearch(allowedActions, actionId) < 0)
+							final TransformTemplate transformTemplate = player.getTransformation().get().getTemplate(player);
+							final int[] allowedActions = transformTemplate.getBasicActionList();
+							if ((allowedActions == null) || (Arrays.binarySearch(allowedActions, actionId) < 0))
 							{
 								continue ACTIONS;
 							}
@@ -442,7 +445,24 @@ public class AutoUseTaskManager
 							final IPlayerActionHandler actionHandler = PlayerActionHandler.getInstance().getHandler(actionHolder.getHandler());
 							if (actionHandler != null)
 							{
-								actionHandler.useAction(player, actionHolder, false, false);
+								if (!actionHandler.isPetAction())
+								{
+									actionHandler.useAction(player, actionHolder, false, false);
+								}
+								else
+								{
+									final Summon summon = player.getAnyServitor();
+									if ((summon != null) && !summon.isAlikeDead())
+									{
+										final Skill skill = summon.getKnownSkill(actionHolder.getOptionId());
+										if ((skill != null) && !canSummonCastSkill(player, summon, skill))
+										{
+											continue ACTIONS;
+										}
+										
+										actionHandler.useAction(player, actionHolder, false, false);
+									}
+								}
 							}
 						}
 					}
@@ -525,6 +545,59 @@ public class AutoUseTaskManager
 			
 			return !player.isSkillDisabled(skill) && skill.checkCondition(player, target, false);
 		}
+		
+		private boolean canSummonCastSkill(Player player, Summon summon, Skill skill)
+		{
+			if (skill.isBad() && (player.getTarget() == null))
+			{
+				return false;
+			}
+			
+			final int mpConsume = skill.getMpConsume() + skill.getMpInitialConsume();
+			if ((((mpConsume != 0) && (mpConsume > (int) Math.floor(summon.getCurrentMp()))) || ((skill.getHpConsume() != 0) && (skill.getHpConsume() > (int) Math.floor(summon.getCurrentHp())))))
+			{
+				return false;
+			}
+			
+			if (summon.isSkillDisabled(skill))
+			{
+				return false;
+			}
+			
+			if (((player.getTarget() != null) && !skill.checkCondition(summon, player.getTarget(), false)) || ((player.getTarget() == null) && !skill.checkCondition(summon, player, false)))
+			{
+				return false;
+			}
+			
+			if ((skill.getItemConsumeCount() > 0) && (summon.getInventory().getInventoryItemCount(skill.getItemConsumeId(), -1) < skill.getItemConsumeCount()))
+			{
+				return false;
+			}
+			
+			if (skill.getTargetType().equals(TargetType.SELF) || skill.getTargetType().equals(TargetType.SUMMON))
+			{
+				final BuffInfo summonInfo = summon.getEffectList().getBuffInfoBySkillId(skill.getId());
+				return (summonInfo != null) && (summonInfo.getTime() >= REUSE_MARGIN_TIME);
+			}
+			
+			if ((skill.getEffects(EffectScope.GENERAL) != null) && skill.getEffects(EffectScope.GENERAL).stream().anyMatch(a -> a.getEffectType().equals(EffectType.MANAHEAL_BY_LEVEL)) && (player.getCurrentMpPercent() > 80))
+			{
+				return false;
+			}
+			
+			final BuffInfo buffInfo = player.getEffectList().getBuffInfoBySkillId(skill.getId());
+			final BuffInfo abnormalBuffInfo = player.getEffectList().getFirstBuffInfoByAbnormalType(skill.getAbnormalType());
+			if (abnormalBuffInfo != null)
+			{
+				if (buffInfo != null)
+				{
+					return (abnormalBuffInfo.getSkill().getId() == buffInfo.getSkill().getId()) && ((buffInfo.getTime() <= REUSE_MARGIN_TIME) || (buffInfo.getSkill().getLevel() < skill.getLevel()));
+				}
+				return (abnormalBuffInfo.getSkill().getAbnormalLevel() < skill.getAbnormalLevel()) || abnormalBuffInfo.isAbnormalType(AbnormalType.NONE);
+			}
+			
+			return true;
+		}
 	}
 	
 	public synchronized void startAutoUseTask(Player player)
diff --git a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/util/Util.java
index dde351d51a..d004f93d57 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/util/Util.java
@@ -34,6 +34,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -721,13 +722,13 @@ public class Util
 	{
 		if (descending)
 		{
-			return map.entrySet().stream().sorted(Map.Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+			return map.entrySet().stream().sorted(Entry.comparingByValue(Collections.reverseOrder())).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 		}
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 	
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map)
 	{
-		return map.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+		return map.entrySet().stream().sorted(Entry.comparingByValue()).collect(Collectors.toMap(Entry::getKey, Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
 	}
 }
diff --git a/L2J_Mobius_Essence_7.1_Assassin/readme.txt b/L2J_Mobius_Essence_7.1_Assassin/readme.txt
index c51b302ee4..b883194292 100644
--- a/L2J_Mobius_Essence_7.1_Assassin/readme.txt
+++ b/L2J_Mobius_Essence_7.1_Assassin/readme.txt
@@ -127,6 +127,7 @@ Fluffy Reinforcement: https://eu.4game.com/patchnotes/lineage2essence/204/
 
 Dwelling of Spirits: https://eu.4game.com/patchnotes/lineage2essence/261/
 -Transcendent hunting zones
+-Pet extraction system
 
 Sylph: https://eu.4game.com/patchnotes/lineage2essence/281/
 -Sylph creation support
@@ -167,6 +168,7 @@ Assassin: https://eu.4game.com/patchnotes/lineage2essence/426/
 -New quest system
 -Elemental spirit changes
 
+
 Customs:
 -Newbie Helper NPC location info
 -Newbie Helper buff support until 40 level